diff --git a/rollup/circuitcapacitychecker/impl.go b/rollup/circuitcapacitychecker/impl.go index d1f463470b..b6d79c630c 100644 --- a/rollup/circuitcapacitychecker/impl.go +++ b/rollup/circuitcapacitychecker/impl.go @@ -15,8 +15,8 @@ import ( "sync" "unsafe" - "github.com/scroll-tech/go-ethereum/core/types" - "github.com/scroll-tech/go-ethereum/log" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/log" ) // mutex for concurrent CircuitCapacityChecker creations diff --git a/rollup/circuitcapacitychecker/mock.go b/rollup/circuitcapacitychecker/mock.go index a50bc6d5d7..e3aa4d8372 100644 --- a/rollup/circuitcapacitychecker/mock.go +++ b/rollup/circuitcapacitychecker/mock.go @@ -5,7 +5,7 @@ package circuitcapacitychecker import ( "math/rand" - "github.com/scroll-tech/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/core/types" ) type CircuitCapacityChecker struct { diff --git a/rollup/circuitcapacitychecker/types.go b/rollup/circuitcapacitychecker/types.go index 13a9385d56..9846c2fb00 100644 --- a/rollup/circuitcapacitychecker/types.go +++ b/rollup/circuitcapacitychecker/types.go @@ -3,7 +3,7 @@ package circuitcapacitychecker import ( "errors" - "github.com/scroll-tech/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/core/types" ) var ( diff --git a/rollup/fees/rollup_fee.go b/rollup/fees/rollup_fee.go index 81e427d631..2008077efb 100644 --- a/rollup/fees/rollup_fee.go +++ b/rollup/fees/rollup_fee.go @@ -6,11 +6,11 @@ import ( "fmt" "math/big" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/core/types" - "github.com/scroll-tech/go-ethereum/crypto" - "github.com/scroll-tech/go-ethereum/params" - "github.com/scroll-tech/go-ethereum/rollup/rcfg" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/params" + "github.com/ethereum/go-ethereum/rollup/rcfg" ) var ( diff --git a/rollup/rcfg/config.go b/rollup/rcfg/config.go index 3e0e00ce04..0f986f93ac 100644 --- a/rollup/rcfg/config.go +++ b/rollup/rcfg/config.go @@ -3,7 +3,7 @@ package rcfg import ( "math/big" - "github.com/scroll-tech/go-ethereum/common" + "github.com/ethereum/go-ethereum/common" ) // TODO: diff --git a/rollup/rollup_sync_service/abi.go b/rollup/rollup_sync_service/abi.go index 0252ecd02f..10648d4a9d 100644 --- a/rollup/rollup_sync_service/abi.go +++ b/rollup/rollup_sync_service/abi.go @@ -4,10 +4,10 @@ import ( "fmt" "math/big" - "github.com/scroll-tech/go-ethereum/accounts/abi" - "github.com/scroll-tech/go-ethereum/accounts/abi/bind" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" ) // scrollChainMetaData contains ABI of the ScrollChain contract. diff --git a/rollup/rollup_sync_service/abi_test.go b/rollup/rollup_sync_service/abi_test.go index d47a2c72e1..b2b20a4895 100644 --- a/rollup/rollup_sync_service/abi_test.go +++ b/rollup/rollup_sync_service/abi_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/core/types" - "github.com/scroll-tech/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/crypto" ) func TestEventSignatures(t *testing.T) { diff --git a/rollup/rollup_sync_service/batch_header.go b/rollup/rollup_sync_service/batch_header.go index 2930d859af..df393c22b1 100644 --- a/rollup/rollup_sync_service/batch_header.go +++ b/rollup/rollup_sync_service/batch_header.go @@ -5,9 +5,9 @@ import ( "fmt" "math/big" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/core/types" - "github.com/scroll-tech/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/crypto" ) const batchHeaderVersion = 0 diff --git a/rollup/rollup_sync_service/block.go b/rollup/rollup_sync_service/block.go index e86fb020b4..ae510bcb9e 100644 --- a/rollup/rollup_sync_service/block.go +++ b/rollup/rollup_sync_service/block.go @@ -7,9 +7,9 @@ import ( "math" "math/big" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/common/hexutil" - "github.com/scroll-tech/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethereum/go-ethereum/core/types" ) const blockContextByteSize = 60 diff --git a/rollup/rollup_sync_service/chunk.go b/rollup/rollup_sync_service/chunk.go index 6df318d358..611e986ca4 100644 --- a/rollup/rollup_sync_service/chunk.go +++ b/rollup/rollup_sync_service/chunk.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/core/rawdb" - "github.com/scroll-tech/go-ethereum/core/types" - "github.com/scroll-tech/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/crypto" ) // Chunk contains blocks to be encoded diff --git a/rollup/rollup_sync_service/l1client.go b/rollup/rollup_sync_service/l1client.go index 0aaf4466ca..ee437d0476 100644 --- a/rollup/rollup_sync_service/l1client.go +++ b/rollup/rollup_sync_service/l1client.go @@ -6,14 +6,14 @@ import ( "fmt" "math/big" - "github.com/scroll-tech/go-ethereum" - "github.com/scroll-tech/go-ethereum/accounts/abi" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/core/types" - "github.com/scroll-tech/go-ethereum/log" - "github.com/scroll-tech/go-ethereum/rpc" + "github.com/ethereum/go-ethereum" + "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/log" + "github.com/ethereum/go-ethereum/rpc" - "github.com/scroll-tech/go-ethereum/rollup/sync_service" + "github.com/ethereum/go-ethereum/rollup/sync_service" ) // L1Client is a wrapper around EthClient that adds diff --git a/rollup/rollup_sync_service/l1client_test.go b/rollup/rollup_sync_service/l1client_test.go index 2ac6ee6e66..615b804648 100644 --- a/rollup/rollup_sync_service/l1client_test.go +++ b/rollup/rollup_sync_service/l1client_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/scroll-tech/go-ethereum" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/core/types" - "github.com/scroll-tech/go-ethereum/rlp" + "github.com/ethereum/go-ethereum" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/rlp" ) func TestL1Client(t *testing.T) { diff --git a/rollup/rollup_sync_service/rollup_sync_service.go b/rollup/rollup_sync_service/rollup_sync_service.go index b6d0f653f0..5f46c23895 100644 --- a/rollup/rollup_sync_service/rollup_sync_service.go +++ b/rollup/rollup_sync_service/rollup_sync_service.go @@ -9,18 +9,18 @@ import ( "syscall" "time" - "github.com/scroll-tech/go-ethereum/accounts/abi" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/core" - "github.com/scroll-tech/go-ethereum/core/rawdb" - "github.com/scroll-tech/go-ethereum/core/types" - "github.com/scroll-tech/go-ethereum/ethdb" - "github.com/scroll-tech/go-ethereum/log" - "github.com/scroll-tech/go-ethereum/params" + "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core" + "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethereum/go-ethereum/log" + "github.com/ethereum/go-ethereum/params" - "github.com/scroll-tech/go-ethereum/rollup/rcfg" - "github.com/scroll-tech/go-ethereum/rollup/sync_service" - "github.com/scroll-tech/go-ethereum/rollup/withdrawtrie" + "github.com/ethereum/go-ethereum/rollup/rcfg" + "github.com/ethereum/go-ethereum/rollup/sync_service" + "github.com/ethereum/go-ethereum/rollup/withdrawtrie" ) const ( diff --git a/rollup/rollup_sync_service/rollup_sync_service_test.go b/rollup/rollup_sync_service/rollup_sync_service_test.go index f1e2f0a553..9798434f1f 100644 --- a/rollup/rollup_sync_service/rollup_sync_service_test.go +++ b/rollup/rollup_sync_service/rollup_sync_service_test.go @@ -12,12 +12,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/core" - "github.com/scroll-tech/go-ethereum/core/rawdb" - "github.com/scroll-tech/go-ethereum/core/types" - "github.com/scroll-tech/go-ethereum/ethdb/memorydb" - "github.com/scroll-tech/go-ethereum/params" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core" + "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/ethereum/go-ethereum/params" ) func TestRollupSyncServiceStartAndStop(t *testing.T) { diff --git a/rollup/sync_service/bindings.go b/rollup/sync_service/bindings.go index 1c2b1393e9..3926ff860c 100644 --- a/rollup/sync_service/bindings.go +++ b/rollup/sync_service/bindings.go @@ -11,11 +11,11 @@ import ( "math/big" "strings" - ethereum "github.com/scroll-tech/go-ethereum" - "github.com/scroll-tech/go-ethereum/accounts/abi" - "github.com/scroll-tech/go-ethereum/accounts/abi/bind" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/core/types" + ethereum "github.com/ethereum/go-ethereum" + "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" ) // L1MessageQueueMetaData contains all meta data concerning the L1MessageQueue contract. diff --git a/rollup/sync_service/bridge_client.go b/rollup/sync_service/bridge_client.go index ea46fdcb8b..47b12ac2f2 100644 --- a/rollup/sync_service/bridge_client.go +++ b/rollup/sync_service/bridge_client.go @@ -6,11 +6,11 @@ import ( "fmt" "math/big" - "github.com/scroll-tech/go-ethereum/accounts/abi/bind" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/core/types" - "github.com/scroll-tech/go-ethereum/log" - "github.com/scroll-tech/go-ethereum/rpc" + "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/log" + "github.com/ethereum/go-ethereum/rpc" ) // BridgeClient is a wrapper around EthClient that adds diff --git a/rollup/sync_service/sync_service.go b/rollup/sync_service/sync_service.go index 2720aec76b..c5d3cf3780 100644 --- a/rollup/sync_service/sync_service.go +++ b/rollup/sync_service/sync_service.go @@ -6,13 +6,13 @@ import ( "reflect" "time" - "github.com/scroll-tech/go-ethereum/core" - "github.com/scroll-tech/go-ethereum/core/rawdb" - "github.com/scroll-tech/go-ethereum/ethdb" - "github.com/scroll-tech/go-ethereum/event" - "github.com/scroll-tech/go-ethereum/log" - "github.com/scroll-tech/go-ethereum/node" - "github.com/scroll-tech/go-ethereum/params" + "github.com/ethereum/go-ethereum/core" + "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethereum/go-ethereum/event" + "github.com/ethereum/go-ethereum/log" + "github.com/ethereum/go-ethereum/node" + "github.com/ethereum/go-ethereum/params" ) const ( diff --git a/rollup/sync_service/types.go b/rollup/sync_service/types.go index 0bc062772a..5dae9105bc 100644 --- a/rollup/sync_service/types.go +++ b/rollup/sync_service/types.go @@ -4,9 +4,9 @@ import ( "context" "math/big" - "github.com/scroll-tech/go-ethereum" - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/core/types" + "github.com/ethereum/go-ethereum" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" ) // We cannot use ethclient.Client directly as that would lead diff --git a/rollup/withdrawtrie/withdraw_trie.go b/rollup/withdrawtrie/withdraw_trie.go index 85f0347309..75b9649dc8 100644 --- a/rollup/withdrawtrie/withdraw_trie.go +++ b/rollup/withdrawtrie/withdraw_trie.go @@ -1,8 +1,8 @@ package withdrawtrie import ( - "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/rollup/rcfg" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/rollup/rcfg" ) // StateDB represents the StateDB interface