diff --git op-geth/params/protocol_params.go CELO/params/protocol_params.go
+
diff --git op-geth/params/protocol_params.go CELO/params/protocol_params.go
index 5e2a0632afbeeb1ae2341791f076615cea6fe092..88fb80ba6084b6b0c3596756c806112f1ea28c9b 100644
--- op-geth/params/protocol_params.go
+++ CELO/params/protocol_params.go
@@ -8898,7 +8898,7 @@
-
+
E2E tests
@@ -8920,15 +8920,15 @@
-
+
-
diff --git op-geth/e2e_test/.gitignore CELO/e2e_test/.gitignore
+
diff --git op-geth/e2e_test/.gitignore CELO/e2e_test/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..d93e90bc6936c69f4976f29030cd041295ba09cb
--- /dev/null
@@ -8976,8 +8976,8 @@
-
diff --git op-geth/e2e_test/debug-fee-currency/DebugFeeCurrency.sol CELO/e2e_test/debug-fee-currency/DebugFeeCurrency.sol
+
diff --git op-geth/e2e_test/debug-fee-currency/DebugFeeCurrency.sol CELO/e2e_test/debug-fee-currency/DebugFeeCurrency.sol
new file mode 100644
index 0000000000000000000000000000000000000000..e5d6e1ce3ab14941d79d0cf628e296af1e512f86
--- /dev/null
@@ -9773,8 +9773,8 @@
-
diff --git op-geth/e2e_test/debug-fee-currency/deploy_and_send_tx.sh CELO/e2e_test/debug-fee-currency/deploy_and_send_tx.sh
+
diff --git op-geth/e2e_test/debug-fee-currency/deploy_and_send_tx.sh CELO/e2e_test/debug-fee-currency/deploy_and_send_tx.sh
new file mode 100755
index 0000000000000000000000000000000000000000..76470fa53a1de90fb71677d1278231178b872a1f
--- /dev/null
@@ -9832,8 +9832,8 @@
-
diff --git op-geth/e2e_test/js-tests/Makefile CELO/e2e_test/js-tests/Makefile
+
diff --git op-geth/e2e_test/js-tests/Makefile CELO/e2e_test/js-tests/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..69555e594b4419c7c012ddc56d5403d88f4cd142
--- /dev/null
@@ -9880,8 +9880,8 @@
-
diff --git op-geth/e2e_test/js-tests/package-lock.json CELO/e2e_test/js-tests/package-lock.json
+
diff --git op-geth/e2e_test/js-tests/package-lock.json CELO/e2e_test/js-tests/package-lock.json
new file mode 100644
index 0000000000000000000000000000000000000000..e9d3322a249d2178182cfe11c5742afe1e7432d0
--- /dev/null
@@ -11035,8 +11035,8 @@
-
diff --git op-geth/e2e_test/js-tests/package.json CELO/e2e_test/js-tests/package.json
+
diff --git op-geth/e2e_test/js-tests/package.json CELO/e2e_test/js-tests/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..1867f08694bdc7ec40af0ef8bfecd71c19dd45da
--- /dev/null
@@ -11098,8 +11098,8 @@
-
diff --git op-geth/e2e_test/js-tests/send_tx.mjs CELO/e2e_test/js-tests/send_tx.mjs
+
diff --git op-geth/e2e_test/js-tests/send_tx.mjs CELO/e2e_test/js-tests/send_tx.mjs
new file mode 100755
index 0000000000000000000000000000000000000000..5a9b46950271fa7d8f0e38c2cccfd68e5a2c3696
--- /dev/null
@@ -11188,8 +11188,8 @@
-
diff --git op-geth/e2e_test/js-tests/test_ethers_tx.mjs CELO/e2e_test/js-tests/test_ethers_tx.mjs
+
diff --git op-geth/e2e_test/js-tests/test_ethers_tx.mjs CELO/e2e_test/js-tests/test_ethers_tx.mjs
new file mode 100644
index 0000000000000000000000000000000000000000..3faf2d9cdf29fd0ca19d44803c77e0bd4e0895d1
--- /dev/null
@@ -11286,8 +11286,8 @@
-
diff --git op-geth/e2e_test/js-tests/test_viem_tx.mjs CELO/e2e_test/js-tests/test_viem_tx.mjs
+
diff --git op-geth/e2e_test/js-tests/test_viem_tx.mjs CELO/e2e_test/js-tests/test_viem_tx.mjs
new file mode 100644
index 0000000000000000000000000000000000000000..91d5e425a2cf23a00e4a8d97ac826e907396fe53
--- /dev/null
@@ -11608,8 +11608,8 @@
-
diff --git op-geth/e2e_test/run_all_tests.sh CELO/e2e_test/run_all_tests.sh
+
diff --git op-geth/e2e_test/run_all_tests.sh CELO/e2e_test/run_all_tests.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1a87baa83a86191be612b0415c7e5a023e6e981e
--- /dev/null
@@ -11716,8 +11716,8 @@
-
diff --git op-geth/e2e_test/shared.sh CELO/e2e_test/shared.sh
+
diff --git op-geth/e2e_test/shared.sh CELO/e2e_test/shared.sh
new file mode 100644
index 0000000000000000000000000000000000000000..87d85dc24d690cf7bb1cd35d298befd74c9bf55e
--- /dev/null
@@ -11782,8 +11782,8 @@
-
diff --git op-geth/e2e_test/test_base_fee_recipient.sh CELO/e2e_test/test_base_fee_recipient.sh
+
diff --git op-geth/e2e_test/test_base_fee_recipient.sh CELO/e2e_test/test_base_fee_recipient.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ec22198f88fbd9c83b9fd475bfacb09a3a6fe92d
--- /dev/null
@@ -11845,8 +11845,8 @@
-
diff --git op-geth/e2e_test/test_ethers_tx.sh CELO/e2e_test/test_ethers_tx.sh
+
diff --git op-geth/e2e_test/test_ethers_tx.sh CELO/e2e_test/test_ethers_tx.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8c94521b73ab4e314f2b965fa9896b4f39d538cd
--- /dev/null
@@ -11898,8 +11898,8 @@
-
diff --git op-geth/e2e_test/test_fee_currency_fails_on_credit.sh CELO/e2e_test/test_fee_currency_fails_on_credit.sh
+
diff --git op-geth/e2e_test/test_fee_currency_fails_on_credit.sh CELO/e2e_test/test_fee_currency_fails_on_credit.sh
new file mode 100755
index 0000000000000000000000000000000000000000..137ea6c2273ce381d7b39581f75c7554ad116891
--- /dev/null
@@ -11956,8 +11956,8 @@
-
diff --git op-geth/e2e_test/test_fee_currency_fails_on_debit.sh CELO/e2e_test/test_fee_currency_fails_on_debit.sh
+
diff --git op-geth/e2e_test/test_fee_currency_fails_on_debit.sh CELO/e2e_test/test_fee_currency_fails_on_debit.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0b4e4438f39b7ba93bf5f64cd75bc3a5b289b560
--- /dev/null
@@ -12012,8 +12012,8 @@
-
diff --git op-geth/e2e_test/test_token_duality.sh CELO/e2e_test/test_token_duality.sh
+
diff --git op-geth/e2e_test/test_token_duality.sh CELO/e2e_test/test_token_duality.sh
new file mode 100755
index 0000000000000000000000000000000000000000..355afef8c7ca71f39454d1e452c60d2046b6ebf8
--- /dev/null
@@ -12070,8 +12070,8 @@
-
diff --git op-geth/e2e_test/test_viem_tx.sh CELO/e2e_test/test_viem_tx.sh
+
diff --git op-geth/e2e_test/test_viem_tx.sh CELO/e2e_test/test_viem_tx.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0e4d001eda411d32e1bbca49ed3e98fbe72dc23d
--- /dev/null
@@ -12134,7 +12134,7 @@
-
+
Other changes
@@ -12148,7 +12148,7 @@
-
+3503
+
+3501
-292
@@ -12156,15 +12156,15 @@
-
+
-
+
.gitignore
@@ -12180,7 +12180,7 @@
@@ -12197,7 +12197,7 @@
-
diff --git op-geth/.gitignore CELO/.gitignore
+
diff --git op-geth/.gitignore CELO/.gitignore
index 3f27cdc00f0746c28f7e79285a50425f435bd0ef..3196c8484819fab224b735ea82e44396c4d3d0a8 100644
--- op-geth/.gitignore
+++ CELO/.gitignore
@@ -12220,8 +12220,8 @@
-
diff --git op-geth/accounts/external/backend.go CELO/accounts/external/backend.go
+
diff --git op-geth/accounts/external/backend.go CELO/accounts/external/backend.go
index 6f1581f9b806deacf12a5667c24feaff003ed2f6..28c6dccabbf834ef22425ac7d368f461caf108e7 100644
--- op-geth/accounts/external/backend.go
+++ CELO/accounts/external/backend.go
@@ -12273,8 +12273,8 @@
-
diff --git op-geth/accounts/keystore/account_cache_test.go CELO/accounts/keystore/account_cache_test.go
+
diff --git op-geth/accounts/keystore/account_cache_test.go CELO/accounts/keystore/account_cache_test.go
index 48a238048fec9171334c79576286de688a6050d4..ff0daba5c441ad82cbbd2e3938323f1802da3c28 100644
--- op-geth/accounts/keystore/account_cache_test.go
+++ CELO/accounts/keystore/account_cache_test.go
@@ -12340,8 +12340,8 @@
-
diff --git op-geth/cmd/celotool/main.go CELO/cmd/celotool/main.go
+
diff --git op-geth/cmd/celotool/main.go CELO/cmd/celotool/main.go
new file mode 100644
index 0000000000000000000000000000000000000000..4397c43551e884832434982e167167471b38e384
--- /dev/null
@@ -12427,8 +12427,8 @@
-
diff --git op-geth/cmd/celotool/send-tx.go CELO/cmd/celotool/send-tx.go
+
diff --git op-geth/cmd/celotool/send-tx.go CELO/cmd/celotool/send-tx.go
new file mode 100644
index 0000000000000000000000000000000000000000..7560aee30291a2045b8edb1dfa8d5d4be2b1aeb5
--- /dev/null
@@ -12614,8 +12614,8 @@
-
diff --git op-geth/cmd/evm/internal/t8ntool/execution.go CELO/cmd/evm/internal/t8ntool/execution.go
+
diff --git op-geth/cmd/evm/internal/t8ntool/execution.go CELO/cmd/evm/internal/t8ntool/execution.go
index cb975054c1b284a91baeced4af7c7eeecea568f3..026b5ad159048e0dd906689b66d51ff7dc63a0bd 100644
--- op-geth/cmd/evm/internal/t8ntool/execution.go
+++ CELO/cmd/evm/internal/t8ntool/execution.go
@@ -12667,8 +12667,8 @@
-
diff --git op-geth/cmd/evm/internal/t8ntool/transaction.go CELO/cmd/evm/internal/t8ntool/transaction.go
+
diff --git op-geth/cmd/evm/internal/t8ntool/transaction.go CELO/cmd/evm/internal/t8ntool/transaction.go
index 8533b78637696ccc1461e6177e937ca1f6be69a1..1ee2d5142a04c631d61e03657f0cd544ee5c31be 100644
--- op-geth/cmd/evm/internal/t8ntool/transaction.go
+++ CELO/cmd/evm/internal/t8ntool/transaction.go
@@ -12720,8 +12720,8 @@
-
diff --git op-geth/cmd/geth/config.go CELO/cmd/geth/config.go
+
diff --git op-geth/cmd/geth/config.go CELO/cmd/geth/config.go
index 6a4dbc2c2e6b0b77910d17a6c453c64fd454a02f..cd6ba95013b3c3bfd52835c8e993a5f29b4a84ec 100644
--- op-geth/cmd/geth/config.go
+++ CELO/cmd/geth/config.go
@@ -12776,8 +12776,8 @@
-
diff --git op-geth/cmd/geth/main.go CELO/cmd/geth/main.go
+
diff --git op-geth/cmd/geth/main.go CELO/cmd/geth/main.go
index d987364ca16887d5cea85d88a3e07e3080d82390..e91ca41a21aeb7c1a7a9a1dc4b237488059a9f9e 100644
--- op-geth/cmd/geth/main.go
+++ CELO/cmd/geth/main.go
@@ -12837,8 +12837,8 @@
-
diff --git op-geth/cmd/utils/flags.go CELO/cmd/utils/flags.go
+
diff --git op-geth/cmd/utils/flags.go CELO/cmd/utils/flags.go
index f4ecd35287b786583f4330f146ac6ff5c9fd50de..960f598bf7cba85a20a7423c9e8cf2171e2fc8f7 100644
--- op-geth/cmd/utils/flags.go
+++ CELO/cmd/utils/flags.go
@@ -12960,8 +12960,8 @@
-
diff --git op-geth/common/celo_types.go CELO/common/celo_types.go
+
diff --git op-geth/common/celo_types.go CELO/common/celo_types.go
new file mode 100644
index 0000000000000000000000000000000000000000..3ae8a2935a506072527f061b05bcf613c7f9c836
--- /dev/null
@@ -13050,8 +13050,8 @@
-
diff --git op-geth/common/celo_types_test.go CELO/common/celo_types_test.go
+
diff --git op-geth/common/celo_types_test.go CELO/common/celo_types_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..4ecfe47182d85f2cae00eaed175a4b7610d8ed39
--- /dev/null
@@ -13143,8 +13143,8 @@
-
diff --git op-geth/common/exchange/rates.go CELO/common/exchange/rates.go
+
diff --git op-geth/common/exchange/rates.go CELO/common/exchange/rates.go
new file mode 100644
-
index 0000000000000000000000000000000000000000..8cbbebf2704fc319e6e0ab8dfdf5a1f8d36adb42
+
index 0000000000000000000000000000000000000000..8905d12e3e4d60106e834224b3bb1bec45216dc7
--- /dev/null
+++ CELO/common/exchange/rates.go
-
@@ -0,0 +1,164 @@
+
@@ -0,0 +1,162 @@
+package exchange
+
+import (
@@ -13220,9 +13220,7 @@
+ }
+ exchangeRate, ok := exchangeRates[*feeCurrency]
+ if !ok {
-
+ if !ok {
-
+ return nil, fmt.Errorf("could not convert from fee currency to native (fee-currency=%s): %w ", feeCurrency, ErrNonWhitelistedFeeCurrency)
-
+ }
+
+ return nil, fmt.Errorf("could not convert from fee currency to native (fee-currency=%s): %w ", feeCurrency, ErrNonWhitelistedFeeCurrency)
+ }
+ return new(big.Int).Div(new(big.Int).Mul(currencyAmount, exchangeRate.Denom()), exchangeRate.Num()), nil
+}
@@ -13353,8 +13351,8 @@
-
diff --git op-geth/common/exchange/rates_test.go CELO/common/exchange/rates_test.go
+
diff --git op-geth/common/exchange/rates_test.go CELO/common/exchange/rates_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..3cda8eb530ff2a9df75aebad4619d76c52aab558
--- /dev/null
@@ -13570,8 +13568,8 @@
-
diff --git op-geth/consensus/misc/eip1559/eip1559.go CELO/consensus/misc/eip1559/eip1559.go
+
diff --git op-geth/consensus/misc/eip1559/eip1559.go CELO/consensus/misc/eip1559/eip1559.go
index a66298af692fbb7bb477847452aff5937af55c83..d21e41654dd453ea226d0999a4bf97fc19d4b5d8 100644
--- op-geth/consensus/misc/eip1559/eip1559.go
+++ CELO/consensus/misc/eip1559/eip1559.go
@@ -13627,8 +13625,8 @@
-
diff --git op-geth/consensus/misc/eip1559/eip1559_test.go CELO/consensus/misc/eip1559/eip1559_test.go
+
diff --git op-geth/consensus/misc/eip1559/eip1559_test.go CELO/consensus/misc/eip1559/eip1559_test.go
index d34da8fd8bbb21a6a649384435c3926a6735083d..39766b57cc18f9e1e433495cff8183cd7e0984b4 100644
--- op-geth/consensus/misc/eip1559/eip1559_test.go
+++ CELO/consensus/misc/eip1559/eip1559_test.go
@@ -13685,8 +13683,8 @@
-
diff --git op-geth/contracts/addresses/addresses.go CELO/contracts/addresses/addresses.go
+
diff --git op-geth/contracts/addresses/addresses.go CELO/contracts/addresses/addresses.go
new file mode 100644
index 0000000000000000000000000000000000000000..9bc556252df9c615c6b2aa512ba49d6dae6f0d7e
--- /dev/null
@@ -13745,8 +13743,8 @@
-
diff --git op-geth/contracts/celo_backend.go CELO/contracts/celo_backend.go
+
diff --git op-geth/contracts/celo_backend.go CELO/contracts/celo_backend.go
new file mode 100644
index 0000000000000000000000000000000000000000..d3133c783e9e26515fbe414a6065f2f56c6d3607
--- /dev/null
@@ -13862,8 +13860,8 @@
-
diff --git op-geth/contracts/read_only_statedb.go CELO/contracts/read_only_statedb.go
+
diff --git op-geth/contracts/read_only_statedb.go CELO/contracts/read_only_statedb.go
new file mode 100644
index 0000000000000000000000000000000000000000..146f544fa3e27b6671430e88819b92b4b11f2753
--- /dev/null
@@ -14039,8 +14037,8 @@
-
diff --git op-geth/core/bench_test.go CELO/core/bench_test.go
+
diff --git op-geth/core/bench_test.go CELO/core/bench_test.go
index 97713868a5473b49cc7b8d7a5fb5937d69e7d4b7..893758029f2fccfd3635f568270ca8b78513c9cb 100644
--- op-geth/core/bench_test.go
+++ CELO/core/bench_test.go
@@ -14092,8 +14090,8 @@
-
diff --git op-geth/core/celo_multi_gaspool.go CELO/core/celo_multi_gaspool.go
+
diff --git op-geth/core/celo_multi_gaspool.go CELO/core/celo_multi_gaspool.go
new file mode 100644
index 0000000000000000000000000000000000000000..6cec29a1c978264c893bd161ccb0d5073ab89593
--- /dev/null
@@ -14209,8 +14207,8 @@
-
diff --git op-geth/core/celo_multi_gaspool_test.go CELO/core/celo_multi_gaspool_test.go
+
diff --git op-geth/core/celo_multi_gaspool_test.go CELO/core/celo_multi_gaspool_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..ec79703329226c884779d53ece25c8edfbeba7ad
--- /dev/null
@@ -14393,8 +14391,8 @@
-
diff --git op-geth/core/error.go CELO/core/error.go
+
diff --git op-geth/core/error.go CELO/core/error.go
index 8c691b17ff761c541093a5de23db70edba74e5d7..49a644cc509409a2fe48c4f0934048d843681de0 100644
--- op-geth/core/error.go
+++ CELO/core/error.go
@@ -14445,8 +14443,8 @@
-
diff --git op-geth/core/gen_genesis.go CELO/core/gen_genesis.go
+
diff --git op-geth/core/gen_genesis.go CELO/core/gen_genesis.go
index 3a57ec65e8c35e151f4fe3b792a2d5b7290744a4..f4aec12026c290a42e50059db4afda1c62cc85d0 100644
--- op-geth/core/gen_genesis.go
+++ CELO/core/gen_genesis.go
@@ -14585,8 +14583,8 @@
-
diff --git op-geth/core/state/statedb.go CELO/core/state/statedb.go
+
diff --git op-geth/core/state/statedb.go CELO/core/state/statedb.go
index 9fc529b86b3be8dbdaf4509c97f12540fc835a53..fd4dbb65ba52315d1d82d4c75f8ff987cb03a1d0 100644
--- op-geth/core/state/statedb.go
+++ CELO/core/state/statedb.go
@@ -14646,8 +14644,8 @@
-
diff --git op-geth/core/state/statedb_test.go CELO/core/state/statedb_test.go
+
diff --git op-geth/core/state/statedb_test.go CELO/core/state/statedb_test.go
index cd86a7f4b67faa6f6bb393d9e7550be8e8effa6f..03c0ea82f61d91a80adffe317ef5b01e9b89b3d7 100644
--- op-geth/core/state/statedb_test.go
+++ CELO/core/state/statedb_test.go
@@ -14738,8 +14736,8 @@
-
diff --git op-geth/core/state_prefetcher.go CELO/core/state_prefetcher.go
+
diff --git op-geth/core/state_prefetcher.go CELO/core/state_prefetcher.go
index bb6835202b9758e49611f8da677ddee3edc346f1..45348979f64194fa9a584f9a1f8bb78e306c7812 100644
--- op-geth/core/state_prefetcher.go
+++ CELO/core/state_prefetcher.go
@@ -14791,8 +14789,8 @@
-
diff --git op-geth/core/state_processor_test.go CELO/core/state_processor_test.go
+
diff --git op-geth/core/state_processor_test.go CELO/core/state_processor_test.go
index 77efaede5886e8cc3e92e78be5739e784fd099c0..12a978b616a80dce94de4a836a52d9f8234b9abf 100644
--- op-geth/core/state_processor_test.go
+++ CELO/core/state_processor_test.go
@@ -14866,8 +14864,8 @@
-
diff --git op-geth/core/superchain_test.go CELO/core/superchain_test.go
+
diff --git op-geth/core/superchain_test.go CELO/core/superchain_test.go
index 4f7ea71ac5a773afb25ea8d67f0cade27f641cdc..6ed8d8ad33933a52357ff5df6b35c4c9c01957c6 100644
--- op-geth/core/superchain_test.go
+++ CELO/core/superchain_test.go
@@ -15021,8 +15019,8 @@
-
diff --git op-geth/core/types/celo_block.go CELO/core/types/celo_block.go
+
diff --git op-geth/core/types/celo_block.go CELO/core/types/celo_block.go
new file mode 100644
index 0000000000000000000000000000000000000000..075c856087147209a568fd24e4ce647eadc115c5
--- /dev/null
@@ -15228,8 +15226,8 @@
-
diff --git op-geth/core/types/celo_denominated_tx.go CELO/core/types/celo_denominated_tx.go
+
diff --git op-geth/core/types/celo_denominated_tx.go CELO/core/types/celo_denominated_tx.go
new file mode 100644
index 0000000000000000000000000000000000000000..21ed9da5564d7ab1cebd75ca5ef1e5f94617d7dd
--- /dev/null
@@ -15393,8 +15391,8 @@
-
diff --git op-geth/core/types/celo_dynamic_fee_tx_v2.go CELO/core/types/celo_dynamic_fee_tx_v2.go
+
diff --git op-geth/core/types/celo_dynamic_fee_tx_v2.go CELO/core/types/celo_dynamic_fee_tx_v2.go
new file mode 100644
index 0000000000000000000000000000000000000000..45f83a5b70b97ce68f22c77400d81d74ba083703
--- /dev/null
@@ -15570,8 +15568,8 @@
-
diff --git op-geth/core/types/celo_receipt_test.go CELO/core/types/celo_receipt_test.go
+
diff --git op-geth/core/types/celo_receipt_test.go CELO/core/types/celo_receipt_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..297e8504ae269ce5ef8c6ab599019583c265db21
--- /dev/null
@@ -15719,8 +15717,8 @@
-
diff --git op-geth/core/types/celo_transaction.go CELO/core/types/celo_transaction.go
+
diff --git op-geth/core/types/celo_transaction.go CELO/core/types/celo_transaction.go
new file mode 100644
index 0000000000000000000000000000000000000000..bdad1f66300b456344c47e9aaaaac45dec6c5bfe
--- /dev/null
@@ -15885,8 +15883,8 @@
-
diff --git op-geth/core/types/celo_transaction_marshalling.go CELO/core/types/celo_transaction_marshalling.go
+
diff --git op-geth/core/types/celo_transaction_marshalling.go CELO/core/types/celo_transaction_marshalling.go
new file mode 100644
index 0000000000000000000000000000000000000000..109342a3668a7c4bcae80b26ebd47238ba460e6d
--- /dev/null
@@ -16064,8 +16062,8 @@
-
diff --git op-geth/core/types/celo_transaction_signing_forks.go CELO/core/types/celo_transaction_signing_forks.go
+
diff --git op-geth/core/types/celo_transaction_signing_forks.go CELO/core/types/celo_transaction_signing_forks.go
new file mode 100644
index 0000000000000000000000000000000000000000..5aa3c79dd3ef5c732bc1a36668d47c6fba5f0748
--- /dev/null
@@ -16216,8 +16214,8 @@
-
diff --git op-geth/core/types/celo_transaction_signing_tx_funcs.go CELO/core/types/celo_transaction_signing_tx_funcs.go
+
diff --git op-geth/core/types/celo_transaction_signing_tx_funcs.go CELO/core/types/celo_transaction_signing_tx_funcs.go
new file mode 100644
index 0000000000000000000000000000000000000000..9f22b43439cac0f564baac7200dc196d3cc201d1
--- /dev/null
@@ -16441,8 +16439,8 @@
-
diff --git op-geth/core/types/celo_tx_legacy.go CELO/core/types/celo_tx_legacy.go
+
diff --git op-geth/core/types/celo_tx_legacy.go CELO/core/types/celo_tx_legacy.go
new file mode 100644
index 0000000000000000000000000000000000000000..b1ea04209573fa7c9b62081fb5b5e158df4a8ba2
--- /dev/null
@@ -16649,8 +16647,8 @@
-
diff --git op-geth/core/types/gen_header_rlp.go CELO/core/types/gen_header_rlp.go
+
diff --git op-geth/core/types/gen_header_rlp.go CELO/core/types/gen_header_rlp.go
deleted file mode 100644
index ed6a1a002cdbaab59d8261746fd512fb90888c44..0000000000000000000000000000000000000000
--- op-geth/core/types/gen_header_rlp.go
@@ -16780,8 +16778,8 @@