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

meerevm v1.14.11 #801

Merged
merged 1 commit into from
Oct 10, 2024
Merged

meerevm v1.14.11 #801

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
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/dchest/blake256 v1.1.0
github.com/deckarep/golang-set v1.8.0
github.com/dgraph-io/ristretto v0.0.2
github.com/ethereum/go-ethereum v1.14.9
github.com/ethereum/go-ethereum v1.14.11
github.com/ferranbt/fastssz v0.1.2
github.com/go-stack/stack v1.8.1
github.com/gofrs/flock v0.8.1
Expand Down Expand Up @@ -192,7 +192,7 @@ require (
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/status-im/keycard-go v0.2.0 // indirect
github.com/supranational/blst v0.3.11 // indirect
github.com/supranational/blst v0.3.13 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
Expand All @@ -218,6 +218,6 @@ require (
rsc.io/tmplfunc v0.0.3 // indirect
)

replace github.com/ethereum/go-ethereum v1.14.9 => github.com/Qitmeer/go-ethereum v1.14.9-q.1
replace github.com/ethereum/go-ethereum v1.14.11 => github.com/Qitmeer/go-ethereum v1.14.11-q.0

replace github.com/karalabe/usb v0.0.2 => github.com/dindinw/karalabe-usb v0.0.0-20230613095851-cd69a62c9c30
5 changes: 3 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ github.com/Qitmeer/crypto v0.0.0-20201028030128-6ed4040ca34a h1:LUGOJG/lF0TlnlYT
github.com/Qitmeer/crypto v0.0.0-20201028030128-6ed4040ca34a/go.mod h1:gbGKdXSJn71Mc2xcKJHqC/waPiX0byZae67zarj83m4=
github.com/Qitmeer/crypto/cryptonight v0.0.0-20201028030128-6ed4040ca34a h1:O2Erw/YvYAkIqkc2uvP/WwuWf0V8S0+pjU/FKHmjFU4=
github.com/Qitmeer/crypto/cryptonight v0.0.0-20201028030128-6ed4040ca34a/go.mod h1:KiA7g46zc6dkgf/3NbEpJirY75v656WYlmSQNR1wTVk=
github.com/Qitmeer/go-ethereum v1.14.9-q.1 h1:JnHxQ6u5pzAoy7yrArj3xSS6dq7KQjaT44ur/sMeT5E=
github.com/Qitmeer/go-ethereum v1.14.9-q.1/go.mod h1:LQ3f5b8AbuHbOi/XITy8fZuKC9XIGD5YeB/txwhOzSk=
github.com/Qitmeer/go-ethereum v1.14.11-q.0 h1:5k8fcs5hzwwb4+1+iguD8ewOC0IinCgV6dQG97UpivQ=
github.com/Qitmeer/go-ethereum v1.14.11-q.0/go.mod h1:G/lOJx/OgkhxHd4/H2gVLujGhewGflf2112ENitmGGo=
github.com/Qitmeer/go-secp256k1 v0.5.1 h1:t3u4VMSz7LRn9Ki1lecG7tyTNwbLGILt1CwdOAA5N7M=
github.com/Qitmeer/go-secp256k1 v0.5.1/go.mod h1:AkrSQDAMwdV4+pXUQnEAPvPbUiIN4DAHMAm0ueneJB8=
github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
Expand Down Expand Up @@ -641,6 +641,7 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4=
github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
Expand Down
3 changes: 2 additions & 1 deletion meerevm/amana/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ func (c *backend) Fork(parentHash common.Hash) error {
if parent == nil {
return errors.New("parent not found")
}
return c.eth.BlockChain().SetHead(parent.NumberU64())
_, err := c.eth.BlockChain().SetCanonical(parent)
return err
}

// AdjustTime creates a new block with an adjusted timestamp.
Expand Down
3 changes: 1 addition & 2 deletions meerevm/eth/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ func makeFullNode(ctx *cli.Context, cfg *Config) (*node.Node, *eth.EthAPIBackend
}
utils.RegisterFullSyncTester(stack, ethe, common.BytesToHash(hex))
}
return stack, backend.(*eth.EthAPIBackend), ethe
return stack, backend, ethe
}

func makeConfigNode(ctx *cli.Context, cfg *Config) *node.Node {
Expand Down Expand Up @@ -597,7 +597,6 @@ func MakeChain(ctx *cli.Context, stack *node.Node, readonly bool, cfg *Config) (
var (
vmcfg = vm.Config{
EnablePreimageRecording: cfg.Eth.EnablePreimageRecording,
EnableWitnessCollection: cfg.Eth.EnableWitnessCollection,
}
cacheConfig = &core.CacheConfig{
TrieCleanLimit: cfg.Eth.TrieCleanCache,
Expand Down
Loading