diff --git a/bridge-history-api/go.mod b/bridge-history-api/go.mod index 4c4bd89dcc..3fac29cd4f 100644 --- a/bridge-history-api/go.mod +++ b/bridge-history-api/go.mod @@ -8,7 +8,7 @@ require ( github.com/go-redis/redis/v8 v8.11.5 github.com/pressly/goose/v3 v3.16.0 github.com/prometheus/client_golang v1.16.0 - github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 + github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e github.com/stretchr/testify v1.9.0 github.com/urfave/cli/v2 v2.25.7 golang.org/x/sync v0.6.0 diff --git a/bridge-history-api/go.sum b/bridge-history-api/go.sum index 30c7a4effb..0ea329b376 100644 --- a/bridge-history-api/go.sum +++ b/bridge-history-api/go.sum @@ -311,8 +311,8 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 h1:bHBt6sillaT4o/9RjxkVX8pWwvEmu37uWBw4XbCjfzY= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e h1:FcoK0rykAWI+5E7cQM6ALRLd5CmjBTHRvJztRBH2xeM= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= github.com/scroll-tech/zktrie v0.7.1 h1:NrmZNjuBzsbrKePqdHDG+t2cXnimbtezPAFS0+L9ElE= github.com/scroll-tech/zktrie v0.7.1/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= diff --git a/common/forks/forks.go b/common/forks/forks.go index 5b0bb24d5b..ae6e165c38 100644 --- a/common/forks/forks.go +++ b/common/forks/forks.go @@ -33,7 +33,8 @@ func CollectSortedForkHeights(config *params.ChainConfig) ([]uint64, map[uint64] {name: "arrowGlacier", block: config.ArrowGlacierBlock}, {name: "archimedes", block: config.ArchimedesBlock}, {name: "shanghai", block: config.ShanghaiBlock}, - {name: "banach", block: config.BanachBlock}, + {name: "bernoulli", block: config.BernoulliBlock}, + {name: "curie", block: config.CurieBlock}, } { if fork.block == nil { continue diff --git a/common/forks/forks_test.go b/common/forks/forks_test.go index 50c1474e26..73a75a7a0c 100644 --- a/common/forks/forks_test.go +++ b/common/forks/forks_test.go @@ -11,10 +11,10 @@ import ( func TestCollectSortedForkBlocks(t *testing.T) { l, m, n := CollectSortedForkHeights(¶ms.ChainConfig{ - EIP155Block: big.NewInt(4), - EIP158Block: big.NewInt(3), - ByzantiumBlock: big.NewInt(3), - ConstantinopleBlock: big.NewInt(0), + ArchimedesBlock: big.NewInt(0), + ShanghaiBlock: big.NewInt(3), + BernoulliBlock: big.NewInt(3), + CurieBlock: big.NewInt(4), }) require.Equal(t, l, []uint64{ 0, @@ -27,9 +27,9 @@ func TestCollectSortedForkBlocks(t *testing.T) { 0: true, }, m) require.Equal(t, map[string]uint64{ - "eip155": 4, - "byzantium": 3, - "constantinople": 0, + "archimedes": 0, + "bernoulli": 3, + "curie": 4, }, n) } diff --git a/common/go.mod b/common/go.mod index 533fc222f9..1edfeec042 100644 --- a/common/go.mod +++ b/common/go.mod @@ -16,7 +16,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 github.com/orcaman/concurrent-map v1.0.0 github.com/prometheus/client_golang v1.16.0 - github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 + github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.29.1 github.com/testcontainers/testcontainers-go/modules/compose v0.29.1 diff --git a/common/go.sum b/common/go.sum index 119e1b88e2..a1a1245177 100644 --- a/common/go.sum +++ b/common/go.sum @@ -614,8 +614,8 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 h1:bHBt6sillaT4o/9RjxkVX8pWwvEmu37uWBw4XbCjfzY= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e h1:FcoK0rykAWI+5E7cQM6ALRLd5CmjBTHRvJztRBH2xeM= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= github.com/scroll-tech/zktrie v0.7.1 h1:NrmZNjuBzsbrKePqdHDG+t2cXnimbtezPAFS0+L9ElE= github.com/scroll-tech/zktrie v0.7.1/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk= github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE= diff --git a/common/version/version.go b/common/version/version.go index 129cefdc46..76e5ea54fe 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.3.77" +var tag = "v4.3.78" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { diff --git a/coordinator/go.mod b/coordinator/go.mod index 32e0d238c7..64c415dbfe 100644 --- a/coordinator/go.mod +++ b/coordinator/go.mod @@ -7,7 +7,7 @@ require ( github.com/gin-gonic/gin v1.9.1 github.com/go-resty/resty/v2 v2.7.0 github.com/mitchellh/mapstructure v1.5.0 - github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 + github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e github.com/shopspring/decimal v1.3.1 github.com/stretchr/testify v1.9.0 github.com/urfave/cli/v2 v2.25.7 diff --git a/coordinator/go.sum b/coordinator/go.sum index c8b98cbd43..508a95e432 100644 --- a/coordinator/go.sum +++ b/coordinator/go.sum @@ -173,8 +173,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 h1:bHBt6sillaT4o/9RjxkVX8pWwvEmu37uWBw4XbCjfzY= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e h1:FcoK0rykAWI+5E7cQM6ALRLd5CmjBTHRvJztRBH2xeM= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= github.com/scroll-tech/zktrie v0.7.1 h1:NrmZNjuBzsbrKePqdHDG+t2cXnimbtezPAFS0+L9ElE= github.com/scroll-tech/zktrie v0.7.1/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= diff --git a/coordinator/test/api_test.go b/coordinator/test/api_test.go index cb72d99283..c7e3a98101 100644 --- a/coordinator/test/api_test.go +++ b/coordinator/test/api_test.go @@ -115,8 +115,8 @@ func setupCoordinator(t *testing.T, proversPerSession uint8, coordinatorURL stri var chainConf params.ChainConfig for forkName, forkNumber := range nameForkMap { switch forkName { - case "banach": - chainConf.BanachBlock = big.NewInt(forkNumber) + case "bernoulli": + chainConf.BernoulliBlock = big.NewInt(forkNumber) case "london": chainConf.LondonBlock = big.NewInt(forkNumber) case "istanbul": @@ -332,18 +332,18 @@ func testHardForkAssignTask(t *testing.T) { { // hard fork 4, prover 4 block [2-3] name: "noTaskForkChunkProverVersionLargeOrEqualThanHardFork", proofType: message.ProofTypeChunk, - forkNumbers: map[string]int64{"banach": forkNumberFour}, + forkNumbers: map[string]int64{"bernoulli": forkNumberFour}, exceptTaskNumber: 0, - proverForkNames: []string{"banach", "banach"}, + proverForkNames: []string{"bernoulli", "bernoulli"}, exceptGetTaskErrCodes: []int{types.ErrCoordinatorEmptyProofData, types.ErrCoordinatorEmptyProofData}, exceptGetTaskErrMsgs: []string{"get empty prover task", "get empty prover task"}, }, { name: "noTaskForkBatchProverVersionLargeOrEqualThanHardFork", proofType: message.ProofTypeBatch, - forkNumbers: map[string]int64{"banach": forkNumberFour}, + forkNumbers: map[string]int64{"bernoulli": forkNumberFour}, exceptTaskNumber: 0, - proverForkNames: []string{"banach", "banach"}, + proverForkNames: []string{"bernoulli", "bernoulli"}, exceptGetTaskErrCodes: []int{types.ErrCoordinatorEmptyProofData, types.ErrCoordinatorEmptyProofData}, exceptGetTaskErrMsgs: []string{"get empty prover task", "get empty prover task"}, }, @@ -431,7 +431,7 @@ func testHardForkAssignTask(t *testing.T) { { // hard fork 4, prover 3 block [2-3] name: "twoTaskForkChunkProverVersionLessThanHardFork", proofType: message.ProofTypeChunk, - forkNumbers: map[string]int64{"banach": forkNumberFour, "istanbul": forkNumberTwo}, + forkNumbers: map[string]int64{"bernoulli": forkNumberFour, "istanbul": forkNumberTwo}, exceptTaskNumber: 2, proverForkNames: []string{"istanbul", "istanbul"}, exceptGetTaskErrCodes: []int{types.Success, types.Success}, diff --git a/database/go.mod b/database/go.mod index 3551a1882a..af1a2350c4 100644 --- a/database/go.mod +++ b/database/go.mod @@ -6,7 +6,7 @@ require ( github.com/jmoiron/sqlx v1.3.5 github.com/lib/pq v1.10.9 github.com/pressly/goose/v3 v3.16.0 - github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 + github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e github.com/stretchr/testify v1.9.0 github.com/urfave/cli/v2 v2.25.7 ) diff --git a/database/go.sum b/database/go.sum index c536647879..bd8271005d 100644 --- a/database/go.sum +++ b/database/go.sum @@ -119,8 +119,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 h1:bHBt6sillaT4o/9RjxkVX8pWwvEmu37uWBw4XbCjfzY= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e h1:FcoK0rykAWI+5E7cQM6ALRLd5CmjBTHRvJztRBH2xeM= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/sethvargo/go-retry v0.2.4 h1:T+jHEQy/zKJf5s95UkguisicE0zuF9y7+/vgz08Ocec= diff --git a/go.work.sum b/go.work.sum index 3b8168309e..21364419dc 100644 --- a/go.work.sum +++ b/go.work.sum @@ -660,6 +660,7 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/crate-crypto/go-ipa v0.0.0-20220523130400-f11357ae11c7 h1:6IrxszG5G+O7zhtkWxq6+unVvnrm1fqV2Pe+T95DUzw= github.com/crate-crypto/go-ipa v0.0.0-20220523130400-f11357ae11c7/go.mod h1:gFnFS95y8HstDP6P9pPwzrxOOC5TRDkwbM+ao15ChAI= github.com/crate-crypto/go-ipa v0.0.0-20230601170251-1830d0757c80 h1:DuBDHVjgGMPki7bAyh91+3cF1Vh34sAEdH8JQgbc2R0= @@ -1491,6 +1492,8 @@ github.com/scroll-tech/go-ethereum v1.10.14-0.20230306131930-03b4de32b78b/go.mod github.com/scroll-tech/go-ethereum v1.10.14-0.20230321020420-127af384ed04/go.mod h1:jH8c08L9K8Hieaf0r/ur2P/cpesn4dFhmLm2Mmoi8kI= github.com/scroll-tech/go-ethereum v1.10.14-0.20230802095950-4b2bbf6225e7/go.mod h1:DiN3p2inoXOxGffxSswDKqWjQ7bU+Mp0c9v0XQXKmaA= github.com/scroll-tech/go-ethereum v1.10.14-0.20230829000527-f883dcdc21fc/go.mod h1:DiN3p2inoXOxGffxSswDKqWjQ7bU+Mp0c9v0XQXKmaA= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e h1:FcoK0rykAWI+5E7cQM6ALRLd5CmjBTHRvJztRBH2xeM= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= github.com/scroll-tech/zktrie v0.6.0/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0 h1:HtCSf6B4gN/87yc5qTl7WsxPKQIIGXLPPM1bMCPOsoY= diff --git a/prover/go.mod b/prover/go.mod index b9829c12f1..e954eddb93 100644 --- a/prover/go.mod +++ b/prover/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/go-resty/resty/v2 v2.7.0 github.com/google/uuid v1.6.0 - github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 + github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e github.com/stretchr/testify v1.9.0 github.com/urfave/cli/v2 v2.25.7 go.etcd.io/bbolt v1.3.7 diff --git a/prover/go.sum b/prover/go.sum index 387ac0ed7a..e662be34a4 100644 --- a/prover/go.sum +++ b/prover/go.sum @@ -168,8 +168,8 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 h1:bHBt6sillaT4o/9RjxkVX8pWwvEmu37uWBw4XbCjfzY= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e h1:FcoK0rykAWI+5E7cQM6ALRLd5CmjBTHRvJztRBH2xeM= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= github.com/scroll-tech/zktrie v0.7.1 h1:NrmZNjuBzsbrKePqdHDG+t2cXnimbtezPAFS0+L9ElE= github.com/scroll-tech/zktrie v0.7.1/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= diff --git a/rollup/go.mod b/rollup/go.mod index 9f5e2af489..498c70162b 100644 --- a/rollup/go.mod +++ b/rollup/go.mod @@ -10,7 +10,7 @@ require ( github.com/go-resty/resty/v2 v2.7.0 github.com/holiman/uint256 v1.2.4 github.com/prometheus/client_golang v1.16.0 - github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 + github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e github.com/smartystreets/goconvey v1.8.0 github.com/stretchr/testify v1.9.0 github.com/urfave/cli/v2 v2.25.7 diff --git a/rollup/go.sum b/rollup/go.sum index 963944acde..e10c2bac99 100644 --- a/rollup/go.sum +++ b/rollup/go.sum @@ -237,8 +237,8 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 h1:bHBt6sillaT4o/9RjxkVX8pWwvEmu37uWBw4XbCjfzY= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e h1:FcoK0rykAWI+5E7cQM6ALRLd5CmjBTHRvJztRBH2xeM= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= github.com/scroll-tech/zktrie v0.7.1 h1:NrmZNjuBzsbrKePqdHDG+t2cXnimbtezPAFS0+L9ElE= github.com/scroll-tech/zktrie v0.7.1/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= diff --git a/rollup/internal/controller/relayer/l2_relayer.go b/rollup/internal/controller/relayer/l2_relayer.go index ffa1b5cc18..023cb8e530 100644 --- a/rollup/internal/controller/relayer/l2_relayer.go +++ b/rollup/internal/controller/relayer/l2_relayer.go @@ -374,7 +374,7 @@ func (r *Layer2Relayer) ProcessPendingBatches() { var calldata []byte var blob *kzg4844.Blob - if !r.chainCfg.IsBanach(new(big.Int).SetUint64(dbChunks[0].StartBlockNumber)) { // codecv0 + if !r.chainCfg.IsBernoulli(new(big.Int).SetUint64(dbChunks[0].StartBlockNumber)) { // codecv0 calldata, err = r.constructCommitBatchPayloadCodecV0(dbBatch, dbParentBatch, dbChunks, chunks) if err != nil { log.Error("failed to construct commitBatch payload codecv0", "index", dbBatch.Index, "err", err) @@ -535,7 +535,7 @@ func (r *Layer2Relayer) finalizeBatch(dbBatch *orm.Batch, withProof bool) error } var calldata []byte - if !r.chainCfg.IsBanach(new(big.Int).SetUint64(dbChunks[0].StartBlockNumber)) { // codecv0 + if !r.chainCfg.IsBernoulli(new(big.Int).SetUint64(dbChunks[0].StartBlockNumber)) { // codecv0 calldata, err = r.constructFinalizeBatchPayloadCodecV0(dbBatch, dbParentBatch, aggProof) if err != nil { return fmt.Errorf("failed to construct commitBatch payload codecv0, index: %v, err: %w", dbBatch.Index, err) diff --git a/rollup/internal/controller/relayer/l2_relayer_test.go b/rollup/internal/controller/relayer/l2_relayer_test.go index bd6039202d..1a9b9988af 100644 --- a/rollup/internal/controller/relayer/l2_relayer_test.go +++ b/rollup/internal/controller/relayer/l2_relayer_test.go @@ -57,7 +57,7 @@ func testL2RelayerProcessPendingBatches(t *testing.T) { l2Cfg := cfg.L2Config chainConfig := ¶ms.ChainConfig{} if codecVersion == encoding.CodecV0 { - chainConfig.BanachBlock = big.NewInt(0) + chainConfig.BernoulliBlock = big.NewInt(0) } relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig, chainConfig, true, ServiceTypeL2RollupRelayer, nil) @@ -107,7 +107,7 @@ func testL2RelayerProcessCommittedBatches(t *testing.T) { l2Cfg := cfg.L2Config chainConfig := ¶ms.ChainConfig{} if codecVersion == encoding.CodecV0 { - chainConfig.BanachBlock = big.NewInt(0) + chainConfig.BernoulliBlock = big.NewInt(0) } relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig, chainConfig, true, ServiceTypeL2RollupRelayer, nil) assert.NoError(t, err) @@ -172,7 +172,7 @@ func testL2RelayerFinalizeTimeoutBatches(t *testing.T) { l2Cfg.RelayerConfig.FinalizeBatchWithoutProofTimeoutSec = 0 chainConfig := ¶ms.ChainConfig{} if codecVersion == encoding.CodecV0 { - chainConfig.BanachBlock = big.NewInt(0) + chainConfig.BernoulliBlock = big.NewInt(0) } relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig, chainConfig, true, ServiceTypeL2RollupRelayer, nil) assert.NoError(t, err) diff --git a/rollup/internal/controller/watcher/batch_proposer.go b/rollup/internal/controller/watcher/batch_proposer.go index 5929af3635..2909092fd9 100644 --- a/rollup/internal/controller/watcher/batch_proposer.go +++ b/rollup/internal/controller/watcher/batch_proposer.go @@ -182,7 +182,7 @@ func (p *BatchProposer) proposeBatch() error { } codecVersion := encoding.CodecV0 - if p.chainCfg.IsBanach(new(big.Int).SetUint64(dbChunks[0].StartBlockNumber)) { + if p.chainCfg.IsBernoulli(new(big.Int).SetUint64(dbChunks[0].StartBlockNumber)) { codecVersion = encoding.CodecV1 } @@ -201,8 +201,8 @@ func (p *BatchProposer) proposeBatch() error { batch.ParentBatchHash = common.HexToHash(dbParentBatch.Hash) parentBatchEndBlockNumber := daChunks[0].Blocks[0].Header.Number.Uint64() - 1 parentBatchCodecVersion := encoding.CodecV0 - // Genesis batch uses codecv0 encoding, otherwise using banach fork to choose codec version. - if dbParentBatch.Index > 0 && p.chainCfg.IsBanach(new(big.Int).SetUint64(parentBatchEndBlockNumber)) { + // Genesis batch uses codecv0 encoding, otherwise using bernoulli fork to choose codec version. + if dbParentBatch.Index > 0 && p.chainCfg.IsBernoulli(new(big.Int).SetUint64(parentBatchEndBlockNumber)) { parentBatchCodecVersion = encoding.CodecV1 } batch.TotalL1MessagePoppedBefore, err = utils.GetTotalL1MessagePoppedBeforeBatch(dbParentBatch.BatchHeader, parentBatchCodecVersion) diff --git a/rollup/internal/controller/watcher/batch_proposer_test.go b/rollup/internal/controller/watcher/batch_proposer_test.go index 5939de19f1..5e8a9fa7c8 100644 --- a/rollup/internal/controller/watcher/batch_proposer_test.go +++ b/rollup/internal/controller/watcher/batch_proposer_test.go @@ -268,7 +268,7 @@ func testBatchProposerCodecv1Limits(t *testing.T) { ChunkTimeoutSec: 300, GasCostIncreaseMultiplier: 1.2, }, ¶ms.ChainConfig{ - BanachBlock: big.NewInt(0), HomesteadBlock: tt.forkBlock, + BernoulliBlock: big.NewInt(0), HomesteadBlock: tt.forkBlock, }, db, nil) cp.TryProposeChunk() // chunk1 contains block1 cp.TryProposeChunk() // chunk2 contains block2 @@ -287,7 +287,7 @@ func testBatchProposerCodecv1Limits(t *testing.T) { BatchTimeoutSec: tt.batchTimeoutSec, GasCostIncreaseMultiplier: 1.2, }, ¶ms.ChainConfig{ - BanachBlock: big.NewInt(0), HomesteadBlock: tt.forkBlock, + BernoulliBlock: big.NewInt(0), HomesteadBlock: tt.forkBlock, }, db, nil) bp.TryProposeBatch() @@ -428,7 +428,7 @@ func testBatchProposerBlobSizeLimit(t *testing.T) { MaxRowConsumptionPerChunk: math.MaxUint64, ChunkTimeoutSec: math.MaxUint64, GasCostIncreaseMultiplier: 1, - }, ¶ms.ChainConfig{BanachBlock: big.NewInt(0)}, db, nil) + }, ¶ms.ChainConfig{BernoulliBlock: big.NewInt(0)}, db, nil) block = readBlockFromJSON(t, "../../../testdata/blockTrace_03.json") for total := int64(0); total < 7; total++ { @@ -447,7 +447,7 @@ func testBatchProposerBlobSizeLimit(t *testing.T) { MaxL1CommitCalldataSizePerBatch: 1, BatchTimeoutSec: math.MaxUint64, GasCostIncreaseMultiplier: 1, - }, ¶ms.ChainConfig{BanachBlock: big.NewInt(0)}, db, nil) + }, ¶ms.ChainConfig{BernoulliBlock: big.NewInt(0)}, db, nil) for i := 0; i < 10; i++ { bp.TryProposeBatch() diff --git a/rollup/internal/controller/watcher/chunk_proposer.go b/rollup/internal/controller/watcher/chunk_proposer.go index 9d74bec23f..06802f057b 100644 --- a/rollup/internal/controller/watcher/chunk_proposer.go +++ b/rollup/internal/controller/watcher/chunk_proposer.go @@ -193,7 +193,7 @@ func (p *ChunkProposer) proposeChunk() error { } codecVersion := encoding.CodecV0 - if p.chainCfg.IsBanach(blocks[0].Header.Number) { + if p.chainCfg.IsBernoulli(blocks[0].Header.Number) { codecVersion = encoding.CodecV1 } diff --git a/rollup/internal/controller/watcher/chunk_proposer_test.go b/rollup/internal/controller/watcher/chunk_proposer_test.go index 46ed4ae201..287cdb4d06 100644 --- a/rollup/internal/controller/watcher/chunk_proposer_test.go +++ b/rollup/internal/controller/watcher/chunk_proposer_test.go @@ -300,7 +300,7 @@ func testChunkProposerCodecv1Limits(t *testing.T) { MaxRowConsumptionPerChunk: tt.maxRowConsumption, ChunkTimeoutSec: tt.chunkTimeoutSec, GasCostIncreaseMultiplier: 1.2, - }, ¶ms.ChainConfig{BanachBlock: big.NewInt(0), HomesteadBlock: tt.forkBlock}, db, nil) + }, ¶ms.ChainConfig{BernoulliBlock: big.NewInt(0), HomesteadBlock: tt.forkBlock}, db, nil) cp.TryProposeChunk() chunkOrm := orm.NewChunk(db) @@ -342,7 +342,7 @@ func testChunkProposerCodecv1BlobSizeLimit(t *testing.T) { MaxRowConsumptionPerChunk: math.MaxUint64, ChunkTimeoutSec: math.MaxUint64, GasCostIncreaseMultiplier: 1, - }, ¶ms.ChainConfig{BanachBlock: big.NewInt(0)}, db, nil) + }, ¶ms.ChainConfig{BernoulliBlock: big.NewInt(0)}, db, nil) for i := 0; i < 10; i++ { cp.TryProposeChunk() diff --git a/rollup/tests/rollup_test.go b/rollup/tests/rollup_test.go index ae22cb526e..08f05b61b7 100644 --- a/rollup/tests/rollup_test.go +++ b/rollup/tests/rollup_test.go @@ -187,7 +187,7 @@ func testCommitBatchAndFinalizeBatch4844(t *testing.T) { // Create L2Relayer l2Cfg := rollupApp.Config.L2Config - chainConfig := ¶ms.ChainConfig{BanachBlock: big.NewInt(0)} + chainConfig := ¶ms.ChainConfig{BernoulliBlock: big.NewInt(0)} l2Relayer, err := relayer.NewLayer2Relayer(context.Background(), l2Client, db, l2Cfg.RelayerConfig, chainConfig, true, relayer.ServiceTypeL2RollupRelayer, nil) assert.NoError(t, err) defer l2Relayer.StopSenders() @@ -316,7 +316,7 @@ func testCommitBatchAndFinalizeBatchBeforeAndPost4844(t *testing.T) { // Create L2Relayer l2Cfg := rollupApp.Config.L2Config - chainConfig := ¶ms.ChainConfig{BanachBlock: big.NewInt(5)} + chainConfig := ¶ms.ChainConfig{BernoulliBlock: big.NewInt(5)} l2Relayer, err := relayer.NewLayer2Relayer(context.Background(), l2Client, db, l2Cfg.RelayerConfig, chainConfig, true, relayer.ServiceTypeL2RollupRelayer, nil) assert.NoError(t, err) defer l2Relayer.StopSenders() diff --git a/tests/integration-test/go.mod b/tests/integration-test/go.mod index 69533870fc..09cd14f4b0 100644 --- a/tests/integration-test/go.mod +++ b/tests/integration-test/go.mod @@ -3,7 +3,7 @@ module scroll-tech/integration-test go 1.21 require ( - github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 + github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e github.com/stretchr/testify v1.9.0 gorm.io/gorm v1.25.5 ) diff --git a/tests/integration-test/go.sum b/tests/integration-test/go.sum index 334d35043d..93e731e560 100644 --- a/tests/integration-test/go.sum +++ b/tests/integration-test/go.sum @@ -94,8 +94,8 @@ github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeC github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935 h1:bHBt6sillaT4o/9RjxkVX8pWwvEmu37uWBw4XbCjfzY= -github.com/scroll-tech/go-ethereum v1.10.14-0.20240314095130-4553f5f26935/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e h1:FcoK0rykAWI+5E7cQM6ALRLd5CmjBTHRvJztRBH2xeM= +github.com/scroll-tech/go-ethereum v1.10.14-0.20240326144132-0f0cd99f7a2e/go.mod h1:7Rz2bh9pn42rGuxjh51CG7HL9SKMG3ZugJkL3emdZx8= github.com/scroll-tech/zktrie v0.7.1 h1:NrmZNjuBzsbrKePqdHDG+t2cXnimbtezPAFS0+L9ElE= github.com/scroll-tech/zktrie v0.7.1/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=