Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Evm integration #43

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Evm integration #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,21 @@
[submodule "extern/test-vectors"]
path = extern/test-vectors
url = https://github.com/filecoin-project/test-vectors.git
[submodule "extern/fil-blst"]
path = extern/fil-blst
url = https://github.com/filecoin-project/fil-blst.git
[submodule "extern/oni"]
path = extern/oni
url = https://github.com/filecoin-project/oni
[submodule "extern/specs-actors"]
path = extern/specs-actors
url = https://github.com/pixelplex-dev/specs-actors
[submodule "extern/evm-adapter"]
path = extern/evm-adapter
url = https://github.com/filestar-project/evm_adapter
[submodule "extern/go-state-types"]
path = extern/go-state-types
url = https://github.com/filestar-project/go-state-types
[submodule "extern/geth"]
path = extern/go-ethereum
url = https://github.com/pixelplex-dev/filestar-geth
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ endif

GOFLAGS+=-ldflags="$(ldflags)"


## FFI

FFI_PATH:=extern/filecoin-ffi/
Expand Down
9 changes: 9 additions & 0 deletions chain/actors/builtin/contract/contract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package contract

import (
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
)

var (
Methods = builtin2.MethodsContract
)
2 changes: 1 addition & 1 deletion chain/messagepool/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var (
MemPoolSizeLimitHiDefault = 30000
MemPoolSizeLimitLoDefault = 20000
PruneCooldownDefault = time.Minute
GasLimitOverestimation = 1.25
GasLimitOverestimation = 2.0

ConfigKey = datastore.NewKey("/mpool/config")
)
Expand Down
2 changes: 1 addition & 1 deletion chain/types/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,4 +201,4 @@ func (m *Message) ValidForBlockInclusion(minGas int64) error {
return nil
}

const TestGasLimit = 100e6
const TestGasLimit = 100e14
Loading