From 66f14a4d4c7051e1d9ccec7cd19e0a3aeeac1da4 Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Fri, 10 May 2024 15:02:14 +0200 Subject: [PATCH] op-service: predeploys package Migrates the `op-bindings/predeploys` package to `op-service/predeploys`. There is various other "system related" code there. This unblocks fully deleting `op-bindings` as a top level package. --- indexer/config/config.go | 2 +- indexer/database/bridge_transfers.go | 2 +- indexer/e2e_tests/bridge_messages_e2e_test.go | 2 +- indexer/e2e_tests/bridge_transactions_e2e_test.go | 2 +- indexer/e2e_tests/bridge_transfers_e2e_test.go | 2 +- indexer/e2e_tests/reorg_e2e_test.go | 2 +- indexer/processors/bridge/legacy_bridge_processor.go | 2 +- indexer/processors/contracts/standard_bridge.go | 2 +- op-chain-ops/cmd/check-ecotone/main.go | 2 +- op-chain-ops/crossdomain/legacy_withdrawal.go | 2 +- op-chain-ops/crossdomain/legacy_withdrawal_test.go | 2 +- op-chain-ops/crossdomain/migrate.go | 2 +- op-chain-ops/crossdomain/migrate_test.go | 2 +- op-chain-ops/genesis/genesis.go | 2 +- op-chain-ops/genesis/layer_two.go | 2 +- op-chain-ops/upgrades/l1.go | 2 +- op-e2e/actions/ecotone_fork_test.go | 2 +- op-e2e/actions/user.go | 2 +- op-e2e/bridge_test.go | 2 +- op-e2e/custom_gas_token_test.go | 2 +- op-e2e/e2eutils/addresses.go | 2 +- op-e2e/e2eutils/setup_test.go | 2 +- op-e2e/setup.go | 2 +- op-e2e/system_test.go | 2 +- op-e2e/system_tob_test.go | 2 +- op-e2e/withdrawal_helper.go | 2 +- op-node/rollup/derive/attributes.go | 2 +- op-node/rollup/derive/attributes_queue_test.go | 2 +- op-node/rollup/derive/attributes_test.go | 2 +- op-node/rollup/derive/ecotone_upgrade_transactions.go | 2 +- op-node/rollup/derive/l1_block_info.go | 2 +- op-node/withdrawals/utils.go | 2 +- op-program/client/l2/engine.go | 2 +- {op-bindings => op-service}/predeploys/addresses.go | 0 {op-bindings => op-service}/predeploys/addresses_test.go | 0 {op-bindings => op-service}/predeploys/eip4788.go | 0 {op-bindings => op-service}/predeploys/legacy_addresses.go | 0 {op-bindings => op-service}/predeploys/predeploy.go | 0 op-service/sources/l2_client.go | 2 +- .../contracts-bedrock/scripts/go-ffi/differential-testing.go | 2 +- packages/contracts-ts/wagmi.config.ts | 2 +- 41 files changed, 36 insertions(+), 36 deletions(-) rename {op-bindings => op-service}/predeploys/addresses.go (100%) rename {op-bindings => op-service}/predeploys/addresses_test.go (100%) rename {op-bindings => op-service}/predeploys/eip4788.go (100%) rename {op-bindings => op-service}/predeploys/legacy_addresses.go (100%) rename {op-bindings => op-service}/predeploys/predeploy.go (100%) diff --git a/indexer/config/config.go b/indexer/config/config.go index 7369fd0d2221..9524bb97164d 100644 --- a/indexer/config/config.go +++ b/indexer/config/config.go @@ -7,7 +7,7 @@ import ( "reflect" "github.com/BurntSushi/toml" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" ) diff --git a/indexer/database/bridge_transfers.go b/indexer/database/bridge_transfers.go index 51bf48d99065..fbb866bbde43 100644 --- a/indexer/database/bridge_transfers.go +++ b/indexer/database/bridge_transfers.go @@ -8,7 +8,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" ) diff --git a/indexer/e2e_tests/bridge_messages_e2e_test.go b/indexer/e2e_tests/bridge_messages_e2e_test.go index d7a454c2f942..44914574e15a 100644 --- a/indexer/e2e_tests/bridge_messages_e2e_test.go +++ b/indexer/e2e_tests/bridge_messages_e2e_test.go @@ -10,10 +10,10 @@ import ( "github.com/ethereum-optimism/optimism/indexer/bindings" e2etest_utils "github.com/ethereum-optimism/optimism/indexer/e2e_tests/utils" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" op_e2e "github.com/ethereum-optimism/optimism/op-e2e" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait" "github.com/ethereum-optimism/optimism/op-node/withdrawals" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" diff --git a/indexer/e2e_tests/bridge_transactions_e2e_test.go b/indexer/e2e_tests/bridge_transactions_e2e_test.go index 83d7ea81ae6a..02f3eaa83b86 100644 --- a/indexer/e2e_tests/bridge_transactions_e2e_test.go +++ b/indexer/e2e_tests/bridge_transactions_e2e_test.go @@ -12,9 +12,9 @@ import ( "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait" "github.com/ethereum-optimism/optimism/indexer/bindings" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" op_e2e "github.com/ethereum-optimism/optimism/op-e2e" "github.com/ethereum-optimism/optimism/op-node/withdrawals" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" diff --git a/indexer/e2e_tests/bridge_transfers_e2e_test.go b/indexer/e2e_tests/bridge_transfers_e2e_test.go index 83fa45269e93..fd8e4ab630b0 100644 --- a/indexer/e2e_tests/bridge_transfers_e2e_test.go +++ b/indexer/e2e_tests/bridge_transfers_e2e_test.go @@ -16,7 +16,7 @@ import ( "github.com/ethereum-optimism/optimism/op-node/withdrawals" "github.com/ethereum-optimism/optimism/indexer/bindings" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" diff --git a/indexer/e2e_tests/reorg_e2e_test.go b/indexer/e2e_tests/reorg_e2e_test.go index 3f23caf45e3e..04dcef8f2694 100644 --- a/indexer/e2e_tests/reorg_e2e_test.go +++ b/indexer/e2e_tests/reorg_e2e_test.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum-optimism/optimism/indexer/bindings" "github.com/ethereum-optimism/optimism/indexer/database" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/params" "github.com/stretchr/testify/require" diff --git a/indexer/processors/bridge/legacy_bridge_processor.go b/indexer/processors/bridge/legacy_bridge_processor.go index b9af31cf1172..be3612657a99 100644 --- a/indexer/processors/bridge/legacy_bridge_processor.go +++ b/indexer/processors/bridge/legacy_bridge_processor.go @@ -13,8 +13,8 @@ import ( "github.com/ethereum-optimism/optimism/indexer/processors/bridge/ovm1" "github.com/ethereum-optimism/optimism/indexer/processors/contracts" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain" + "github.com/ethereum-optimism/optimism/op-service/predeploys" ) // Legacy Bridge Initiation diff --git a/indexer/processors/contracts/standard_bridge.go b/indexer/processors/contracts/standard_bridge.go index 89a5a7c45b87..34f0eff7088f 100644 --- a/indexer/processors/contracts/standard_bridge.go +++ b/indexer/processors/contracts/standard_bridge.go @@ -5,7 +5,7 @@ import ( "github.com/ethereum-optimism/optimism/indexer/bindings" "github.com/ethereum-optimism/optimism/indexer/database" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/common" ) diff --git a/op-chain-ops/cmd/check-ecotone/main.go b/op-chain-ops/cmd/check-ecotone/main.go index 507a20d211a3..4a6b3db979b5 100644 --- a/op-chain-ops/cmd/check-ecotone/main.go +++ b/op-chain-ops/cmd/check-ecotone/main.go @@ -27,7 +27,6 @@ import ( "github.com/ethereum/go-ethereum/params" "github.com/ethereum-optimism/optimism/op-bindings/bindings" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" op_service "github.com/ethereum-optimism/optimism/op-service" "github.com/ethereum-optimism/optimism/op-service/cliapp" @@ -36,6 +35,7 @@ import ( "github.com/ethereum-optimism/optimism/op-service/eth" oplog "github.com/ethereum-optimism/optimism/op-service/log" "github.com/ethereum-optimism/optimism/op-service/opio" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum-optimism/optimism/op-service/retry" "github.com/ethereum-optimism/optimism/op-service/sources" "github.com/ethereum-optimism/optimism/op-service/txmgr" diff --git a/op-chain-ops/crossdomain/legacy_withdrawal.go b/op-chain-ops/crossdomain/legacy_withdrawal.go index 0a4a127e0f1e..a70d12deecd9 100644 --- a/op-chain-ops/crossdomain/legacy_withdrawal.go +++ b/op-chain-ops/crossdomain/legacy_withdrawal.go @@ -6,8 +6,8 @@ import ( "fmt" "math/big" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain/bindings" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/op-chain-ops/crossdomain/legacy_withdrawal_test.go b/op-chain-ops/crossdomain/legacy_withdrawal_test.go index 7c5265ba414e..3402835d23c7 100644 --- a/op-chain-ops/crossdomain/legacy_withdrawal_test.go +++ b/op-chain-ops/crossdomain/legacy_withdrawal_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain" "github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain/bindings" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/stretchr/testify/require" "github.com/ethereum/go-ethereum/accounts/abi" diff --git a/op-chain-ops/crossdomain/migrate.go b/op-chain-ops/crossdomain/migrate.go index e7580f7406dc..e542db2c4ecc 100644 --- a/op-chain-ops/crossdomain/migrate.go +++ b/op-chain-ops/crossdomain/migrate.go @@ -4,8 +4,8 @@ import ( "fmt" "math/big" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain/bindings" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/params" diff --git a/op-chain-ops/crossdomain/migrate_test.go b/op-chain-ops/crossdomain/migrate_test.go index deac179ef055..362b129246e0 100644 --- a/op-chain-ops/crossdomain/migrate_test.go +++ b/op-chain-ops/crossdomain/migrate_test.go @@ -5,8 +5,8 @@ import ( "math/big" "testing" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" diff --git a/op-chain-ops/genesis/genesis.go b/op-chain-ops/genesis/genesis.go index 0ed58212c1ff..bbfb15c34649 100644 --- a/op-chain-ops/genesis/genesis.go +++ b/op-chain-ops/genesis/genesis.go @@ -6,7 +6,7 @@ import ( "math/big" "time" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core" diff --git a/op-chain-ops/genesis/layer_two.go b/op-chain-ops/genesis/layer_two.go index 4c9fe3b1273c..1ed675fad1b9 100644 --- a/op-chain-ops/genesis/layer_two.go +++ b/op-chain-ops/genesis/layer_two.go @@ -16,7 +16,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" + "github.com/ethereum-optimism/optimism/op-service/predeploys" ) type L2AllocsMode string diff --git a/op-chain-ops/upgrades/l1.go b/op-chain-ops/upgrades/l1.go index 5d4a551fa4d8..3cd7fa7726bc 100644 --- a/op-chain-ops/upgrades/l1.go +++ b/op-chain-ops/upgrades/l1.go @@ -10,10 +10,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/genesis" "github.com/ethereum-optimism/optimism/op-chain-ops/safe" "github.com/ethereum-optimism/optimism/op-chain-ops/upgrades/bindings" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum-optimism/superchain-registry/superchain" ) diff --git a/op-e2e/actions/ecotone_fork_test.go b/op-e2e/actions/ecotone_fork_test.go index 61cc33088bf9..de2775740d4b 100644 --- a/op-e2e/actions/ecotone_fork_test.go +++ b/op-e2e/actions/ecotone_fork_test.go @@ -15,10 +15,10 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum-optimism/optimism/op-bindings/bindings" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/genesis" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum-optimism/optimism/op-service/testlog" ) diff --git a/op-e2e/actions/user.go b/op-e2e/actions/user.go index b562fc6200ee..9e4db71cca48 100644 --- a/op-e2e/actions/user.go +++ b/op-e2e/actions/user.go @@ -19,7 +19,6 @@ import ( "github.com/stretchr/testify/require" legacybindings "github.com/ethereum-optimism/optimism/op-bindings/bindings" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain" e2e "github.com/ethereum-optimism/optimism/op-e2e" "github.com/ethereum-optimism/optimism/op-e2e/config" @@ -28,6 +27,7 @@ import ( bindingspreview "github.com/ethereum-optimism/optimism/op-node/bindings/preview" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/withdrawals" + "github.com/ethereum-optimism/optimism/op-service/predeploys" ) type L1Bindings struct { diff --git a/op-e2e/bridge_test.go b/op-e2e/bridge_test.go index a21efbb39d04..c4e0788794ea 100644 --- a/op-e2e/bridge_test.go +++ b/op-e2e/bridge_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/ethereum-optimism/optimism/op-bindings/bindings" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/receipts" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/transactions" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum-optimism/optimism/op-service/testlog" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/core/types" diff --git a/op-e2e/custom_gas_token_test.go b/op-e2e/custom_gas_token_test.go index 9fc65aa2bffb..3f8eab04fefa 100644 --- a/op-e2e/custom_gas_token_test.go +++ b/op-e2e/custom_gas_token_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/ethereum-optimism/optimism/op-bindings/bindings" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/receipts" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" diff --git a/op-e2e/e2eutils/addresses.go b/op-e2e/e2eutils/addresses.go index 1028178b3e69..46e639425a22 100644 --- a/op-e2e/e2eutils/addresses.go +++ b/op-e2e/e2eutils/addresses.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain" + "github.com/ethereum-optimism/optimism/op-service/predeploys" ) func collectAllocAddrs(alloc types.GenesisAlloc) []common.Address { diff --git a/op-e2e/e2eutils/setup_test.go b/op-e2e/e2eutils/setup_test.go index 2bc6a362a158..6ce4176591e0 100644 --- a/op-e2e/e2eutils/setup_test.go +++ b/op-e2e/e2eutils/setup_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-e2e/config" + "github.com/ethereum-optimism/optimism/op-service/predeploys" ) func TestWriteDefaultJWT(t *testing.T) { diff --git a/op-e2e/setup.go b/op-e2e/setup.go index a383d6110ad9..2840097ce442 100644 --- a/op-e2e/setup.go +++ b/op-e2e/setup.go @@ -41,7 +41,6 @@ import ( bss "github.com/ethereum-optimism/optimism/op-batcher/batcher" batcherFlags "github.com/ethereum-optimism/optimism/op-batcher/flags" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/genesis" "github.com/ethereum-optimism/optimism/op-e2e/config" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils" @@ -63,6 +62,7 @@ import ( "github.com/ethereum-optimism/optimism/op-service/dial" "github.com/ethereum-optimism/optimism/op-service/eth" oplog "github.com/ethereum-optimism/optimism/op-service/log" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum-optimism/optimism/op-service/sources" "github.com/ethereum-optimism/optimism/op-service/testlog" "github.com/ethereum-optimism/optimism/op-service/txmgr" diff --git a/op-e2e/system_test.go b/op-e2e/system_test.go index 4db0103b5385..afffad714bc9 100644 --- a/op-e2e/system_test.go +++ b/op-e2e/system_test.go @@ -29,7 +29,6 @@ import ( "github.com/stretchr/testify/require" "github.com/ethereum-optimism/optimism/op-bindings/bindings" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-e2e/config" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/geth" @@ -43,6 +42,7 @@ import ( "github.com/ethereum-optimism/optimism/op-service/client" "github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/oppprof" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum-optimism/optimism/op-service/retry" "github.com/ethereum-optimism/optimism/op-service/sources" "github.com/ethereum-optimism/optimism/op-service/testlog" diff --git a/op-e2e/system_tob_test.go b/op-e2e/system_tob_test.go index 7505c35c341a..13f87f23eb95 100644 --- a/op-e2e/system_tob_test.go +++ b/op-e2e/system_tob_test.go @@ -11,7 +11,6 @@ import ( "time" legacybindings "github.com/ethereum-optimism/optimism/op-bindings/bindings" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/challenger" @@ -20,6 +19,7 @@ import ( "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait" "github.com/ethereum-optimism/optimism/op-node/bindings" bindingspreview "github.com/ethereum-optimism/optimism/op-node/bindings/preview" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum-optimism/optimism/op-service/testutils/fuzzerutils" "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/accounts/abi" diff --git a/op-e2e/withdrawal_helper.go b/op-e2e/withdrawal_helper.go index 74c58956f7eb..8d04dc673ec9 100644 --- a/op-e2e/withdrawal_helper.go +++ b/op-e2e/withdrawal_helper.go @@ -8,7 +8,6 @@ import ( "time" legacybindings "github.com/ethereum-optimism/optimism/op-bindings/bindings" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain" "github.com/ethereum-optimism/optimism/op-e2e/config" "github.com/ethereum-optimism/optimism/op-e2e/e2eutils" @@ -17,6 +16,7 @@ import ( "github.com/ethereum-optimism/optimism/op-node/bindings" bindingspreview "github.com/ethereum-optimism/optimism/op-node/bindings/preview" "github.com/ethereum-optimism/optimism/op-node/withdrawals" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" diff --git a/op-node/rollup/derive/attributes.go b/op-node/rollup/derive/attributes.go index 77a683755ebc..0be6198374be 100644 --- a/op-node/rollup/derive/attributes.go +++ b/op-node/rollup/derive/attributes.go @@ -8,9 +8,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-service/eth" + "github.com/ethereum-optimism/optimism/op-service/predeploys" ) // L1ReceiptsFetcher fetches L1 header info and receipts for the payload attributes derivation (the info tx and deposits) diff --git a/op-node/rollup/derive/attributes_queue_test.go b/op-node/rollup/derive/attributes_queue_test.go index c9f23080d4fc..ebbca96ee4f5 100644 --- a/op-node/rollup/derive/attributes_queue_test.go +++ b/op-node/rollup/derive/attributes_queue_test.go @@ -11,9 +11,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-service/eth" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum-optimism/optimism/op-service/testlog" "github.com/ethereum-optimism/optimism/op-service/testutils" ) diff --git a/op-node/rollup/derive/attributes_test.go b/op-node/rollup/derive/attributes_test.go index b6c3e80737e0..68c7c71aa1e1 100644 --- a/op-node/rollup/derive/attributes_test.go +++ b/op-node/rollup/derive/attributes_test.go @@ -13,9 +13,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-service/eth" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum-optimism/optimism/op-service/testutils" ) diff --git a/op-node/rollup/derive/ecotone_upgrade_transactions.go b/op-node/rollup/derive/ecotone_upgrade_transactions.go index 7b0d885025af..e2fed646dc84 100644 --- a/op-node/rollup/derive/ecotone_upgrade_transactions.go +++ b/op-node/rollup/derive/ecotone_upgrade_transactions.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum-optimism/optimism/op-service/solabi" ) diff --git a/op-node/rollup/derive/l1_block_info.go b/op-node/rollup/derive/l1_block_info.go index 54788ba495cd..93c529750ef9 100644 --- a/op-node/rollup/derive/l1_block_info.go +++ b/op-node/rollup/derive/l1_block_info.go @@ -11,9 +11,9 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-service/eth" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum-optimism/optimism/op-service/solabi" ) diff --git a/op-node/withdrawals/utils.go b/op-node/withdrawals/utils.go index 3a4374c28ea8..f3b2067a33d6 100644 --- a/op-node/withdrawals/utils.go +++ b/op-node/withdrawals/utils.go @@ -14,9 +14,9 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethclient/gethclient" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-node/bindings" bindingspreview "github.com/ethereum-optimism/optimism/op-node/bindings/preview" + "github.com/ethereum-optimism/optimism/op-service/predeploys" ) var MessagePassedTopic = crypto.Keccak256Hash([]byte("MessagePassed(uint256,address,address,uint256,uint256,bytes,bytes32)")) diff --git a/op-program/client/l2/engine.go b/op-program/client/l2/engine.go index b3040187138c..ee5e1e937ecf 100644 --- a/op-program/client/l2/engine.go +++ b/op-program/client/l2/engine.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-program/client/l2/engineapi" "github.com/ethereum-optimism/optimism/op-service/eth" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/log" diff --git a/op-bindings/predeploys/addresses.go b/op-service/predeploys/addresses.go similarity index 100% rename from op-bindings/predeploys/addresses.go rename to op-service/predeploys/addresses.go diff --git a/op-bindings/predeploys/addresses_test.go b/op-service/predeploys/addresses_test.go similarity index 100% rename from op-bindings/predeploys/addresses_test.go rename to op-service/predeploys/addresses_test.go diff --git a/op-bindings/predeploys/eip4788.go b/op-service/predeploys/eip4788.go similarity index 100% rename from op-bindings/predeploys/eip4788.go rename to op-service/predeploys/eip4788.go diff --git a/op-bindings/predeploys/legacy_addresses.go b/op-service/predeploys/legacy_addresses.go similarity index 100% rename from op-bindings/predeploys/legacy_addresses.go rename to op-service/predeploys/legacy_addresses.go diff --git a/op-bindings/predeploys/predeploy.go b/op-service/predeploys/predeploy.go similarity index 100% rename from op-bindings/predeploys/predeploy.go rename to op-service/predeploys/predeploy.go diff --git a/op-service/sources/l2_client.go b/op-service/sources/l2_client.go index 03e13e6bc9ef..304a94a0a292 100644 --- a/op-service/sources/l2_client.go +++ b/op-service/sources/l2_client.go @@ -10,11 +10,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-service/client" "github.com/ethereum-optimism/optimism/op-service/eth" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum-optimism/optimism/op-service/sources/caching" ) diff --git a/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go b/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go index ebbf889d758b..0135a794b79e 100644 --- a/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go +++ b/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go @@ -8,8 +8,8 @@ import ( "strconv" "github.com/ethereum-optimism/optimism/cannon/mipsevm" - "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain" + "github.com/ethereum-optimism/optimism/op-service/predeploys" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/packages/contracts-ts/wagmi.config.ts b/packages/contracts-ts/wagmi.config.ts index 7dd906baeb37..e761300db530 100644 --- a/packages/contracts-ts/wagmi.config.ts +++ b/packages/contracts-ts/wagmi.config.ts @@ -9,7 +9,7 @@ import { camelCase, constantCase } from 'change-case' /** * Predeployed contract addresses * In future it would be nice to have a json file in contracts bedrock be generated as source of truth - * Keep this in sync with op-bindings/predeploys/addresses.go in meantime + * Keep this in sync with op-service/predeploys/addresses.go in meantime */ const predeployContracts = { LegacyMessagePasser: {