Upgrade geth to 1.13 #2416
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,15 +9,15 @@ import ( | |
| "github.com/synapsecns/sanguine/ethergo/chain/client" | ||
| ) | ||
|
|
||
| // GetSepolia gets the rinkeby preset backend. | ||
| func GetSepolia() Backend { | ||
| chainConfig := *params.AllCliqueProtocolChanges | ||
| chainConfig.ChainID = params.SepoliaChainConfig.ChainID | ||
|
|
||
| return Backend{ | ||
| config: &chainConfig, | ||
| rpcURL: core.GetEnv("SEPOLIA_RPC_URL", "ws://0.0.0.0:8045"), | ||
| name: "Sepolia", | ||
| privateKey: os.Getenv("EXPORT_KEY"), | ||
| } | ||
| } | ||
|
|
@@ -42,7 +42,7 @@ func GetMaticMumbai() Backend { | |
| chainConfig := *params.AllCliqueProtocolChanges | ||
| chainConfig.ChainID = client.MaticMainnetConfig.ChainID | ||
| // london is not activated on bsc | ||
| chainConfig.LondonBlock = big.NewInt(0) | ||
|
|
||
| return Backend{ | ||
| config: &chainConfig, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,16 @@ | ||
| package multibackend | ||
|
|
||
| import ( | ||
| "math/big" | ||
|
|
||
| "github.com/ethereum/go-ethereum/consensus/ethash" | ||
| "github.com/ethereum/go-ethereum/core" | ||
| "github.com/ethereum/go-ethereum/core/rawdb" | ||
| "github.com/ethereum/go-ethereum/core/vm" | ||
| "github.com/ethereum/go-ethereum/eth/filters" | ||
| "github.com/ethereum/go-ethereum/params" | ||
| "github.com/ethereum/go-ethereum/trie" | ||
| util "github.com/synapsecns/sanguine/core" | ||
| ) | ||
|
|
||
| // NewConfigWithChainID creates a new *params.ChainConfig and changes only the chain id | ||
|
|
@@ -46,9 +48,10 @@ func NewConfigWithChainID(chainID *big.Int) *params.ChainConfig { | |
| // NewSimulatedBackendWithConfig creates a new simulated backend with the given chain id. | ||
| func NewSimulatedBackendWithConfig(alloc core.GenesisAlloc, gasLimit uint64, config *params.ChainConfig) *SimulatedBackend { | ||
| database := rawdb.NewMemoryDatabase() | ||
| triedb := trie.NewDatabase(database, nil) | ||
|
|
||
| genesis := core.Genesis{Config: config, GasLimit: gasLimit, Alloc: alloc} | ||
| genesis.MustCommit(database, triedb) | ||
| blockchain, _ := core.NewBlockChain(database, nil, &genesis, nil, ethash.NewFaker(), vm.Config{}, nil, nil) | ||
|
|
||
| backend := &SimulatedBackend{ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,10 @@ package simulated | |
| import ( | ||
| "context" | ||
| "errors" | ||
| "math/big" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/ethereum/go-ethereum/accounts/abi/bind" | ||
| "github.com/ethereum/go-ethereum/accounts/keystore" | ||
| "github.com/ethereum/go-ethereum/common" | ||
|
|
@@ -20,9 +24,6 @@ import ( | |
| "github.com/synapsecns/sanguine/ethergo/chain/client" | ||
| "github.com/synapsecns/sanguine/ethergo/signer/nonce" | ||
| "github.com/teivah/onecontext" | ||
| ) | ||
|
|
||
| var logger = log.Logger("simulated-logger") | ||
|
|
@@ -51,7 +52,7 @@ func (s *Backend) Signer() types.Signer { | |
| latestBlock, err := s.BlockByNumber(s.Context(), nil) | ||
| assert.Nil(s.T(), err) | ||
|
|
||
| return types.MakeSigner(s.chainConfig, latestBlock.Number(), latestBlock.Time()) | ||
| } | ||
|
|
||
| // T gets the testing object for the backend. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,7 @@ func (s *ChainSuite) TestChainWatcher() { | |
|
|
||
| // make sure a chain client can be started form a url. | ||
| func (s *ChainSuite) TestNewFromURL() { | ||
| rinkeby := preset.GetSepolia().Geth(s.GetTestContext(), s.T()) | ||
| chnRPC, err := chain.NewFromURL(s.GetTestContext(), rinkeby.RPCAddress()) | ||
| Nil(s.T(), err) | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,9 @@ | ||
| package client_test | ||
|
|
||
| import ( | ||
| "os" | ||
| "time" | ||
|
|
||
| "github.com/ethereum/go-ethereum/core/types" | ||
| "github.com/lmittmann/w3/module/eth" | ||
| "github.com/lmittmann/w3/w3types" | ||
|
|
@@ -10,8 +13,6 @@ import ( | |
| "github.com/synapsecns/sanguine/ethergo/chain/client" | ||
| "github.com/synapsecns/sanguine/ethergo/mocks" | ||
| "go.uber.org/atomic" | ||
| ) | ||
|
|
||
| // TestAttemptReconnect tests the rehupping process. You may notice that in the below test, if the first connection | ||
|
|
@@ -22,7 +23,7 @@ func (c *ClientSuite) TestAttemptReconnect() { | |
| if os.Getenv("ATTEMPT_CONNECT_ENABLED") != "" { | ||
| c.T().Skip("deprecated") | ||
| } | ||
| testBackend := preset.GetSepolia().Geth(c.GetTestContext(), c.T()) | ||
|
|
||
| // make sure the client doesn't reset on us during the test | ||
| client.SetResetTimeout(time.Hour) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,10 @@ | ||
| package client | ||
|
|
||
| import ( | ||
| "math/big" | ||
|
|
||
| ethCommon "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/params" | ||
| ) | ||
|
|
||
| // Config contains the configuration needed to connect to the chain. | ||
|
|
@@ -333,8 +334,7 @@ var ( | |
|
|
||
| // chainConfigs is a list of chain configs. | ||
| var chainConfigs = []*params.ChainConfig{ | ||
| params.MainnetChainConfig, params.SepoliaChainConfig, params.GoerliChainConfig, | ||
| params.AllEthashProtocolChanges, BSCChainConfig, ChapelChainConfig, RialtoChainConfig, | ||
| SimulatedConfig, MaticMumbaiConfig, MaticMainnetConfig, AvalancheMainnetChainConfig, AvalancheLocalChainConfig, | ||
| ArbitrumMainnetConfig, FtmMainnetConfig, HarmonyConfig, BobaConfig, MoonRiverConfig, OptimisticEthereum, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,16 @@ | ||
| package client_test | ||
|
|
||
| import ( | ||
| "math" | ||
| "math/big" | ||
| "time" | ||
|
|
||
| "github.com/ethereum/go-ethereum/core/types" | ||
| . "github.com/stretchr/testify/assert" | ||
| "github.com/synapsecns/sanguine/core/testsuite" | ||
| "github.com/synapsecns/sanguine/ethergo/chain/client" | ||
| "github.com/synapsecns/sanguine/ethergo/mocks" | ||
| "gotest.tools/assert" | ||
| ) | ||
|
|
||
| // TestConfigFromID makes sure configs are properly returned by id. | ||
|
|
@@ -37,7 +39,7 @@ func (c ClientSuite) TestConfig() { | |
| // TestChainSigner is a sanity check that our configs correctly use the signer. | ||
| func (c ClientSuite) TestChainSigner() { | ||
| for _, config := range client.ChainConfigs { | ||
| signer := types.MakeSigner(config, big.NewInt(0).SetUint64(math.MaxUint64), uint64(time.Now().Unix())) | ||
| False(c.T(), signer.Equal(types.FrontierSigner{})) | ||
| False(c.T(), signer.Equal(types.HomesteadSigner{})) | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Handle potential failure from
StartMiningin the retry logic.Committable suggestion