From a198a337d1dd1418561e30d5f996cc04bbf2f517 Mon Sep 17 00:00:00 2001 From: De'on Summers Date: Thu, 22 Feb 2024 08:25:36 -0600 Subject: [PATCH] replace ethereum/go-ethereum --- .circleci/check-releases.sh | 4 +- .github/CONTRIBUTING.md | 2 +- .travis.yml | 2 +- README.md | 8 +- SECURITY.md | 14 +- accounts/abi/abi.go | 4 +- accounts/abi/abi_test.go | 6 +- accounts/abi/bind/auth.go | 14 +- accounts/abi/bind/backend.go | 6 +- accounts/abi/bind/backends/simulated.go | 42 ++-- accounts/abi/bind/backends/simulated_test.go | 16 +- accounts/abi/bind/base.go | 12 +- accounts/abi/bind/base_test.go | 16 +- accounts/abi/bind/bind.go | 6 +- accounts/abi/bind/bind_test.go | 236 +++++++++--------- accounts/abi/bind/template.go | 14 +- accounts/abi/bind/util.go | 8 +- accounts/abi/bind/util_test.go | 12 +- accounts/abi/error.go | 4 +- accounts/abi/event.go | 4 +- accounts/abi/event_test.go | 4 +- accounts/abi/method.go | 2 +- accounts/abi/pack.go | 4 +- accounts/abi/pack_test.go | 2 +- accounts/abi/packing_test.go | 2 +- accounts/abi/topics.go | 4 +- accounts/abi/topics_test.go | 4 +- accounts/abi/type.go | 2 +- accounts/abi/type_test.go | 2 +- accounts/abi/unpack.go | 2 +- accounts/abi/unpack_test.go | 2 +- accounts/accounts.go | 8 +- accounts/accounts_test.go | 2 +- accounts/external/backend.go | 18 +- accounts/keystore/account_cache.go | 6 +- accounts/keystore/account_cache_test.go | 4 +- accounts/keystore/file_cache.go | 2 +- accounts/keystore/key.go | 6 +- accounts/keystore/keystore.go | 10 +- accounts/keystore/keystore_test.go | 8 +- accounts/keystore/passphrase.go | 10 +- accounts/keystore/passphrase_test.go | 2 +- accounts/keystore/plain.go | 2 +- accounts/keystore/plain_test.go | 4 +- accounts/keystore/presale.go | 4 +- accounts/keystore/wallet.go | 8 +- accounts/keystore/watch.go | 2 +- accounts/manager.go | 4 +- accounts/scwallet/hub.go | 8 +- accounts/scwallet/securechannel.go | 2 +- accounts/scwallet/wallet.go | 12 +- accounts/usbwallet/hub.go | 6 +- accounts/usbwallet/ledger.go | 14 +- accounts/usbwallet/trezor.go | 12 +- accounts/usbwallet/wallet.go | 12 +- beacon/engine/errors.go | 4 +- beacon/engine/gen_blockparams.go | 6 +- beacon/engine/gen_ed.go | 6 +- beacon/engine/gen_epe.go | 4 +- beacon/engine/types.go | 8 +- beacon/light/canonical.go | 8 +- beacon/light/committee_chain.go | 16 +- beacon/light/committee_chain_test.go | 8 +- beacon/light/test_helpers.go | 8 +- beacon/merkle/merkle.go | 4 +- beacon/types/committee.go | 6 +- beacon/types/config.go | 6 +- beacon/types/gen_header_json.go | 2 +- beacon/types/gen_syncaggregate_json.go | 2 +- beacon/types/header.go | 6 +- beacon/types/light_sync.go | 6 +- build/ci.go | 14 +- build/deb/ethereum/deb.control | 4 +- build/nsis.install.nsh | 6 +- build/update-license.go | 2 +- cmd/abidump/main.go | 4 +- cmd/abigen/main.go | 12 +- cmd/bootnode/main.go | 14 +- cmd/clef/main.go | 40 +-- cmd/clef/run_test.go | 4 +- cmd/clef/tutorial.md | 6 +- cmd/devp2p/crawl.go | 4 +- cmd/devp2p/discv4cmd.go | 14 +- cmd/devp2p/discv5cmd.go | 8 +- cmd/devp2p/dns_cloudflare.go | 4 +- cmd/devp2p/dns_route53.go | 4 +- cmd/devp2p/dnscmd.go | 10 +- cmd/devp2p/enrcmd.go | 6 +- cmd/devp2p/internal/ethtest/chain.go | 20 +- cmd/devp2p/internal/ethtest/chain_test.go | 6 +- cmd/devp2p/internal/ethtest/conn.go | 12 +- cmd/devp2p/internal/ethtest/engine.go | 2 +- cmd/devp2p/internal/ethtest/protocol.go | 4 +- cmd/devp2p/internal/ethtest/snap.go | 16 +- cmd/devp2p/internal/ethtest/suite.go | 18 +- cmd/devp2p/internal/ethtest/suite_test.go | 16 +- cmd/devp2p/internal/ethtest/transaction.go | 6 +- cmd/devp2p/internal/v4test/discv4tests.go | 6 +- cmd/devp2p/internal/v4test/framework.go | 6 +- cmd/devp2p/internal/v5test/discv5tests.go | 8 +- cmd/devp2p/internal/v5test/framework.go | 10 +- cmd/devp2p/keycmd.go | 6 +- cmd/devp2p/main.go | 6 +- cmd/devp2p/nodeset.go | 4 +- cmd/devp2p/nodesetcmd.go | 10 +- cmd/devp2p/rlpxcmd.go | 12 +- cmd/devp2p/runtest.go | 8 +- cmd/ethkey/changepassword.go | 4 +- cmd/ethkey/generate.go | 6 +- cmd/ethkey/inspect.go | 6 +- cmd/ethkey/main.go | 2 +- cmd/ethkey/message.go | 10 +- cmd/ethkey/run_test.go | 4 +- cmd/ethkey/utils.go | 2 +- cmd/evm/blockrunner.go | 10 +- cmd/evm/compiler.go | 2 +- cmd/evm/disasm.go | 2 +- cmd/evm/internal/compiler/compiler.go | 2 +- cmd/evm/internal/t8ntool/block.go | 14 +- cmd/evm/internal/t8ntool/execution.go | 32 +-- cmd/evm/internal/t8ntool/flags.go | 4 +- cmd/evm/internal/t8ntool/gen_header.go | 8 +- cmd/evm/internal/t8ntool/gen_stenv.go | 6 +- cmd/evm/internal/t8ntool/tracewriter.go | 8 +- cmd/evm/internal/t8ntool/transaction.go | 14 +- cmd/evm/internal/t8ntool/transition.go | 24 +- cmd/evm/internal/t8ntool/tx_iterator.go | 12 +- cmd/evm/main.go | 10 +- cmd/evm/runner.go | 26 +- cmd/evm/staterunner.go | 14 +- cmd/evm/t8n_test.go | 6 +- cmd/evm/testdata/30/README.txt | 2 +- cmd/geth/accountcmd.go | 10 +- cmd/geth/accountcmd_test.go | 2 +- cmd/geth/chaincmd.go | 26 +- cmd/geth/config.go | 34 +-- cmd/geth/consolecmd.go | 6 +- cmd/geth/consolecmd_test.go | 2 +- cmd/geth/dbcmd.go | 22 +- cmd/geth/exportcmd_test.go | 2 +- cmd/geth/logging_test.go | 2 +- cmd/geth/logtestcmd_active.go | 6 +- cmd/geth/main.go | 32 +-- cmd/geth/misccmd.go | 4 +- cmd/geth/run_test.go | 6 +- cmd/geth/snapshot.go | 24 +- cmd/geth/testdata/vcheck/data.json | 4 +- cmd/geth/testdata/vcheck/vulnerabilities.json | 42 ++-- cmd/geth/verkle.go | 10 +- cmd/geth/version_check.go | 2 +- cmd/p2psim/main.go | 14 +- cmd/rlpdump/main.go | 4 +- cmd/rlpdump/rlpdump_test.go | 4 +- cmd/utils/cmd.go | 24 +- cmd/utils/export_test.go | 4 +- cmd/utils/flags.go | 76 +++--- cmd/utils/flags_legacy.go | 4 +- cmd/utils/prompt.go | 2 +- common/bitutil/compress_test.go | 2 +- common/bytes.go | 2 +- common/debug.go | 2 +- common/hexutil/json_example_test.go | 2 +- common/math/big_test.go | 2 +- common/prque/lazyqueue.go | 2 +- common/prque/lazyqueue_test.go | 2 +- common/types.go | 2 +- consensus/beacon/consensus.go | 18 +- consensus/beacon/faker.go | 4 +- consensus/beacon/oplegacy.go | 10 +- consensus/clique/api.go | 12 +- consensus/clique/clique.go | 32 +-- consensus/clique/clique_test.go | 14 +- consensus/clique/snapshot.go | 14 +- consensus/clique/snapshot_test.go | 16 +- consensus/consensus.go | 10 +- consensus/ethash/consensus.go | 20 +- consensus/ethash/consensus_test.go | 8 +- consensus/ethash/difficulty.go | 2 +- consensus/ethash/ethash.go | 6 +- consensus/merger.go | 8 +- consensus/misc/create2deployer.go | 8 +- consensus/misc/create2deployer_test.go | 6 +- consensus/misc/dao.go | 6 +- consensus/misc/eip1559/eip1559.go | 10 +- consensus/misc/eip1559/eip1559_test.go | 6 +- consensus/misc/eip4844/eip4844.go | 4 +- consensus/misc/eip4844/eip4844_test.go | 2 +- consensus/misc/gaslimit.go | 2 +- console/bridge.go | 12 +- console/bridge_test.go | 2 +- console/console.go | 12 +- console/console_test.go | 16 +- core/asm/asm.go | 2 +- core/asm/compiler.go | 4 +- core/bench_test.go | 18 +- core/block_validator.go | 10 +- core/block_validator_test.go | 20 +- core/blockchain.go | 44 ++-- core/blockchain_insert.go | 8 +- core/blockchain_reader.go | 22 +- core/blockchain_repair_test.go | 14 +- core/blockchain_sethead_test.go | 20 +- core/blockchain_snapshot_test.go | 14 +- core/blockchain_test.go | 34 +-- core/blocks.go | 2 +- core/bloom_indexer.go | 12 +- core/bloombits/generator.go | 2 +- core/bloombits/generator_test.go | 2 +- core/bloombits/matcher.go | 4 +- core/bloombits/matcher_test.go | 4 +- core/chain_indexer.go | 12 +- core/chain_indexer_test.go | 6 +- core/chain_makers.go | 24 +- core/chain_makers_test.go | 18 +- core/dao_test.go | 8 +- core/error.go | 2 +- core/events.go | 4 +- core/evm.go | 12 +- core/forkchoice.go | 10 +- core/forkid/forkid.go | 6 +- core/forkid/forkid_test.go | 10 +- core/gen_genesis.go | 8 +- core/gen_genesis_account.go | 6 +- core/genesis.go | 26 +- core/genesis_test.go | 16 +- core/headerchain.go | 18 +- core/headerchain_test.go | 12 +- core/mkalloc.go | 6 +- core/rawdb/accessors_chain.go | 16 +- core/rawdb/accessors_chain_test.go | 12 +- core/rawdb/accessors_indexes.go | 12 +- core/rawdb/accessors_indexes_test.go | 12 +- core/rawdb/accessors_metadata.go | 10 +- core/rawdb/accessors_snapshot.go | 6 +- core/rawdb/accessors_state.go | 6 +- core/rawdb/accessors_sync.go | 8 +- core/rawdb/accessors_trie.go | 8 +- core/rawdb/ancient_utils.go | 4 +- core/rawdb/chain_freezer.go | 8 +- core/rawdb/chain_iterator.go | 12 +- core/rawdb/chain_iterator_test.go | 4 +- core/rawdb/database.go | 12 +- core/rawdb/freezer.go | 8 +- core/rawdb/freezer_batch.go | 4 +- core/rawdb/freezer_meta.go | 4 +- core/rawdb/freezer_resettable.go | 4 +- core/rawdb/freezer_resettable_test.go | 2 +- core/rawdb/freezer_table.go | 6 +- core/rawdb/freezer_table_test.go | 2 +- core/rawdb/freezer_test.go | 4 +- core/rawdb/key_length_iterator.go | 2 +- core/rawdb/schema.go | 6 +- core/rawdb/table.go | 2 +- core/rawdb/table_test.go | 2 +- core/rlp_test.go | 12 +- core/sender_cacher.go | 2 +- core/state/access_list.go | 2 +- core/state/database.go | 18 +- core/state/dump.go | 12 +- core/state/iterator.go | 8 +- core/state/iterator_test.go | 6 +- core/state/journal.go | 2 +- core/state/metrics.go | 2 +- core/state/pruner/bloom.go | 6 +- core/state/pruner/pruner.go | 16 +- core/state/snapshot/context.go | 12 +- core/state/snapshot/conversion.go | 14 +- core/state/snapshot/difflayer.go | 6 +- core/state/snapshot/difflayer_test.go | 6 +- core/state/snapshot/disklayer.go | 12 +- core/state/snapshot/disklayer_test.go | 8 +- core/state/snapshot/generate.go | 18 +- core/state/snapshot/generate_test.go | 20 +- core/state/snapshot/holdable_iterator.go | 4 +- core/state/snapshot/holdable_iterator_test.go | 4 +- core/state/snapshot/iterator.go | 6 +- core/state/snapshot/iterator_binary.go | 2 +- core/state/snapshot/iterator_fast.go | 2 +- core/state/snapshot/iterator_test.go | 4 +- core/state/snapshot/journal.go | 12 +- core/state/snapshot/metrics.go | 2 +- core/state/snapshot/snapshot.go | 16 +- core/state/snapshot/snapshot_test.go | 10 +- core/state/snapshot/utils.go | 10 +- core/state/state_object.go | 12 +- core/state/state_object_test.go | 2 +- core/state/state_test.go | 12 +- core/state/statedb.go | 24 +- core/state/statedb_fuzz_test.go | 18 +- core/state/statedb_test.go | 28 +-- core/state/sync.go | 10 +- core/state/sync_test.go | 18 +- core/state/transient_storage.go | 2 +- core/state/trie_prefetcher.go | 6 +- core/state/trie_prefetcher_test.go | 6 +- core/state_prefetcher.go | 10 +- core/state_processor.go | 16 +- core/state_processor_test.go | 26 +- core/state_transition.go | 10 +- core/superchain.go | 4 +- core/superchain_test.go | 4 +- core/txpool/blobpool/blobpool.go | 24 +- core/txpool/blobpool/blobpool_test.go | 28 +-- core/txpool/blobpool/config.go | 2 +- core/txpool/blobpool/evictheap.go | 2 +- core/txpool/blobpool/evictheap_test.go | 4 +- core/txpool/blobpool/interface.go | 8 +- core/txpool/blobpool/limbo.go | 8 +- core/txpool/blobpool/metrics.go | 2 +- core/txpool/legacypool/journal.go | 8 +- core/txpool/legacypool/legacypool.go | 22 +- core/txpool/legacypool/legacypool2_test.go | 12 +- core/txpool/legacypool/legacypool_test.go | 20 +- core/txpool/legacypool/list.go | 6 +- core/txpool/legacypool/list_test.go | 4 +- core/txpool/legacypool/noncer.go | 4 +- core/txpool/subpool.go | 8 +- core/txpool/txpool.go | 12 +- core/txpool/validation.go | 14 +- core/types.go | 6 +- core/types/block.go | 6 +- core/types/block_test.go | 12 +- core/types/bloom9.go | 4 +- core/types/bloom9_test.go | 4 +- core/types/deposit_tx.go | 4 +- core/types/gen_access_tuple.go | 2 +- core/types/gen_account_rlp.go | 2 +- core/types/gen_header_json.go | 4 +- core/types/gen_header_rlp.go | 2 +- core/types/gen_log_json.go | 4 +- core/types/gen_log_rlp.go | 2 +- core/types/gen_receipt_json.go | 4 +- core/types/gen_withdrawal_json.go | 4 +- core/types/gen_withdrawal_rlp.go | 2 +- core/types/hashes.go | 6 +- core/types/hashing.go | 6 +- core/types/hashing_test.go | 14 +- core/types/log.go | 4 +- core/types/log_test.go | 4 +- core/types/receipt.go | 10 +- core/types/receipt_test.go | 6 +- core/types/rlp_fuzzer_test.go | 2 +- core/types/rollup_cost.go | 6 +- core/types/rollup_cost_test.go | 4 +- core/types/state_account.go | 4 +- core/types/transaction.go | 10 +- core/types/transaction_marshalling.go | 6 +- core/types/transaction_marshalling_test.go | 2 +- core/types/transaction_signing.go | 6 +- core/types/transaction_signing_test.go | 6 +- core/types/transaction_test.go | 6 +- core/types/tx_access_list.go | 4 +- core/types/tx_blob.go | 8 +- core/types/tx_blob_test.go | 6 +- core/types/tx_dynamic_fee.go | 4 +- core/types/tx_legacy.go | 2 +- core/types/types_test.go | 6 +- core/types/withdrawal.go | 6 +- core/vm/analysis_test.go | 2 +- core/vm/common.go | 4 +- core/vm/contract.go | 2 +- core/vm/contracts.go | 16 +- core/vm/contracts_fuzz_test.go | 2 +- core/vm/contracts_test.go | 2 +- core/vm/eips.go | 4 +- core/vm/evm.go | 8 +- core/vm/gas_table.go | 6 +- core/vm/gas_table_test.go | 12 +- core/vm/instructions.go | 8 +- core/vm/instructions_test.go | 14 +- core/vm/interface.go | 6 +- core/vm/interpreter.go | 10 +- core/vm/interpreter_test.go | 12 +- core/vm/jump_table.go | 2 +- core/vm/jump_table_export.go | 2 +- core/vm/logger.go | 2 +- core/vm/memory_test.go | 2 +- core/vm/operations_acl.go | 6 +- core/vm/runtime/env.go | 4 +- core/vm/runtime/runtime.go | 14 +- core/vm/runtime/runtime_example_test.go | 4 +- core/vm/runtime/runtime_test.go | 28 +-- core/vm/stack_table.go | 2 +- crypto/bls12381/g1_test.go | 2 +- crypto/bls12381/g2_test.go | 2 +- crypto/bls12381/pairing_test.go | 2 +- crypto/bls12381/utils.go | 2 +- crypto/bn256/bn256_fast.go | 2 +- crypto/bn256/bn256_slow.go | 2 +- crypto/crypto.go | 6 +- crypto/crypto_test.go | 4 +- crypto/ecies/ecies_test.go | 2 +- crypto/ecies/params.go | 2 +- crypto/kzg4844/kzg4844_ckzg_cgo.go | 2 +- crypto/secp256k1/dummy.go | 6 +- crypto/signature_cgo.go | 4 +- crypto/signature_test.go | 6 +- .../2021-08-22-split-postmortem.md | 4 +- eth/api.go | 4 +- eth/api_admin.go | 6 +- eth/api_backend.go | 40 +-- eth/api_debug.go | 22 +- eth/api_debug_test.go | 12 +- eth/api_miner.go | 4 +- eth/backend.go | 66 ++--- eth/bloombits.go | 4 +- eth/catalyst/api.go | 22 +- eth/catalyst/api_test.go | 40 +-- eth/catalyst/queue.go | 8 +- eth/catalyst/simulated_beacon.go | 16 +- eth/catalyst/simulated_beacon_api.go | 4 +- eth/catalyst/simulated_beacon_test.go | 20 +- eth/catalyst/superchain.go | 6 +- eth/catalyst/superchain_test.go | 8 +- eth/catalyst/tester.go | 10 +- eth/downloader/api.go | 6 +- eth/downloader/beacondevsync.go | 4 +- eth/downloader/beaconsync.go | 8 +- eth/downloader/downloader.go | 22 +- eth/downloader/downloader_test.go | 28 +-- eth/downloader/events.go | 2 +- eth/downloader/fetchers.go | 6 +- eth/downloader/fetchers_concurrent.go | 8 +- eth/downloader/fetchers_concurrent_bodies.go | 6 +- eth/downloader/fetchers_concurrent_headers.go | 6 +- .../fetchers_concurrent_receipts.go | 6 +- eth/downloader/metrics.go | 2 +- eth/downloader/peer.go | 10 +- eth/downloader/queue.go | 12 +- eth/downloader/queue_test.go | 14 +- eth/downloader/receiptreference.go | 6 +- eth/downloader/receiptreference_test.go | 2 +- eth/downloader/resultstore.go | 2 +- eth/downloader/skeleton.go | 12 +- eth/downloader/skeleton_test.go | 10 +- eth/downloader/statesync.go | 4 +- eth/downloader/testchain_test.go | 18 +- eth/ethconfig/config.go | 26 +- eth/ethconfig/gen_config.go | 14 +- eth/fetcher/block_fetcher.go | 16 +- eth/fetcher/block_fetcher_test.go | 18 +- eth/fetcher/tx_fetcher.go | 14 +- eth/fetcher/tx_fetcher_test.go | 10 +- eth/filters/api.go | 12 +- eth/filters/api_test.go | 4 +- eth/filters/bench_test.go | 14 +- eth/filters/filter.go | 8 +- eth/filters/filter_system.go | 24 +- eth/filters/filter_system_test.go | 26 +- eth/filters/filter_test.go | 22 +- eth/gasestimator/gasestimator.go | 14 +- eth/gasprice/feehistory.go | 10 +- eth/gasprice/feehistory_test.go | 2 +- eth/gasprice/gasprice.go | 16 +- eth/gasprice/gasprice_test.go | 20 +- eth/gasprice/optimism-gasprice.go | 8 +- eth/gasprice/optimism-gasprice_test.go | 16 +- eth/handler.go | 36 +-- eth/handler_eth.go | 10 +- eth/handler_eth_test.go | 28 +-- eth/handler_snap.go | 6 +- eth/handler_test.go | 26 +- eth/peer.go | 4 +- eth/peerset.go | 8 +- eth/protocols/eth/broadcast.go | 4 +- eth/protocols/eth/discovery.go | 8 +- eth/protocols/eth/dispatcher.go | 2 +- eth/protocols/eth/handler.go | 16 +- eth/protocols/eth/handler_test.go | 30 +-- eth/protocols/eth/handlers.go | 12 +- eth/protocols/eth/handshake.go | 8 +- eth/protocols/eth/handshake_test.go | 8 +- eth/protocols/eth/metrics.go | 2 +- eth/protocols/eth/peer.go | 8 +- eth/protocols/eth/peer_test.go | 6 +- eth/protocols/eth/protocol.go | 8 +- eth/protocols/eth/protocol_test.go | 6 +- eth/protocols/eth/tracker.go | 2 +- eth/protocols/snap/discovery.go | 2 +- eth/protocols/snap/handler.go | 20 +- eth/protocols/snap/handler_fuzzing_test.go | 18 +- eth/protocols/snap/metrics.go | 2 +- eth/protocols/snap/peer.go | 6 +- eth/protocols/snap/protocol.go | 6 +- eth/protocols/snap/range.go | 2 +- eth/protocols/snap/range_test.go | 2 +- eth/protocols/snap/sort_test.go | 2 +- eth/protocols/snap/sync.go | 26 +- eth/protocols/snap/sync_test.go | 22 +- eth/protocols/snap/tracker.go | 2 +- eth/state_accessor.go | 18 +- eth/sync.go | 10 +- eth/sync_test.go | 10 +- eth/tracers/api.go | 30 +-- eth/tracers/api_test.go | 32 +-- .../internal/tracetest/calltrace_test.go | 22 +- .../internal/tracetest/flat_calltrace_test.go | 18 +- .../internal/tracetest/prestate_test.go | 14 +- eth/tracers/internal/tracetest/util.go | 4 +- eth/tracers/js/goja.go | 12 +- eth/tracers/js/tracer_test.go | 10 +- eth/tracers/logger/access_list_tracer.go | 6 +- eth/tracers/logger/gen_structlog.go | 8 +- eth/tracers/logger/logger.go | 12 +- eth/tracers/logger/logger_json.go | 6 +- eth/tracers/logger/logger_test.go | 10 +- eth/tracers/native/4byte.go | 6 +- eth/tracers/native/call.go | 14 +- eth/tracers/native/call_flat.go | 8 +- eth/tracers/native/gen_account_json.go | 4 +- eth/tracers/native/gen_callframe_json.go | 6 +- eth/tracers/native/gen_flatcallaction_json.go | 4 +- eth/tracers/native/gen_flatcallresult_json.go | 4 +- eth/tracers/native/mux.go | 6 +- eth/tracers/native/noop.go | 6 +- eth/tracers/native/prestate.go | 12 +- eth/tracers/tracers.go | 4 +- eth/tracers/tracers_test.go | 18 +- ethclient/ethclient.go | 10 +- ethclient/ethclient_test.go | 32 +-- ethclient/gethclient/gethclient.go | 12 +- ethclient/gethclient/gethclient_test.go | 26 +- ethclient/signer.go | 4 +- ethdb/dbtest/testsuite.go | 2 +- ethdb/leveldb/leveldb.go | 8 +- ethdb/leveldb/leveldb_test.go | 4 +- ethdb/memorydb/memorydb.go | 4 +- ethdb/memorydb/memorydb_test.go | 4 +- ethdb/pebble/pebble.go | 10 +- ethdb/pebble/pebble_test.go | 4 +- ethdb/remotedb/remotedb.go | 6 +- ethstats/ethstats.go | 26 +- event/example_feed_test.go | 2 +- event/example_scope_test.go | 2 +- event/example_subscription_test.go | 2 +- event/subscription.go | 2 +- fork.yaml | 8 +- go.mod | 2 +- graphql/graphiql.go | 4 +- graphql/graphql.go | 22 +- graphql/graphql_test.go | 26 +- graphql/service.go | 8 +- interfaces.go | 4 +- internal/blocktest/test_hash.go | 2 +- internal/build/env.go | 2 +- internal/cmdtest/test_cmd.go | 2 +- internal/debug/api.go | 2 +- internal/debug/flags.go | 8 +- internal/debug/trace.go | 2 +- internal/ethapi/addrlock.go | 2 +- internal/ethapi/api.go | 50 ++-- internal/ethapi/api_test.go | 38 +-- internal/ethapi/backend.go | 26 +- internal/ethapi/dbapi.go | 4 +- internal/ethapi/transaction_args.go | 20 +- internal/ethapi/transaction_args_test.go | 28 +-- internal/flags/flags.go | 2 +- internal/flags/helpers.go | 6 +- internal/guide/guide_test.go | 6 +- internal/jsre/deps/web3.js | 2 +- internal/jsre/jsre.go | 2 +- internal/shutdowncheck/shutdown_tracker.go | 8 +- internal/testlog/testlog.go | 2 +- internal/version/version.go | 4 +- metrics/cpu_enabled.go | 2 +- metrics/cputime_unix.go | 2 +- metrics/exp/exp.go | 6 +- metrics/influxdb/influxdb.go | 2 +- metrics/influxdb/influxdb_test.go | 4 +- metrics/influxdb/influxdbv1.go | 4 +- metrics/influxdb/influxdbv2.go | 4 +- metrics/internal/sampledata.go | 2 +- metrics/internal/sampledata_test.go | 2 +- metrics/librato/librato.go | 2 +- metrics/metrics.go | 2 +- metrics/prometheus/collector.go | 2 +- metrics/prometheus/collector_test.go | 4 +- metrics/prometheus/prometheus.go | 4 +- miner/miner.go | 24 +- miner/miner_test.go | 28 +-- miner/ordering.go | 8 +- miner/ordering_test.go | 8 +- miner/payload_building.go | 12 +- miner/payload_building_test.go | 12 +- miner/stress/clique/main.go | 32 +-- miner/worker.go | 32 +-- miner/worker_test.go | 30 +-- node/api.go | 14 +- node/api_test.go | 2 +- node/config.go | 10 +- node/config_test.go | 4 +- node/defaults.go | 6 +- node/endpoints.go | 4 +- node/jwt_auth.go | 2 +- node/node.go | 18 +- node/node_auth_test.go | 4 +- node/node_example_test.go | 2 +- node/node_test.go | 8 +- node/rpcstack.go | 4 +- node/rpcstack_test.go | 6 +- node/utils_test.go | 4 +- oss-fuzz.sh | 68 ++--- p2p/dial.go | 8 +- p2p/dial_test.go | 10 +- p2p/discover/common.go | 10 +- p2p/discover/lookup.go | 2 +- p2p/discover/metrics.go | 2 +- p2p/discover/node.go | 6 +- p2p/discover/ntp.go | 2 +- p2p/discover/table.go | 10 +- p2p/discover/table_test.go | 8 +- p2p/discover/table_util_test.go | 6 +- p2p/discover/v4_lookup_test.go | 8 +- p2p/discover/v4_udp.go | 10 +- p2p/discover/v4_udp_test.go | 10 +- p2p/discover/v4wire/v4wire.go | 10 +- p2p/discover/v4wire/v4wire_test.go | 4 +- p2p/discover/v5_talk.go | 6 +- p2p/discover/v5_udp.go | 12 +- p2p/discover/v5_udp_test.go | 12 +- p2p/discover/v5wire/crypto.go | 6 +- p2p/discover/v5wire/crypto_test.go | 6 +- p2p/discover/v5wire/encoding.go | 8 +- p2p/discover/v5wire/encoding_test.go | 8 +- p2p/discover/v5wire/msg.go | 10 +- p2p/discover/v5wire/session.go | 8 +- p2p/dnsdisc/client.go | 12 +- p2p/dnsdisc/client_test.go | 14 +- p2p/dnsdisc/sync.go | 4 +- p2p/dnsdisc/tree.go | 8 +- p2p/dnsdisc/tree_test.go | 4 +- p2p/enode/idscheme.go | 8 +- p2p/enode/idscheme_test.go | 6 +- p2p/enode/iter_test.go | 2 +- p2p/enode/localnode.go | 6 +- p2p/enode/localnode_test.go | 4 +- p2p/enode/node.go | 4 +- p2p/enode/node_test.go | 4 +- p2p/enode/nodedb.go | 2 +- p2p/enode/urlv4.go | 6 +- p2p/enode/urlv4_test.go | 4 +- p2p/enr/enr.go | 2 +- p2p/enr/enr_test.go | 2 +- p2p/enr/entries.go | 2 +- p2p/message.go | 6 +- p2p/metrics.go | 2 +- p2p/msgrate/msgrate.go | 2 +- p2p/nat/nat.go | 2 +- p2p/nat/natupnp_test.go | 2 +- p2p/netutil/iptrack.go | 2 +- p2p/netutil/iptrack_test.go | 2 +- p2p/nodestate/nodestate.go | 14 +- p2p/nodestate/nodestate_test.go | 10 +- p2p/peer.go | 14 +- p2p/peer_test.go | 6 +- p2p/protocol.go | 4 +- p2p/rlpx/buffer_test.go | 2 +- p2p/rlpx/rlpx.go | 6 +- p2p/rlpx/rlpx_test.go | 8 +- p2p/server.go | 20 +- p2p/server_nat.go | 8 +- p2p/server_nat_test.go | 6 +- p2p/server_test.go | 12 +- p2p/simulations/adapters/exec.go | 12 +- p2p/simulations/adapters/inproc.go | 14 +- p2p/simulations/adapters/inproc_test.go | 2 +- p2p/simulations/adapters/types.go | 16 +- p2p/simulations/connect.go | 2 +- p2p/simulations/connect_test.go | 6 +- p2p/simulations/examples/ping-pong.go | 12 +- p2p/simulations/http.go | 10 +- p2p/simulations/http_test.go | 14 +- p2p/simulations/mocker.go | 6 +- p2p/simulations/mocker_test.go | 2 +- p2p/simulations/network.go | 10 +- p2p/simulations/network_test.go | 8 +- p2p/simulations/simulation.go | 2 +- p2p/simulations/test.go | 8 +- p2p/tracker/tracker.go | 4 +- p2p/transport.go | 10 +- p2p/transport_test.go | 4 +- p2p/util.go | 2 +- p2p/util_test.go | 2 +- params/bootnodes.go | 2 +- params/config.go | 2 +- params/config_test.go | 2 +- params/dao.go | 2 +- params/protocol_params.go | 2 +- params/superchain.go | 2 +- rlp/decode.go | 2 +- rlp/decode_test.go | 2 +- rlp/encbuffer_example_test.go | 2 +- rlp/encode.go | 2 +- rlp/encode_test.go | 2 +- rlp/encoder_example_test.go | 2 +- rlp/iterator_test.go | 2 +- rlp/rlpgen/gen.go | 2 +- rlp/rlpgen/main.go | 2 +- rlp/rlpgen/testdata/bigint.out.txt | 2 +- rlp/rlpgen/testdata/nil.out.txt | 2 +- rlp/rlpgen/testdata/optional.out.txt | 2 +- rlp/rlpgen/testdata/rawvalue.in.txt | 2 +- rlp/rlpgen/testdata/rawvalue.out.txt | 2 +- rlp/rlpgen/testdata/uint256.out.txt | 2 +- rlp/rlpgen/testdata/uints.out.txt | 2 +- rlp/typecache.go | 2 +- rpc/client.go | 2 +- rpc/client_example_test.go | 4 +- rpc/client_opt_test.go | 2 +- rpc/client_test.go | 6 +- rpc/doc.go | 2 +- rpc/endpoints.go | 2 +- rpc/handler.go | 2 +- rpc/ipc.go | 4 +- rpc/ipc_unix.go | 2 +- rpc/metrics.go | 2 +- rpc/server.go | 2 +- rpc/service.go | 2 +- rpc/subscription_test.go | 4 +- rpc/types.go | 4 +- rpc/types_test.go | 4 +- rpc/websocket.go | 2 +- rpc/websocket_test.go | 2 +- signer/core/api.go | 24 +- signer/core/api_test.go | 22 +- .../apitypes/signed_data_internal_test.go | 6 +- signer/core/apitypes/types.go | 14 +- signer/core/auditlog.go | 10 +- signer/core/cliui.go | 8 +- signer/core/gnosis_safe.go | 8 +- signer/core/signed_data.go | 18 +- signer/core/signed_data_test.go | 14 +- signer/core/stdioui.go | 6 +- signer/core/uiapi.go | 10 +- signer/fourbyte/abi.go | 4 +- signer/fourbyte/abi_test.go | 4 +- signer/fourbyte/fourbyte_test.go | 4 +- signer/fourbyte/validation.go | 6 +- signer/fourbyte/validation_test.go | 6 +- signer/rules/rules.go | 10 +- signer/rules/rules_test.go | 16 +- signer/storage/aes_gcm_storage.go | 2 +- signer/storage/aes_gcm_storage_test.go | 4 +- tests/block_test.go | 4 +- tests/block_test_util.go | 30 +-- tests/difficulty_test.go | 2 +- tests/difficulty_test_util.go | 10 +- tests/fuzzers/bls12381/bls12381_fuzz.go | 4 +- tests/fuzzers/bls12381/precompile_fuzzer.go | 4 +- tests/fuzzers/bn256/bn256_fuzz.go | 4 +- tests/fuzzers/difficulty/difficulty-fuzz.go | 4 +- tests/fuzzers/rangeproof/rangeproof-fuzzer.go | 8 +- tests/fuzzers/secp256k1/secp_test.go | 2 +- tests/fuzzers/txfetcher/txfetcher_fuzzer.go | 8 +- tests/gen_btheader.go | 8 +- tests/gen_difficultytest.go | 4 +- tests/gen_stenv.go | 4 +- tests/gen_sttransaction.go | 8 +- tests/init.go | 2 +- tests/init_test.go | 2 +- tests/rlp_test_util.go | 2 +- tests/state_test.go | 14 +- tests/state_test_util.go | 32 +-- tests/transaction_test.go | 2 +- tests/transaction_test_util.go | 12 +- trie/committer.go | 4 +- trie/database.go | 14 +- trie/database_test.go | 8 +- trie/errors.go | 2 +- trie/hasher.go | 4 +- trie/iterator.go | 4 +- trie/iterator_test.go | 10 +- trie/node.go | 4 +- trie/node_enc.go | 2 +- trie/node_test.go | 16 +- trie/preimages.go | 6 +- trie/proof.go | 6 +- trie/proof_test.go | 8 +- trie/secure_trie.go | 8 +- trie/secure_trie_test.go | 10 +- trie/stacktrie.go | 8 +- trie/stacktrie_fuzzer_test.go | 10 +- trie/stacktrie_test.go | 8 +- trie/sync.go | 14 +- trie/sync_test.go | 14 +- trie/testutil/utils.go | 6 +- trie/tracer.go | 2 +- trie/tracer_test.go | 8 +- trie/trie.go | 8 +- trie/trie_id.go | 2 +- trie/trie_reader.go | 8 +- trie/trie_test.go | 14 +- trie/triedb/hashdb/database.go | 18 +- trie/triedb/pathdb/database.go | 16 +- trie/triedb/pathdb/database_test.go | 16 +- trie/triedb/pathdb/difflayer.go | 8 +- trie/triedb/pathdb/difflayer_test.go | 16 +- trie/triedb/pathdb/disklayer.go | 12 +- trie/triedb/pathdb/errors.go | 4 +- trie/triedb/pathdb/history.go | 10 +- trie/triedb/pathdb/history_test.go | 14 +- trie/triedb/pathdb/journal.go | 16 +- trie/triedb/pathdb/layertree.go | 8 +- trie/triedb/pathdb/metrics.go | 2 +- trie/triedb/pathdb/nodebuffer.go | 12 +- trie/triedb/pathdb/testutils.go | 10 +- trie/trienode/node.go | 2 +- trie/trienode/proof.go | 8 +- trie/triestate/state.go | 10 +- trie/utils/verkle.go | 4 +- trie/utils/verkle_test.go | 8 +- trie/verkle.go | 10 +- trie/verkle_test.go | 10 +- 813 files changed, 3665 insertions(+), 3665 deletions(-) diff --git a/.circleci/check-releases.sh b/.circleci/check-releases.sh index f3595e1320..dbe66d4277 100755 --- a/.circleci/check-releases.sh +++ b/.circleci/check-releases.sh @@ -4,12 +4,12 @@ set -euo pipefail LATEST_RELEASE=$(curl -s --fail -L \ -H "Accept: application/vnd.github+json" \ -H "X-GitHub-Api-Version: 2022-11-28" \ - https://api.github.com/repos/ethereum/go-ethereum/releases \ + https://api.github.com/repos/slingshot-finance/op-geth/releases \ | jq -r '(.[] | select(.draft==false) | select(.prerelease==false)).tag_name' | head -n 1) echo "Detected latest go-ethereum release as ${LATEST_RELEASE}" -git remote add upstream https://github.com/ethereum/go-ethereum +git remote add upstream https://github.com/slingshot-finance/op-geth git fetch upstream > /dev/null if git branch --contains "${LATEST_RELEASE}" 2>&1 | grep -e '^[ *]*optimism$' > /dev/null diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 969b7f8f9f..df8faddeb5 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -7,7 +7,7 @@ smallest of fixes! If you'd like to contribute to go-ethereum, please fork, fix, commit and send a pull request for the maintainers to review and merge into the main code base. If you wish to submit more complex changes though, please check up with the core -devs first on [our gitter channel](https://gitter.im/ethereum/go-ethereum) to +devs first on [our gitter channel](https://gitter.im/slingshot-finance/op-geth) to ensure those changes are in line with the general philosophy of the project and/or get some early feedback which can make both your efforts much lighter as well as our review and merge procedures quick and simple. diff --git a/.travis.yml b/.travis.yml index a55583a703..2bbfb6fd71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/ethereum/go-ethereum +go_import_path: github.com/slingshot-finance/op-geth sudo: false jobs: allow_failures: diff --git a/README.md b/README.md index 77317090c1..81107d8358 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ Official Golang execution layer implementation of the Ethereum protocol. [![API Reference]( https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667 -)](https://pkg.go.dev/github.com/ethereum/go-ethereum?tab=doc) -[![Go Report Card](https://goreportcard.com/badge/github.com/ethereum/go-ethereum)](https://goreportcard.com/report/github.com/ethereum/go-ethereum) -[![Travis](https://travis-ci.com/ethereum/go-ethereum.svg?branch=master)](https://travis-ci.com/ethereum/go-ethereum) +)](https://pkg.go.dev/github.com/slingshot-finance/op-geth?tab=doc) +[![Go Report Card](https://goreportcard.com/badge/github.com/slingshot-finance/op-geth)](https://goreportcard.com/report/github.com/slingshot-finance/op-geth) +[![Travis](https://travis-ci.com/slingshot-finance/op-geth.svg?branch=master)](https://travis-ci.com/slingshot-finance/op-geth) [![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.gg/nthXNEv) Automated builds are available for stable releases and the unstable master branch. Binary @@ -344,7 +344,7 @@ testing procedures. ### Contributing to geth.ethereum.org For contributions to the [go-ethereum website](https://geth.ethereum.org), please checkout and raise pull requests against the `website` branch. -For more detailed instructions please see the `website` branch [README](https://github.com/ethereum/go-ethereum/tree/website#readme) or the +For more detailed instructions please see the `website` branch [README](https://github.com/slingshot-finance/op-geth/tree/website#readme) or the [contributing](https://geth.ethereum.org/docs/developers/geth-developer/contributing) page of the website. ## License diff --git a/SECURITY.md b/SECURITY.md index 41b900d5e9..34c01c9c3f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,24 +2,24 @@ ## Supported Versions -Please see [Releases](https://github.com/ethereum/go-ethereum/releases). We recommend using the [most recently released version](https://github.com/ethereum/go-ethereum/releases/latest). +Please see [Releases](https://github.com/slingshot-finance/op-geth/releases). We recommend using the [most recently released version](https://github.com/slingshot-finance/op-geth/releases/latest). ## Audit reports -Audit reports are published in the `docs` folder: https://github.com/ethereum/go-ethereum/tree/master/docs/audits +Audit reports are published in the `docs` folder: https://github.com/slingshot-finance/op-geth/tree/master/docs/audits | Scope | Date | Report Link | | ------- | ------- | ----------- | -| `geth` | 20170425 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2017-04-25_Geth-audit_Truesec.pdf) | -| `clef` | 20180914 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2018-09-14_Clef-audit_NCC.pdf) | -| `Discv5` | 20191015 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2019-10-15_Discv5_audit_LeastAuthority.pdf) | -| `Discv5` | 20200124 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2020-01-24_DiscV5_audit_Cure53.pdf) | +| `geth` | 20170425 | [pdf](https://github.com/slingshot-finance/op-geth/blob/master/docs/audits/2017-04-25_Geth-audit_Truesec.pdf) | +| `clef` | 20180914 | [pdf](https://github.com/slingshot-finance/op-geth/blob/master/docs/audits/2018-09-14_Clef-audit_NCC.pdf) | +| `Discv5` | 20191015 | [pdf](https://github.com/slingshot-finance/op-geth/blob/master/docs/audits/2019-10-15_Discv5_audit_LeastAuthority.pdf) | +| `Discv5` | 20200124 | [pdf](https://github.com/slingshot-finance/op-geth/blob/master/docs/audits/2020-01-24_DiscV5_audit_Cure53.pdf) | ## Reporting a Vulnerability **Please do not file a public ticket** mentioning the vulnerability. -To find out how to disclose a vulnerability in Ethereum visit [https://bounty.ethereum.org](https://bounty.ethereum.org) or email bounty@ethereum.org. Please read the [disclosure page](https://github.com/ethereum/go-ethereum/security/advisories?state=published) for more information about publicly disclosed security vulnerabilities. +To find out how to disclose a vulnerability in Ethereum visit [https://bounty.ethereum.org](https://bounty.ethereum.org) or email bounty@ethereum.org. Please read the [disclosure page](https://github.com/slingshot-finance/op-geth/security/advisories?state=published) for more information about publicly disclosed security vulnerabilities. Use the built-in `geth version-check` feature to check whether the software is affected by any known vulnerability. This command will fetch the latest [`vulnerabilities.json`](https://geth.ethereum.org/docs/vulnerabilities/vulnerabilities.json) file which contains known security vulnerabilities concerning `geth`, and cross-check the data against its own version number. diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go index 4abf298068..1ec566b7c9 100644 --- a/accounts/abi/abi.go +++ b/accounts/abi/abi.go @@ -24,8 +24,8 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" ) // The ABI holds information about a contract's context and available diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index bc76df0dc2..d73f10ae51 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -26,9 +26,9 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index 0740c69510..bab418195d 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -23,13 +23,13 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/external" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/accounts/external" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" ) // ErrNoChainID is returned whenever the user failed to specify a chain id. diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go index 2e45e86ae2..6dd144016a 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index ad59a6bbd8..1ce8349647 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,27 +24,27 @@ import ( "sync" "time" - "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/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/bloombits" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/filters" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" + "github.com/slingshot-finance/op-geth/trie" ) // This nil assignment ensures at compile time that SimulatedBackend implements bind.ContractBackend. diff --git a/accounts/abi/bind/backends/simulated_test.go b/accounts/abi/bind/backends/simulated_test.go index a2acf7ead5..02f3a78168 100644 --- a/accounts/abi/bind/backends/simulated_test.go +++ b/accounts/abi/bind/backends/simulated_test.go @@ -27,14 +27,14 @@ import ( "testing" "time" - "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" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" ) func TestSimulatedBackend(t *testing.T) { diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index 96d284cdcc..19643b39cd 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -24,12 +24,12 @@ import ( "strings" "sync" - "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/crypto" - "github.com/ethereum/go-ethereum/event" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/event" ) const basefeeWiggleMultiplier = 2 diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go index f7eb7d14d3..50cd40d2ba 100644 --- a/accounts/abi/bind/base_test.go +++ b/accounts/abi/bind/base_test.go @@ -24,14 +24,14 @@ import ( "strings" "testing" - "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/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" "github.com/stretchr/testify/assert" ) diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index e902345f09..8834903ad8 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -17,7 +17,7 @@ // Package bind generates Ethereum contract Go bindings. // // Detailed usage document and tutorial available on the go-ethereum Wiki page: -// https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts +// https://github.com/slingshot-finance/op-geth/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts package bind import ( @@ -29,8 +29,8 @@ import ( "text/template" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/log" ) // Lang is a target programming language selector to generate bindings for. diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index a5f7afa73c..cda263a480 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) var bindTests = []struct { @@ -46,7 +46,7 @@ var bindTests = []struct { `contract NilContract {}`, []string{`606060405260068060106000396000f3606060405200`}, []string{`[]`}, - `"github.com/ethereum/go-ethereum/common"`, + `"github.com/slingshot-finance/op-geth/common"`, ` if b, err := NewEmpty(common.Address{}, nil); b == nil || err != nil { t.Fatalf("combined binding (%v) nil or error (%v) not nil", b, nil) @@ -69,7 +69,7 @@ var bindTests = []struct { `https://ethereum.org/token`, []string{`60606040526040516107fd3803806107fd83398101604052805160805160a05160c051929391820192909101600160a060020a0333166000908152600360209081526040822086905581548551838052601f6002600019610100600186161502019093169290920482018390047f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56390810193919290918801908390106100e857805160ff19168380011785555b506101189291505b8082111561017157600081556001016100b4565b50506002805460ff19168317905550505050610658806101a56000396000f35b828001600101855582156100ac579182015b828111156100ac5782518260005055916020019190600101906100fa565b50508060016000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017557805160ff19168380011785555b506100c89291506100b4565b5090565b82800160010185558215610165579182015b8281111561016557825182600050559160200191906001019061018756606060405236156100775760e060020a600035046306fdde03811461007f57806323b872dd146100dc578063313ce5671461010e57806370a082311461011a57806395d89b4114610132578063a9059cbb1461018e578063cae9ca51146101bd578063dc3080f21461031c578063dd62ed3e14610341575b610365610002565b61036760008054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b6103d5600435602435604435600160a060020a038316600090815260036020526040812054829010156104f357610002565b6103e760025460ff1681565b6103d560043560036020526000908152604090205481565b610367600180546020600282841615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b610365600435602435600160a060020a033316600090815260036020526040902054819010156103f157610002565b60806020604435600481810135601f8101849004909302840160405260608381526103d5948235946024803595606494939101919081908382808284375094965050505050505060006000836004600050600033600160a060020a03168152602001908152602001600020600050600087600160a060020a031681526020019081526020016000206000508190555084905080600160a060020a0316638f4ffcb1338630876040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156102f25780820380516001836020036101000a031916815260200191505b50955050505050506000604051808303816000876161da5a03f11561000257505050509392505050565b6005602090815260043560009081526040808220909252602435815220546103d59081565b60046020818152903560009081526040808220909252602435815220546103d59081565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156103c75780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60408051918252519081900360200190f35b6060908152602090f35b600160a060020a03821660009081526040902054808201101561041357610002565b806003600050600033600160a060020a03168152602001908152602001600020600082828250540392505081905550806003600050600084600160a060020a0316815260200190815260200160002060008282825054019250508190555081600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b820191906000526020600020905b8154815290600101906020018083116104ce57829003601f168201915b505050505081565b600160a060020a03831681526040812054808301101561051257610002565b600160a060020a0380851680835260046020908152604080852033949094168086529382528085205492855260058252808520938552929052908220548301111561055c57610002565b816003600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816003600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816005600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054019250508190555082600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3939250505056`}, []string{`[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"},{"name":"_extraData","type":"bytes"}],"name":"approveAndCall","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"spentAllowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"inputs":[{"name":"initialSupply","type":"uint256"},{"name":"tokenName","type":"string"},{"name":"decimalUnits","type":"uint8"},{"name":"tokenSymbol","type":"string"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}]`}, - `"github.com/ethereum/go-ethereum/common"`, + `"github.com/slingshot-finance/op-geth/common"`, ` if b, err := NewToken(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -85,7 +85,7 @@ var bindTests = []struct { `https://ethereum.org/crowdsale`, []string{`606060408190526007805460ff1916905560a0806105a883396101006040529051608051915160c05160e05160008054600160a060020a03199081169095178155670de0b6b3a7640000958602600155603c9093024201600355930260045560058054909216909217905561052f90819061007990396000f36060604052361561006c5760e060020a600035046301cb3b20811461008257806329dcb0cf1461014457806338af3eed1461014d5780636e66f6e91461015f5780637a3a0e84146101715780637b3e5e7b1461017a578063a035b1fe14610183578063dc0d3dff1461018c575b61020060075460009060ff161561032357610002565b61020060035460009042106103205760025460015490106103cb576002548154600160a060020a0316908290606082818181858883f150915460025460408051600160a060020a039390931683526020830191909152818101869052517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf6945090819003909201919050a15b60405160008054600160a060020a039081169230909116319082818181858883f150506007805460ff1916600117905550505050565b6103a160035481565b6103ab600054600160a060020a031681565b6103ab600554600160a060020a031681565b6103a160015481565b6103a160025481565b6103a160045481565b6103be60043560068054829081101561000257506000526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f8101547ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d409190910154600160a060020a03919091169082565b005b505050815481101561000257906000526020600020906002020160005060008201518160000160006101000a815481600160a060020a030219169083021790555060208201518160010160005055905050806002600082828250540192505081905550600560009054906101000a9004600160a060020a0316600160a060020a031663a9059cbb3360046000505484046040518360e060020a0281526004018083600160a060020a03168152602001828152602001925050506000604051808303816000876161da5a03f11561000257505060408051600160a060020a03331681526020810184905260018183015290517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf692509081900360600190a15b50565b5060a0604052336060908152346080819052600680546001810180835592939282908280158290116102025760020281600202836000526020600020918201910161020291905b8082111561039d57805473ffffffffffffffffffffffffffffffffffffffff19168155600060019190910190815561036a565b5090565b6060908152602090f35b600160a060020a03166060908152602090f35b6060918252608052604090f35b5b60065481101561010e576006805482908110156100025760009182526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f0190600680549254600160a060020a0316928490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460405190915082818181858883f19350505050507fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf660066000508281548110156100025760008290526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f01548154600160a060020a039190911691908490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460408051600160a060020a0394909416845260208401919091526000838201525191829003606001919050a16001016103cc56`}, []string{`[{"constant":false,"inputs":[],"name":"checkGoalReached","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"deadline","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"beneficiary","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"tokenReward","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"fundingGoal","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"amountRaised","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"price","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"funders","outputs":[{"name":"addr","type":"address"},{"name":"amount","type":"uint256"}],"type":"function"},{"inputs":[{"name":"ifSuccessfulSendTo","type":"address"},{"name":"fundingGoalInEthers","type":"uint256"},{"name":"durationInMinutes","type":"uint256"},{"name":"etherCostOfEachToken","type":"uint256"},{"name":"addressOfTokenUsedAsReward","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"backer","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"isContribution","type":"bool"}],"name":"FundTransfer","type":"event"}]`}, - `"github.com/ethereum/go-ethereum/common"`, + `"github.com/slingshot-finance/op-geth/common"`, ` if b, err := NewCrowdsale(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -101,7 +101,7 @@ var bindTests = []struct { `https://ethereum.org/dao`, []string{`606060405260405160808061145f833960e06040529051905160a05160c05160008054600160a060020a03191633179055600184815560028490556003839055600780549182018082558280158290116100b8576003028160030283600052602060002091820191016100b891906101c8565b50506060919091015160029190910155600160a060020a0381166000146100a65760008054600160a060020a031916821790555b505050506111f18061026e6000396000f35b505060408051608081018252600080825260208281018290528351908101845281815292820192909252426060820152600780549194509250811015610002579081527fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c6889050815181546020848101517401000000000000000000000000000000000000000002600160a060020a03199290921690921760a060020a60ff021916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f9081018390048201949192919091019083901061023e57805160ff19168380011785555b50610072929150610226565b5050600060028201556001015b8082111561023a578054600160a860020a031916815560018181018054600080835592600290821615610100026000190190911604601f81901061020c57506101bb565b601f0160209004906000526020600020908101906101bb91905b8082111561023a5760008155600101610226565b5090565b828001600101855582156101af579182015b828111156101af57825182600050559160200191906001019061025056606060405236156100b95760e060020a6000350463013cf08b81146100bb578063237e9492146101285780633910682114610281578063400e3949146102995780635daf08ca146102a257806369bd34361461032f5780638160f0b5146103385780638da5cb5b146103415780639644fcbd14610353578063aa02a90f146103be578063b1050da5146103c7578063bcca1fd3146104b5578063d3c0715b146104dc578063eceb29451461058d578063f2fde38b1461067b575b005b61069c6004356004805482908110156100025790600052602060002090600a02016000506005810154815460018301546003840154600485015460068601546007870154600160a060020a03959095169750929560020194919360ff828116946101009093041692919089565b60408051602060248035600481810135601f81018590048502860185019096528585526107759581359591946044949293909201918190840183828082843750949650505050505050600060006004600050848154811015610002575090527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19e600a8402908101547f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b909101904210806101e65750600481015460ff165b8061026757508060000160009054906101000a9004600160a060020a03168160010160005054846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020816007016000505414155b8061027757506001546005820154105b1561109257610002565b61077560043560066020526000908152604090205481565b61077560055481565b61078760043560078054829081101561000257506000526003026000805160206111d18339815191528101547fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c68a820154600160a060020a0382169260a060020a90920460ff16917fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c689019084565b61077560025481565b61077560015481565b610830600054600160a060020a031681565b604080516020604435600481810135601f81018490048402850184019095528484526100b9948135946024803595939460649492939101918190840183828082843750949650505050505050600080548190600160a060020a03908116339091161461084d57610002565b61077560035481565b604080516020604435600481810135601f8101849004840285018401909552848452610775948135946024803595939460649492939101918190840183828082843750506040805160209735808a0135601f81018a90048a0283018a019093528282529698976084979196506024909101945090925082915084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806104ab5750604081205460078054909190811015610002579082526003026000805160206111d1833981519152015460a060020a900460ff16155b15610ce557610002565b6100b960043560243560443560005433600160a060020a03908116911614610b1857610002565b604080516020604435600481810135601f810184900484028501840190955284845261077594813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806105835750604081205460078054909190811015610002579082526003026000805160206111d18339815191520181505460a060020a900460ff16155b15610f1d57610002565b604080516020606435600481810135601f81018490048402850184019095528484526107759481359460248035956044359560849492019190819084018382808284375094965050505050505060006000600460005086815481101561000257908252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01815090508484846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005054149150610cdc565b6100b960043560005433600160a060020a03908116911614610f0857610002565b604051808a600160a060020a031681526020018981526020018060200188815260200187815260200186815260200185815260200184815260200183815260200182810382528981815460018160011615610100020316600290048152602001915080546001816001161561010002031660029004801561075e5780601f106107335761010080835404028352916020019161075e565b820191906000526020600020905b81548152906001019060200180831161074157829003601f168201915b50509a505050505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a038616815260208101859052606081018390526080918101828152845460026001821615610100026000190190911604928201839052909160a08301908590801561081e5780601f106107f35761010080835404028352916020019161081e565b820191906000526020600020905b81548152906001019060200180831161080157829003601f168201915b50509550505050505060405180910390f35b60408051600160a060020a03929092168252519081900360200190f35b600160a060020a03851660009081526006602052604081205414156108a957604060002060078054918290556001820180825582801582901161095c5760030281600302836000526020600020918201910161095c9190610a4f565b600160a060020a03851660009081526006602052604090205460078054919350908390811015610002575060005250600381026000805160206111d183398151915201805474ff0000000000000000000000000000000000000000191660a060020a85021781555b60408051600160a060020a03871681526020810186905281517f27b022af4a8347100c7a041ce5ccf8e14d644ff05de696315196faae8cd50c9b929181900390910190a15050505050565b505050915081506080604051908101604052808681526020018581526020018481526020014281526020015060076000508381548110156100025790600052602060002090600302016000508151815460208481015160a060020a02600160a060020a03199290921690921774ff00000000000000000000000000000000000000001916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f90810183900482019491929190910190839010610ad357805160ff19168380011785555b50610b03929150610abb565b5050600060028201556001015b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610aa15750610a42565b601f016020900490600052602060002090810190610a4291905b80821115610acf5760008155600101610abb565b5090565b82800160010185558215610a36579182015b82811115610a36578251826000505591602001919060010190610ae5565b50506060919091015160029190910155610911565b600183905560028290556003819055604080518481526020810184905280820183905290517fa439d3fa452be5e0e1e24a8145e715f4fd8b9c08c96a42fd82a855a85e5d57de9181900360600190a1505050565b50508585846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005081905550600260005054603c024201816003016000508190555060008160040160006101000a81548160ff0219169083021790555060008160040160016101000a81548160ff02191690830217905550600081600501600050819055507f646fec02522b41e7125cfc859a64fd4f4cefd5dc3b6237ca0abe251ded1fa881828787876040518085815260200184600160a060020a03168152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f168015610cc45780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1600182016005555b50949350505050565b6004805460018101808355909190828015829011610d1c57600a0281600a028360005260206000209182019101610d1c9190610db8565b505060048054929450918491508110156100025790600052602060002090600a02016000508054600160a060020a031916871781556001818101879055855160028381018054600082815260209081902096975091959481161561010002600019011691909104601f90810182900484019391890190839010610ed857805160ff19168380011785555b50610b6c929150610abb565b50506001015b80821115610acf578054600160a060020a03191681556000600182810182905560028381018054848255909281161561010002600019011604601f819010610e9c57505b5060006003830181905560048301805461ffff191690556005830181905560068301819055600783018190556008830180548282559082526020909120610db2916002028101905b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610eba57505b5050600101610e44565b601f016020900490600052602060002090810190610dfc9190610abb565b601f016020900490600052602060002090810190610e929190610abb565b82800160010185558215610da6579182015b82811115610da6578251826000505591602001919060010190610eea565b60008054600160a060020a0319168217905550565b600480548690811015610002576000918252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260098201602052604090205490915060ff1660011415610f8457610002565b33600160a060020a031660009081526009820160205260409020805460ff1916600190811790915560058201805490910190558315610fcd576006810180546001019055610fda565b6006810180546000190190555b7fc34f869b7ff431b034b7b9aea9822dac189a685e0b015c7d1be3add3f89128e8858533866040518085815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f16801561107a5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1509392505050565b6006810154600354901315611158578060000160009054906101000a9004600160a060020a0316600160a060020a03168160010160005054670de0b6b3a76400000284604051808280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156111225780820380516001836020036101000a031916815260200191505b5091505060006040518083038185876185025a03f15050505060048101805460ff191660011761ff00191661010017905561116d565b60048101805460ff191660011761ff00191690555b60068101546005820154600483015460408051888152602081019490945283810192909252610100900460ff166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a1509291505056a66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c688`}, []string{`[{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"proposals","outputs":[{"name":"recipient","type":"address"},{"name":"amount","type":"uint256"},{"name":"description","type":"string"},{"name":"votingDeadline","type":"uint256"},{"name":"executed","type":"bool"},{"name":"proposalPassed","type":"bool"},{"name":"numberOfVotes","type":"uint256"},{"name":"currentResult","type":"int256"},{"name":"proposalHash","type":"bytes32"}],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"executeProposal","outputs":[{"name":"result","type":"int256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"memberId","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"numProposals","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"members","outputs":[{"name":"member","type":"address"},{"name":"canVote","type":"bool"},{"name":"name","type":"string"},{"name":"memberSince","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"debatingPeriodInMinutes","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"minimumQuorum","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"targetMember","type":"address"},{"name":"canVote","type":"bool"},{"name":"memberName","type":"string"}],"name":"changeMembership","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"majorityMargin","outputs":[{"name":"","type":"int256"}],"type":"function"},{"constant":false,"inputs":[{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"JobDescription","type":"string"},{"name":"transactionBytecode","type":"bytes"}],"name":"newProposal","outputs":[{"name":"proposalID","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"}],"name":"changeVotingRules","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"supportsProposal","type":"bool"},{"name":"justificationText","type":"string"}],"name":"vote","outputs":[{"name":"voteID","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"checkProposalCode","outputs":[{"name":"codeChecksOut","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"type":"function"},{"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"},{"name":"congressLeader","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"recipient","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"description","type":"string"}],"name":"ProposalAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"position","type":"bool"},{"indexed":false,"name":"voter","type":"address"},{"indexed":false,"name":"justification","type":"string"}],"name":"Voted","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"result","type":"int256"},{"indexed":false,"name":"quorum","type":"uint256"},{"indexed":false,"name":"active","type":"bool"}],"name":"ProposalTallied","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"member","type":"address"},{"indexed":false,"name":"isMember","type":"bool"}],"name":"MembershipChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"minimumQuorum","type":"uint256"},{"indexed":false,"name":"debatingPeriodInMinutes","type":"uint256"},{"indexed":false,"name":"majorityMargin","type":"int256"}],"name":"ChangeOfRules","type":"event"}]`}, - `"github.com/ethereum/go-ethereum/common"`, + `"github.com/slingshot-finance/op-geth/common"`, ` if b, err := NewDAO(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -128,7 +128,7 @@ var bindTests = []struct { ` "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" `, `if b, err := NewInputChecker(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -166,7 +166,7 @@ var bindTests = []struct { ` "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" `, `if b, err := NewOutputChecker(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -207,7 +207,7 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" `, `if e, err := NewEventChecker(common.Address{}, nil); e == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", e, nil) @@ -287,10 +287,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -342,10 +342,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -388,10 +388,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -445,11 +445,11 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -494,10 +494,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -560,10 +560,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -605,10 +605,10 @@ var bindTests = []struct { []string{`6060604052609f8060106000396000f3606060405260e060020a6000350463f97a60058114601a575b005b600060605260c0604052600d60809081527f4920646f6e27742065786973740000000000000000000000000000000000000060a052602060c0908152600d60e081905281906101009060a09080838184600060046012f15050815172ffffffffffffffffffffffffffffffffffffff1916909152505060405161012081900392509050f3`}, []string{`[{"constant":true,"inputs":[],"name":"String","outputs":[{"name":"","type":"string"}],"type":"function"}]`}, ` - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" `, ` // Create a simulator and wrap a non-deployed contract @@ -644,10 +644,10 @@ var bindTests = []struct { []string{`6080604052348015600f57600080fd5b5060888061001e6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063d5f6622514602d575b600080fd5b6033604c565b6040805192835260208301919091528051918290030190f35b600a809156fea264697066735822beefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeef64736f6c6343decafe0033`}, []string{`[{"inputs":[],"name":"Struct","outputs":[{"internalType":"uint256","name":"a","type":"uint256"},{"internalType":"uint256","name":"b","type":"uint256"}],"stateMutability":"pure","type":"function"}]`}, ` - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" `, ` // Create a simulator and wrap a non-deployed contract @@ -692,10 +692,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -741,11 +741,11 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -817,10 +817,10 @@ var bindTests = []struct { "fmt" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -910,11 +910,11 @@ var bindTests = []struct { "math/big" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -1101,10 +1101,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -1236,10 +1236,10 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` @@ -1378,10 +1378,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -1444,10 +1444,10 @@ var bindTests = []struct { "math/big" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Initialize test accounts @@ -1532,10 +1532,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/core" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/core" `, ` // Initialize test accounts @@ -1595,10 +1595,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/core" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/core" `, ` key, _ := crypto.GenerateKey() @@ -1657,10 +1657,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` // Generate a new random account and a funded simulator @@ -1718,10 +1718,10 @@ var bindTests = []struct { "bytes" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" `, ` key, _ := crypto.GenerateKey() @@ -1806,11 +1806,11 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/ethconfig" `, ` var ( @@ -1876,11 +1876,11 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/ethconfig" `, ` var ( @@ -1928,11 +1928,11 @@ var bindTests = []struct { imports: ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/ethconfig" `, tester: ` var ( @@ -1976,11 +1976,11 @@ var bindTests = []struct { imports: ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/ethconfig" `, tester: ` var ( @@ -2016,11 +2016,11 @@ var bindTests = []struct { imports: ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/ethconfig" `, tester: ` var ( @@ -2054,7 +2054,7 @@ var bindTests = []struct { bytecode: []string{"0x6080604052348015600f57600080fd5b5060958061001e6000396000f3fe6080604052348015600f57600080fd5b5060043610603c5760003560e01c80639d993132146041578063d02767c7146049578063ffa02795146051575b600080fd5b60476059565b005b604f605b565b005b6057605d565b005b565b565b56fea26469706673582212200382ca602dff96a7e2ba54657985e2b4ac423a56abe4a1f0667bc635c4d4371f64736f6c63430008110033"}, abi: []string{`[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_param","type":"address"}],"name":"_1TestEvent","type":"event"},{"inputs":[],"name":"_1test","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"__1test","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"__2test","outputs":[],"stateMutability":"pure","type":"function"}]`}, imports: ` - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" `, tester: ` if b, err := NewNumericMethodName(common.Address{}, nil); b == nil || err != nil { @@ -2122,7 +2122,7 @@ func TestGolangBindings(t *testing.T) { t.Fatalf("failed to convert binding test to modules: %v\n%s", err, out) } pwd, _ := os.Getwd() - replacer := exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ethereum/go-ethereum@v0.0.0", "-replace", "github.com/ethereum/go-ethereum="+filepath.Join(pwd, "..", "..", "..")) // Repo root + replacer := exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/slingshot-finance/op-geth@v0.0.0", "-replace", "github.com/slingshot-finance/op-geth="+filepath.Join(pwd, "..", "..", "..")) // Repo root replacer.Dir = pkg if out, err := replacer.CombinedOutput(); err != nil { t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out) diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 95dc13cc18..4c5307d502 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/ethereum/go-ethereum/accounts/abi" +import "github.com/slingshot-finance/op-geth/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { @@ -91,12 +91,12 @@ import ( "strings" "errors" - 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" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index b931fbb04d..1f33bac0d5 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,10 +21,10 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" ) // WaitMined waits for tx to be mined on the blockchain. diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go index 826426632c..b75edd959d 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/accounts/abi/bind/backends" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/error.go b/accounts/abi/error.go index 8e50112ec5..e29a40f44e 100644 --- a/accounts/abi/error.go +++ b/accounts/abi/error.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" ) type Error struct { diff --git a/accounts/abi/event.go b/accounts/abi/event.go index f9457b86af..78f8bc5d9c 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" ) // Event is an event potentially triggered by the EVM's LOG mechanism. The Event diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go index fffe28ea63..e6a3e6aa9e 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/accounts/abi/method.go b/accounts/abi/method.go index c5a1a71f47..067ae5c9a8 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/crypto" ) // FunctionType represents different types of functions a contract might have. diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index beef1fa37f..b093b9d107 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -22,8 +22,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" ) // packBytesSlice packs the given bytes as [L, V] as the canonical representation diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go index 00bdae469e..4ccb0a12bc 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // TestPack tests the general pack/unpack tests in packing_test.go diff --git a/accounts/abi/packing_test.go b/accounts/abi/packing_test.go index 9ed52a475e..9e79800848 100644 --- a/accounts/abi/packing_test.go +++ b/accounts/abi/packing_test.go @@ -19,7 +19,7 @@ package abi import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) type packUnpackTest struct { diff --git a/accounts/abi/topics.go b/accounts/abi/topics.go index 60c71d88b2..62ee4263a8 100644 --- a/accounts/abi/topics.go +++ b/accounts/abi/topics.go @@ -23,8 +23,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" ) // MakeTopics converts a filter query argument list into a filter topic set. diff --git a/accounts/abi/topics_test.go b/accounts/abi/topics_test.go index b31f58fba3..f0aba785a7 100644 --- a/accounts/abi/topics_test.go +++ b/accounts/abi/topics_test.go @@ -21,8 +21,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" ) func TestMakeTopics(t *testing.T) { diff --git a/accounts/abi/type.go b/accounts/abi/type.go index 2eee11787f..2ab2e691c2 100644 --- a/accounts/abi/type.go +++ b/accounts/abi/type.go @@ -26,7 +26,7 @@ import ( "unicode" "unicode/utf8" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // Type enumerator diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index ae69872ad8..5aceab3cb3 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // typeWithoutStringer is a alias for the Type type which simply doesn't implement diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go index 905b5ce629..24f45ccb54 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -24,7 +24,7 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) var ( diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index 29891ec0a4..d5a5de6903 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" "github.com/stretchr/testify/require" ) diff --git a/accounts/accounts.go b/accounts/accounts.go index 6c351a9649..2c13f7dcdc 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -21,10 +21,10 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/event" "golang.org/x/crypto/sha3" ) diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go index 2c4138aa78..aefa7d8840 100644 --- a/accounts/accounts_test.go +++ b/accounts/accounts_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common/hexutil" ) func TestTextHash(t *testing.T) { diff --git a/accounts/external/backend.go b/accounts/external/backend.go index 6f1581f9b8..b274b3968b 100644 --- a/accounts/external/backend.go +++ b/accounts/external/backend.go @@ -22,15 +22,15 @@ import ( "math/big" "sync" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rpc" + "github.com/slingshot-finance/op-geth/signer/core/apitypes" ) type ExternalBackend struct { diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go index 4ed1439514..e071aa3ce6 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -28,9 +28,9 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/log" "golang.org/x/exp/slices" ) diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index 48a238048f..7acc0bf5e2 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -28,8 +28,8 @@ import ( "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" "golang.org/x/exp/slices" ) diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index 63eb850374..a3f1912ab1 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -24,7 +24,7 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) // fileCache is a cache of files seen during scan of keystore. diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index 9b2ac14712..8f57096682 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -28,9 +28,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" "github.com/google/uuid" ) diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 0ffcf376a5..eae006f4a0 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -32,11 +32,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/event" ) var ( diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go index c9a23eddd6..d1b66717ce 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/event" "golang.org/x/exp/slices" ) diff --git a/accounts/keystore/passphrase.go b/accounts/keystore/passphrase.go index 8d6ed2b14e..ec7d5591a3 100644 --- a/accounts/keystore/passphrase.go +++ b/accounts/keystore/passphrase.go @@ -37,10 +37,10 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" "github.com/google/uuid" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" @@ -120,7 +120,7 @@ func (ks keyStorePassphrase) StoreKey(filename string, key *Key, auth string) er "This indicates that the keystore is corrupted. \n" + "The corrupted file is stored at \n%v\n" + "Please file a ticket at:\n\n" + - "https://github.com/ethereum/go-ethereum/issues." + + "https://github.com/slingshot-finance/op-geth/issues." + "The error was : %s" //lint:ignore ST1005 This is a message for the user return fmt.Errorf(msg, tmpName, err) diff --git a/accounts/keystore/passphrase_test.go b/accounts/keystore/passphrase_test.go index 20ec0f5519..dc4c592496 100644 --- a/accounts/keystore/passphrase_test.go +++ b/accounts/keystore/passphrase_test.go @@ -20,7 +20,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) const ( diff --git a/accounts/keystore/plain.go b/accounts/keystore/plain.go index f62a133ce1..d470ff25a5 100644 --- a/accounts/keystore/plain.go +++ b/accounts/keystore/plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/plain_test.go b/accounts/keystore/plain_test.go index 737eb7fd61..e48bbcfa54 100644 --- a/accounts/keystore/plain_test.go +++ b/accounts/keystore/plain_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" ) func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) { diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 0664dc2cdd..af8105472f 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/crypto" "github.com/google/uuid" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/wallet.go b/accounts/keystore/wallet.go index 1066095f6d..a5a18e421f 100644 --- a/accounts/keystore/wallet.go +++ b/accounts/keystore/wallet.go @@ -19,10 +19,10 @@ package keystore import ( "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index 1bef321cd1..b108ae9334 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -23,7 +23,7 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" "github.com/fsnotify/fsnotify" ) diff --git a/accounts/manager.go b/accounts/manager.go index cbe4f7c79d..42d85045d1 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,8 +21,8 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/event" ) // managerSubBufferSize determines how many incoming wallet events diff --git a/accounts/scwallet/hub.go b/accounts/scwallet/hub.go index f9dcf58e19..a98aae4c66 100644 --- a/accounts/scwallet/hub.go +++ b/accounts/scwallet/hub.go @@ -41,10 +41,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" pcsc "github.com/gballet/go-libpcsclite" ) diff --git a/accounts/scwallet/securechannel.go b/accounts/scwallet/securechannel.go index bbd8b22647..c5805d142f 100644 --- a/accounts/scwallet/securechannel.go +++ b/accounts/scwallet/securechannel.go @@ -27,7 +27,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/crypto" pcsc "github.com/gballet/go-libpcsclite" "golang.org/x/crypto/pbkdf2" "golang.org/x/text/unicode/norm" diff --git a/accounts/scwallet/wallet.go b/accounts/scwallet/wallet.go index f0ca9085b6..ca32df5fe4 100644 --- a/accounts/scwallet/wallet.go +++ b/accounts/scwallet/wallet.go @@ -33,12 +33,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" pcsc "github.com/gballet/go-libpcsclite" "github.com/status-im/keycard-go/derivationpath" ) diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go index 0682310867..21552fed48 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -25,9 +25,9 @@ import ( "golang.org/x/exp/slices" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" "github.com/karalabe/usb" ) diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index 723df0f2b3..6e37ab03a3 100644 --- a/accounts/usbwallet/ledger.go +++ b/accounts/usbwallet/ledger.go @@ -28,13 +28,13 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index 9644dc4e02..208a1f3d2d 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -27,12 +27,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/usbwallet/trezor" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/accounts/usbwallet/trezor" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" "github.com/golang/protobuf/proto" ) diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index 69083dc893..b325348aa4 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" "github.com/karalabe/usb" ) diff --git a/beacon/engine/errors.go b/beacon/engine/errors.go index 62773a0ea9..7c1f520540 100644 --- a/beacon/engine/errors.go +++ b/beacon/engine/errors.go @@ -17,8 +17,8 @@ package engine import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/rpc" ) // EngineAPIError is a standardized error message between consensus and execution diff --git a/beacon/engine/gen_blockparams.go b/beacon/engine/gen_blockparams.go index c343e58906..a16148760b 100644 --- a/beacon/engine/gen_blockparams.go +++ b/beacon/engine/gen_blockparams.go @@ -6,9 +6,9 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" ) var _ = (*payloadAttributesMarshaling)(nil) diff --git a/beacon/engine/gen_ed.go b/beacon/engine/gen_ed.go index 6893d64a16..1ac73e76f2 100644 --- a/beacon/engine/gen_ed.go +++ b/beacon/engine/gen_ed.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" ) var _ = (*executableDataMarshaling)(nil) diff --git a/beacon/engine/gen_epe.go b/beacon/engine/gen_epe.go index 3529bbd661..aff9d6a66a 100644 --- a/beacon/engine/gen_epe.go +++ b/beacon/engine/gen_epe.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) var _ = (*executionPayloadEnvelopeMarshaling)(nil) diff --git a/beacon/engine/types.go b/beacon/engine/types.go index 487693ea18..1fb3bf4ca0 100644 --- a/beacon/engine/types.go +++ b/beacon/engine/types.go @@ -20,10 +20,10 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/trie" ) //go:generate go run github.com/fjl/gencodec -type PayloadAttributes -field-override payloadAttributesMarshaling -out gen_blockparams.go diff --git a/beacon/light/canonical.go b/beacon/light/canonical.go index b5371493b4..da11be93fd 100644 --- a/beacon/light/canonical.go +++ b/beacon/light/canonical.go @@ -20,10 +20,10 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" ) // canonicalStore stores instances of the given type in a database and caches diff --git a/beacon/light/committee_chain.go b/beacon/light/committee_chain.go index d707f8cc34..ca396635f1 100644 --- a/beacon/light/committee_chain.go +++ b/beacon/light/committee_chain.go @@ -23,14 +23,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/beacon/params" - "github.com/ethereum/go-ethereum/beacon/types" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/beacon/params" + "github.com/slingshot-finance/op-geth/beacon/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" ) var ( diff --git a/beacon/light/committee_chain_test.go b/beacon/light/committee_chain_test.go index 60ea2a0efd..d4ed7fc146 100644 --- a/beacon/light/committee_chain_test.go +++ b/beacon/light/committee_chain_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/beacon/params" - "github.com/ethereum/go-ethereum/beacon/types" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/slingshot-finance/op-geth/beacon/params" + "github.com/slingshot-finance/op-geth/beacon/types" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/ethdb/memorydb" ) var ( diff --git a/beacon/light/test_helpers.go b/beacon/light/test_helpers.go index f537d963a6..93afb1f9f1 100644 --- a/beacon/light/test_helpers.go +++ b/beacon/light/test_helpers.go @@ -21,10 +21,10 @@ import ( "crypto/sha256" mrand "math/rand" - "github.com/ethereum/go-ethereum/beacon/merkle" - "github.com/ethereum/go-ethereum/beacon/params" - "github.com/ethereum/go-ethereum/beacon/types" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/beacon/merkle" + "github.com/slingshot-finance/op-geth/beacon/params" + "github.com/slingshot-finance/op-geth/beacon/types" + "github.com/slingshot-finance/op-geth/common" ) func GenerateTestCommittee() *types.SerializedSyncCommittee { diff --git a/beacon/merkle/merkle.go b/beacon/merkle/merkle.go index 30896f9b01..7dffea4873 100644 --- a/beacon/merkle/merkle.go +++ b/beacon/merkle/merkle.go @@ -22,8 +22,8 @@ import ( "errors" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) // Value represents either a 32 byte leaf value or hash node in a binary merkle tree/partial proof. diff --git a/beacon/types/committee.go b/beacon/types/committee.go index 5f89c27554..60fd87985a 100644 --- a/beacon/types/committee.go +++ b/beacon/types/committee.go @@ -22,9 +22,9 @@ import ( "fmt" "math/bits" - "github.com/ethereum/go-ethereum/beacon/params" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/beacon/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" bls "github.com/protolambda/bls12-381-util" ) diff --git a/beacon/types/config.go b/beacon/types/config.go index 8cb8808b6f..4cf594a302 100644 --- a/beacon/types/config.go +++ b/beacon/types/config.go @@ -24,9 +24,9 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/beacon/merkle" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/beacon/merkle" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" "gopkg.in/yaml.v3" ) diff --git a/beacon/types/gen_header_json.go b/beacon/types/gen_header_json.go index 9b3ffea06f..580f63c661 100644 --- a/beacon/types/gen_header_json.go +++ b/beacon/types/gen_header_json.go @@ -6,7 +6,7 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) var _ = (*headerMarshaling)(nil) diff --git a/beacon/types/gen_syncaggregate_json.go b/beacon/types/gen_syncaggregate_json.go index 1547ec5f01..2811247073 100644 --- a/beacon/types/gen_syncaggregate_json.go +++ b/beacon/types/gen_syncaggregate_json.go @@ -6,7 +6,7 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common/hexutil" ) var _ = (*syncAggregateMarshaling)(nil) diff --git a/beacon/types/header.go b/beacon/types/header.go index 2ddc4575f1..b288730d1f 100644 --- a/beacon/types/header.go +++ b/beacon/types/header.go @@ -21,9 +21,9 @@ import ( "crypto/sha256" "encoding/binary" - "github.com/ethereum/go-ethereum/beacon/merkle" - "github.com/ethereum/go-ethereum/beacon/params" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/beacon/merkle" + "github.com/slingshot-finance/op-geth/beacon/params" + "github.com/slingshot-finance/op-geth/common" ) //go:generate go run github.com/fjl/gencodec -type Header -field-override headerMarshaling -out gen_header_json.go diff --git a/beacon/types/light_sync.go b/beacon/types/light_sync.go index 3284081e4d..b73dfdfd65 100644 --- a/beacon/types/light_sync.go +++ b/beacon/types/light_sync.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/beacon/merkle" - "github.com/ethereum/go-ethereum/beacon/params" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/beacon/merkle" + "github.com/slingshot-finance/op-geth/beacon/params" + "github.com/slingshot-finance/op-geth/common" ) // BootstrapData contains a sync committee where light sync can be started, diff --git a/build/ci.go b/build/ci.go index 33d58c58fe..6b15b891cc 100644 --- a/build/ci.go +++ b/build/ci.go @@ -53,10 +53,10 @@ import ( "time" "github.com/cespare/cp" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/signify" - "github.com/ethereum/go-ethereum/internal/build" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto/signify" + "github.com/slingshot-finance/op-geth/internal/build" + "github.com/slingshot-finance/op-geth/params" ) var ( @@ -244,11 +244,11 @@ func doInstall(cmdline []string) { func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (flags []string) { var ld []string if env.Commit != "" { - ld = append(ld, "-X", "github.com/ethereum/go-ethereum/internal/version.gitCommit="+env.Commit) - ld = append(ld, "-X", "github.com/ethereum/go-ethereum/internal/version.gitDate="+env.Date) + ld = append(ld, "-X", "github.com/slingshot-finance/op-geth/internal/version.gitCommit="+env.Commit) + ld = append(ld, "-X", "github.com/slingshot-finance/op-geth/internal/version.gitDate="+env.Date) } if env.Tag != "" { - ld = append(ld, "-X", "github.com/ethereum/go-ethereum/params.gitTag="+env.Tag) + ld = append(ld, "-X", "github.com/slingshot-finance/op-geth/params.gitTag="+env.Tag) } // Strip DWARF on darwin. This used to be required for certain things, // and there is no downside to this, so we just keep doing it. diff --git a/build/deb/ethereum/deb.control b/build/deb/ethereum/deb.control index 3b759f2d04..f4209c1823 100644 --- a/build/deb/ethereum/deb.control +++ b/build/deb/ethereum/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), {{.GoBootPackage}} Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: https://github.com/ethereum/go-ethereum.git -Vcs-Browser: https://github.com/ethereum/go-ethereum +Vcs-Git: https://github.com/slingshot-finance/op-geth.git +Vcs-Browser: https://github.com/slingshot-finance/op-geth Package: {{.Name}} Architecture: any diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index 9b73148a44..a5d214ea47 100644 --- a/build/nsis.install.nsh +++ b/build/nsis.install.nsh @@ -3,9 +3,9 @@ InstallDir "$InstDir" OutFile "${OUTPUTFILE}" # set through command line arguments # Links for "Add/Remove Programs" -!define HELPURL "https://github.com/ethereum/go-ethereum/issues" -!define UPDATEURL "https://github.com/ethereum/go-ethereum/releases" -!define ABOUTURL "https://github.com/ethereum/go-ethereum#ethereum-go" +!define HELPURL "https://github.com/slingshot-finance/op-geth/issues" +!define UPDATEURL "https://github.com/slingshot-finance/op-geth/releases" +!define ABOUTURL "https://github.com/slingshot-finance/op-geth#ethereum-go" !define /date NOW "%Y%m%d" PageEx license diff --git a/build/update-license.go b/build/update-license.go index 70e2de06c7..5a8b675d86 100644 --- a/build/update-license.go +++ b/build/update-license.go @@ -79,7 +79,7 @@ var ( "internal/reexec", // skip special licenses - "crypto/secp256k1", // Relicensed to BSD-3 via https://github.com/ethereum/go-ethereum/pull/17225 + "crypto/secp256k1", // Relicensed to BSD-3 via https://github.com/slingshot-finance/op-geth/pull/17225 } // paths with this prefix are licensed as GPL. all other files are LGPL. diff --git a/cmd/abidump/main.go b/cmd/abidump/main.go index ae1ac64139..3bc7336f20 100644 --- a/cmd/abidump/main.go +++ b/cmd/abidump/main.go @@ -23,8 +23,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/ethereum/go-ethereum/signer/fourbyte" + "github.com/slingshot-finance/op-geth/signer/core/apitypes" + "github.com/slingshot-finance/op-geth/signer/fourbyte" ) func init() { diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index 0149dec527..0e94390990 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -24,12 +24,12 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common/compiler" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/accounts/abi/bind" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/common/compiler" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/log" "github.com/urfave/cli/v2" ) diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 350b85df1e..ec9fdc6170 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -25,13 +25,13 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/discover" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/nat" + "github.com/slingshot-finance/op-geth/p2p/netutil" ) func main() { diff --git a/cmd/clef/main.go b/cmd/clef/main.go index f9b00e4a12..45eaae685f 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -35,25 +35,25 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/ethereum/go-ethereum/signer/fourbyte" - "github.com/ethereum/go-ethereum/signer/rules" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/rpc" + "github.com/slingshot-finance/op-geth/signer/core" + "github.com/slingshot-finance/op-geth/signer/core/apitypes" + "github.com/slingshot-finance/op-geth/signer/fourbyte" + "github.com/slingshot-finance/op-geth/signer/rules" + "github.com/slingshot-finance/op-geth/signer/storage" "github.com/mattn/go-colorable" "github.com/mattn/go-isatty" "github.com/urfave/cli/v2" @@ -873,7 +873,7 @@ func checkFile(filename string) error { } // Check the unix permission bits // However, on windows, we cannot use the unix perm-bits, see - // https://github.com/ethereum/go-ethereum/issues/20123 + // https://github.com/slingshot-finance/op-geth/issues/20123 if runtime.GOOS != "windows" && info.Mode().Perm()&0377 != 0 { return fmt.Errorf("file (%v) has insecure file permissions (%v)", filename, info.Mode().String()) } diff --git a/cmd/clef/run_test.go b/cmd/clef/run_test.go index 5fa6e02e14..1ec90ee288 100644 --- a/cmd/clef/run_test.go +++ b/cmd/clef/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/slingshot-finance/op-geth/internal/cmdtest" + "github.com/slingshot-finance/op-geth/internal/reexec" ) const registeredName = "clef-test" diff --git a/cmd/clef/tutorial.md b/cmd/clef/tutorial.md index 3ea662b5d4..29cb5741bc 100644 --- a/cmd/clef/tutorial.md +++ b/cmd/clef/tutorial.md @@ -100,9 +100,9 @@ or {"jsonrpc":"2.0","id":1,"error":{"code":-32000,"message":"Request denied"}} ``` -Apart from listing accounts, you can also *request* creating a new account; signing transactions and data; and recovering signatures. You can find the available methods in the Clef [External API Spec](https://github.com/ethereum/go-ethereum/tree/master/cmd/clef#external-api-1) and the [External API Changelog](https://github.com/ethereum/go-ethereum/blob/master/cmd/clef/extapi_changelog.md). +Apart from listing accounts, you can also *request* creating a new account; signing transactions and data; and recovering signatures. You can find the available methods in the Clef [External API Spec](https://github.com/slingshot-finance/op-geth/tree/master/cmd/clef#external-api-1) and the [External API Changelog](https://github.com/slingshot-finance/op-geth/blob/master/cmd/clef/extapi_changelog.md). -*Note, the number of things you can do from the External API is deliberately small, since we want to limit the power of remote calls by as much as possible! Clef has an [Internal API](https://github.com/ethereum/go-ethereum/tree/master/cmd/clef#ui-api-1) too for the UI (User Interface) which is much richer and can support custom interfaces on top. But that's out of scope here.* +*Note, the number of things you can do from the External API is deliberately small, since we want to limit the power of remote calls by as much as possible! Clef has an [Internal API](https://github.com/slingshot-finance/op-geth/tree/master/cmd/clef#ui-api-1) too for the UI (User Interface) which is much richer and can support custom interfaces on top. But that's out of scope here.* ## Automatic rules @@ -288,7 +288,7 @@ t=2019-07-01T15:52:23+0300 lvl=info msg=SignData api=signer type=request meta t=2019-07-01T15:52:23+0300 lvl=info msg=SignData api=signer type=response data= error="Request denied" ``` -For more details on writing automatic rules, please see the [rules spec](https://github.com/ethereum/go-ethereum/blob/master/cmd/clef/rules.md). +For more details on writing automatic rules, please see the [rules spec](https://github.com/slingshot-finance/op-geth/blob/master/cmd/clef/rules.md). ## Geth integration diff --git a/cmd/devp2p/crawl.go b/cmd/devp2p/crawl.go index 4288a5feb8..2d83b64e2c 100644 --- a/cmd/devp2p/crawl.go +++ b/cmd/devp2p/crawl.go @@ -22,8 +22,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/enode" ) type crawler struct { diff --git a/cmd/devp2p/discv4cmd.go b/cmd/devp2p/discv4cmd.go index 45bcdcd367..60a054b075 100644 --- a/cmd/devp2p/discv4cmd.go +++ b/cmd/devp2p/discv4cmd.go @@ -24,13 +24,13 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/cmd/devp2p/internal/v4test" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/p2p/discover" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/params" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/discv5cmd.go b/cmd/devp2p/discv5cmd.go index 0dac945269..5d13616749 100644 --- a/cmd/devp2p/discv5cmd.go +++ b/cmd/devp2p/discv5cmd.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v5test" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/slingshot-finance/op-geth/cmd/devp2p/internal/v5test" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/p2p/discover" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/dns_cloudflare.go b/cmd/devp2p/dns_cloudflare.go index a3cc69cf19..c5191f414b 100644 --- a/cmd/devp2p/dns_cloudflare.go +++ b/cmd/devp2p/dns_cloudflare.go @@ -23,8 +23,8 @@ import ( "strings" "github.com/cloudflare/cloudflare-go" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/dnsdisc" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/dnsdisc" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/dns_route53.go b/cmd/devp2p/dns_route53.go index 21a32f9414..12956dcddb 100644 --- a/cmd/devp2p/dns_route53.go +++ b/cmd/devp2p/dns_route53.go @@ -29,8 +29,8 @@ import ( "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/service/route53" "github.com/aws/aws-sdk-go-v2/service/route53/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/dnsdisc" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/dnsdisc" "github.com/urfave/cli/v2" "golang.org/x/exp/slices" ) diff --git a/cmd/devp2p/dnscmd.go b/cmd/devp2p/dnscmd.go index 0fce7b1030..0de806f117 100644 --- a/cmd/devp2p/dnscmd.go +++ b/cmd/devp2p/dnscmd.go @@ -25,11 +25,11 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/p2p/dnsdisc" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/console/prompt" + "github.com/slingshot-finance/op-geth/p2p/dnsdisc" + "github.com/slingshot-finance/op-geth/p2p/enode" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/enrcmd.go b/cmd/devp2p/enrcmd.go index c5a97c8411..97b7349733 100644 --- a/cmd/devp2p/enrcmd.go +++ b/cmd/devp2p/enrcmd.go @@ -28,9 +28,9 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/internal/ethtest/chain.go b/cmd/devp2p/internal/ethtest/chain.go index e8b3725b17..78c3aed0b3 100644 --- a/cmd/devp2p/internal/ethtest/chain.go +++ b/cmd/devp2p/internal/ethtest/chain.go @@ -30,16 +30,16 @@ import ( "sort" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/forkid" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" "golang.org/x/exp/slices" ) diff --git a/cmd/devp2p/internal/ethtest/chain_test.go b/cmd/devp2p/internal/ethtest/chain_test.go index 62bd6d26ea..db6cccc83e 100644 --- a/cmd/devp2p/internal/ethtest/chain_test.go +++ b/cmd/devp2p/internal/ethtest/chain_test.go @@ -21,9 +21,9 @@ import ( "strconv" "testing" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/p2p" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/p2p" "github.com/stretchr/testify/assert" ) diff --git a/cmd/devp2p/internal/ethtest/conn.go b/cmd/devp2p/internal/ethtest/conn.go index 2d36ccb423..9045cb8f0f 100644 --- a/cmd/devp2p/internal/ethtest/conn.go +++ b/cmd/devp2p/internal/ethtest/conn.go @@ -25,12 +25,12 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/rlpx" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/eth/protocols/snap" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/rlpx" + "github.com/slingshot-finance/op-geth/rlp" ) var ( diff --git a/cmd/devp2p/internal/ethtest/engine.go b/cmd/devp2p/internal/ethtest/engine.go index ea4fc76e6f..e7734fd98d 100644 --- a/cmd/devp2p/internal/ethtest/engine.go +++ b/cmd/devp2p/internal/ethtest/engine.go @@ -25,7 +25,7 @@ import ( "path" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" "github.com/golang-jwt/jwt/v4" ) diff --git a/cmd/devp2p/internal/ethtest/protocol.go b/cmd/devp2p/internal/ethtest/protocol.go index f5f5f7e489..6f843eb6b8 100644 --- a/cmd/devp2p/internal/ethtest/protocol.go +++ b/cmd/devp2p/internal/ethtest/protocol.go @@ -16,8 +16,8 @@ package ethtest import ( - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/rlp" ) // Unexported devp2p message codes from p2p/peer.go. diff --git a/cmd/devp2p/internal/ethtest/snap.go b/cmd/devp2p/internal/ethtest/snap.go index 83844b1e9d..5065c80ea2 100644 --- a/cmd/devp2p/internal/ethtest/snap.go +++ b/cmd/devp2p/internal/ethtest/snap.go @@ -24,14 +24,14 @@ import ( "math/rand" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/protocols/snap" + "github.com/slingshot-finance/op-geth/internal/utesting" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/trienode" "golang.org/x/crypto/sha3" ) diff --git a/cmd/devp2p/internal/ethtest/suite.go b/cmd/devp2p/internal/ethtest/suite.go index dd42ec7f7f..1e00efa786 100644 --- a/cmd/devp2p/internal/ethtest/suite.go +++ b/cmd/devp2p/internal/ethtest/suite.go @@ -21,15 +21,15 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/misc/eip4844" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/crypto/kzg4844" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/internal/utesting" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" "github.com/holiman/uint256" ) diff --git a/cmd/devp2p/internal/ethtest/suite_test.go b/cmd/devp2p/internal/ethtest/suite_test.go index 79146c8aba..1299325dc8 100644 --- a/cmd/devp2p/internal/ethtest/suite_test.go +++ b/cmd/devp2p/internal/ethtest/suite_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/catalyst" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/eth/catalyst" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/internal/utesting" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p" ) func makeJWTSecret() (string, [32]byte, error) { diff --git a/cmd/devp2p/internal/ethtest/transaction.go b/cmd/devp2p/internal/ethtest/transaction.go index e6ce37aae3..5a5d80aee5 100644 --- a/cmd/devp2p/internal/ethtest/transaction.go +++ b/cmd/devp2p/internal/ethtest/transaction.go @@ -22,9 +22,9 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" ) // sendTxs sends the given transactions to the node and diff --git a/cmd/devp2p/internal/v4test/discv4tests.go b/cmd/devp2p/internal/v4test/discv4tests.go index 3afcfd0698..c518d8e07e 100644 --- a/cmd/devp2p/internal/v4test/discv4tests.go +++ b/cmd/devp2p/internal/v4test/discv4tests.go @@ -24,9 +24,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/p2p/discover/v4wire" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/internal/utesting" + "github.com/slingshot-finance/op-geth/p2p/discover/v4wire" ) const ( diff --git a/cmd/devp2p/internal/v4test/framework.go b/cmd/devp2p/internal/v4test/framework.go index 9286594181..516fbb92e5 100644 --- a/cmd/devp2p/internal/v4test/framework.go +++ b/cmd/devp2p/internal/v4test/framework.go @@ -22,9 +22,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/discover/v4wire" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/discover/v4wire" + "github.com/slingshot-finance/op-geth/p2p/enode" ) const waitTime = 300 * time.Millisecond diff --git a/cmd/devp2p/internal/v5test/discv5tests.go b/cmd/devp2p/internal/v5test/discv5tests.go index 56624a0ca8..2b2e0b4b6c 100644 --- a/cmd/devp2p/internal/v5test/discv5tests.go +++ b/cmd/devp2p/internal/v5test/discv5tests.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/p2p/discover/v5wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/slingshot-finance/op-geth/internal/utesting" + "github.com/slingshot-finance/op-geth/p2p/discover/v5wire" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/netutil" ) // Suite is the discv5 test suite. diff --git a/cmd/devp2p/internal/v5test/framework.go b/cmd/devp2p/internal/v5test/framework.go index 10856a50bc..471338dcc8 100644 --- a/cmd/devp2p/internal/v5test/framework.go +++ b/cmd/devp2p/internal/v5test/framework.go @@ -24,11 +24,11 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/discover/v5wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/discover/v5wire" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" ) // readError represents an error during packet reading. diff --git a/cmd/devp2p/keycmd.go b/cmd/devp2p/keycmd.go index 98d7bd76ae..33ba75c8ae 100644 --- a/cmd/devp2p/keycmd.go +++ b/cmd/devp2p/keycmd.go @@ -21,9 +21,9 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/main.go b/cmd/devp2p/main.go index 8461a8b9b5..6d15bd02c4 100644 --- a/cmd/devp2p/main.go +++ b/cmd/devp2p/main.go @@ -20,9 +20,9 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/internal/debug" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/p2p/enode" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/nodeset.go b/cmd/devp2p/nodeset.go index 7360dc5bcf..d65ee9c45d 100644 --- a/cmd/devp2p/nodeset.go +++ b/cmd/devp2p/nodeset.go @@ -23,8 +23,8 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/p2p/enode" "golang.org/x/exp/slices" ) diff --git a/cmd/devp2p/nodesetcmd.go b/cmd/devp2p/nodesetcmd.go index 6fbc185ad8..5a0e715f0d 100644 --- a/cmd/devp2p/nodesetcmd.go +++ b/cmd/devp2p/nodesetcmd.go @@ -25,11 +25,11 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/forkid" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/rlpxcmd.go b/cmd/devp2p/rlpxcmd.go index aa7d065818..29387c4e2b 100644 --- a/cmd/devp2p/rlpxcmd.go +++ b/cmd/devp2p/rlpxcmd.go @@ -21,12 +21,12 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/cmd/devp2p/internal/ethtest" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/rlpx" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/cmd/devp2p/internal/ethtest" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/rlpx" + "github.com/slingshot-finance/op-geth/rlp" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/runtest.go b/cmd/devp2p/runtest.go index 7e3723c641..82755ca602 100644 --- a/cmd/devp2p/runtest.go +++ b/cmd/devp2p/runtest.go @@ -19,10 +19,10 @@ package main import ( "os" - "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/cmd/devp2p/internal/v4test" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/internal/utesting" + "github.com/slingshot-finance/op-geth/log" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/changepassword.go b/cmd/ethkey/changepassword.go index 4298e2b834..70af83287b 100644 --- a/cmd/ethkey/changepassword.go +++ b/cmd/ethkey/changepassword.go @@ -21,8 +21,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/cmd/utils" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index 60d8b3c779..1be5eb25e0 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -22,9 +22,9 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/crypto" "github.com/google/uuid" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index 29b1c13e85..d0d77b26cf 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -21,9 +21,9 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/crypto" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index 25c0d104f6..c9b69a48d5 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/slingshot-finance/op-geth/internal/flags" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index 6b8dec03cd..5ff3caadb7 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,11 +21,11 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index 73506e5da1..ac64b839b6 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/slingshot-finance/op-geth/internal/cmdtest" + "github.com/slingshot-finance/op-geth/internal/reexec" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 2821145089..7b7b5415ca 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,7 +22,7 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/slingshot-finance/op-geth/cmd/utils" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/blockrunner.go b/cmd/evm/blockrunner.go index c5d836e0ea..7b5fa1f645 100644 --- a/cmd/evm/blockrunner.go +++ b/cmd/evm/blockrunner.go @@ -24,11 +24,11 @@ import ( "regexp" "sort" - "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/tracers/logger" - "github.com/ethereum/go-ethereum/tests" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers/logger" + "github.com/slingshot-finance/op-geth/tests" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index c071834b59..f88f50a4de 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" + "github.com/slingshot-finance/op-geth/cmd/evm/internal/compiler" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index b1f35cbaf5..aaf7477fdf 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/slingshot-finance/op-geth/core/asm" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go index 54981b6697..1eed921d03 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/slingshot-finance/op-geth/core/asm" ) func Compile(fn string, src []byte, debug bool) (string, error) { diff --git a/cmd/evm/internal/t8ntool/block.go b/cmd/evm/internal/t8ntool/block.go index a2dc473437..38459bf8ea 100644 --- a/cmd/evm/internal/t8ntool/block.go +++ b/cmd/evm/internal/t8ntool/block.go @@ -24,13 +24,13 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus/clique" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go index a4ffd09e4f..1e1b8fa9f4 100644 --- a/cmd/evm/internal/t8ntool/execution.go +++ b/cmd/evm/internal/t8ntool/execution.go @@ -20,22 +20,22 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/consensus/misc" + "github.com/slingshot-finance/op-geth/consensus/misc/eip4844" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" "golang.org/x/crypto/sha3" ) diff --git a/cmd/evm/internal/t8ntool/flags.go b/cmd/evm/internal/t8ntool/flags.go index c2eca8cc21..850685797b 100644 --- a/cmd/evm/internal/t8ntool/flags.go +++ b/cmd/evm/internal/t8ntool/flags.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/tests" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/tests" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/internal/t8ntool/gen_header.go b/cmd/evm/internal/t8ntool/gen_header.go index a8c8668978..1a7439a0b9 100644 --- a/cmd/evm/internal/t8ntool/gen_header.go +++ b/cmd/evm/internal/t8ntool/gen_header.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/types" ) var _ = (*headerMarshaling)(nil) diff --git a/cmd/evm/internal/t8ntool/gen_stenv.go b/cmd/evm/internal/t8ntool/gen_stenv.go index d47db4a876..1880eae75a 100644 --- a/cmd/evm/internal/t8ntool/gen_stenv.go +++ b/cmd/evm/internal/t8ntool/gen_stenv.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/types" ) var _ = (*stEnvMarshaling)(nil) diff --git a/cmd/evm/internal/t8ntool/tracewriter.go b/cmd/evm/internal/t8ntool/tracewriter.go index e4efad112f..edfd5fbf30 100644 --- a/cmd/evm/internal/t8ntool/tracewriter.go +++ b/cmd/evm/internal/t8ntool/tracewriter.go @@ -21,10 +21,10 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/log" ) // traceWriter is an vm.EVMLogger which also holds an inner logger/tracer. diff --git a/cmd/evm/internal/t8ntool/transaction.go b/cmd/evm/internal/t8ntool/transaction.go index 8533b78637..214a0907c3 100644 --- a/cmd/evm/internal/t8ntool/transaction.go +++ b/cmd/evm/internal/t8ntool/transaction.go @@ -24,13 +24,13 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/tests" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go index 837e2938e7..f6eb299597 100644 --- a/cmd/evm/internal/t8ntool/transition.go +++ b/cmd/evm/internal/t8ntool/transition.go @@ -24,18 +24,18 @@ import ( "os" "path" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/tests" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/eth/tracers/logger" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/tests" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/internal/t8ntool/tx_iterator.go b/cmd/evm/internal/t8ntool/tx_iterator.go index 8f28dc7022..39952e0aca 100644 --- a/cmd/evm/internal/t8ntool/tx_iterator.go +++ b/cmd/evm/internal/t8ntool/tx_iterator.go @@ -25,12 +25,12 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" ) // txWithKey is a helper-struct, to allow us to use the types.Transaction along with diff --git a/cmd/evm/main.go b/cmd/evm/main.go index c3e6a4af91..99baf3bf58 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,14 +22,14 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/cmd/evm/internal/t8ntool" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/slingshot-finance/op-geth/cmd/evm/internal/t8ntool" + "github.com/slingshot-finance/op-geth/internal/debug" + "github.com/slingshot-finance/op-geth/internal/flags" "github.com/urfave/cli/v2" // Force-load the tracer engines to trigger registration - _ "github.com/ethereum/go-ethereum/eth/tracers/js" - _ "github.com/ethereum/go-ethereum/eth/tracers/native" + _ "github.com/slingshot-finance/op-geth/eth/tracers/js" + _ "github.com/slingshot-finance/op-geth/eth/tracers/native" ) var ( diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index f3ffb3ed9f..1891954d91 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -27,19 +27,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" - "github.com/ethereum/go-ethereum/cmd/utils" - "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/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/core/vm/runtime" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" + "github.com/slingshot-finance/op-geth/cmd/evm/internal/compiler" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/core/vm/runtime" + "github.com/slingshot-finance/op-geth/eth/tracers/logger" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/triedb/hashdb" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index 6e751b630f..9879ec8674 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -22,13 +22,13 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/tests" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers/logger" + "github.com/slingshot-finance/op-geth/tests" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/t8n_test.go b/cmd/evm/t8n_test.go index ad36540de5..91c120a734 100644 --- a/cmd/evm/t8n_test.go +++ b/cmd/evm/t8n_test.go @@ -24,9 +24,9 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/cmd/evm/internal/t8ntool" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/slingshot-finance/op-geth/cmd/evm/internal/t8ntool" + "github.com/slingshot-finance/op-geth/internal/cmdtest" + "github.com/slingshot-finance/op-geth/internal/reexec" ) func TestMain(m *testing.M) { diff --git a/cmd/evm/testdata/30/README.txt b/cmd/evm/testdata/30/README.txt index 84c92de853..be84f44667 100644 --- a/cmd/evm/testdata/30/README.txt +++ b/cmd/evm/testdata/30/README.txt @@ -1,4 +1,4 @@ -This example comes from https://github.com/ethereum/go-ethereum/issues/27730. +This example comes from https://github.com/slingshot-finance/op-geth/issues/27730. The input transactions contain three transactions, number `0` and `2` are taken from `testdata/13`, whereas number `1` is taken from #27730. diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index cc22684e0b..74c13c0a06 100644 --- a/cmd/geth/accountcmd.go +++ b/cmd/geth/accountcmd.go @@ -20,11 +20,11 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go index ea3a7c3b64..85194ba158 100644 --- a/cmd/geth/accountcmd_test.go +++ b/cmd/geth/accountcmd_test.go @@ -249,7 +249,7 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could `) } -// https://github.com/ethereum/go-ethereum/issues/1785 +// https://github.com/slingshot-finance/op-geth/issues/1785 func TestUnlockFlagMultiIndex(t *testing.T) { t.Parallel() geth := runMinimalGeth(t, "--port", "0", "--ipcdisable", "--datadir", tmpDatadirWithKeystore(t), diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 3b4f516af7..2816f55964 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -26,19 +26,19 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/node" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 7e5cf5edfb..6bead13185 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -26,23 +26,23 @@ import ( "strings" "unicode" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/external" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/eth/catalyst" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/internal/version" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/accounts/external" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/accounts/scwallet" + "github.com/slingshot-finance/op-geth/accounts/usbwallet" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/eth/catalyst" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/internal/version" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/params" "github.com/naoina/toml" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 526ede9619..9dd136362a 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -20,9 +20,9 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/console" + "github.com/slingshot-finance/op-geth/internal/flags" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index ef6ef5f288..edd99ae8c8 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/params" ) const ( diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go index 1ae026fd29..b1a7dbe432 100644 --- a/cmd/geth/dbcmd.go +++ b/cmd/geth/dbcmd.go @@ -27,17 +27,17 @@ import ( "syscall" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/console/prompt" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/trie" "github.com/olekukonko/tablewriter" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/exportcmd_test.go b/cmd/geth/exportcmd_test.go index 9570b1ffd2..5b5a36afd6 100644 --- a/cmd/geth/exportcmd_test.go +++ b/cmd/geth/exportcmd_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // TestExport does a basic test of "geth export", exporting the test-genesis. diff --git a/cmd/geth/logging_test.go b/cmd/geth/logging_test.go index b5ce03f4b8..03cf2cbf76 100644 --- a/cmd/geth/logging_test.go +++ b/cmd/geth/logging_test.go @@ -30,7 +30,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/slingshot-finance/op-geth/internal/reexec" ) func runSelf(args ...string) ([]byte, error) { diff --git a/cmd/geth/logtestcmd_active.go b/cmd/geth/logtestcmd_active.go index 5cce1ec6ab..510efa6b14 100644 --- a/cmd/geth/logtestcmd_active.go +++ b/cmd/geth/logtestcmd_active.go @@ -25,9 +25,9 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/internal/debug" + "github.com/slingshot-finance/op-geth/log" "github.com/holiman/uint256" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 5858ae1eeb..b07518d3ca 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -25,25 +25,25 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/console/prompt" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/ethclient" + "github.com/slingshot-finance/op-geth/internal/debug" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/node" "go.uber.org/automaxprocs/maxprocs" // Force-load the tracer engines to trigger registration - _ "github.com/ethereum/go-ethereum/eth/tracers/js" - _ "github.com/ethereum/go-ethereum/eth/tracers/native" + _ "github.com/slingshot-finance/op-geth/eth/tracers/js" + _ "github.com/slingshot-finance/op-geth/eth/tracers/native" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index e7fb108ebf..0fcdd7440d 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -22,8 +22,8 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/internal/version" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/internal/version" + "github.com/slingshot-finance/op-geth/params" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go index 1d32880325..d89e06a06e 100644 --- a/cmd/geth/run_test.go +++ b/cmd/geth/run_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/internal/reexec" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/internal/cmdtest" + "github.com/slingshot-finance/op-geth/internal/reexec" + "github.com/slingshot-finance/op-geth/rpc" ) type testgeth struct { diff --git a/cmd/geth/snapshot.go b/cmd/geth/snapshot.go index 4284005a02..70060d61df 100644 --- a/cmd/geth/snapshot.go +++ b/cmd/geth/snapshot.go @@ -24,18 +24,18 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/pruner" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/state/pruner" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" cli "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/testdata/vcheck/data.json b/cmd/geth/testdata/vcheck/data.json index e7ee2bf7e4..caa31e3734 100644 --- a/cmd/geth/testdata/vcheck/data.json +++ b/cmd/geth/testdata/vcheck/data.json @@ -5,9 +5,9 @@ "summary": "Mining nodes will generate erroneous PoW on epochs > `385`.", "description": "A mining flaw could cause miners to erroneously calculate PoW, due to an index overflow, if DAG size is exceeding the maximum 32 bit unsigned value.\n\nThis occurred on the ETC chain on 2020-11-06. This is likely to trigger for ETH mainnet around block `11550000`/epoch `385`, slated to occur early January 2021.\n\nThis issue is relevant only for miners, non-mining nodes are unaffected, since non-mining nodes use a smaller verification cache instead of a full DAG.", "links": [ - "https://github.com/ethereum/go-ethereum/pull/21793", + "https://github.com/slingshot-finance/op-geth/pull/21793", "https://blog.ethereum.org/2020/11/12/geth_security_release/", - "https://github.com/ethereum/go-ethereum/commit/567d41d9363706b4b13ce0903804e8acf214af49" + "https://github.com/slingshot-finance/op-geth/commit/567d41d9363706b4b13ce0903804e8acf214af49" ], "introduced": "v1.6.0", "fixed": "v1.9.24", diff --git a/cmd/geth/testdata/vcheck/vulnerabilities.json b/cmd/geth/testdata/vcheck/vulnerabilities.json index bee0e66dd8..b575432078 100644 --- a/cmd/geth/testdata/vcheck/vulnerabilities.json +++ b/cmd/geth/testdata/vcheck/vulnerabilities.json @@ -5,10 +5,10 @@ "summary": "Mining nodes will generate erroneous PoW on epochs > `385`.", "description": "A mining flaw could cause miners to erroneously calculate PoW, due to an index overflow, if DAG size is exceeding the maximum 32 bit unsigned value.\n\nThis occurred on the ETC chain on 2020-11-06. This is likely to trigger for ETH mainnet around block `11550000`/epoch `385`, slated to occur early January 2021.\n\nThis issue is relevant only for miners, non-mining nodes are unaffected, since non-mining nodes use a smaller verification cache instead of a full DAG.", "links": [ - "https://github.com/ethereum/go-ethereum/pull/21793", + "https://github.com/slingshot-finance/op-geth/pull/21793", "https://blog.ethereum.org/2020/11/12/geth_security_release/", - "https://github.com/ethereum/go-ethereum/commit/567d41d9363706b4b13ce0903804e8acf214af49", - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-v592-xf75-856p" + "https://github.com/slingshot-finance/op-geth/commit/567d41d9363706b4b13ce0903804e8acf214af49", + "https://github.com/slingshot-finance/op-geth/security/advisories/GHSA-v592-xf75-856p" ], "introduced": "v1.6.0", "fixed": "v1.9.24", @@ -26,7 +26,7 @@ "https://blog.ethereum.org/2020/11/12/geth_security_release/", "https://groups.google.com/g/golang-announce/c/NpBGTTmKzpM", "https://github.com/golang/go/issues/42552", - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-m6gx-rhvj-fh52" + "https://github.com/slingshot-finance/op-geth/security/advisories/GHSA-m6gx-rhvj-fh52" ], "introduced": "v0.0.0", "fixed": "v1.9.24", @@ -42,7 +42,7 @@ "description": "Geth erroneously performed a 'shallow' copy when the precompiled `datacopy` (at `0x00...04`) was invoked. An attacker could deploy a contract that uses the shallow copy to corrupt the contents of the `RETURNDATA`, thus causing a consensus failure.", "links": [ "https://blog.ethereum.org/2020/11/12/geth_security_release/", - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-69v6-xc2j-r2jf" + "https://github.com/slingshot-finance/op-geth/security/advisories/GHSA-69v6-xc2j-r2jf" ], "introduced": "v1.9.7", "fixed": "v1.9.17", @@ -55,13 +55,13 @@ "name": "Geth DoS via MULMOD", "uid": "GETH-2020-04", "summary": "A denial-of-service issue can be used to crash Geth nodes during block processing", - "description": "Affected versions suffer from a vulnerability which can be exploited through the `MULMOD` operation, by specifying a modulo of `0`: `mulmod(a,b,0)`, causing a `panic` in the underlying library. \nThe crash was in the `uint256` library, where a buffer [underflowed](https://github.com/holiman/uint256/blob/4ce82e695c10ddad57215bdbeafb68b8c5df2c30/uint256.go#L442).\n\n\tif `d == 0`, `dLen` remains `0`\n\nand https://github.com/holiman/uint256/blob/4ce82e695c10ddad57215bdbeafb68b8c5df2c30/uint256.go#L451 will try to access index `[-1]`.\n\nThe `uint256` library was first merged in this [commit](https://github.com/ethereum/go-ethereum/commit/cf6674539c589f80031f3371a71c6a80addbe454), on 2020-06-08. \nExploiting this vulnerabilty would cause all vulnerable nodes to drop off the network. \n\nThe issue was brought to our attention through a [bug report](https://github.com/ethereum/go-ethereum/issues/21367), showing a `panic` occurring on sync from genesis on the Ropsten network.\n \nIt was estimated that the least obvious way to fix this would be to merge the fix into `uint256`, make a new release of that library and then update the geth-dependency.\n", + "description": "Affected versions suffer from a vulnerability which can be exploited through the `MULMOD` operation, by specifying a modulo of `0`: `mulmod(a,b,0)`, causing a `panic` in the underlying library. \nThe crash was in the `uint256` library, where a buffer [underflowed](https://github.com/holiman/uint256/blob/4ce82e695c10ddad57215bdbeafb68b8c5df2c30/uint256.go#L442).\n\n\tif `d == 0`, `dLen` remains `0`\n\nand https://github.com/holiman/uint256/blob/4ce82e695c10ddad57215bdbeafb68b8c5df2c30/uint256.go#L451 will try to access index `[-1]`.\n\nThe `uint256` library was first merged in this [commit](https://github.com/slingshot-finance/op-geth/commit/cf6674539c589f80031f3371a71c6a80addbe454), on 2020-06-08. \nExploiting this vulnerabilty would cause all vulnerable nodes to drop off the network. \n\nThe issue was brought to our attention through a [bug report](https://github.com/slingshot-finance/op-geth/issues/21367), showing a `panic` occurring on sync from genesis on the Ropsten network.\n \nIt was estimated that the least obvious way to fix this would be to merge the fix into `uint256`, make a new release of that library and then update the geth-dependency.\n", "links": [ "https://blog.ethereum.org/2020/11/12/geth_security_release/", - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-jm5c-rv3w-w83m", + "https://github.com/slingshot-finance/op-geth/security/advisories/GHSA-jm5c-rv3w-w83m", "https://github.com/holiman/uint256/releases/tag/v1.1.1", "https://github.com/holiman/uint256/pull/80", - "https://github.com/ethereum/go-ethereum/pull/21368" + "https://github.com/slingshot-finance/op-geth/pull/21368" ], "introduced": "v1.9.16", "fixed": "v1.9.18", @@ -76,8 +76,8 @@ "summary": "A DoS vulnerability can make a LES server crash.", "description": "A DoS vulnerability can make a LES server crash via malicious GetProofsV2 request from a connected LES client.\n\nThe vulnerability was patched in #21896.\n\nThis vulnerability only concern users explicitly running geth as a light server", "links": [ - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-r33q-22hv-j29q", - "https://github.com/ethereum/go-ethereum/pull/21896" + "https://github.com/slingshot-finance/op-geth/security/advisories/GHSA-r33q-22hv-j29q", + "https://github.com/slingshot-finance/op-geth/pull/21896" ], "introduced": "v1.8.0", "fixed": "v1.9.25", @@ -92,9 +92,9 @@ "introduced": "v1.9.4", "fixed": "v1.9.20", "summary": "A consensus-vulnerability in Geth could cause a chain split, where vulnerable versions refuse to accept the canonical chain.", - "description": "A flaw was repoted at 2020-08-11 by John Youngseok Yang (Software Platform Lab), where a particular sequence of transactions could cause a consensus failure.\n\n- Tx 1:\n - `sender` invokes `caller`.\n - `caller` invokes `0xaa`. `0xaa` has 3 wei, does a self-destruct-to-self\n - `caller` does a `1 wei` -call to `0xaa`, who thereby has 1 wei (the code in `0xaa` still executed, since the tx is still ongoing, but doesn't redo the selfdestruct, it takes a different path if callvalue is non-zero)\n\n-Tx 2:\n - `sender` does a 5-wei call to 0xaa. No exec (since no code). \n\nIn geth, the result would be that `0xaa` had `6 wei`, whereas OE reported (correctly) `5` wei. Furthermore, in geth, if the second tx was not executed, the `0xaa` would be destructed, resulting in `0 wei`. Thus obviously wrong. \n\nIt was determined that the root cause was this [commit](https://github.com/ethereum/go-ethereum/commit/223b950944f494a5b4e0957fd9f92c48b09037ad) from [this PR](https://github.com/ethereum/go-ethereum/pull/19953). The semantics of `createObject` was subtly changd, into returning a non-nil object (with `deleted=true`) where it previously did not if the account had been destructed. This return value caused the new object to inherit the old `balance`.\n", + "description": "A flaw was repoted at 2020-08-11 by John Youngseok Yang (Software Platform Lab), where a particular sequence of transactions could cause a consensus failure.\n\n- Tx 1:\n - `sender` invokes `caller`.\n - `caller` invokes `0xaa`. `0xaa` has 3 wei, does a self-destruct-to-self\n - `caller` does a `1 wei` -call to `0xaa`, who thereby has 1 wei (the code in `0xaa` still executed, since the tx is still ongoing, but doesn't redo the selfdestruct, it takes a different path if callvalue is non-zero)\n\n-Tx 2:\n - `sender` does a 5-wei call to 0xaa. No exec (since no code). \n\nIn geth, the result would be that `0xaa` had `6 wei`, whereas OE reported (correctly) `5` wei. Furthermore, in geth, if the second tx was not executed, the `0xaa` would be destructed, resulting in `0 wei`. Thus obviously wrong. \n\nIt was determined that the root cause was this [commit](https://github.com/slingshot-finance/op-geth/commit/223b950944f494a5b4e0957fd9f92c48b09037ad) from [this PR](https://github.com/slingshot-finance/op-geth/pull/19953). The semantics of `createObject` was subtly changd, into returning a non-nil object (with `deleted=true`) where it previously did not if the account had been destructed. This return value caused the new object to inherit the old `balance`.\n", "links": [ - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-xw37-57qp-9mm4" + "https://github.com/slingshot-finance/op-geth/security/advisories/GHSA-xw37-57qp-9mm4" ], "published": "2020-12-10", "severity": "High", @@ -122,9 +122,9 @@ "summary": "A consensus-flaw in the Geth EVM could cause a node to deviate from the canonical chain.", "description": "A memory-corruption bug within the EVM can cause a consensus error, where vulnerable nodes obtain a different `stateRoot` when processing a maliciously crafted transaction. This, in turn, would lead to the chain being split: mainnet splitting in two forks.\n\nAll Geth versions supporting the London hard fork are vulnerable (the bug is older than London), so all users should update.\n\nThis bug was exploited on Mainnet at block 13107518.\n\nCredits for the discovery go to @guidovranken (working for Sentnl during an audit of the Telos EVM) and reported via bounty@ethereum.org.", "links": [ - "https://github.com/ethereum/go-ethereum/blob/master/docs/postmortems/2021-08-22-split-postmortem.md", - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-9856-9gg9-qcmq", - "https://github.com/ethereum/go-ethereum/releases/tag/v1.10.8" + "https://github.com/slingshot-finance/op-geth/blob/master/docs/postmortems/2021-08-22-split-postmortem.md", + "https://github.com/slingshot-finance/op-geth/security/advisories/GHSA-9856-9gg9-qcmq", + "https://github.com/slingshot-finance/op-geth/releases/tag/v1.10.8" ], "introduced": "v1.10.0", "fixed": "v1.10.8", @@ -137,11 +137,11 @@ "name": "DoS via malicious `snap/1` request", "uid": "GETH-2021-03", "summary": "A vulnerable node is susceptible to crash when processing a maliciously crafted message from a peer, via the snap/1 protocol. The crash can be triggered by sending a malicious snap/1 GetTrieNodes package.", - "description": "The `snap/1` protocol handler contains two vulnerabilities related to the `GetTrieNodes` packet, which can be exploited to crash the node. Full details are available at the Github security [advisory](https://github.com/ethereum/go-ethereum/security/advisories/GHSA-59hh-656j-3p7v)", + "description": "The `snap/1` protocol handler contains two vulnerabilities related to the `GetTrieNodes` packet, which can be exploited to crash the node. Full details are available at the Github security [advisory](https://github.com/slingshot-finance/op-geth/security/advisories/GHSA-59hh-656j-3p7v)", "links": [ - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-59hh-656j-3p7v", + "https://github.com/slingshot-finance/op-geth/security/advisories/GHSA-59hh-656j-3p7v", "https://geth.ethereum.org/docs/vulnerabilities/vulnerabilities", - "https://github.com/ethereum/go-ethereum/pull/23657" + "https://github.com/slingshot-finance/op-geth/pull/23657" ], "introduced": "v1.10.0", "fixed": "v1.10.9", @@ -154,11 +154,11 @@ "name": "DoS via malicious p2p message", "uid": "GETH-2022-01", "summary": "A vulnerable node can crash via p2p messages sent from an attacker node, if running with non-default log options.", - "description": "A vulnerable node, if configured to use high verbosity logging, can be made to crash when handling specially crafted p2p messages sent from an attacker node. Full details are available at the Github security [advisory](https://github.com/ethereum/go-ethereum/security/advisories/GHSA-wjxw-gh3m-7pm5)", + "description": "A vulnerable node, if configured to use high verbosity logging, can be made to crash when handling specially crafted p2p messages sent from an attacker node. Full details are available at the Github security [advisory](https://github.com/slingshot-finance/op-geth/security/advisories/GHSA-wjxw-gh3m-7pm5)", "links": [ - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-wjxw-gh3m-7pm5", + "https://github.com/slingshot-finance/op-geth/security/advisories/GHSA-wjxw-gh3m-7pm5", "https://geth.ethereum.org/docs/vulnerabilities/vulnerabilities", - "https://github.com/ethereum/go-ethereum/pull/24507" + "https://github.com/slingshot-finance/op-geth/pull/24507" ], "introduced": "v1.10.0", "fixed": "v1.10.17", diff --git a/cmd/geth/verkle.go b/cmd/geth/verkle.go index 420b063d8b..3ac4163fa1 100644 --- a/cmd/geth/verkle.go +++ b/cmd/geth/verkle.go @@ -23,11 +23,11 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/cmd/utils" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/log" "github.com/gballet/go-verkle" cli "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/version_check.go b/cmd/geth/version_check.go index 237556788e..3f191766c9 100644 --- a/cmd/geth/version_check.go +++ b/cmd/geth/version_check.go @@ -26,7 +26,7 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" "github.com/jedisct1/go-minisign" "github.com/urfave/cli/v2" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index a0f5f0d288..60e277de8d 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -44,13 +44,13 @@ import ( "strings" "text/tabwriter" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/simulations" + "github.com/slingshot-finance/op-geth/p2p/simulations/adapters" + "github.com/slingshot-finance/op-geth/rpc" "github.com/urfave/cli/v2" ) diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index 70337749ae..f8cd2972d5 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -28,8 +28,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/rlp" ) var ( diff --git a/cmd/rlpdump/rlpdump_test.go b/cmd/rlpdump/rlpdump_test.go index 8d55f4200a..9660d0eccf 100644 --- a/cmd/rlpdump/rlpdump_test.go +++ b/cmd/rlpdump/rlpdump_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) func TestRoundtrip(t *testing.T) { diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 8b571be1ef..aa1239cca0 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -30,18 +30,18 @@ import ( "syscall" "time" - "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/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/internal/debug" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/rlp" "github.com/urfave/cli/v2" ) diff --git a/cmd/utils/export_test.go b/cmd/utils/export_test.go index 84ba8d0c31..51742756fa 100644 --- a/cmd/utils/export_test.go +++ b/cmd/utils/export_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/rlp" ) // TestExport does basic sanity checks on the export/import functionality diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 736acbb0d8..1acccc1186 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -34,44 +34,44 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/catalyst" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/remotedb" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/graphql" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/exp" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/fdlimit" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/txpool/legacypool" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/crypto/kzg4844" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/eth/catalyst" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/eth/filters" + "github.com/slingshot-finance/op-geth/eth/gasprice" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/ethdb/remotedb" + "github.com/slingshot-finance/op-geth/ethstats" + "github.com/slingshot-finance/op-geth/graphql" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/metrics/exp" + "github.com/slingshot-finance/op-geth/metrics/influxdb" + "github.com/slingshot-finance/op-geth/miner" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/nat" + "github.com/slingshot-finance/op-geth/p2p/netutil" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/triedb/hashdb" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" pcsclite "github.com/gballet/go-libpcsclite" gopsutil "github.com/shirou/gopsutil/mem" "github.com/urfave/cli/v2" diff --git a/cmd/utils/flags_legacy.go b/cmd/utils/flags_legacy.go index 243abd8311..a33bc82cf5 100644 --- a/cmd/utils/flags_legacy.go +++ b/cmd/utils/flags_legacy.go @@ -19,8 +19,8 @@ package utils import ( "fmt" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/internal/flags" "github.com/urfave/cli/v2" ) diff --git a/cmd/utils/prompt.go b/cmd/utils/prompt.go index f513e38188..ce468c3ddb 100644 --- a/cmd/utils/prompt.go +++ b/cmd/utils/prompt.go @@ -20,7 +20,7 @@ package utils import ( "fmt" - "github.com/ethereum/go-ethereum/console/prompt" + "github.com/slingshot-finance/op-geth/console/prompt" ) // GetPassPhrase displays the given text(prompt) to the user and requests some textual diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index c6f6fe8bcf..9c985bc60c 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -22,7 +22,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/bytes.go b/common/bytes.go index d1f5c6c995..cd139eb49e 100644 --- a/common/bytes.go +++ b/common/bytes.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "errors" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common/hexutil" ) // FromHex returns the bytes represented by the hexadecimal string s. diff --git a/common/debug.go b/common/debug.go index 28c52b4a9c..f26a4fed4a 100644 --- a/common/debug.go +++ b/common/debug.go @@ -26,7 +26,7 @@ import ( // Report gives off a warning requesting the user to submit an issue to the github tracker. func Report(extra ...interface{}) { - fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/ethereum/go-ethereum/issues") + fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/slingshot-finance/op-geth/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index 80180d9186..94c1360d84 100644 --- a/common/hexutil/json_example_test.go +++ b/common/hexutil/json_example_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index 803b5e1cc6..e35ccec99e 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/prque/lazyqueue.go b/common/prque/lazyqueue.go index 59bda72fa7..f0279b9c80 100644 --- a/common/prque/lazyqueue.go +++ b/common/prque/lazyqueue.go @@ -20,7 +20,7 @@ import ( "container/heap" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/slingshot-finance/op-geth/common/mclock" "golang.org/x/exp/constraints" ) diff --git a/common/prque/lazyqueue_test.go b/common/prque/lazyqueue_test.go index ffb7e5e9e3..24c4946e7f 100644 --- a/common/prque/lazyqueue_test.go +++ b/common/prque/lazyqueue_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/slingshot-finance/op-geth/common/mclock" ) const ( diff --git a/common/types.go b/common/types.go index aadca87f82..2e64480811 100644 --- a/common/types.go +++ b/common/types.go @@ -29,7 +29,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common/hexutil" "golang.org/x/crypto/sha3" ) diff --git a/consensus/beacon/consensus.go b/consensus/beacon/consensus.go index 1db9d81a1d..abe7fb0cd2 100644 --- a/consensus/beacon/consensus.go +++ b/consensus/beacon/consensus.go @@ -21,15 +21,15 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/consensus/misc/eip4844" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" + "github.com/slingshot-finance/op-geth/trie" ) // Proof-of-stake protocol constants. diff --git a/consensus/beacon/faker.go b/consensus/beacon/faker.go index 981e345e3e..e586a39bd4 100644 --- a/consensus/beacon/faker.go +++ b/consensus/beacon/faker.go @@ -19,8 +19,8 @@ package beacon import ( "math/big" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core/types" ) // NewFaker creates a fake consensus engine for testing. diff --git a/consensus/beacon/oplegacy.go b/consensus/beacon/oplegacy.go index 62810cb03f..fdf2c29bb4 100644 --- a/consensus/beacon/oplegacy.go +++ b/consensus/beacon/oplegacy.go @@ -4,11 +4,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rpc" ) type OpLegacy struct{} diff --git a/consensus/clique/api.go b/consensus/clique/api.go index 374b50692d..d133881870 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -20,12 +20,12 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/rpc" ) // API is a user facing RPC API to allow controlling the signer and voting diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index c693189ea5..b335c46429 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -27,22 +27,22 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - lru "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + lru "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/misc" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/rpc" + "github.com/slingshot-finance/op-geth/trie" "golang.org/x/crypto/sha3" ) diff --git a/consensus/clique/clique_test.go b/consensus/clique/clique_test.go index 7cd5919c5e..01e3486be6 100644 --- a/consensus/clique/clique_test.go +++ b/consensus/clique/clique_test.go @@ -20,13 +20,13 @@ import ( "math/big" "testing" - "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/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" ) // This test case is a repro of an annoying bug that took us forever to catch. diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index a97115121b..7cb6289260 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -21,13 +21,13 @@ import ( "encoding/json" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "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/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" "golang.org/x/exp/slices" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index 26cebe008a..44b26860cd 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -23,13 +23,13 @@ import ( "math/big" "testing" - "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/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" "golang.org/x/exp/slices" ) @@ -367,7 +367,7 @@ func TestClique(t *testing.T) { failure: errRecentlySigned, }, { // Recent signatures should not reset on checkpoint blocks imported in a new - // batch (https://github.com/ethereum/go-ethereum/issues/17593). Whilst this + // batch (https://github.com/slingshot-finance/op-geth/issues/17593). Whilst this // seems overly specific and weird, it was a Rinkeby consensus split. epoch: 3, signers: []string{"A", "B", "C"}, diff --git a/consensus/consensus.go b/consensus/consensus.go index 3a2c2d2229..c8e2415e30 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -20,11 +20,11 @@ package consensus import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" ) // ChainHeaderReader defines a small collection of methods needed to access the local diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 130dfdf213..775e9180e4 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -23,16 +23,16 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/misc" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" "golang.org/x/crypto/sha3" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index e3793cd1b0..0ed8498dc8 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -26,10 +26,10 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" ) type diffTest struct { diff --git a/consensus/ethash/difficulty.go b/consensus/ethash/difficulty.go index 66a18059c6..ca87bd0555 100644 --- a/consensus/ethash/difficulty.go +++ b/consensus/ethash/difficulty.go @@ -19,7 +19,7 @@ package ethash import ( "math/big" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/core/types" "github.com/holiman/uint256" ) diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index f37ec26056..48cc7adc24 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -20,9 +20,9 @@ package ethash import ( "time" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rpc" ) // Ethash is a consensus engine based on proof-of-work implementing the ethash diff --git a/consensus/merger.go b/consensus/merger.go index ffbcbf2b85..32faf40e5a 100644 --- a/consensus/merger.go +++ b/consensus/merger.go @@ -20,10 +20,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" ) // transitionStatus describes the status of eth1/2 transition. This switch diff --git a/consensus/misc/create2deployer.go b/consensus/misc/create2deployer.go index 27c87a4a8c..538fc718a3 100644 --- a/consensus/misc/create2deployer.go +++ b/consensus/misc/create2deployer.go @@ -3,10 +3,10 @@ package misc import ( "github.com/ethereum-optimism/superchain-registry/superchain" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" ) // The original create2deployer contract could not be deployed to Base mainnet at diff --git a/consensus/misc/create2deployer_test.go b/consensus/misc/create2deployer_test.go index fc0ef79fd7..ff1624fc04 100644 --- a/consensus/misc/create2deployer_test.go +++ b/consensus/misc/create2deployer_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/params" ) func TestEnsureCreate2Deployer(t *testing.T) { diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 96995616de..f2baeab864 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" ) var ( diff --git a/consensus/misc/eip1559/eip1559.go b/consensus/misc/eip1559/eip1559.go index a66298af69..a4da5c8c22 100644 --- a/consensus/misc/eip1559/eip1559.go +++ b/consensus/misc/eip1559/eip1559.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus/misc" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" ) // VerifyEIP1559Header verifies some header attributes which were changed in EIP-1559, diff --git a/consensus/misc/eip1559/eip1559_test.go b/consensus/misc/eip1559/eip1559_test.go index d34da8fd8b..38954843be 100644 --- a/consensus/misc/eip1559/eip1559_test.go +++ b/consensus/misc/eip1559/eip1559_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" ) // copyConfig does a _shallow_ copy of a given config. Safe to set new values, but diff --git a/consensus/misc/eip4844/eip4844.go b/consensus/misc/eip4844/eip4844.go index 2dad9a0cd3..34e8fa542d 100644 --- a/consensus/misc/eip4844/eip4844.go +++ b/consensus/misc/eip4844/eip4844.go @@ -21,8 +21,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" ) var ( diff --git a/consensus/misc/eip4844/eip4844_test.go b/consensus/misc/eip4844/eip4844_test.go index ec417380fc..def940275a 100644 --- a/consensus/misc/eip4844/eip4844_test.go +++ b/consensus/misc/eip4844/eip4844_test.go @@ -21,7 +21,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/params" ) func TestCalcExcessBlobGas(t *testing.T) { diff --git a/consensus/misc/gaslimit.go b/consensus/misc/gaslimit.go index dfcabd9a80..ca8bbf46b1 100644 --- a/consensus/misc/gaslimit.go +++ b/consensus/misc/gaslimit.go @@ -19,7 +19,7 @@ package misc import ( "fmt" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/params" ) // VerifyGaslimit verifies the header gas limit according increase/decrease diff --git a/console/bridge.go b/console/bridge.go index 37578041ca..7d2b6e8e5d 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -26,12 +26,12 @@ import ( "time" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/accounts/scwallet" + "github.com/slingshot-finance/op-geth/accounts/usbwallet" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/console/prompt" + "github.com/slingshot-finance/op-geth/internal/jsre" + "github.com/slingshot-finance/op-geth/rpc" ) // bridge is a collection of JavaScript utility methods to bride the .js runtime diff --git a/console/bridge_test.go b/console/bridge_test.go index e57e294fc5..c1124c75c5 100644 --- a/console/bridge_test.go +++ b/console/bridge_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/internal/jsre" + "github.com/slingshot-finance/op-geth/internal/jsre" ) // TestUndefinedAsParam ensures that personal functions can receive diff --git a/console/console.go b/console/console.go index cdee53684e..45ed0a0008 100644 --- a/console/console.go +++ b/console/console.go @@ -30,12 +30,12 @@ import ( "syscall" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/internal/jsre/deps" - "github.com/ethereum/go-ethereum/internal/web3ext" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/console/prompt" + "github.com/slingshot-finance/op-geth/internal/jsre" + "github.com/slingshot-finance/op-geth/internal/jsre/deps" + "github.com/slingshot-finance/op-geth/internal/web3ext" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rpc" "github.com/mattn/go-colorable" "github.com/peterh/liner" ) diff --git a/console/console_test.go b/console/console_test.go index a13be6a99d..0b5de6b166 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -25,14 +25,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/console/prompt" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/internal/jsre" + "github.com/slingshot-finance/op-geth/miner" + "github.com/slingshot-finance/op-geth/node" ) const ( diff --git a/core/asm/asm.go b/core/asm/asm.go index 294eb6ffaa..850e5f8dba 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/slingshot-finance/op-geth/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index 02c589b2c1..db497feb0b 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index c5991f10e8..c280156461 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -21,15 +21,15 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index f3d65cea25..d5166b7258 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -20,11 +20,11 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" ) // BlockValidator is responsible for validating block headers, uncles and diff --git a/core/block_validator_test.go b/core/block_validator_test.go index 48bdceff62..8dec1c0880 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,16 +21,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/consensus/clique" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index e27b9420dc..eb7b203618 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -28,28 +28,28 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/syncx" - "github.com/ethereum/go-ethereum/internal/version" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/common/prque" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/misc/eip4844" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/internal/syncx" + "github.com/slingshot-finance/op-geth/internal/version" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/triedb/hashdb" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" "golang.org/x/exp/slices" ) diff --git a/core/blockchain_insert.go b/core/blockchain_insert.go index 9bf662b6b7..e58c602fb1 100644 --- a/core/blockchain_insert.go +++ b/core/blockchain_insert.go @@ -19,10 +19,10 @@ package core import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" ) // insertStats tracks and reports on block insertion. diff --git a/core/blockchain_reader.go b/core/blockchain_reader.go index 30fbcb883b..2f3c6d7157 100644 --- a/core/blockchain_reader.go +++ b/core/blockchain_reader.go @@ -19,17 +19,17 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" ) // CurrentHeader retrieves the current head header of the canonical chain. The diff --git a/core/blockchain_repair_test.go b/core/blockchain_repair_test.go index b2df39d17b..89b3325bdc 100644 --- a/core/blockchain_repair_test.go +++ b/core/blockchain_repair_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/params" ) // Tests a recovery for a short canonical chain where a recent block was already @@ -1883,7 +1883,7 @@ func testRepairWithScheme(t *testing.T, tt *rewindTest, snapshots bool, scheme s } } -// TestIssue23496 tests scenario described in https://github.com/ethereum/go-ethereum/pull/23496#issuecomment-926393893 +// TestIssue23496 tests scenario described in https://github.com/slingshot-finance/op-geth/pull/23496#issuecomment-926393893 // Credits to @zzyalbert for finding the issue. // // Local chain owns these blocks: diff --git a/core/blockchain_sethead_test.go b/core/blockchain_sethead_test.go index fa739f924f..52b64268a0 100644 --- a/core/blockchain_sethead_test.go +++ b/core/blockchain_sethead_test.go @@ -27,16 +27,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/triedb/hashdb" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" ) // rewindTest is a test case for chain rollback upon user request. diff --git a/core/blockchain_snapshot_test.go b/core/blockchain_snapshot_test.go index dd012c430c..fc8ae4786a 100644 --- a/core/blockchain_snapshot_test.go +++ b/core/blockchain_snapshot_test.go @@ -29,13 +29,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/params" ) // snapshotTestBasic wraps the common testing fields in the snapshot tests. diff --git a/core/blockchain_test.go b/core/blockchain_test.go index bc6f8112f0..214d2dee7d 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -26,20 +26,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/tracers/logger" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" ) // So we can deterministically seed different blockchains @@ -1754,7 +1754,7 @@ func testEIP161AccountRemoval(t *testing.T, scheme string) { // tests that under weird reorg conditions the blockchain and its internal header- // chain return the same latest block/header. // -// https://github.com/ethereum/go-ethereum/pull/15941 +// https://github.com/slingshot-finance/op-geth/pull/15941 func TestBlockchainHeaderchainReorgConsistency(t *testing.T) { testBlockchainHeaderchainReorgConsistency(t, rawdb.HashScheme) testBlockchainHeaderchainReorgConsistency(t, rawdb.PathScheme) @@ -2056,8 +2056,8 @@ func testInsertReceiptChainRollback(t *testing.T, scheme string) { // overtake the 'canon' chain until after it's passed canon by about 200 blocks. // // Details at: -// - https://github.com/ethereum/go-ethereum/issues/18977 -// - https://github.com/ethereum/go-ethereum/pull/18988 +// - https://github.com/slingshot-finance/op-geth/issues/18977 +// - https://github.com/slingshot-finance/op-geth/pull/18988 func TestLowDiffLongChain(t *testing.T) { testLowDiffLongChain(t, rawdb.HashScheme) testLowDiffLongChain(t, rawdb.PathScheme) diff --git a/core/blocks.go b/core/blocks.go index f20ba4aaf2..b5be82fb5f 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -16,7 +16,7 @@ package core -import "github.com/ethereum/go-ethereum/common" +import "github.com/slingshot-finance/op-geth/common" // BadHashes represent a set of manually tracked bad hashes (usually hard forks) var BadHashes = map[common.Hash]bool{ diff --git a/core/bloom_indexer.go b/core/bloom_indexer.go index 68a35d811e..5ef6baf9dd 100644 --- a/core/bloom_indexer.go +++ b/core/bloom_indexer.go @@ -20,12 +20,12 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/bitutil" + "github.com/slingshot-finance/op-geth/core/bloombits" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" ) const ( diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go index 646151db0b..ae0df64d1e 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -19,7 +19,7 @@ package bloombits import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/core/types" ) var ( diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index ac1aee0b25..7732f189f0 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -22,7 +22,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/core/types" ) // Tests that batched bloom bits are correctly rotated from the input bloom diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go index 6a4cfb23db..65488eb72b 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common/bitutil" + "github.com/slingshot-finance/op-geth/crypto" ) // bloomIndexes represents the bit indexes inside the bloom filter that belong diff --git a/core/bloombits/matcher_test.go b/core/bloombits/matcher_test.go index 7f3d5f279c..b76bd748fc 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) const testSectionSize = 4096 @@ -86,7 +86,7 @@ func TestMatcherRandom(t *testing.T) { // Tests that the matcher can properly find matches if the starting block is // shifted from a multiple of 8. This is needed to cover an optimisation with -// bitset matching https://github.com/ethereum/go-ethereum/issues/15309. +// bitset matching https://github.com/slingshot-finance/op-geth/issues/15309. func TestMatcherShifted(t *testing.T) { t.Parallel() // Block 0 always matches in the tests, skip ahead of first 8 blocks with the diff --git a/core/chain_indexer.go b/core/chain_indexer.go index f5fce72588..06ecb58d33 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -25,12 +25,12 @@ import ( "sync/atomic" "time" - "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/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" ) // ChainIndexerBackend defines the methods needed to process chain segments in diff --git a/core/chain_indexer_test.go b/core/chain_indexer_test.go index f099609015..3b2ea48943 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index 22c837e84f..e2fe864859 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -20,18 +20,18 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/misc" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/consensus/misc/eip4844" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" ) // BlockGen creates blocks for testing. diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 84148841f5..93e1b6f4fb 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -23,15 +23,15 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" ) func TestGeneratePOSChain(t *testing.T) { diff --git a/core/dao_test.go b/core/dao_test.go index b9a899ef2f..c56b57da19 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/error.go b/core/error.go index 43f2510680..1d5ed9c6b9 100644 --- a/core/error.go +++ b/core/error.go @@ -19,7 +19,7 @@ package core import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/core/types" ) var ( diff --git a/core/events.go b/core/events.go index ac935a137f..89b89ac41f 100644 --- a/core/events.go +++ b/core/events.go @@ -17,8 +17,8 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" ) // NewTxsEvent is posted when a batch of transactions enter the transaction pool. diff --git a/core/evm.go b/core/evm.go index b0ac3276e0..4a5fc510dc 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,12 +19,12 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/misc/eip4844" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/params" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/forkchoice.go b/core/forkchoice.go index b293c851bf..a355dd1308 100644 --- a/core/forkchoice.go +++ b/core/forkchoice.go @@ -22,11 +22,11 @@ import ( "math/big" mrand "math/rand" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" ) // ChainReader defines a small collection of methods needed to access the local diff --git a/core/forkid/forkid.go b/core/forkid/forkid.go index 76825d3bef..accbf6be39 100644 --- a/core/forkid/forkid.go +++ b/core/forkid/forkid.go @@ -26,9 +26,9 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" "golang.org/x/exp/slices" ) diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go index e311c0b43f..6c2f5050b6 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -23,11 +23,11 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" ) // TestCreation tests that different genesis and fork rule combinations result in diff --git a/core/gen_genesis.go b/core/gen_genesis.go index bd2a069b54..24f65fc3d9 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index a9d47e6ba3..532f14cccc 100644 --- a/core/gen_genesis_account.go +++ b/core/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index da2b74ccc6..c671de35ac 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -27,19 +27,19 @@ import ( "github.com/ethereum-optimism/superchain-registry/superchain" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" ) //go:generate go run github.com/fjl/gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go diff --git a/core/genesis_test.go b/core/genesis_test.go index 1d85b510ca..75f269aa7e 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -24,14 +24,14 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" ) func TestInvalidCliqueConfig(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index 519a32ab80..5296312470 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -26,15 +26,15 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/consensus" - "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/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" ) const ( diff --git a/core/headerchain_test.go b/core/headerchain_test.go index 2c0323e6f7..6bb1698045 100644 --- a/core/headerchain_test.go +++ b/core/headerchain_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" ) func verifyUnbrokenCanonchain(hc *HeaderChain) error { diff --git a/core/mkalloc.go b/core/mkalloc.go index 12c40c14fb..143f43dbdf 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -32,9 +32,9 @@ import ( "os" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/rlp" "golang.org/x/exp/slices" ) diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index 40d60236c1..fba273deaa 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -23,14 +23,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/misc/eip4844" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" "golang.org/x/exp/slices" ) diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index 3340c7f15c..b63ee65f92 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -26,12 +26,12 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" "github.com/stretchr/testify/require" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index 4f2ef0a880..cee33c610b 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -20,12 +20,12 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/common" - "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/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" ) // ReadTxLookupEntry retrieves the positional metadata associated with a transaction diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go index 124389ba7a..6cc34a2c5c 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/blocktest" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/internal/blocktest" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" ) var newTestHasher = blocktest.NewHasher diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index 7dae87a98f..3a2b112fb2 100644 --- a/core/rawdb/accessors_metadata.go +++ b/core/rawdb/accessors_metadata.go @@ -20,11 +20,11 @@ import ( "encoding/json" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" ) // ReadDatabaseVersion retrieves the version number of the database. diff --git a/core/rawdb/accessors_snapshot.go b/core/rawdb/accessors_snapshot.go index 3c82b3f731..7a29b41b73 100644 --- a/core/rawdb/accessors_snapshot.go +++ b/core/rawdb/accessors_snapshot.go @@ -19,9 +19,9 @@ package rawdb import ( "encoding/binary" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" ) // ReadSnapshotDisabled retrieves if the snapshot maintenance is disabled. diff --git a/core/rawdb/accessors_state.go b/core/rawdb/accessors_state.go index 9ce58e7d27..f6c5fa81fc 100644 --- a/core/rawdb/accessors_state.go +++ b/core/rawdb/accessors_state.go @@ -19,9 +19,9 @@ package rawdb import ( "encoding/binary" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" ) // ReadPreimage retrieves a single preimage of the provided hash. diff --git a/core/rawdb/accessors_sync.go b/core/rawdb/accessors_sync.go index 2dc08b3b72..b5face9939 100644 --- a/core/rawdb/accessors_sync.go +++ b/core/rawdb/accessors_sync.go @@ -17,10 +17,10 @@ package rawdb import ( - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" ) // ReadSkeletonSyncStatus retrieves the serialized sync status saved at shutdown. diff --git a/core/rawdb/accessors_trie.go b/core/rawdb/accessors_trie.go index ea3367db36..87324566dc 100644 --- a/core/rawdb/accessors_trie.go +++ b/core/rawdb/accessors_trie.go @@ -20,10 +20,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/ancient_utils.go b/core/rawdb/ancient_utils.go index 428cda544b..7b8e611002 100644 --- a/core/rawdb/ancient_utils.go +++ b/core/rawdb/ancient_utils.go @@ -20,8 +20,8 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" ) type tableSize struct { diff --git a/core/rawdb/chain_freezer.go b/core/rawdb/chain_freezer.go index bb2c409dbb..4f3c008d4d 100644 --- a/core/rawdb/chain_freezer.go +++ b/core/rawdb/chain_freezer.go @@ -22,10 +22,10 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" ) const ( diff --git a/core/rawdb/chain_iterator.go b/core/rawdb/chain_iterator.go index 56bb15b718..86fcf79b74 100644 --- a/core/rawdb/chain_iterator.go +++ b/core/rawdb/chain_iterator.go @@ -21,12 +21,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/prque" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" ) // InitDatabaseFromFreezer reinitializes an empty database from a previous batch diff --git a/core/rawdb/chain_iterator_test.go b/core/rawdb/chain_iterator_test.go index 9580cd92a8..2eca39bf8a 100644 --- a/core/rawdb/chain_iterator_test.go +++ b/core/rawdb/chain_iterator_test.go @@ -23,8 +23,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" ) func TestChainIterator(t *testing.T) { diff --git a/core/rawdb/database.go b/core/rawdb/database.go index 18b5bccb51..d0ca4f9a93 100644 --- a/core/rawdb/database.go +++ b/core/rawdb/database.go @@ -26,13 +26,13 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/leveldb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/ethdb/pebble" - "github.com/ethereum/go-ethereum/log" "github.com/olekukonko/tablewriter" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/ethdb/leveldb" + "github.com/slingshot-finance/op-geth/ethdb/memorydb" + "github.com/slingshot-finance/op-geth/ethdb/pebble" + "github.com/slingshot-finance/op-geth/log" ) // freezerdb is a database wrapper that enables freezer data retrievals. diff --git a/core/rawdb/freezer.go b/core/rawdb/freezer.go index b7824ddc0d..36079ba389 100644 --- a/core/rawdb/freezer.go +++ b/core/rawdb/freezer.go @@ -26,10 +26,10 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" "github.com/gofrs/flock" ) diff --git a/core/rawdb/freezer_batch.go b/core/rawdb/freezer_batch.go index 84a63a4518..9ff4b9f00b 100644 --- a/core/rawdb/freezer_batch.go +++ b/core/rawdb/freezer_batch.go @@ -19,8 +19,8 @@ package rawdb import ( "fmt" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/rlp" "github.com/golang/snappy" ) diff --git a/core/rawdb/freezer_meta.go b/core/rawdb/freezer_meta.go index 9eef9df351..1602ce1bd4 100644 --- a/core/rawdb/freezer_meta.go +++ b/core/rawdb/freezer_meta.go @@ -20,8 +20,8 @@ import ( "io" "os" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" ) const freezerVersion = 1 // The initial version tag of freezer table metadata diff --git a/core/rawdb/freezer_resettable.go b/core/rawdb/freezer_resettable.go index 7a85489738..e37fe0d8c0 100644 --- a/core/rawdb/freezer_resettable.go +++ b/core/rawdb/freezer_resettable.go @@ -21,8 +21,8 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" ) const tmpSuffix = ".tmp" diff --git a/core/rawdb/freezer_resettable_test.go b/core/rawdb/freezer_resettable_test.go index d741bc14e5..b38d29c10c 100644 --- a/core/rawdb/freezer_resettable_test.go +++ b/core/rawdb/freezer_resettable_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/slingshot-finance/op-geth/ethdb" ) func TestResetFreezer(t *testing.T) { diff --git a/core/rawdb/freezer_table.go b/core/rawdb/freezer_table.go index 4b9d510e82..c8943459c0 100644 --- a/core/rawdb/freezer_table.go +++ b/core/rawdb/freezer_table.go @@ -27,9 +27,9 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" "github.com/golang/snappy" ) diff --git a/core/rawdb/freezer_table_test.go b/core/rawdb/freezer_table_test.go index 4471463932..3dcda72e7c 100644 --- a/core/rawdb/freezer_table_test.go +++ b/core/rawdb/freezer_table_test.go @@ -28,7 +28,7 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/metrics" "github.com/stretchr/testify/require" ) diff --git a/core/rawdb/freezer_test.go b/core/rawdb/freezer_test.go index b4bd6a382a..52ec55e29a 100644 --- a/core/rawdb/freezer_test.go +++ b/core/rawdb/freezer_test.go @@ -27,8 +27,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/rlp" "github.com/stretchr/testify/require" ) diff --git a/core/rawdb/key_length_iterator.go b/core/rawdb/key_length_iterator.go index d1c5af269a..3e9d4b8cff 100644 --- a/core/rawdb/key_length_iterator.go +++ b/core/rawdb/key_length_iterator.go @@ -16,7 +16,7 @@ package rawdb -import "github.com/ethereum/go-ethereum/ethdb" +import "github.com/slingshot-finance/op-geth/ethdb" // KeyLengthIterator is a wrapper for a database iterator that ensures only key-value pairs // with a specific key length will be returned. diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go index be03723553..be04e2c11f 100644 --- a/core/rawdb/schema.go +++ b/core/rawdb/schema.go @@ -21,9 +21,9 @@ import ( "bytes" "encoding/binary" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/metrics" ) // The fields below define the low level database schema prefixing. diff --git a/core/rawdb/table.go b/core/rawdb/table.go index 19e4ed5b5c..cc4e40fed4 100644 --- a/core/rawdb/table.go +++ b/core/rawdb/table.go @@ -17,7 +17,7 @@ package rawdb import ( - "github.com/ethereum/go-ethereum/ethdb" + "github.com/slingshot-finance/op-geth/ethdb" ) // table is a wrapper around a database that prefixes each key access with a pre- diff --git a/core/rawdb/table_test.go b/core/rawdb/table_test.go index aa6adf3e72..7b1180b25c 100644 --- a/core/rawdb/table_test.go +++ b/core/rawdb/table_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/slingshot-finance/op-geth/ethdb" ) func TestTableDatabase(t *testing.T) { testTableDatabase(t, "prefix") } diff --git a/core/rlp_test.go b/core/rlp_test.go index a2fb4937f8..5c38b55af1 100644 --- a/core/rlp_test.go +++ b/core/rlp_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/sender_cacher.go b/core/sender_cacher.go index 4be53619eb..1e92614ddd 100644 --- a/core/sender_cacher.go +++ b/core/sender_cacher.go @@ -19,7 +19,7 @@ package core import ( "runtime" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/core/types" ) // SenderCacher is a concurrent transaction sender recoverer and cacher. diff --git a/core/state/access_list.go b/core/state/access_list.go index 4194691345..6fb4b3a7a3 100644 --- a/core/state/access_list.go +++ b/core/state/access_list.go @@ -17,7 +17,7 @@ package state import ( - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) type accessList struct { diff --git a/core/state/database.go b/core/state/database.go index b55f870d90..db30a31f3d 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -21,15 +21,15 @@ import ( "fmt" "github.com/crate-crypto/go-ipa/banderwagon" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/utils" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/trienode" + "github.com/slingshot-finance/op-geth/trie/utils" ) const ( diff --git a/core/state/dump.go b/core/state/dump.go index 55abb50f1c..3b6a98e32c 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -21,12 +21,12 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" ) // DumpConfig is a set of options to control what portions of the state will be diff --git a/core/state/iterator.go b/core/state/iterator.go index dc84ce689b..fb3b377e60 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -21,10 +21,10 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" ) // nodeIterator is an iterator to traverse the entire state trie post-order, diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go index 73cc22490b..3eedf5cb20 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -19,9 +19,9 @@ package state import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/crypto" ) // Tests that the node iterator indeed walks over the entire database contents. diff --git a/core/state/journal.go b/core/state/journal.go index 137ec76395..e3529eacf3 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -19,7 +19,7 @@ package state import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // journalEntry is a modification entry in the state change journal that can be diff --git a/core/state/metrics.go b/core/state/metrics.go index 64c651461e..4fd27a2c19 100644 --- a/core/state/metrics.go +++ b/core/state/metrics.go @@ -16,7 +16,7 @@ package state -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/slingshot-finance/op-geth/metrics" var ( accountUpdatedMeter = metrics.NewRegisteredMeter("state/update/account", nil) diff --git a/core/state/pruner/bloom.go b/core/state/pruner/bloom.go index 9f068eaf2d..c08f0bb6e4 100644 --- a/core/state/pruner/bloom.go +++ b/core/state/pruner/bloom.go @@ -21,9 +21,9 @@ import ( "errors" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/log" bloomfilter "github.com/holiman/bloomfilter/v2" ) diff --git a/core/state/pruner/pruner.go b/core/state/pruner/pruner.go index a0f95078d0..be6271604f 100644 --- a/core/state/pruner/pruner.go +++ b/core/state/pruner/pruner.go @@ -27,14 +27,14 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" ) const ( diff --git a/core/state/snapshot/context.go b/core/state/snapshot/context.go index 67d7e41a03..e68fbfb5e4 100644 --- a/core/state/snapshot/context.go +++ b/core/state/snapshot/context.go @@ -22,12 +22,12 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/ethdb/memorydb" + "github.com/slingshot-finance/op-geth/log" ) const ( diff --git a/core/state/snapshot/conversion.go b/core/state/snapshot/conversion.go index 681be7ebc0..42ff4cc283 100644 --- a/core/state/snapshot/conversion.go +++ b/core/state/snapshot/conversion.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "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/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" ) // trieKV represents a trie key-value pair diff --git a/core/state/snapshot/difflayer.go b/core/state/snapshot/difflayer.go index b6aca599c5..0be1281094 100644 --- a/core/state/snapshot/difflayer.go +++ b/core/state/snapshot/difflayer.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rlp" bloomfilter "github.com/holiman/bloomfilter/v2" "golang.org/x/exp/slices" ) diff --git a/core/state/snapshot/difflayer_test.go b/core/state/snapshot/difflayer_test.go index 674a031b16..66eea88686 100644 --- a/core/state/snapshot/difflayer_test.go +++ b/core/state/snapshot/difflayer_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb/memorydb" ) func copyDestructs(destructs map[common.Hash]struct{}) map[common.Hash]struct{} { diff --git a/core/state/snapshot/disklayer.go b/core/state/snapshot/disklayer.go index d563b67ca4..be3f9455db 100644 --- a/core/state/snapshot/disklayer.go +++ b/core/state/snapshot/disklayer.go @@ -21,12 +21,12 @@ import ( "sync" "github.com/VictoriaMetrics/fastcache" - "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/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" ) // diskLayer is a low level persistent snapshot built on top of a key-value store. diff --git a/core/state/snapshot/disklayer_test.go b/core/state/snapshot/disklayer_test.go index f95b798515..3cd8427f45 100644 --- a/core/state/snapshot/disklayer_test.go +++ b/core/state/snapshot/disklayer_test.go @@ -21,10 +21,10 @@ import ( "testing" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/ethdb/memorydb" + "github.com/slingshot-finance/op-geth/rlp" ) // reverse reverses the contents of a byte slice. It's used to update random accs diff --git a/core/state/snapshot/generate.go b/core/state/snapshot/generate.go index f455a6db3f..4b04c227f6 100644 --- a/core/state/snapshot/generate.go +++ b/core/state/snapshot/generate.go @@ -23,15 +23,15 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "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/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/trienode" ) var ( diff --git a/core/state/snapshot/generate_test.go b/core/state/snapshot/generate_test.go index c25f3e7e8b..d722deec34 100644 --- a/core/state/snapshot/generate_test.go +++ b/core/state/snapshot/generate_test.go @@ -23,16 +23,16 @@ import ( "testing" "time" - "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/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/triedb/hashdb" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/trie/trienode" "golang.org/x/crypto/sha3" ) diff --git a/core/state/snapshot/holdable_iterator.go b/core/state/snapshot/holdable_iterator.go index 1e86ff9d82..43622c2440 100644 --- a/core/state/snapshot/holdable_iterator.go +++ b/core/state/snapshot/holdable_iterator.go @@ -17,8 +17,8 @@ package snapshot import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" ) // holdableIterator is a wrapper of underlying database iterator. It extends diff --git a/core/state/snapshot/holdable_iterator_test.go b/core/state/snapshot/holdable_iterator_test.go index ce4cf6bb8a..cf547fbdaa 100644 --- a/core/state/snapshot/holdable_iterator_test.go +++ b/core/state/snapshot/holdable_iterator_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" ) func TestIteratorHold(t *testing.T) { diff --git a/core/state/snapshot/iterator.go b/core/state/snapshot/iterator.go index c1a196c7ff..4b8409d9cc 100644 --- a/core/state/snapshot/iterator.go +++ b/core/state/snapshot/iterator.go @@ -21,9 +21,9 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/ethdb" ) // Iterator is an iterator to step over all the accounts or the specific diff --git a/core/state/snapshot/iterator_binary.go b/core/state/snapshot/iterator_binary.go index 22184b2545..57f6c12d01 100644 --- a/core/state/snapshot/iterator_binary.go +++ b/core/state/snapshot/iterator_binary.go @@ -19,7 +19,7 @@ package snapshot import ( "bytes" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // binaryIterator is a simplistic iterator to step over the accounts or storage diff --git a/core/state/snapshot/iterator_fast.go b/core/state/snapshot/iterator_fast.go index 0502d9cf85..262f01457f 100644 --- a/core/state/snapshot/iterator_fast.go +++ b/core/state/snapshot/iterator_fast.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" "golang.org/x/exp/slices" ) diff --git a/core/state/snapshot/iterator_test.go b/core/state/snapshot/iterator_test.go index 54614427a5..89a113acc1 100644 --- a/core/state/snapshot/iterator_test.go +++ b/core/state/snapshot/iterator_test.go @@ -25,8 +25,8 @@ import ( "testing" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" ) // TestAccountIteratorBasics tests some simple single-layer(diff and disk) iteration diff --git a/core/state/snapshot/journal.go b/core/state/snapshot/journal.go index 4d070208f5..68cb3a68ad 100644 --- a/core/state/snapshot/journal.go +++ b/core/state/snapshot/journal.go @@ -25,12 +25,12 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" ) const journalVersion uint64 = 0 diff --git a/core/state/snapshot/metrics.go b/core/state/snapshot/metrics.go index b2e884588b..e7aa06849d 100644 --- a/core/state/snapshot/metrics.go +++ b/core/state/snapshot/metrics.go @@ -16,7 +16,7 @@ package snapshot -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/slingshot-finance/op-geth/metrics" // Metrics in generation var ( diff --git a/core/state/snapshot/snapshot.go b/core/state/snapshot/snapshot.go index 6389842382..5bfe90806c 100644 --- a/core/state/snapshot/snapshot.go +++ b/core/state/snapshot/snapshot.go @@ -23,14 +23,14 @@ import ( "fmt" "sync" - "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/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" ) var ( diff --git a/core/state/snapshot/snapshot_test.go b/core/state/snapshot/snapshot_test.go index b66799757e..83a8f8e76c 100644 --- a/core/state/snapshot/snapshot_test.go +++ b/core/state/snapshot/snapshot_test.go @@ -26,10 +26,10 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "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/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rlp" ) // randomHash generates a random blob of data and returns it as a hash. @@ -185,7 +185,7 @@ func TestDiskLayerExternalInvalidationPartialFlatten(t *testing.T) { // layer to check the usual mode of operation where the accumulator is retained. func TestDiffLayerExternalInvalidationPartialFlatten(t *testing.T) { // Un-commenting this triggers the bloom set to be deterministic. The values below - // were used to trigger the flaw described in https://github.com/ethereum/go-ethereum/issues/27254. + // were used to trigger the flaw described in https://github.com/slingshot-finance/op-geth/issues/27254. // bloomDestructHasherOffset, bloomAccountHasherOffset, bloomStorageHasherOffset = 14, 24, 5 // Create an empty base layer and a snapshot tree out of it diff --git a/core/state/snapshot/utils.go b/core/state/snapshot/utils.go index 62f073d2e1..7fd183b66f 100644 --- a/core/state/snapshot/utils.go +++ b/core/state/snapshot/utils.go @@ -21,11 +21,11 @@ import ( "fmt" "time" - "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/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" ) // CheckDanglingStorage iterates the snap storage data, and verifies that all diff --git a/core/state/state_object.go b/core/state/state_object.go index 9383b98e44..01979336f5 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -23,12 +23,12 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie/trienode" ) type Code []byte diff --git a/core/state/state_object_test.go b/core/state/state_object_test.go index 42fd778025..e600dc242d 100644 --- a/core/state/state_object_test.go +++ b/core/state/state_object_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) func BenchmarkCutOriginal(b *testing.B) { diff --git a/core/state/state_test.go b/core/state/state_test.go index 2f45ba44b4..b348ee328e 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -22,12 +22,12 @@ import ( "math/big" "testing" - "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" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/trie" ) type stateEnv struct { diff --git a/core/state/statedb.go b/core/state/statedb.go index cd61b07297..d67c7461d8 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -23,17 +23,17 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/trienode" + "github.com/slingshot-finance/op-geth/trie/triestate" ) const ( @@ -714,7 +714,7 @@ func (s *StateDB) Copy() *StateDB { } // Copy the dirty states, logs, and preimages for addr := range s.journal.dirties { - // As documented [here](https://github.com/ethereum/go-ethereum/pull/16485#issuecomment-380438527), + // As documented [here](https://github.com/slingshot-finance/op-geth/pull/16485#issuecomment-380438527), // and in the Finalise-method, there is a case where an object is in the journal but not // in the stateObjects: OOG after touch on ripeMD prior to Byzantium. Thus, we need to check for // nil diff --git a/core/state/statedb_fuzz_test.go b/core/state/statedb_fuzz_test.go index c4704257c7..a1f0961ae6 100644 --- a/core/state/statedb_fuzz_test.go +++ b/core/state/statedb_fuzz_test.go @@ -29,15 +29,15 @@ import ( "testing" "testing/quick" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/trie/triestate" ) // A stateTest checks that the state changes are correctly captured. Instances diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index df1cd5547d..8f4399922d 100644 --- a/core/state/statedb_test.go +++ b/core/state/statedb_test.go @@ -30,16 +30,16 @@ import ( "testing" "testing/quick" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/triedb/hashdb" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/trie/trienode" "github.com/holiman/uint256" ) @@ -160,7 +160,7 @@ func TestIntermediateLeaks(t *testing.T) { // TestCopy tests that copying a StateDB object indeed makes the original and // the copy independent of each other. This test is a regression test against -// https://github.com/ethereum/go-ethereum/pull/15549. +// https://github.com/slingshot-finance/op-geth/pull/15549. func TestCopy(t *testing.T) { // Create a random state test to copy and modify "independently" orig, _ := New(types.EmptyRootHash, NewDatabase(rawdb.NewMemoryDatabase()), nil) @@ -548,7 +548,7 @@ func TestTouchDelete(t *testing.T) { } // TestCopyOfCopy tests that modified objects are carried over to the copy, and the copy of the copy. -// See https://github.com/ethereum/go-ethereum/pull/15225#issuecomment-380191512 +// See https://github.com/slingshot-finance/op-geth/pull/15225#issuecomment-380191512 func TestCopyOfCopy(t *testing.T) { state, _ := New(types.EmptyRootHash, NewDatabase(rawdb.NewMemoryDatabase()), nil) addr := common.HexToAddress("aaaa") @@ -565,7 +565,7 @@ func TestCopyOfCopy(t *testing.T) { // Tests a regression where committing a copy lost some internal meta information, // leading to corrupted subsequent copies. // -// See https://github.com/ethereum/go-ethereum/issues/20106. +// See https://github.com/slingshot-finance/op-geth/issues/20106. func TestCopyCommitCopy(t *testing.T) { tdb := NewDatabase(rawdb.NewMemoryDatabase()) state, _ := New(types.EmptyRootHash, tdb, nil) @@ -639,7 +639,7 @@ func TestCopyCommitCopy(t *testing.T) { // Tests a regression where committing a copy lost some internal meta information, // leading to corrupted subsequent copies. // -// See https://github.com/ethereum/go-ethereum/issues/20106. +// See https://github.com/slingshot-finance/op-geth/issues/20106. func TestCopyCopyCommitCopy(t *testing.T) { state, _ := New(types.EmptyRootHash, NewDatabase(rawdb.NewMemoryDatabase()), nil) diff --git a/core/state/sync.go b/core/state/sync.go index d6775e8896..f7ec392f6c 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -17,11 +17,11 @@ package state import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 6196e77817..c563f23f80 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -21,15 +21,15 @@ import ( "math/big" "testing" - "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" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/triedb/hashdb" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" ) // testAccount is the data associated with an account used by the state tests. diff --git a/core/state/transient_storage.go b/core/state/transient_storage.go index 66e563efa7..6f7ef45e07 100644 --- a/core/state/transient_storage.go +++ b/core/state/transient_storage.go @@ -17,7 +17,7 @@ package state import ( - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // transientStorage is a representation of EIP-1153 "Transient Storage". diff --git a/core/state/trie_prefetcher.go b/core/state/trie_prefetcher.go index c2a49417d4..403217f774 100644 --- a/core/state/trie_prefetcher.go +++ b/core/state/trie_prefetcher.go @@ -19,9 +19,9 @@ package state import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" ) var ( diff --git a/core/state/trie_prefetcher_test.go b/core/state/trie_prefetcher_test.go index b190567e92..04e03690a4 100644 --- a/core/state/trie_prefetcher_test.go +++ b/core/state/trie_prefetcher_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" ) func filledStateDB() *StateDB { diff --git a/core/state_prefetcher.go b/core/state_prefetcher.go index bb6835202b..6c8ea24d6a 100644 --- a/core/state_prefetcher.go +++ b/core/state_prefetcher.go @@ -19,11 +19,11 @@ package core import ( "sync/atomic" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/params" ) // statePrefetcher is a basic Prefetcher, which blindly executes a block on top diff --git a/core/state_processor.go b/core/state_processor.go index 9b22e947a4..8786345bee 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -21,14 +21,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/misc" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_processor_test.go b/core/state_processor_test.go index 5bfb5947a7..0f5bf91afc 100644 --- a/core/state_processor_test.go +++ b/core/state_processor_test.go @@ -21,19 +21,19 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/consensus/misc/eip4844" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" "github.com/holiman/uint256" "golang.org/x/crypto/sha3" ) diff --git a/core/state_transition.go b/core/state_transition.go index 51c4b36cca..c033d7865e 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -22,11 +22,11 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/common" - cmath "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + cmath "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/params" ) // ExecutionResult includes all output after executing given evm diff --git a/core/superchain.go b/core/superchain.go index 96f68cedcf..49859336b9 100644 --- a/core/superchain.go +++ b/core/superchain.go @@ -6,8 +6,8 @@ import ( "github.com/ethereum-optimism/superchain-registry/superchain" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/params" ) func LoadOPStackGenesis(chainID uint64) (*Genesis, error) { diff --git a/core/superchain_test.go b/core/superchain_test.go index 9959374bdd..cb69fdec39 100644 --- a/core/superchain_test.go +++ b/core/superchain_test.go @@ -5,8 +5,8 @@ import ( "github.com/ethereum-optimism/superchain-registry/superchain" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/trie" ) func TestOPStackGenesis(t *testing.T) { diff --git a/core/txpool/blobpool/blobpool.go b/core/txpool/blobpool/blobpool.go index 37a66f738b..ba67ecf934 100644 --- a/core/txpool/blobpool/blobpool.go +++ b/core/txpool/blobpool/blobpool.go @@ -29,18 +29,18 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/consensus/misc/eip4844" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" "github.com/holiman/billy" "github.com/holiman/uint256" ) diff --git a/core/txpool/blobpool/blobpool_test.go b/core/txpool/blobpool/blobpool_test.go index b877be5614..507b7c9f65 100644 --- a/core/txpool/blobpool/blobpool_test.go +++ b/core/txpool/blobpool/blobpool_test.go @@ -29,20 +29,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/consensus/misc/eip4844" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/crypto/kzg4844" + "github.com/slingshot-finance/op-geth/ethdb/memorydb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" "github.com/holiman/billy" "github.com/holiman/uint256" ) diff --git a/core/txpool/blobpool/config.go b/core/txpool/blobpool/config.go index 99a2002a30..969b6f27d9 100644 --- a/core/txpool/blobpool/config.go +++ b/core/txpool/blobpool/config.go @@ -17,7 +17,7 @@ package blobpool import ( - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) // Config are the configuration parameters of the blob transaction pool. diff --git a/core/txpool/blobpool/evictheap.go b/core/txpool/blobpool/evictheap.go index df594099f7..9706300e4c 100644 --- a/core/txpool/blobpool/evictheap.go +++ b/core/txpool/blobpool/evictheap.go @@ -22,7 +22,7 @@ import ( "math" "sort" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" "github.com/holiman/uint256" ) diff --git a/core/txpool/blobpool/evictheap_test.go b/core/txpool/blobpool/evictheap_test.go index 01b136551c..15e74f06c9 100644 --- a/core/txpool/blobpool/evictheap_test.go +++ b/core/txpool/blobpool/evictheap_test.go @@ -21,8 +21,8 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/params" "github.com/holiman/uint256" ) diff --git a/core/txpool/blobpool/interface.go b/core/txpool/blobpool/interface.go index 6f296a54bd..ccf33fe1e2 100644 --- a/core/txpool/blobpool/interface.go +++ b/core/txpool/blobpool/interface.go @@ -17,10 +17,10 @@ package blobpool import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" ) // BlockChain defines the minimal set of methods needed to back a blob pool with diff --git a/core/txpool/blobpool/limbo.go b/core/txpool/blobpool/limbo.go index d1fe9c7394..822b37adc0 100644 --- a/core/txpool/blobpool/limbo.go +++ b/core/txpool/blobpool/limbo.go @@ -19,10 +19,10 @@ package blobpool import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" "github.com/holiman/billy" ) diff --git a/core/txpool/blobpool/metrics.go b/core/txpool/blobpool/metrics.go index 587804cc61..60c313dc72 100644 --- a/core/txpool/blobpool/metrics.go +++ b/core/txpool/blobpool/metrics.go @@ -16,7 +16,7 @@ package blobpool -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/slingshot-finance/op-geth/metrics" var ( // datacapGauge tracks the user's configured capacity for the blob pool. It diff --git a/core/txpool/legacypool/journal.go b/core/txpool/legacypool/journal.go index f04ab8fc14..ef8cce654a 100644 --- a/core/txpool/legacypool/journal.go +++ b/core/txpool/legacypool/journal.go @@ -22,10 +22,10 @@ import ( "io/fs" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" ) // errNoActiveJournal is returned if a transaction is attempted to be inserted diff --git a/core/txpool/legacypool/legacypool.go b/core/txpool/legacypool/legacypool.go index caa015aa5b..9b077714f8 100644 --- a/core/txpool/legacypool/legacypool.go +++ b/core/txpool/legacypool/legacypool.go @@ -26,17 +26,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/prque" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/params" ) const ( diff --git a/core/txpool/legacypool/legacypool2_test.go b/core/txpool/legacypool/legacypool2_test.go index a73c1bb8a7..7e073b267b 100644 --- a/core/txpool/legacypool/legacypool2_test.go +++ b/core/txpool/legacypool/legacypool2_test.go @@ -20,12 +20,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/event" ) func pricedValuedTransaction(nonce uint64, value int64, gaslimit uint64, gasprice *big.Int, key *ecdsa.PrivateKey) *types.Transaction { diff --git a/core/txpool/legacypool/legacypool_test.go b/core/txpool/legacypool/legacypool_test.go index fb2a77d559..0218d08153 100644 --- a/core/txpool/legacypool/legacypool_test.go +++ b/core/txpool/legacypool/legacypool_test.go @@ -29,16 +29,16 @@ import ( "testing" "time" - "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/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" ) var ( diff --git a/core/txpool/legacypool/list.go b/core/txpool/legacypool/list.go index 28333a2c05..087cb613e7 100644 --- a/core/txpool/legacypool/list.go +++ b/core/txpool/legacypool/list.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" ) // nonceHeap is a heap.Interface implementation over 64bit unsigned integers for diff --git a/core/txpool/legacypool/list_test.go b/core/txpool/legacypool/list_test.go index b1f6ec305d..1ee5bea0ba 100644 --- a/core/txpool/legacypool/list_test.go +++ b/core/txpool/legacypool/list_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" ) // Tests that transactions can be added to strict lists and list contents and diff --git a/core/txpool/legacypool/noncer.go b/core/txpool/legacypool/noncer.go index 2c65dd2cae..2fec600390 100644 --- a/core/txpool/legacypool/noncer.go +++ b/core/txpool/legacypool/noncer.go @@ -19,8 +19,8 @@ package legacypool import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/state" ) // noncer is a tiny virtual state database to manage the executable nonces of diff --git a/core/txpool/subpool.go b/core/txpool/subpool.go index de05b38d43..a87a8730db 100644 --- a/core/txpool/subpool.go +++ b/core/txpool/subpool.go @@ -20,10 +20,10 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/event" ) // LazyTransaction contains a small subset of the transaction properties that is diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go index d5d496c589..5be0c0f02a 100644 --- a/core/txpool/txpool.go +++ b/core/txpool/txpool.go @@ -22,12 +22,12 @@ import ( "math/big" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" ) type L1CostFunc func(dataGas types.RollupCostData) *big.Int diff --git a/core/txpool/validation.go b/core/txpool/validation.go index b087e34ee0..a99aa200a0 100644 --- a/core/txpool/validation.go +++ b/core/txpool/validation.go @@ -21,13 +21,13 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto/kzg4844" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" ) // L1 Info Gas Overhead is the amount of gas the the L1 info deposit consumes. diff --git a/core/types.go b/core/types.go index 36eb0d1ded..69edac41c3 100644 --- a/core/types.go +++ b/core/types.go @@ -19,9 +19,9 @@ package core import ( "sync/atomic" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" ) // Validator is an interface which defines the standard for block validation. It diff --git a/core/types/block.go b/core/types/block.go index 1a357baa3a..ff3a6230e1 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -26,9 +26,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/rlp" ) // A BlockNonce is a 64-bit hash which proves (combined with the diff --git a/core/types/block_test.go b/core/types/block_test.go index cf0b1dd85c..42a0820035 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -22,12 +22,12 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/blocktest" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/internal/blocktest" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index a560a20724..7675c49ea5 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -21,8 +21,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index d3178d112e..9d713db9d9 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -21,8 +21,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" ) func TestBloom(t *testing.T) { diff --git a/core/types/deposit_tx.go b/core/types/deposit_tx.go index 4131ee7af0..6e614af71f 100644 --- a/core/types/deposit_tx.go +++ b/core/types/deposit_tx.go @@ -20,8 +20,8 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/rlp" ) const DepositTxType = 0x7E diff --git a/core/types/gen_access_tuple.go b/core/types/gen_access_tuple.go index d740b70981..ca746002c0 100644 --- a/core/types/gen_access_tuple.go +++ b/core/types/gen_access_tuple.go @@ -6,7 +6,7 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // MarshalJSON marshals as JSON. diff --git a/core/types/gen_account_rlp.go b/core/types/gen_account_rlp.go index 3fb36f4038..5f164831af 100644 --- a/core/types/gen_account_rlp.go +++ b/core/types/gen_account_rlp.go @@ -2,7 +2,7 @@ package types -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/slingshot-finance/op-geth/rlp" import "io" func (obj *StateAccount) EncodeRLP(_w io.Writer) error { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index fb1f915d01..806e96ec39 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_header_rlp.go b/core/types/gen_header_rlp.go index ed6a1a002c..d2613a243f 100644 --- a/core/types/gen_header_rlp.go +++ b/core/types/gen_header_rlp.go @@ -2,7 +2,7 @@ package types -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/slingshot-finance/op-geth/rlp" import "io" func (obj *Header) EncodeRLP(_w io.Writer) error { diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 3ffa9c2feb..e8d2a21a87 100644 --- a/core/types/gen_log_json.go +++ b/core/types/gen_log_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_log_rlp.go b/core/types/gen_log_rlp.go index 7e89629668..8172ecce51 100644 --- a/core/types/gen_log_rlp.go +++ b/core/types/gen_log_rlp.go @@ -2,7 +2,7 @@ package types -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/slingshot-finance/op-geth/rlp" import "io" func (obj *Log) EncodeRLP(_w io.Writer) error { diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 14a074b2ba..f0a3755716 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_withdrawal_json.go b/core/types/gen_withdrawal_json.go index 983a7f7a12..fcf4c098c6 100644 --- a/core/types/gen_withdrawal_json.go +++ b/core/types/gen_withdrawal_json.go @@ -5,8 +5,8 @@ package types import ( "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) var _ = (*withdrawalMarshaling)(nil) diff --git a/core/types/gen_withdrawal_rlp.go b/core/types/gen_withdrawal_rlp.go index 6a97c04c81..4594735a63 100644 --- a/core/types/gen_withdrawal_rlp.go +++ b/core/types/gen_withdrawal_rlp.go @@ -2,7 +2,7 @@ package types -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/slingshot-finance/op-geth/rlp" import "io" func (obj *Withdrawal) EncodeRLP(_w io.Writer) error { diff --git a/core/types/hashes.go b/core/types/hashes.go index 43e9130fd1..bad3f32577 100644 --- a/core/types/hashes.go +++ b/core/types/hashes.go @@ -17,9 +17,9 @@ package types import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" ) var ( diff --git a/core/types/hashing.go b/core/types/hashing.go index 224d7a87ea..bae0541414 100644 --- a/core/types/hashing.go +++ b/core/types/hashing.go @@ -22,9 +22,9 @@ import ( "math" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/types/hashing_test.go b/core/types/hashing_test.go index d2a98ed7bf..5a33cccc8a 100644 --- a/core/types/hashing_test.go +++ b/core/types/hashing_test.go @@ -24,13 +24,13 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" ) func TestDeriveSha(t *testing.T) { diff --git a/core/types/log.go b/core/types/log.go index 54c7ff6372..3093bc0744 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -17,8 +17,8 @@ package types import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) //go:generate go run ../../rlp/rlpgen -type Log -out gen_log_rlp.go diff --git a/core/types/log_test.go b/core/types/log_test.go index 02eef3ecd4..f7416b5350 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index 1b7d03459a..928290f634 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -24,11 +24,11 @@ import ( "math/big" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" ) //go:generate go run github.com/fjl/gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go diff --git a/core/types/receipt_test.go b/core/types/receipt_test.go index 8eaae91057..3a97d12e2c 100644 --- a/core/types/receipt_test.go +++ b/core/types/receipt_test.go @@ -25,9 +25,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" "github.com/holiman/uint256" "github.com/kylelemons/godebug/diff" "github.com/stretchr/testify/require" diff --git a/core/types/rlp_fuzzer_test.go b/core/types/rlp_fuzzer_test.go index a3b9f72436..2b6d8ad0cb 100644 --- a/core/types/rlp_fuzzer_test.go +++ b/core/types/rlp_fuzzer_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/rlp" "github.com/holiman/uint256" ) diff --git a/core/types/rollup_cost.go b/core/types/rollup_cost.go index c40b24db94..a05bcafed9 100644 --- a/core/types/rollup_cost.go +++ b/core/types/rollup_cost.go @@ -21,9 +21,9 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" ) const ( diff --git a/core/types/rollup_cost_test.go b/core/types/rollup_cost_test.go index d893f4517b..47354a7792 100644 --- a/core/types/rollup_cost_test.go +++ b/core/types/rollup_cost_test.go @@ -5,8 +5,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/params" "github.com/stretchr/testify/require" ) diff --git a/core/types/state_account.go b/core/types/state_account.go index ad07ca3f3a..a024289249 100644 --- a/core/types/state_account.go +++ b/core/types/state_account.go @@ -20,8 +20,8 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/rlp" ) //go:generate go run ../../rlp/rlpgen -type StateAccount -out gen_account_rlp.go diff --git a/core/types/transaction.go b/core/types/transaction.go index be096c56d2..b797aaba2d 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -25,11 +25,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" ) var ( diff --git a/core/types/transaction_marshalling.go b/core/types/transaction_marshalling.go index fcb8bc21bc..cb2d714b0c 100644 --- a/core/types/transaction_marshalling.go +++ b/core/types/transaction_marshalling.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/rlp" "github.com/holiman/uint256" ) diff --git a/core/types/transaction_marshalling_test.go b/core/types/transaction_marshalling_test.go index 4ab93a539d..1b065e8950 100644 --- a/core/types/transaction_marshalling_test.go +++ b/core/types/transaction_marshalling_test.go @@ -5,7 +5,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" "github.com/stretchr/testify/require" ) diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index 0ffe8c92d7..e3a7ab4b2b 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -22,9 +22,9 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" ) var ErrInvalidChainId = errors.New("invalid chain id for signer") diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 2a9ceb0952..98ac7a40d3 100644 --- a/core/types/transaction_signing_test.go +++ b/core/types/transaction_signing_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index 76a010d2e5..8b53226aec 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -26,9 +26,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/types/tx_access_list.go b/core/types/tx_access_list.go index 59880b0eab..9f2bef7f28 100644 --- a/core/types/tx_access_list.go +++ b/core/types/tx_access_list.go @@ -20,8 +20,8 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/rlp" ) //go:generate go run github.com/fjl/gencodec -type AccessTuple -out gen_access_tuple.go diff --git a/core/types/tx_blob.go b/core/types/tx_blob.go index 2f135a490e..2c84dbaee7 100644 --- a/core/types/tx_blob.go +++ b/core/types/tx_blob.go @@ -21,10 +21,10 @@ import ( "crypto/sha256" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto/kzg4844" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" "github.com/holiman/uint256" ) diff --git a/core/types/tx_blob_test.go b/core/types/tx_blob_test.go index 44ac48cc6f..060f4fa22b 100644 --- a/core/types/tx_blob_test.go +++ b/core/types/tx_blob_test.go @@ -4,9 +4,9 @@ import ( "crypto/ecdsa" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/kzg4844" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/crypto/kzg4844" "github.com/holiman/uint256" ) diff --git a/core/types/tx_dynamic_fee.go b/core/types/tx_dynamic_fee.go index 9c52cde577..e2ed6419ea 100644 --- a/core/types/tx_dynamic_fee.go +++ b/core/types/tx_dynamic_fee.go @@ -20,8 +20,8 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/rlp" ) // DynamicFeeTx represents an EIP-1559 transaction. diff --git a/core/types/tx_legacy.go b/core/types/tx_legacy.go index bcb65c3934..9f29de209f 100644 --- a/core/types/tx_legacy.go +++ b/core/types/tx_legacy.go @@ -20,7 +20,7 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // LegacyTx is the transaction data of the original Ethereum transactions. diff --git a/core/types/types_test.go b/core/types/types_test.go index 1fb386d5de..f4204267f2 100644 --- a/core/types/types_test.go +++ b/core/types/types_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" ) type devnull struct{ len int } diff --git a/core/types/withdrawal.go b/core/types/withdrawal.go index d1ad918f98..26f5c410d4 100644 --- a/core/types/withdrawal.go +++ b/core/types/withdrawal.go @@ -19,9 +19,9 @@ package types import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/rlp" ) //go:generate go run github.com/fjl/gencodec -type Withdrawal -field-override withdrawalMarshaling -out gen_withdrawal_json.go diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go index 398861f8ae..c2d530ebb1 100644 --- a/core/vm/analysis_test.go +++ b/core/vm/analysis_test.go @@ -20,7 +20,7 @@ import ( "math/bits" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/crypto" ) func TestJumpDestAnalysis(t *testing.T) { diff --git a/core/vm/common.go b/core/vm/common.go index 90ba4a4ad1..2fe3904d4b 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -17,8 +17,8 @@ package vm import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" "github.com/holiman/uint256" ) diff --git a/core/vm/contract.go b/core/vm/contract.go index e4b03bd74f..e9d8f189ec 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" "github.com/holiman/uint256" ) diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 574bb9bef6..8d27c5bf23 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -23,14 +23,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/blake2b" - "github.com/ethereum/go-ethereum/crypto/bls12381" - "github.com/ethereum/go-ethereum/crypto/bn256" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/crypto/blake2b" + "github.com/slingshot-finance/op-geth/crypto/bls12381" + "github.com/slingshot-finance/op-geth/crypto/bn256" + "github.com/slingshot-finance/op-geth/crypto/kzg4844" + "github.com/slingshot-finance/op-geth/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_fuzz_test.go b/core/vm/contracts_fuzz_test.go index 87c1fff7cc..ae907efbbf 100644 --- a/core/vm/contracts_fuzz_test.go +++ b/core/vm/contracts_fuzz_test.go @@ -19,7 +19,7 @@ package vm import ( "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) func FuzzPrecompiledContracts(f *testing.F) { diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index f40e2c8f9e..e809683f7f 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/eips.go b/core/vm/eips.go index 35f0a3f7c2..a16effd2a6 100644 --- a/core/vm/eips.go +++ b/core/vm/eips.go @@ -20,8 +20,8 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/params" "github.com/holiman/uint256" ) diff --git a/core/vm/evm.go b/core/vm/evm.go index b02988c122..e9a5078633 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -22,10 +22,10 @@ import ( "github.com/holiman/uint256" - "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/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" ) type ( diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 4b141d8f9a..052e7c5326 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -19,9 +19,9 @@ package vm import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/params" ) // memoryGasCost calculates the quadratic gas for memory expansion. It does so diff --git a/core/vm/gas_table_test.go b/core/vm/gas_table_test.go index c1f7fd70c8..0f0f571450 100644 --- a/core/vm/gas_table_test.go +++ b/core/vm/gas_table_test.go @@ -23,12 +23,12 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" ) func TestMemoryGasCost(t *testing.T) { diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 56ff350201..8cd2c014e2 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -17,10 +17,10 @@ package vm import ( - "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/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" "github.com/holiman/uint256" ) diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 807073336d..b2804aeb19 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -25,13 +25,13 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" "github.com/holiman/uint256" ) diff --git a/core/vm/interface.go b/core/vm/interface.go index 26814d3d2f..083af39b0d 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,9 +19,9 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 002701d648..3ffaa164f6 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -17,11 +17,11 @@ package vm import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" ) // PrecompileOverrides is a function that can be used to override the default precompiled contracts diff --git a/core/vm/interpreter_test.go b/core/vm/interpreter_test.go index 96e681fccd..c7550f2d27 100644 --- a/core/vm/interpreter_test.go +++ b/core/vm/interpreter_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" ) var loopInterruptTests = []string{ diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index fb87258326..0d605c0c59 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -19,7 +19,7 @@ package vm import ( "fmt" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/params" ) type ( diff --git a/core/vm/jump_table_export.go b/core/vm/jump_table_export.go index b74109da0a..2131a28266 100644 --- a/core/vm/jump_table_export.go +++ b/core/vm/jump_table_export.go @@ -19,7 +19,7 @@ package vm import ( "errors" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/params" ) // LookupInstructionSet returns the instruction set for the fork configured by diff --git a/core/vm/logger.go b/core/vm/logger.go index 2667908a84..4744f0e368 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // EVMLogger is used to collect execution traces from an EVM transaction diff --git a/core/vm/memory_test.go b/core/vm/memory_test.go index ba36f8023c..d49f8440f1 100644 --- a/core/vm/memory_test.go +++ b/core/vm/memory_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) func TestMemoryCopy(t *testing.T) { diff --git a/core/vm/operations_acl.go b/core/vm/operations_acl.go index 04c6409ebd..d1b7e7c51f 100644 --- a/core/vm/operations_acl.go +++ b/core/vm/operations_acl.go @@ -19,9 +19,9 @@ package vm import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/params" ) func makeGasSStoreFunc(clearingRefund uint64) gasFunc { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index 34335b8e9e..7b958552aa 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -17,8 +17,8 @@ package runtime import ( - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index d10457e7fa..c7c858d0d5 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -20,13 +20,13 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" ) // Config is a basic type specifying certain configuration flags for running diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go index b7d0ddc384..c96928fa98 100644 --- a/core/vm/runtime/runtime_example_test.go +++ b/core/vm/runtime/runtime_example_test.go @@ -19,8 +19,8 @@ package runtime_test import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm/runtime" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index e71760bb23..0de63d5097 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -23,21 +23,21 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/asm" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/asm" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/eth/tracers/logger" + "github.com/slingshot-finance/op-geth/params" // force-load js tracers to trigger registration - _ "github.com/ethereum/go-ethereum/eth/tracers/js" + _ "github.com/slingshot-finance/op-geth/eth/tracers/js" ) func TestDefaults(t *testing.T) { @@ -599,7 +599,7 @@ func TestEip2929Cases(t *testing.T) { // TestColdAccountAccessCost test that the cold account access cost is reported // correctly -// see: https://github.com/ethereum/go-ethereum/issues/22649 +// see: https://github.com/slingshot-finance/op-geth/issues/22649 func TestColdAccountAccessCost(t *testing.T) { for i, tc := range []struct { code []byte diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index 10c12901af..24f234755c 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -17,7 +17,7 @@ package vm import ( - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/params" ) func minSwapStack(n int) int { diff --git a/crypto/bls12381/g1_test.go b/crypto/bls12381/g1_test.go index 87140459fb..c46a6fffdf 100644 --- a/crypto/bls12381/g1_test.go +++ b/crypto/bls12381/g1_test.go @@ -6,7 +6,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) func (g *G1) one() *PointG1 { diff --git a/crypto/bls12381/g2_test.go b/crypto/bls12381/g2_test.go index 4d1f3a19ac..1ecd6548ae 100644 --- a/crypto/bls12381/g2_test.go +++ b/crypto/bls12381/g2_test.go @@ -6,7 +6,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) func (g *G2) one() *PointG2 { diff --git a/crypto/bls12381/pairing_test.go b/crypto/bls12381/pairing_test.go index 77676fe9b1..6265428f7f 100644 --- a/crypto/bls12381/pairing_test.go +++ b/crypto/bls12381/pairing_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) func TestPairingExpected(t *testing.T) { diff --git a/crypto/bls12381/utils.go b/crypto/bls12381/utils.go index de8bf495fe..26272868b5 100644 --- a/crypto/bls12381/utils.go +++ b/crypto/bls12381/utils.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) func bigFromHex(hex string) *big.Int { diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go index e3c9b60518..13fb44ed7c 100644 --- a/crypto/bn256/bn256_fast.go +++ b/crypto/bn256/bn256_fast.go @@ -9,7 +9,7 @@ package bn256 import ( - bn256cf "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" + bn256cf "github.com/slingshot-finance/op-geth/crypto/bn256/cloudflare" ) // G1 is an abstract cyclic group. The zero value is suitable for use as the diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go index 4c0c351e2d..e792a9658f 100644 --- a/crypto/bn256/bn256_slow.go +++ b/crypto/bn256/bn256_slow.go @@ -8,7 +8,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import bn256 "github.com/ethereum/go-ethereum/crypto/bn256/google" +import bn256 "github.com/slingshot-finance/op-geth/crypto/bn256/google" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/crypto.go b/crypto/crypto.go index 2492165d38..a1e6294b27 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -29,9 +29,9 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/rlp" "golang.org/x/crypto/sha3" ) diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index da123cf980..d07b690ac7 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -25,8 +25,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index e3da71010e..33ef593c23 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -39,7 +39,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/crypto" ) func TestKDF(t *testing.T) { diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index df7698ea0c..6eec4d701b 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -43,7 +43,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/ethereum/go-ethereum/crypto" + ethcrypto "github.com/slingshot-finance/op-geth/crypto" ) var ( diff --git a/crypto/kzg4844/kzg4844_ckzg_cgo.go b/crypto/kzg4844/kzg4844_ckzg_cgo.go index 5400285698..1c52fe624a 100644 --- a/crypto/kzg4844/kzg4844_ckzg_cgo.go +++ b/crypto/kzg4844/kzg4844_ckzg_cgo.go @@ -25,7 +25,7 @@ import ( gokzg4844 "github.com/crate-crypto/go-kzg-4844" ckzg4844 "github.com/ethereum/c-kzg-4844/bindings/go" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common/hexutil" ) // ckzgAvailable signals whether the library was compiled into Geth. diff --git a/crypto/secp256k1/dummy.go b/crypto/secp256k1/dummy.go index 65a75080f6..b687b11a21 100644 --- a/crypto/secp256k1/dummy.go +++ b/crypto/secp256k1/dummy.go @@ -15,7 +15,7 @@ package secp256k1 import ( - _ "github.com/ethereum/go-ethereum/crypto/secp256k1/libsecp256k1/include" - _ "github.com/ethereum/go-ethereum/crypto/secp256k1/libsecp256k1/src" - _ "github.com/ethereum/go-ethereum/crypto/secp256k1/libsecp256k1/src/modules/recovery" + _ "github.com/slingshot-finance/op-geth/crypto/secp256k1/libsecp256k1/include" + _ "github.com/slingshot-finance/op-geth/crypto/secp256k1/libsecp256k1/src" + _ "github.com/slingshot-finance/op-geth/crypto/secp256k1/libsecp256k1/src/modules/recovery" ) diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 2339e52015..a9b7266172 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto/secp256k1" ) // Ecrecover returns the uncompressed public key that created the given signature. diff --git a/crypto/signature_test.go b/crypto/signature_test.go index aecff76bfb..035856b8cc 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" ) var ( diff --git a/docs/postmortems/2021-08-22-split-postmortem.md b/docs/postmortems/2021-08-22-split-postmortem.md index 962aa51f64..3fd16ca6dc 100644 --- a/docs/postmortems/2021-08-22-split-postmortem.md +++ b/docs/postmortems/2021-08-22-split-postmortem.md @@ -7,7 +7,7 @@ This is a post-mortem concerning the minority split that occurred on Ethereum ma - 2021-08-17: Guido Vranken submitted a bounty report. Investigation started, root cause identified, patch variations discussed. - 2021-08-18: Made public announcement over twitter about upcoming security release upcoming Tuesday. Downstream projects were also notified about the upcoming patch-release. -- 2021-08-24: Released [v1.10.8](https://github.com/ethereum/go-ethereum/releases/tag/v1.10.8) containing the fix on Tuesday morning (CET). Erigon released [v2021.08.04](https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.04). +- 2021-08-24: Released [v1.10.8](https://github.com/slingshot-finance/op-geth/releases/tag/v1.10.8) containing the fix on Tuesday morning (CET). Erigon released [v2021.08.04](https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.04). - 2021-08-27: At 12:50:07 UTC, issue exploited. Analysis started roughly 30m later, @@ -62,7 +62,7 @@ Since we had merged the removal of `ETH65`, if the entire network were to upgrad - Announce an upcoming security release on Tuesday (August 24th), via Twitter and official channels, plus reach out to downstream projects. - Temporarily revert the `ETH65`-removal. -- Place the fix into the PR optimizing the jumpdest analysis [233381](https://github.com/ethereum/go-ethereum/pull/23381). +- Place the fix into the PR optimizing the jumpdest analysis [233381](https://github.com/slingshot-finance/op-geth/pull/23381). - After 4-8 weeks, release details about the vulnerability. diff --git a/eth/api.go b/eth/api.go index 44e934fd04..74ea799828 100644 --- a/eth/api.go +++ b/eth/api.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) // EthereumAPI provides an API to access Ethereum full node-related information. diff --git a/eth/api_admin.go b/eth/api_admin.go index 4a3ccb84e8..0cebf8021a 100644 --- a/eth/api_admin.go +++ b/eth/api_admin.go @@ -24,9 +24,9 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rlp" ) // AdminAPI is the collection of Ethereum full node related APIs for node diff --git a/eth/api_backend.go b/eth/api_backend.go index b6280a1847..d38206163b 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -23,26 +23,26 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/bloombits" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/gasprice" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/miner" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" ) // EthAPIBackend implements ethapi.Backend and tracers.Backend for full nodes diff --git a/eth/api_debug.go b/eth/api_debug.go index 7d98e1f98f..e260eff3fe 100644 --- a/eth/api_debug.go +++ b/eth/api_debug.go @@ -22,17 +22,17 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/rpc" + "github.com/slingshot-finance/op-geth/trie" ) // DebugAPI is the collection of Ethereum full node APIs for debugging the diff --git a/eth/api_debug_test.go b/eth/api_debug_test.go index 184b90dd09..87fd6b4063 100644 --- a/eth/api_debug_test.go +++ b/eth/api_debug_test.go @@ -25,12 +25,12 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/trie" "golang.org/x/exp/slices" ) diff --git a/eth/api_miner.go b/eth/api_miner.go index 477531d494..544c25e7e2 100644 --- a/eth/api_miner.go +++ b/eth/api_miner.go @@ -20,8 +20,8 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) // MinerAPI provides an API to control the miner. diff --git a/eth/backend.go b/eth/backend.go index e5c22e3baa..72df14b29a 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -26,39 +26,39 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/pruner" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/txpool/blobpool" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/shutdowncheck" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/dnsdisc" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/consensus/clique" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/bloombits" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state/pruner" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/txpool/blobpool" + "github.com/slingshot-finance/op-geth/core/txpool/legacypool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/eth/gasprice" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/eth/protocols/snap" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/internal/shutdowncheck" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/miner" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/dnsdisc" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/rpc" ) // Config contains the configuration options of the ETH protocol. diff --git a/eth/bloombits.go b/eth/bloombits.go index 0cb7050d23..c155129718 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -19,8 +19,8 @@ package eth import ( "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/slingshot-finance/op-geth/common/bitutil" + "github.com/slingshot-finance/op-geth/core/rawdb" ) const ( diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go index 4498371031..0e533c54d5 100644 --- a/eth/catalyst/api.go +++ b/eth/catalyst/api.go @@ -24,17 +24,17 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/beacon/engine" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/beacon/engine" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/miner" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/rpc" ) // Register adds the engine API to the full node. diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go index 28fcce838b..f1622f37bc 100644 --- a/eth/catalyst/api_test.go +++ b/eth/catalyst/api_test.go @@ -30,26 +30,26 @@ import ( "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum/beacon/engine" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - beaconConsensus "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/beacon/engine" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/consensus" + beaconConsensus "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/crypto/kzg4844" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/miner" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" + "github.com/slingshot-finance/op-geth/trie" "github.com/mattn/go-colorable" ) diff --git a/eth/catalyst/queue.go b/eth/catalyst/queue.go index d42904843b..35bb5452d0 100644 --- a/eth/catalyst/queue.go +++ b/eth/catalyst/queue.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/beacon/engine" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/miner" + "github.com/slingshot-finance/op-geth/beacon/engine" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/miner" ) // maxTrackedPayloads is the maximum number of prepared payloads the execution diff --git a/eth/catalyst/simulated_beacon.go b/eth/catalyst/simulated_beacon.go index b0b13d32cd..7f8f68be78 100644 --- a/eth/catalyst/simulated_beacon.go +++ b/eth/catalyst/simulated_beacon.go @@ -22,14 +22,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/beacon/engine" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/beacon/engine" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/rpc" ) const devEpochLength = 32 diff --git a/eth/catalyst/simulated_beacon_api.go b/eth/catalyst/simulated_beacon_api.go index 93670257f6..0ee209a4c6 100644 --- a/eth/catalyst/simulated_beacon_api.go +++ b/eth/catalyst/simulated_beacon_api.go @@ -19,8 +19,8 @@ package catalyst import ( "context" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" ) type api struct { diff --git a/eth/catalyst/simulated_beacon_test.go b/eth/catalyst/simulated_beacon_test.go index 6fa97ad87a..fcbeabe11d 100644 --- a/eth/catalyst/simulated_beacon_test.go +++ b/eth/catalyst/simulated_beacon_test.go @@ -22,16 +22,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/params" ) func startSimulatedBeaconEthService(t *testing.T, genesis *core.Genesis) (*node.Node, *eth.Ethereum, *SimulatedBeacon) { diff --git a/eth/catalyst/superchain.go b/eth/catalyst/superchain.go index 503519889f..ff46d0ba71 100644 --- a/eth/catalyst/superchain.go +++ b/eth/catalyst/superchain.go @@ -3,9 +3,9 @@ package catalyst import ( "fmt" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/params" ) var ( diff --git a/eth/catalyst/superchain_test.go b/eth/catalyst/superchain_test.go index 4fd46a4c12..170c09f480 100644 --- a/eth/catalyst/superchain_test.go +++ b/eth/catalyst/superchain_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/params" ) func TestSignalSuperchainV1(t *testing.T) { diff --git a/eth/catalyst/tester.go b/eth/catalyst/tester.go index 0922ac0ba6..ae89efddb7 100644 --- a/eth/catalyst/tester.go +++ b/eth/catalyst/tester.go @@ -20,11 +20,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/node" ) // FullSyncTester is an auxiliary service that allows Geth to perform full sync diff --git a/eth/downloader/api.go b/eth/downloader/api.go index b3f7113bcd..6e622367ca 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -20,9 +20,9 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/rpc" ) // DownloaderAPI provides an API which gives information about the current synchronisation status. diff --git a/eth/downloader/beacondevsync.go b/eth/downloader/beacondevsync.go index 9a38fedd46..eb2cdf6b42 100644 --- a/eth/downloader/beacondevsync.go +++ b/eth/downloader/beacondevsync.go @@ -20,8 +20,8 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/log" ) // BeaconDevSync is a development helper to test synchronization by providing diff --git a/eth/downloader/beaconsync.go b/eth/downloader/beaconsync.go index df8af68bc7..e318dd7ece 100644 --- a/eth/downloader/beaconsync.go +++ b/eth/downloader/beaconsync.go @@ -21,10 +21,10 @@ import ( "sync" "time" - "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/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" ) // beaconBackfiller is the chain and state backfilling that can be commenced once diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 3f39b19485..a6b9282db6 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,17 +25,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth/protocols/snap" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index 52feaa327b..cddba333e8 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -26,20 +26,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "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/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/eth/protocols/snap" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" ) // downloadTester is a test simulator for mocking out local block chain. diff --git a/eth/downloader/events.go b/eth/downloader/events.go index 25255a3a72..7063ec0713 100644 --- a/eth/downloader/events.go +++ b/eth/downloader/events.go @@ -16,7 +16,7 @@ package downloader -import "github.com/ethereum/go-ethereum/core/types" +import "github.com/slingshot-finance/op-geth/core/types" type DoneEvent struct { Latest *types.Header diff --git a/eth/downloader/fetchers.go b/eth/downloader/fetchers.go index cc4279b0da..1026d37274 100644 --- a/eth/downloader/fetchers.go +++ b/eth/downloader/fetchers.go @@ -19,9 +19,9 @@ package downloader import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" ) // fetchHeadersByHash is a blocking version of Peer.RequestHeadersByHash which diff --git a/eth/downloader/fetchers_concurrent.go b/eth/downloader/fetchers_concurrent.go index 649aa27615..644c88d327 100644 --- a/eth/downloader/fetchers_concurrent.go +++ b/eth/downloader/fetchers_concurrent.go @@ -21,10 +21,10 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/prque" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/log" ) // timeoutGracePeriod is the amount of time to allow for a peer to deliver a diff --git a/eth/downloader/fetchers_concurrent_bodies.go b/eth/downloader/fetchers_concurrent_bodies.go index 5105fda66b..b25a13b7b4 100644 --- a/eth/downloader/fetchers_concurrent_bodies.go +++ b/eth/downloader/fetchers_concurrent_bodies.go @@ -19,9 +19,9 @@ package downloader import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/log" ) // bodyQueue implements typedQueue and is a type adapter between the generic diff --git a/eth/downloader/fetchers_concurrent_headers.go b/eth/downloader/fetchers_concurrent_headers.go index 8201f4ca74..c0a12223da 100644 --- a/eth/downloader/fetchers_concurrent_headers.go +++ b/eth/downloader/fetchers_concurrent_headers.go @@ -19,9 +19,9 @@ package downloader import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/log" ) // headerQueue implements typedQueue and is a type adapter between the generic diff --git a/eth/downloader/fetchers_concurrent_receipts.go b/eth/downloader/fetchers_concurrent_receipts.go index 3169f030ba..b9bae30842 100644 --- a/eth/downloader/fetchers_concurrent_receipts.go +++ b/eth/downloader/fetchers_concurrent_receipts.go @@ -19,9 +19,9 @@ package downloader import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/log" ) // receiptQueue implements typedQueue and is a type adapter between the generic diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index 23c033a8ad..2308e11d7d 100644 --- a/eth/downloader/metrics.go +++ b/eth/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index 4c43af5270..26d179f3d1 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/msgrate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/msgrate" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index e557158797..19a941a538 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -26,12 +26,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/prque" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/params" ) const ( diff --git a/eth/downloader/queue_test.go b/eth/downloader/queue_test.go index 50b9031a27..28ba6fa96c 100644 --- a/eth/downloader/queue_test.go +++ b/eth/downloader/queue_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" "golang.org/x/exp/slog" ) diff --git a/eth/downloader/receiptreference.go b/eth/downloader/receiptreference.go index b4c5623ddc..8b70081db3 100644 --- a/eth/downloader/receiptreference.go +++ b/eth/downloader/receiptreference.go @@ -8,9 +8,9 @@ import ( "path" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" ) // userDepositNonces is a struct to hold the reference data for user deposits diff --git a/eth/downloader/receiptreference_test.go b/eth/downloader/receiptreference_test.go index 85bc4e1aaa..301e432c0e 100644 --- a/eth/downloader/receiptreference_test.go +++ b/eth/downloader/receiptreference_test.go @@ -3,7 +3,7 @@ package downloader import ( "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/core/types" "github.com/stretchr/testify/assert" ) diff --git a/eth/downloader/resultstore.go b/eth/downloader/resultstore.go index e4323c04eb..d2d93be241 100644 --- a/eth/downloader/resultstore.go +++ b/eth/downloader/resultstore.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/core/types" ) // resultStore implements a structure for maintaining fetchResults, tracking their diff --git a/eth/downloader/skeleton.go b/eth/downloader/skeleton.go index f40ca24d99..257e88d4c0 100644 --- a/eth/downloader/skeleton.go +++ b/eth/downloader/skeleton.go @@ -24,12 +24,12 @@ import ( "sort" "time" - "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/eth/protocols/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" ) // scratchHeaders is the number of headers to store in a scratch space to allow diff --git a/eth/downloader/skeleton_test.go b/eth/downloader/skeleton_test.go index aceadd00d3..d9a5792006 100644 --- a/eth/downloader/skeleton_test.go +++ b/eth/downloader/skeleton_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "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/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/log" ) // hookedBackfiller is a tester backfiller with all interface methods mocked and diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index 501af63ed5..680f001746 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -19,8 +19,8 @@ package downloader import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/log" ) // syncState starts downloading state with the given root hash. diff --git a/eth/downloader/testchain_test.go b/eth/downloader/testchain_test.go index 1bf03411d1..688bbd0907 100644 --- a/eth/downloader/testchain_test.go +++ b/eth/downloader/testchain_test.go @@ -22,15 +22,15 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "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/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" ) // Test chain parameters. diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index afe26e37a8..893639eba9 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -21,19 +21,19 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/txpool/blobpool" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/consensus/clique" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/txpool/blobpool" + "github.com/slingshot-finance/op-geth/core/txpool/legacypool" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/gasprice" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/miner" + "github.com/slingshot-finance/op-geth/params" ) // FullNodeGPO contains default gasprice oracle settings for full node. diff --git a/eth/ethconfig/gen_config.go b/eth/ethconfig/gen_config.go index 92a7147396..254d860b8b 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -5,13 +5,13 @@ package ethconfig import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/txpool/blobpool" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/miner" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/txpool/blobpool" + "github.com/slingshot-finance/op-geth/core/txpool/legacypool" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/gasprice" + "github.com/slingshot-finance/op-geth/miner" ) // MarshalTOML marshals as TOML. diff --git a/eth/fetcher/block_fetcher.go b/eth/fetcher/block_fetcher.go index 126eaaea7f..e15cc04ffe 100644 --- a/eth/fetcher/block_fetcher.go +++ b/eth/fetcher/block_fetcher.go @@ -22,14 +22,14 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/prque" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/trie" ) const ( diff --git a/eth/fetcher/block_fetcher_test.go b/eth/fetcher/block_fetcher_test.go index 6927300b1d..e3dcd02ea4 100644 --- a/eth/fetcher/block_fetcher_test.go +++ b/eth/fetcher/block_fetcher_test.go @@ -24,15 +24,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "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/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" ) var ( diff --git a/eth/fetcher/tx_fetcher.go b/eth/fetcher/tx_fetcher.go index ea7892d8d8..8868f60a52 100644 --- a/eth/fetcher/tx_fetcher.go +++ b/eth/fetcher/tx_fetcher.go @@ -25,13 +25,13 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" ) const ( diff --git a/eth/fetcher/tx_fetcher_test.go b/eth/fetcher/tx_fetcher_test.go index 4a62e579b6..e5c6ed3288 100644 --- a/eth/fetcher/tx_fetcher_test.go +++ b/eth/fetcher/tx_fetcher_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index a4eaa9cec8..14bb1e4159 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 822bc826f6..666783ca8d 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index 73b96b77af..008f507dc5 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core/bloombits" - "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/node" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/bitutil" + "github.com/slingshot-finance/op-geth/core/bloombits" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 83e3284a2b..98424ef099 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -21,10 +21,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/bloombits" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rpc" ) // Filter can be used to retrieve and filter logs. diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index f98a1f84ce..e9c88042b5 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,18 +25,18 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "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/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/bloombits" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" ) // Config represents the configuration of the filter system. diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index 27cad8826a..7cb0c4bdea 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -27,19 +27,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/bloombits" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 1db917c960..266e5d8c25 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -24,17 +24,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "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/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" + "github.com/slingshot-finance/op-geth/trie" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasestimator/gasestimator.go b/eth/gasestimator/gasestimator.go index 734b47c73f..2654cb0826 100644 --- a/eth/gasestimator/gasestimator.go +++ b/eth/gasestimator/gasestimator.go @@ -23,13 +23,13 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" ) // Options are the contextual parameters to execute the requested call. diff --git a/eth/gasprice/feehistory.go b/eth/gasprice/feehistory.go index 13f36499d4..ffc03e7833 100644 --- a/eth/gasprice/feehistory.go +++ b/eth/gasprice/feehistory.go @@ -25,11 +25,11 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rpc" "golang.org/x/exp/slices" ) diff --git a/eth/gasprice/feehistory_test.go b/eth/gasprice/feehistory_test.go index 1bcfb287a5..f4a0bb58ce 100644 --- a/eth/gasprice/feehistory_test.go +++ b/eth/gasprice/feehistory_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/rpc" ) func TestFeeHistory(t *testing.T) { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index e8ef6c7459..c567bbdc3f 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -21,14 +21,14 @@ import ( "math/big" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" "golang.org/x/exp/slices" ) diff --git a/eth/gasprice/gasprice_test.go b/eth/gasprice/gasprice_test.go index 4ee5a0d1b2..738025d907 100644 --- a/eth/gasprice/gasprice_test.go +++ b/eth/gasprice/gasprice_test.go @@ -22,16 +22,16 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "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/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" ) const testHead = 32 diff --git a/eth/gasprice/optimism-gasprice.go b/eth/gasprice/optimism-gasprice.go index 71cd021f63..72d91eeabf 100644 --- a/eth/gasprice/optimism-gasprice.go +++ b/eth/gasprice/optimism-gasprice.go @@ -5,10 +5,10 @@ import ( "math/big" "sort" - "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/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rpc" ) // SuggestOptimismPriorityFee returns a max priority fee value that can be used such that newly diff --git a/eth/gasprice/optimism-gasprice_test.go b/eth/gasprice/optimism-gasprice_test.go index dd0140839d..54fd900897 100644 --- a/eth/gasprice/optimism-gasprice_test.go +++ b/eth/gasprice/optimism-gasprice_test.go @@ -21,14 +21,14 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" + "github.com/slingshot-finance/op-geth/trie" ) const ( diff --git a/eth/handler.go b/eth/handler.go index 5e4e9dbd0b..f2bd7d0f51 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -24,24 +24,24 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/fetcher" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/forkid" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/fetcher" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/eth/protocols/snap" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" ) const ( diff --git a/eth/handler_eth.go b/eth/handler_eth.go index 6dbe03e214..964ded417d 100644 --- a/eth/handler_eth.go +++ b/eth/handler_eth.go @@ -22,11 +22,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/p2p/enode" ) // ethHandler implements the eth.Backend interface to handle the various network diff --git a/eth/handler_eth_test.go b/eth/handler_eth_test.go index bb342acc18..544c97d2f0 100644 --- a/eth/handler_eth_test.go +++ b/eth/handler_eth_test.go @@ -22,20 +22,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/forkid" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/params" ) // testEthHandler is a mock event handler to listen for inbound network requests diff --git a/eth/handler_snap.go b/eth/handler_snap.go index 767416ffd6..ed3e077f80 100644 --- a/eth/handler_snap.go +++ b/eth/handler_snap.go @@ -17,9 +17,9 @@ package eth import ( - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/eth/protocols/snap" + "github.com/slingshot-finance/op-geth/p2p/enode" ) // snapHandler implements the snap.Backend interface to handle the various network diff --git a/eth/handler_test.go b/eth/handler_test.go index 6d6132ee4c..02ee01e7e4 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -21,19 +21,19 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "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/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/params" ) var ( diff --git a/eth/peer.go b/eth/peer.go index 7618777716..61b774ff29 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/eth/protocols/snap" ) // ethPeerInfo represents a short summary of the `eth` sub-protocol metadata known diff --git a/eth/peerset.go b/eth/peerset.go index b27d3964a1..e8a23cc4e2 100644 --- a/eth/peerset.go +++ b/eth/peerset.go @@ -22,10 +22,10 @@ import ( "math/big" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/p2p" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/eth/protocols/snap" + "github.com/slingshot-finance/op-geth/p2p" ) var ( diff --git a/eth/protocols/eth/broadcast.go b/eth/protocols/eth/broadcast.go index 3045303f22..e0e571f59f 100644 --- a/eth/protocols/eth/broadcast.go +++ b/eth/protocols/eth/broadcast.go @@ -19,8 +19,8 @@ package eth import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" ) const ( diff --git a/eth/protocols/eth/discovery.go b/eth/protocols/eth/discovery.go index a7bdd47daf..150ebb1fdc 100644 --- a/eth/protocols/eth/discovery.go +++ b/eth/protocols/eth/discovery.go @@ -17,10 +17,10 @@ package eth import ( - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/forkid" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/rlp" ) // enrEntry is the ENR entry which advertises `eth` protocol on the discovery. diff --git a/eth/protocols/eth/dispatcher.go b/eth/protocols/eth/dispatcher.go index ae98820cd6..5e9473f791 100644 --- a/eth/protocols/eth/dispatcher.go +++ b/eth/protocols/eth/dispatcher.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/p2p" + "github.com/slingshot-finance/op-geth/p2p" ) var ( diff --git a/eth/protocols/eth/handler.go b/eth/protocols/eth/handler.go index 42d0412a12..4fc67039c2 100644 --- a/eth/protocols/eth/handler.go +++ b/eth/protocols/eth/handler.go @@ -21,14 +21,14 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/params" ) const ( diff --git a/eth/protocols/eth/handler_test.go b/eth/protocols/eth/handler_test.go index 41e18bfb3e..635bc1822d 100644 --- a/eth/protocols/eth/handler_test.go +++ b/eth/protocols/eth/handler_test.go @@ -22,21 +22,21 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "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/txpool" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/txpool/legacypool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/params" ) var ( diff --git a/eth/protocols/eth/handlers.go b/eth/protocols/eth/handlers.go index 069e92dadf..76aa64d79d 100644 --- a/eth/protocols/eth/handlers.go +++ b/eth/protocols/eth/handlers.go @@ -20,12 +20,12 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" ) func handleGetBlockHeaders(backend Backend, msg Decoder, peer *Peer) error { diff --git a/eth/protocols/eth/handshake.go b/eth/protocols/eth/handshake.go index ea16a85b1e..411c3b3919 100644 --- a/eth/protocols/eth/handshake.go +++ b/eth/protocols/eth/handshake.go @@ -22,10 +22,10 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/forkid" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/p2p" ) const ( diff --git a/eth/protocols/eth/handshake_test.go b/eth/protocols/eth/handshake_test.go index d96cfc8165..72fe258da7 100644 --- a/eth/protocols/eth/handshake_test.go +++ b/eth/protocols/eth/handshake_test.go @@ -20,10 +20,10 @@ import ( "errors" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/forkid" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" ) // Tests that handshake failures are detected and reported correctly. diff --git a/eth/protocols/eth/metrics.go b/eth/protocols/eth/metrics.go index 5e0aee39f8..01b8d794a4 100644 --- a/eth/protocols/eth/metrics.go +++ b/eth/protocols/eth/metrics.go @@ -16,7 +16,7 @@ package eth -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/slingshot-finance/op-geth/metrics" // meters stores ingress and egress handshake meters. var meters bidirectionalMeters diff --git a/eth/protocols/eth/peer.go b/eth/protocols/eth/peer.go index 98ad22a8cf..e3600986a1 100644 --- a/eth/protocols/eth/peer.go +++ b/eth/protocols/eth/peer.go @@ -22,10 +22,10 @@ import ( "sync" mapset "github.com/deckarep/golang-set/v2" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/rlp" ) const ( diff --git a/eth/protocols/eth/peer_test.go b/eth/protocols/eth/peer_test.go index efbbbc6fff..4d634ae41a 100644 --- a/eth/protocols/eth/peer_test.go +++ b/eth/protocols/eth/peer_test.go @@ -23,9 +23,9 @@ import ( "crypto/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" ) // testPeer is a simulated peer to allow testing direct network calls. diff --git a/eth/protocols/eth/protocol.go b/eth/protocols/eth/protocol.go index 0f44f83de1..8422db5166 100644 --- a/eth/protocols/eth/protocol.go +++ b/eth/protocols/eth/protocol.go @@ -22,10 +22,10 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/forkid" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocols/eth/protocol_test.go b/eth/protocols/eth/protocol_test.go index bc2545dea2..db08dcd196 100644 --- a/eth/protocols/eth/protocol_test.go +++ b/eth/protocols/eth/protocol_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rlp" ) // Tests that the custom union field encoder and decoder works correctly. diff --git a/eth/protocols/eth/tracker.go b/eth/protocols/eth/tracker.go index 324fd22839..82c4a5ed03 100644 --- a/eth/protocols/eth/tracker.go +++ b/eth/protocols/eth/tracker.go @@ -19,7 +19,7 @@ package eth import ( "time" - "github.com/ethereum/go-ethereum/p2p/tracker" + "github.com/slingshot-finance/op-geth/p2p/tracker" ) // requestTracker is a singleton tracker for eth/66 and newer request times. diff --git a/eth/protocols/snap/discovery.go b/eth/protocols/snap/discovery.go index 684ec7e632..b14b7b63db 100644 --- a/eth/protocols/snap/discovery.go +++ b/eth/protocols/snap/discovery.go @@ -17,7 +17,7 @@ package snap import ( - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/rlp" ) // enrEntry is the ENR entry which advertises `snap` protocol on the discovery. diff --git a/eth/protocols/snap/handler.go b/eth/protocols/snap/handler.go index 0d1aac0cef..35057e7c27 100644 --- a/eth/protocols/snap/handler.go +++ b/eth/protocols/snap/handler.go @@ -21,16 +21,16 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/trienode" ) const ( diff --git a/eth/protocols/snap/handler_fuzzing_test.go b/eth/protocols/snap/handler_fuzzing_test.go index daed7ed44a..b47634b3c9 100644 --- a/eth/protocols/snap/handler_fuzzing_test.go +++ b/eth/protocols/snap/handler_fuzzing_test.go @@ -24,15 +24,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "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/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" fuzz "github.com/google/gofuzz" ) diff --git a/eth/protocols/snap/metrics.go b/eth/protocols/snap/metrics.go index a7d071953f..58965666d1 100644 --- a/eth/protocols/snap/metrics.go +++ b/eth/protocols/snap/metrics.go @@ -17,7 +17,7 @@ package snap import ( - metrics "github.com/ethereum/go-ethereum/metrics" + metrics "github.com/slingshot-finance/op-geth/metrics" ) var ( diff --git a/eth/protocols/snap/peer.go b/eth/protocols/snap/peer.go index 3db6e22cbd..306f65572d 100644 --- a/eth/protocols/snap/peer.go +++ b/eth/protocols/snap/peer.go @@ -17,9 +17,9 @@ package snap import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p" ) // Peer is a collection of relevant information we have about a `snap` peer. diff --git a/eth/protocols/snap/protocol.go b/eth/protocols/snap/protocol.go index 0db206b081..078b8296e9 100644 --- a/eth/protocols/snap/protocol.go +++ b/eth/protocols/snap/protocol.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocols/snap/range.go b/eth/protocols/snap/range.go index 8c98c71d50..ab1ec384cb 100644 --- a/eth/protocols/snap/range.go +++ b/eth/protocols/snap/range.go @@ -19,7 +19,7 @@ package snap import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" "github.com/holiman/uint256" ) diff --git a/eth/protocols/snap/range_test.go b/eth/protocols/snap/range_test.go index ea643f1361..a4f858011d 100644 --- a/eth/protocols/snap/range_test.go +++ b/eth/protocols/snap/range_test.go @@ -19,7 +19,7 @@ package snap import ( "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // Tests that given a starting hash and a density, the hash ranger can correctly diff --git a/eth/protocols/snap/sort_test.go b/eth/protocols/snap/sort_test.go index be0a8c5706..a2101ef7a3 100644 --- a/eth/protocols/snap/sort_test.go +++ b/eth/protocols/snap/sort_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) func hexToNibbles(s string) []byte { diff --git a/eth/protocols/snap/sync.go b/eth/protocols/snap/sync.go index 887a50775d..ec2a40e07a 100644 --- a/eth/protocols/snap/sync.go +++ b/eth/protocols/snap/sync.go @@ -29,19 +29,19 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/msgrate" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/msgrate" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/trienode" "golang.org/x/crypto/sha3" ) diff --git a/eth/protocols/snap/sync_test.go b/eth/protocols/snap/sync_test.go index 5d4099a814..086f5e61c4 100644 --- a/eth/protocols/snap/sync_test.go +++ b/eth/protocols/snap/sync_test.go @@ -27,17 +27,17 @@ import ( "testing" "time" - "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" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/testutil" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/testutil" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/trie/trienode" "golang.org/x/crypto/sha3" "golang.org/x/exp/slices" ) diff --git a/eth/protocols/snap/tracker.go b/eth/protocols/snap/tracker.go index 2cf59cc23a..aca1357e7e 100644 --- a/eth/protocols/snap/tracker.go +++ b/eth/protocols/snap/tracker.go @@ -19,7 +19,7 @@ package snap import ( "time" - "github.com/ethereum/go-ethereum/p2p/tracker" + "github.com/slingshot-finance/op-geth/p2p/tracker" ) // requestTracker is a singleton tracker for request times. diff --git a/eth/state_accessor.go b/eth/state_accessor.go index 19128d12b1..d995f43fea 100644 --- a/eth/state_accessor.go +++ b/eth/state_accessor.go @@ -22,15 +22,15 @@ import ( "fmt" "time" - "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/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/trie" ) // noopReleaser is returned in case there is no operation expected diff --git a/eth/sync.go b/eth/sync.go index c7ba7c93d6..c7db9026c3 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,11 +21,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/log" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index d26cbb66ea..351f1740e6 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -20,11 +20,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/eth/protocols/snap" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" ) // Tests that snap sync is disabled after a successful sync cycle. diff --git a/eth/tracers/api.go b/eth/tracers/api.go index 33c4f0ffbb..cc34aaf96a 100644 --- a/eth/tracers/api.go +++ b/eth/tracers/api.go @@ -28,21 +28,21 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers/logger" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/rpc" ) const ( diff --git a/eth/tracers/api_test.go b/eth/tracers/api_test.go index b4725d2417..6ac57312ec 100644 --- a/eth/tracers/api_test.go +++ b/eth/tracers/api_test.go @@ -31,22 +31,22 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "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/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/tracers/logger" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" "github.com/stretchr/testify/mock" "golang.org/x/exp/slices" ) diff --git a/eth/tracers/internal/tracetest/calltrace_test.go b/eth/tracers/internal/tracetest/calltrace_test.go index 5c74baacd1..e8eeb60c8c 100644 --- a/eth/tracers/internal/tracetest/calltrace_test.go +++ b/eth/tracers/internal/tracetest/calltrace_test.go @@ -24,17 +24,17 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "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/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/tests" ) type callContext struct { diff --git a/eth/tracers/internal/tracetest/flat_calltrace_test.go b/eth/tracers/internal/tracetest/flat_calltrace_test.go index 423167b13c..7519347b36 100644 --- a/eth/tracers/internal/tracetest/flat_calltrace_test.go +++ b/eth/tracers/internal/tracetest/flat_calltrace_test.go @@ -10,17 +10,17 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "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/core/vm" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/tests" // Force-load the native, to trigger registration - "github.com/ethereum/go-ethereum/eth/tracers" + "github.com/slingshot-finance/op-geth/eth/tracers" ) // flatCallTrace is the result of a callTracerParity run. diff --git a/eth/tracers/internal/tracetest/prestate_test.go b/eth/tracers/internal/tracetest/prestate_test.go index b4fa5b6272..49236df85c 100644 --- a/eth/tracers/internal/tracetest/prestate_test.go +++ b/eth/tracers/internal/tracetest/prestate_test.go @@ -24,13 +24,13 @@ import ( "strings" "testing" - "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/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/tests" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/tests" ) // prestateTrace is the result of a prestateTrace run. diff --git a/eth/tracers/internal/tracetest/util.go b/eth/tracers/internal/tracetest/util.go index 95d292c924..f2a5d849a8 100644 --- a/eth/tracers/internal/tracetest/util.go +++ b/eth/tracers/internal/tracetest/util.go @@ -5,8 +5,8 @@ import ( "unicode" // Force-load native and js packages, to trigger registration - _ "github.com/ethereum/go-ethereum/eth/tracers/js" - _ "github.com/ethereum/go-ethereum/eth/tracers/native" + _ "github.com/slingshot-finance/op-geth/eth/tracers/js" + _ "github.com/slingshot-finance/op-geth/eth/tracers/native" ) // To generate a new callTracer test, copy paste the makeTest method below into diff --git a/eth/tracers/js/goja.go b/eth/tracers/js/goja.go index 07c138bae4..ee68625bc7 100644 --- a/eth/tracers/js/goja.go +++ b/eth/tracers/js/goja.go @@ -24,12 +24,12 @@ import ( "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/tracers" - jsassets "github.com/ethereum/go-ethereum/eth/tracers/js/internal/tracers" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/tracers" + jsassets "github.com/slingshot-finance/op-geth/eth/tracers/js/internal/tracers" ) var assetTracers = make(map[string]string) diff --git a/eth/tracers/js/tracer_test.go b/eth/tracers/js/tracer_test.go index bf6427faf6..1e0c03d9b3 100644 --- a/eth/tracers/js/tracer_test.go +++ b/eth/tracers/js/tracer_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/params" ) type account struct{} diff --git a/eth/tracers/logger/access_list_tracer.go b/eth/tracers/logger/access_list_tracer.go index 766ee4e4b9..895f3c47ab 100644 --- a/eth/tracers/logger/access_list_tracer.go +++ b/eth/tracers/logger/access_list_tracer.go @@ -19,9 +19,9 @@ package logger import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" ) // accessList is an accumulator for the set of accounts and storage slots an EVM diff --git a/eth/tracers/logger/gen_structlog.go b/eth/tracers/logger/gen_structlog.go index b406cb3445..2a39ab49c2 100644 --- a/eth/tracers/logger/gen_structlog.go +++ b/eth/tracers/logger/gen_structlog.go @@ -5,10 +5,10 @@ package logger import ( "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/vm" "github.com/holiman/uint256" ) diff --git a/eth/tracers/logger/logger.go b/eth/tracers/logger/logger.go index 2b36f9f492..c991829c43 100644 --- a/eth/tracers/logger/logger.go +++ b/eth/tracers/logger/logger.go @@ -25,12 +25,12 @@ import ( "strings" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/params" "github.com/holiman/uint256" ) diff --git a/eth/tracers/logger/logger_json.go b/eth/tracers/logger/logger_json.go index a2cb4cd9fc..91efd48096 100644 --- a/eth/tracers/logger/logger_json.go +++ b/eth/tracers/logger/logger_json.go @@ -21,9 +21,9 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/vm" ) type JSONLogger struct { diff --git a/eth/tracers/logger/logger_test.go b/eth/tracers/logger/logger_test.go index 3192a15cba..133f4bacf2 100644 --- a/eth/tracers/logger/logger_test.go +++ b/eth/tracers/logger/logger_test.go @@ -22,10 +22,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/params" ) type dummyContractRef struct { @@ -76,7 +76,7 @@ func TestStoreCapture(t *testing.T) { } // Tests that blank fields don't appear in logs when JSON marshalled, to reduce -// logs bloat and confusion. See https://github.com/ethereum/go-ethereum/issues/24487 +// logs bloat and confusion. See https://github.com/slingshot-finance/op-geth/issues/24487 func TestStructLogMarshalingOmitEmpty(t *testing.T) { tests := []struct { name string diff --git a/eth/tracers/native/4byte.go b/eth/tracers/native/4byte.go index 5a2c4f9111..b9309c20e1 100644 --- a/eth/tracers/native/4byte.go +++ b/eth/tracers/native/4byte.go @@ -22,9 +22,9 @@ import ( "strconv" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" ) func init() { diff --git a/eth/tracers/native/call.go b/eth/tracers/native/call.go index f85cf6206a..1b406a8765 100644 --- a/eth/tracers/native/call.go +++ b/eth/tracers/native/call.go @@ -22,12 +22,12 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/log" ) //go:generate go run github.com/fjl/gencodec -type callFrame -field-override callFrameMarshaling -out gen_callframe_json.go @@ -41,7 +41,7 @@ type callLog struct { Topics []common.Hash `json:"topics"` Data hexutil.Bytes `json:"data"` // Position of the log relative to subcalls within the same trace - // See https://github.com/ethereum/go-ethereum/pull/28389 for details + // See https://github.com/slingshot-finance/op-geth/pull/28389 for details Position hexutil.Uint `json:"position"` } diff --git a/eth/tracers/native/call_flat.go b/eth/tracers/native/call_flat.go index 266ab99001..a2f80121b8 100644 --- a/eth/tracers/native/call_flat.go +++ b/eth/tracers/native/call_flat.go @@ -23,10 +23,10 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" ) //go:generate go run github.com/fjl/gencodec -type flatCallAction -field-override flatCallActionMarshaling -out gen_flatcallaction_json.go diff --git a/eth/tracers/native/gen_account_json.go b/eth/tracers/native/gen_account_json.go index 4c39cbc38c..bb8091f4bd 100644 --- a/eth/tracers/native/gen_account_json.go +++ b/eth/tracers/native/gen_account_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) var _ = (*accountMarshaling)(nil) diff --git a/eth/tracers/native/gen_callframe_json.go b/eth/tracers/native/gen_callframe_json.go index c44f38390d..b95d94ed37 100644 --- a/eth/tracers/native/gen_callframe_json.go +++ b/eth/tracers/native/gen_callframe_json.go @@ -6,9 +6,9 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/vm" ) var _ = (*callFrameMarshaling)(nil) diff --git a/eth/tracers/native/gen_flatcallaction_json.go b/eth/tracers/native/gen_flatcallaction_json.go index c075606983..4c78a86d14 100644 --- a/eth/tracers/native/gen_flatcallaction_json.go +++ b/eth/tracers/native/gen_flatcallaction_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) var _ = (*flatCallActionMarshaling)(nil) diff --git a/eth/tracers/native/gen_flatcallresult_json.go b/eth/tracers/native/gen_flatcallresult_json.go index e9fa5e44da..b9e86d0005 100644 --- a/eth/tracers/native/gen_flatcallresult_json.go +++ b/eth/tracers/native/gen_flatcallresult_json.go @@ -5,8 +5,8 @@ package native import ( "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) var _ = (*flatCallResultMarshaling)(nil) diff --git a/eth/tracers/native/mux.go b/eth/tracers/native/mux.go index db8ddd6438..d8438a5f5b 100644 --- a/eth/tracers/native/mux.go +++ b/eth/tracers/native/mux.go @@ -20,9 +20,9 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" ) func init() { diff --git a/eth/tracers/native/noop.go b/eth/tracers/native/noop.go index 3beecd8abf..8688d25299 100644 --- a/eth/tracers/native/noop.go +++ b/eth/tracers/native/noop.go @@ -20,9 +20,9 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" ) func init() { diff --git a/eth/tracers/native/prestate.go b/eth/tracers/native/prestate.go index 82451c40a6..af35af6fc0 100644 --- a/eth/tracers/native/prestate.go +++ b/eth/tracers/native/prestate.go @@ -22,12 +22,12 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/log" ) //go:generate go run github.com/fjl/gencodec -type account -field-override accountMarshaling -out gen_account_json.go diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 7b43b7cf83..6927603d71 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -23,8 +23,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/vm" ) // Context contains some contextual infos for a transaction execution that is not diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go index b4989ec984..dc02e585f8 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -20,15 +20,15 @@ import ( "math/big" "testing" - "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/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/tests" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/tracers/logger" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/tests" ) func BenchmarkTransactionTrace(b *testing.B) { diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index e8a201f71b..5b3845181d 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -24,11 +24,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 2b6f19f447..a0344fb9c8 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -28,22 +28,22 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/internal/ethapi" - - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/internal/ethapi" + + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" ) // Verify that Client implements the ethereum interfaces. diff --git a/ethclient/gethclient/gethclient.go b/ethclient/gethclient/gethclient.go index e2c0ef3ed0..a7a62ec426 100644 --- a/ethclient/gethclient/gethclient.go +++ b/ethclient/gethclient/gethclient.go @@ -25,12 +25,12 @@ import ( "runtime" "runtime/debug" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/rpc" ) // Client is a wrapper around rpc.Client that implements geth-specific functionality. diff --git a/ethclient/gethclient/gethclient_test.go b/ethclient/gethclient/gethclient_test.go index fdd94a7d73..3a498c90c4 100644 --- a/ethclient/gethclient/gethclient_test.go +++ b/ethclient/gethclient/gethclient_test.go @@ -23,19 +23,19 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/eth/filters" + "github.com/slingshot-finance/op-geth/ethclient" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" ) var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index f827d4eb56..21d6abf03e 100644 --- a/ethclient/signer.go +++ b/ethclient/signer.go @@ -20,8 +20,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" ) // senderFromServer is a types.Signer that remembers the sender address returned by the RPC diff --git a/ethdb/dbtest/testsuite.go b/ethdb/dbtest/testsuite.go index 29bd24364e..3adf589648 100644 --- a/ethdb/dbtest/testsuite.go +++ b/ethdb/dbtest/testsuite.go @@ -23,7 +23,7 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/slingshot-finance/op-geth/ethdb" "golang.org/x/exp/slices" ) diff --git a/ethdb/leveldb/leveldb.go b/ethdb/leveldb/leveldb.go index e58efbddbe..8d10660c14 100644 --- a/ethdb/leveldb/leveldb.go +++ b/ethdb/leveldb/leveldb.go @@ -26,10 +26,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" diff --git a/ethdb/leveldb/leveldb_test.go b/ethdb/leveldb/leveldb_test.go index d8c6386016..532787eeb6 100644 --- a/ethdb/leveldb/leveldb_test.go +++ b/ethdb/leveldb/leveldb_test.go @@ -19,8 +19,8 @@ package leveldb import ( "testing" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/dbtest" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/ethdb/dbtest" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" ) diff --git a/ethdb/memorydb/memorydb.go b/ethdb/memorydb/memorydb.go index 2a939f9a18..ad83382653 100644 --- a/ethdb/memorydb/memorydb.go +++ b/ethdb/memorydb/memorydb.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" ) var ( diff --git a/ethdb/memorydb/memorydb_test.go b/ethdb/memorydb/memorydb_test.go index 51499c3b1f..43facf4114 100644 --- a/ethdb/memorydb/memorydb_test.go +++ b/ethdb/memorydb/memorydb_test.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "testing" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/dbtest" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/ethdb/dbtest" ) func TestMemoryDB(t *testing.T) { diff --git a/ethdb/pebble/pebble.go b/ethdb/pebble/pebble.go index af4686cf5b..58c1799523 100644 --- a/ethdb/pebble/pebble.go +++ b/ethdb/pebble/pebble.go @@ -27,10 +27,10 @@ import ( "github.com/cockroachdb/pebble" "github.com/cockroachdb/pebble/bloom" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" ) const ( @@ -220,7 +220,7 @@ func New(file string, cache int, handles int, namespace string, readonly bool, e }, Logger: panicLogger{}, // TODO(karalabe): Delete when this is upstreamed in Pebble } - // Disable seek compaction explicitly. Check https://github.com/ethereum/go-ethereum/pull/20130 + // Disable seek compaction explicitly. Check https://github.com/slingshot-finance/op-geth/pull/20130 // for more details. opt.Experimental.ReadSamplingMultiplier = -1 diff --git a/ethdb/pebble/pebble_test.go b/ethdb/pebble/pebble_test.go index 1d5611f211..d738456711 100644 --- a/ethdb/pebble/pebble_test.go +++ b/ethdb/pebble/pebble_test.go @@ -21,8 +21,8 @@ import ( "github.com/cockroachdb/pebble" "github.com/cockroachdb/pebble/vfs" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/dbtest" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/ethdb/dbtest" ) func TestPebbleDB(t *testing.T) { diff --git a/ethdb/remotedb/remotedb.go b/ethdb/remotedb/remotedb.go index c1c803caf2..0c71212a41 100644 --- a/ethdb/remotedb/remotedb.go +++ b/ethdb/remotedb/remotedb.go @@ -22,9 +22,9 @@ package remotedb import ( - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/rpc" ) // Database is a key-value lookup for a remote database via debug_dbGet. diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index 75d0faac54..0d98b8e5d7 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,19 +30,19 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - ethproto "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + ethproto "github.com/slingshot-finance/op-geth/eth/protocols/eth" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/miner" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/rpc" "github.com/gorilla/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 9b5ad50df5..6660d982c5 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/ethereum/go-ethereum/event" + "github.com/slingshot-finance/op-geth/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 825a8deeac..cf36acc3e4 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/event" + "github.com/slingshot-finance/op-geth/event" ) // This example demonstrates how SubscriptionScope can be used to control the lifetime of diff --git a/event/example_subscription_test.go b/event/example_subscription_test.go index 5c76b55d98..a0c7ac77d3 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/ethereum/go-ethereum/event" + "github.com/slingshot-finance/op-geth/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index 07e059c6db..d07912febe 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/slingshot-finance/op-geth/common/mclock" ) // Subscription represents a stream of events. The carrier of the events is typically a diff --git a/fork.yaml b/fork.yaml index 81b979e303..44f06d1724 100644 --- a/fork.yaml +++ b/fork.yaml @@ -1,10 +1,10 @@ title: "op-geth - go-ethereum fork diff overview" footer: | - Fork-diff overview of [`op-geth`](https://github.com/ethereum-optimism/op-geth), a fork of [`go-ethereum`](https://github.com/ethereum/go-ethereum). + Fork-diff overview of [`op-geth`](https://github.com/ethereum-optimism/op-geth), a fork of [`go-ethereum`](https://github.com/slingshot-finance/op-geth). and execution-engine of the [OP-stack](https://github.com/ethereum-optimism/optimism). base: name: go-ethereum - url: https://github.com/ethereum/go-ethereum + url: https://github.com/slingshot-finance/op-geth hash: b20b4a71598481443d60b261d3e5dcb37f8a0d82 # v1.13.8 fork: name: op-geth @@ -14,7 +14,7 @@ def: title: "op-geth" description: | This is an overview of the changes in [`op-geth`](https://github.com/ethereum-optimism/op-geth), - a fork of [`go-ethereum`](https://github.com/ethereum/go-ethereum), part of the OP-stack. + a fork of [`go-ethereum`](https://github.com/slingshot-finance/op-geth), part of the OP-stack. The OP-stack architecture is modular, following the Consensus/Execution split of post-Merge Ethereum L1: @@ -252,7 +252,7 @@ def: description: Extend Ledger wallet support for newer devices on Macos sub: - title: Fix Ledger discoverability - # upstream PR: https://github.com/ethereum/go-ethereum/pull/28863/ + # upstream PR: https://github.com/slingshot-finance/op-geth/pull/28863/ globs: - "accounts/usbwallet/hub.go" diff --git a/go.mod b/go.mod index c4f2d1e559..dc5e263bd4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ethereum/go-ethereum +module github.com/slingshot-finance/op-geth go 1.21 diff --git a/graphql/graphiql.go b/graphql/graphiql.go index 823df0c641..076649c3d1 100644 --- a/graphql/graphiql.go +++ b/graphql/graphiql.go @@ -27,8 +27,8 @@ import ( "net/http" "path/filepath" - "github.com/ethereum/go-ethereum/graphql/internal/graphiql" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/graphql/internal/graphiql" + "github.com/slingshot-finance/op-geth/log" ) // GraphiQL is an in-browser IDE for exploring GraphiQL APIs. diff --git a/graphql/graphql.go b/graphql/graphql.go index d8330dffc6..6a92ee4d11 100644 --- a/graphql/graphql.go +++ b/graphql/graphql.go @@ -27,17 +27,17 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth/filters" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/rpc" ) var ( diff --git a/graphql/graphql_test.go b/graphql/graphql_test.go index f91229d015..74880e5db1 100644 --- a/graphql/graphql_test.go +++ b/graphql/graphql_test.go @@ -27,19 +27,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/eth/filters" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/params" "github.com/stretchr/testify/assert" ) diff --git a/graphql/service.go b/graphql/service.go index 584165bdb8..b15c6e8ef3 100644 --- a/graphql/service.go +++ b/graphql/service.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/eth/filters" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/rpc" "github.com/graph-gophers/graphql-go" gqlErrors "github.com/graph-gophers/graphql-go/errors" ) diff --git a/interfaces.go b/interfaces.go index c4948191d1..14a9e6e76c 100644 --- a/interfaces.go +++ b/interfaces.go @@ -22,8 +22,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" ) // NotFound is returned by API methods if the requested item does not exist. diff --git a/internal/blocktest/test_hash.go b/internal/blocktest/test_hash.go index 4d2b077e89..adb58fa39f 100644 --- a/internal/blocktest/test_hash.go +++ b/internal/blocktest/test_hash.go @@ -25,7 +25,7 @@ package blocktest import ( "hash" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" "golang.org/x/crypto/sha3" ) diff --git a/internal/build/env.go b/internal/build/env.go index 0854fba249..6e1b8ca699 100644 --- a/internal/build/env.go +++ b/internal/build/env.go @@ -99,7 +99,7 @@ func Env() Environment { // LocalEnv returns build environment metadata gathered from git. func LocalEnv() Environment { - env := applyEnvFlags(Environment{Name: "local", Repo: "ethereum/go-ethereum"}) + env := applyEnvFlags(Environment{Name: "local", Repo: "slingshot-finance/op-geth"}) head := readGitFile("HEAD") if fields := strings.Fields(head); len(fields) == 2 { diff --git a/internal/cmdtest/test_cmd.go b/internal/cmdtest/test_cmd.go index 4890d0b7c6..2d00fdaf9c 100644 --- a/internal/cmdtest/test_cmd.go +++ b/internal/cmdtest/test_cmd.go @@ -32,7 +32,7 @@ import ( "text/template" "time" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/slingshot-finance/op-geth/internal/reexec" ) func NewTestCmd(t *testing.T, data interface{}) *TestCmd { diff --git a/internal/debug/api.go b/internal/debug/api.go index 482989e0d0..2aea918741 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -35,7 +35,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" "github.com/hashicorp/go-bexpr" "golang.org/x/exp/slog" ) diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 23e4745e8c..d9496aaf20 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -26,10 +26,10 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/exp" + "github.com/slingshot-finance/op-geth/internal/flags" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/metrics/exp" "github.com/fjl/memsize/memsizeui" "github.com/mattn/go-colorable" "github.com/mattn/go-isatty" diff --git a/internal/debug/trace.go b/internal/debug/trace.go index e291030b82..22129b2ff7 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -21,7 +21,7 @@ import ( "os" "runtime/trace" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 61ddff688c..f211a14ec2 100644 --- a/internal/ethapi/addrlock.go +++ b/internal/ethapi/addrlock.go @@ -19,7 +19,7 @@ package ethapi import ( "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index a790d9e6f9..d4d90f5cbb 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -28,29 +28,29 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/tyler-smith/go-bip39" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/gasestimator" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/accounts/scwallet" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/gasestimator" + "github.com/slingshot-finance/op-geth/eth/tracers/logger" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/rpc" + "github.com/slingshot-finance/op-geth/trie" ) // estimateGasErrorRatio is the amount of overestimation eth_estimateGas is @@ -522,7 +522,7 @@ func (s *PersonalAccountAPI) SignTransaction(ctx context.Context, args Transacti // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_sign +// https://github.com/slingshot-finance/op-geth/wiki/Management-APIs#personal_sign func (s *PersonalAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr common.Address, passwd string) (hexutil.Bytes, error) { // Look up the wallet containing the requested signer account := accounts.Account{Address: addr} @@ -550,7 +550,7 @@ func (s *PersonalAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr // Note, the signature must conform to the secp256k1 curve R, S and V values, where // the V value must be 27 or 28 for legacy reasons. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover +// https://github.com/slingshot-finance/op-geth/wiki/Management-APIs#personal_ecRecover func (s *PersonalAccountAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) { if len(sig) != crypto.SignatureLength { return common.Address{}, fmt.Errorf("signature must be %d bytes long", crypto.SignatureLength) diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go index 132663e085..428b695833 100644 --- a/internal/ethapi/api_test.go +++ b/internal/ethapi/api_test.go @@ -33,25 +33,25 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/exp/slices" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/blocktest" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/bloombits" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/internal/blocktest" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" ) func TestNewRPCTransactionDepositTx(t *testing.T) { diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index 94c6771c43..e65795243c 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -22,19 +22,19 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/bloombits" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" ) // Backend interface provides the common API services (that are provided by diff --git a/internal/ethapi/dbapi.go b/internal/ethapi/dbapi.go index 33fda936dc..a54dece15b 100644 --- a/internal/ethapi/dbapi.go +++ b/internal/ethapi/dbapi.go @@ -17,8 +17,8 @@ package ethapi import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) // DbGet returns the raw value of a key stored in the database. diff --git a/internal/ethapi/transaction_args.go b/internal/ethapi/transaction_args.go index 75dbe38a59..c557b7426b 100644 --- a/internal/ethapi/transaction_args.go +++ b/internal/ethapi/transaction_args.go @@ -23,14 +23,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus/misc/eip4844" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rpc" "github.com/holiman/uint256" ) @@ -48,7 +48,7 @@ type TransactionArgs struct { // We accept "data" and "input" for backwards-compatibility reasons. // "input" is the newer name and should be preferred by clients. - // Issue detail: https://github.com/ethereum/go-ethereum/issues/15628 + // Issue detail: https://github.com/slingshot-finance/op-geth/issues/15628 Data *hexutil.Bytes `json:"data"` Input *hexutil.Bytes `json:"input"` @@ -151,7 +151,7 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend) erro } // If the tx has completely specified a fee mechanism, no default is needed. // This allows users who are not yet synced past London to get defaults for - // other tx values. See https://github.com/ethereum/go-ethereum/pull/23274 + // other tx values. See https://github.com/slingshot-finance/op-geth/pull/23274 // for more information. eip1559ParamsSet := args.MaxFeePerGas != nil && args.MaxPriorityFeePerGas != nil diff --git a/internal/ethapi/transaction_args_test.go b/internal/ethapi/transaction_args_test.go index b4b6f732a5..342b6cd6ed 100644 --- a/internal/ethapi/transaction_args_test.go +++ b/internal/ethapi/transaction_args_test.go @@ -24,20 +24,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/bloombits" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rpc" ) // TestSetFeeDefaults tests the logic for filling in default fee values works as expected. diff --git a/internal/flags/flags.go b/internal/flags/flags.go index 69e9743556..5a36ad0bef 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -28,7 +28,7 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/common/math" + "github.com/slingshot-finance/op-geth/common/math" "github.com/urfave/cli/v2" ) diff --git a/internal/flags/helpers.go b/internal/flags/helpers.go index d9d1f79036..1bf321be0e 100644 --- a/internal/flags/helpers.go +++ b/internal/flags/helpers.go @@ -23,9 +23,9 @@ import ( "sort" "strings" - "github.com/ethereum/go-ethereum/internal/version" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/internal/version" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" "github.com/mattn/go-isatty" "github.com/urfave/cli/v2" ) diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index f682daac91..cca1906484 100644 --- a/internal/guide/guide_test.go +++ b/internal/guide/guide_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" ) // Tests that the account management snippets work correctly. diff --git a/internal/jsre/deps/web3.js b/internal/jsre/deps/web3.js index f23c65584c..44b047dd35 100644 --- a/internal/jsre/deps/web3.js +++ b/internal/jsre/deps/web3.js @@ -5880,7 +5880,7 @@ module.exports = Shh; * @author Alex Beregszaszi * @date 2016 * - * Reference: https://github.com/ethereum/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33 + * Reference: https://github.com/slingshot-finance/op-geth/blob/swarm/internal/web3ext/web3ext.go#L33 */ "use strict"; diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index f6e21d2ef7..3779c3c790 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -28,7 +28,7 @@ import ( "time" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // JSRE is a JS runtime environment embedding the goja interpreter. diff --git a/internal/shutdowncheck/shutdown_tracker.go b/internal/shutdowncheck/shutdown_tracker.go index c95b4f02f4..181fe98bbb 100644 --- a/internal/shutdowncheck/shutdown_tracker.go +++ b/internal/shutdowncheck/shutdown_tracker.go @@ -19,10 +19,10 @@ package shutdowncheck import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" ) // ShutdownTracker is a service that reports previous unclean shutdowns diff --git a/internal/testlog/testlog.go b/internal/testlog/testlog.go index 3cdbea6e05..5be0542c1c 100644 --- a/internal/testlog/testlog.go +++ b/internal/testlog/testlog.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" "golang.org/x/exp/slog" ) diff --git a/internal/version/version.go b/internal/version/version.go index 0daea02b57..23b784e674 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -23,10 +23,10 @@ import ( "runtime/debug" "strings" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/params" ) -const ourPath = "github.com/ethereum/go-ethereum" // Path to our module +const ourPath = "github.com/slingshot-finance/op-geth" // Path to our module // These variables are set at build-time by the linker when the build is // done by build/ci.go. diff --git a/metrics/cpu_enabled.go b/metrics/cpu_enabled.go index 2359028a21..0b2d25c877 100644 --- a/metrics/cpu_enabled.go +++ b/metrics/cpu_enabled.go @@ -20,7 +20,7 @@ package metrics import ( - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" "github.com/shirou/gopsutil/cpu" ) diff --git a/metrics/cputime_unix.go b/metrics/cputime_unix.go index ad4f812fd2..8bd892519b 100644 --- a/metrics/cputime_unix.go +++ b/metrics/cputime_unix.go @@ -22,7 +22,7 @@ package metrics import ( syscall "golang.org/x/sys/unix" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index 7e3f82a075..a8e16a3930 100644 --- a/metrics/exp/exp.go +++ b/metrics/exp/exp.go @@ -8,9 +8,9 @@ import ( "net/http" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/prometheus" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/metrics/prometheus" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index bbc4fc024b..5f65f67560 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -3,7 +3,7 @@ package influxdb import ( "fmt" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/metrics" ) func readMeter(namespace, name string, i interface{}) (string, map[string]interface{}) { diff --git a/metrics/influxdb/influxdb_test.go b/metrics/influxdb/influxdb_test.go index c6f2eeac62..803860d712 100644 --- a/metrics/influxdb/influxdb_test.go +++ b/metrics/influxdb/influxdb_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/internal" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/metrics/internal" influxdb2 "github.com/influxdata/influxdb-client-go/v2" ) diff --git a/metrics/influxdb/influxdbv1.go b/metrics/influxdb/influxdbv1.go index ac58280803..49010882e7 100644 --- a/metrics/influxdb/influxdbv1.go +++ b/metrics/influxdb/influxdbv1.go @@ -5,8 +5,8 @@ import ( uurl "net/url" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" client "github.com/influxdata/influxdb1-client/v2" ) diff --git a/metrics/influxdb/influxdbv2.go b/metrics/influxdb/influxdbv2.go index 0be5137d5e..777c1e3297 100644 --- a/metrics/influxdb/influxdbv2.go +++ b/metrics/influxdb/influxdbv2.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" influxdb2 "github.com/influxdata/influxdb-client-go/v2" "github.com/influxdata/influxdb-client-go/v2/api" ) diff --git a/metrics/internal/sampledata.go b/metrics/internal/sampledata.go index de9b207b6d..572e308cfa 100644 --- a/metrics/internal/sampledata.go +++ b/metrics/internal/sampledata.go @@ -22,7 +22,7 @@ import ( metrics2 "runtime/metrics" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/metrics" ) // ExampleMetrics returns an ordered registry populated with a sample of metrics. diff --git a/metrics/internal/sampledata_test.go b/metrics/internal/sampledata_test.go index 0013299406..0fb76f85ea 100644 --- a/metrics/internal/sampledata_test.go +++ b/metrics/internal/sampledata_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/metrics" ) func TestCollectRuntimeMetrics(t *testing.T) { diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index a86f758637..cbe97bdd43 100644 --- a/metrics/librato/librato.go +++ b/metrics/librato/librato.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index 9ca8f115c0..dfb623cb40 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -14,7 +14,7 @@ import ( "syscall" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) // Enabled is checked by the constructor functions for all of the diff --git a/metrics/prometheus/collector.go b/metrics/prometheus/collector.go index 25b258d56a..5aef3925bb 100644 --- a/metrics/prometheus/collector.go +++ b/metrics/prometheus/collector.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/metrics" ) var ( diff --git a/metrics/prometheus/collector_test.go b/metrics/prometheus/collector_test.go index ea17aac458..21437b4e13 100644 --- a/metrics/prometheus/collector_test.go +++ b/metrics/prometheus/collector_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/internal" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/metrics/internal" ) func TestMain(m *testing.M) { diff --git a/metrics/prometheus/prometheus.go b/metrics/prometheus/prometheus.go index dbdeae6c7f..aec3923fc9 100644 --- a/metrics/prometheus/prometheus.go +++ b/metrics/prometheus/prometheus.go @@ -22,8 +22,8 @@ import ( "net/http" "sort" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" ) // Handler returns an HTTP handler which dump metrics in Prometheus format. diff --git a/miner/miner.go b/miner/miner.go index 82d353a336..0552a33edc 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -24,18 +24,18 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" ) // Backend wraps all methods required for mining. Only full node is capable diff --git a/miner/miner_test.go b/miner/miner_test.go index 411d6026ce..4b28c1b43d 100644 --- a/miner/miner_test.go +++ b/miner/miner_test.go @@ -23,20 +23,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/clique" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/txpool/legacypool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" ) type mockBackend struct { diff --git a/miner/ordering.go b/miner/ordering.go index 4c3055f0d3..9b787defff 100644 --- a/miner/ordering.go +++ b/miner/ordering.go @@ -20,10 +20,10 @@ import ( "container/heap" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" ) // txWithMinerFee wraps a transaction with its gas price or effective miner gasTipCap diff --git a/miner/ordering_test.go b/miner/ordering_test.go index e5868d7a06..fa2f80c02a 100644 --- a/miner/ordering_test.go +++ b/miner/ordering_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" ) func TestTransactionPriceNonceSortLegacy(t *testing.T) { diff --git a/miner/payload_building.go b/miner/payload_building.go index 935329f57e..e729cadb5a 100644 --- a/miner/payload_building.go +++ b/miner/payload_building.go @@ -25,12 +25,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/beacon/engine" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/beacon/engine" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" ) // BuildPayloadArgs contains the provided parameters for building payload. diff --git a/miner/payload_building_test.go b/miner/payload_building_test.go index ce09de635e..b2e0eaccbb 100644 --- a/miner/payload_building_test.go +++ b/miner/payload_building_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/beacon/engine" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/beacon/engine" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" ) func TestBuildPayload(t *testing.T) { diff --git a/miner/stress/clique/main.go b/miner/stress/clique/main.go index 13336cd83c..7f6ae93484 100644 --- a/miner/stress/clique/main.go +++ b/miner/stress/clique/main.go @@ -26,22 +26,22 @@ import ( "os/signal" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/fdlimit" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/txpool/legacypool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/eth" + "github.com/slingshot-finance/op-geth/eth/downloader" + "github.com/slingshot-finance/op-geth/eth/ethconfig" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/miner" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/params" ) func main() { diff --git a/miner/worker.go b/miner/worker.go index 8fe96f9a6c..0316ca999f 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -25,21 +25,21 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/misc" + "github.com/slingshot-finance/op-geth/consensus/misc/eip1559" + "github.com/slingshot-finance/op-geth/consensus/misc/eip4844" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie" ) const ( @@ -1229,7 +1229,7 @@ func (w *worker) commit(env *environment, interval func(), update bool, start ti interval() } // Create a local environment copy, avoid the data race with snapshot state. - // https://github.com/ethereum/go-ethereum/issues/24299 + // https://github.com/slingshot-finance/op-geth/issues/24299 env := env.copy() // Withdrawals are set to nil here, because this is only called in PoW. block, err := w.engine.FinalizeAndAssemble(w.chain, env.header, env.state, env.txs, nil, env.receipts, nil) diff --git a/miner/worker_test.go b/miner/worker_test.go index 948ce43a34..d9c75d2714 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -22,21 +22,21 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "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/txpool" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/consensus" + "github.com/slingshot-finance/op-geth/consensus/clique" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/txpool" + "github.com/slingshot-finance/op-geth/core/txpool/legacypool" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/params" ) const ( diff --git a/node/api.go b/node/api.go index f81f394beb..11f7406c8c 100644 --- a/node/api.go +++ b/node/api.go @@ -21,13 +21,13 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/internal/debug" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/rpc" ) // apis returns the collection of built-in RPC APIs. diff --git a/node/api_test.go b/node/api_test.go index 8761c4883e..a30a408036 100644 --- a/node/api_test.go +++ b/node/api_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/rpc" "github.com/stretchr/testify/assert" ) diff --git a/node/config.go b/node/config.go index 949db887e4..767f5bdcd1 100644 --- a/node/config.go +++ b/node/config.go @@ -25,11 +25,11 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/rpc" ) const ( diff --git a/node/config_test.go b/node/config_test.go index e8af8ddcd8..8b7ee43ecb 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -23,8 +23,8 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index 42d9d4cde0..6174ca6cfb 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,9 +22,9 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/nat" + "github.com/slingshot-finance/op-geth/rpc" ) const ( diff --git a/node/endpoints.go b/node/endpoints.go index 14c12fd1f1..89e7d08c41 100644 --- a/node/endpoints.go +++ b/node/endpoints.go @@ -21,8 +21,8 @@ import ( "net/http" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rpc" ) // StartHTTPEndpoint starts the HTTP RPC endpoint. diff --git a/node/jwt_auth.go b/node/jwt_auth.go index d4f8193ca7..19c015cdb0 100644 --- a/node/jwt_auth.go +++ b/node/jwt_auth.go @@ -21,7 +21,7 @@ import ( "net/http" "time" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/rpc" "github.com/golang-jwt/jwt/v4" ) diff --git a/node/node.go b/node/node.go index d10639fe5b..c126890507 100644 --- a/node/node.go +++ b/node/node.go @@ -28,15 +28,15 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "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/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/rpc" "github.com/gofrs/flock" ) diff --git a/node/node_auth_test.go b/node/node_auth_test.go index 597cd8531f..8f1c5fabb7 100644 --- a/node/node_auth_test.go +++ b/node/node_auth_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/rpc" "github.com/golang-jwt/jwt/v4" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index e45ee49a25..e464bed239 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,7 +20,7 @@ import ( "fmt" "log" - "github.com/ethereum/go-ethereum/node" + "github.com/slingshot-finance/op-geth/node" ) // SampleLifecycle is a trivial network service that can be attached to a node for diff --git a/node/node_test.go b/node/node_test.go index 04810a815b..f81c12e54a 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -26,10 +26,10 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/rpc" "github.com/stretchr/testify/assert" ) diff --git a/node/rpcstack.go b/node/rpcstack.go index b33c238051..7fc7ebe962 100644 --- a/node/rpcstack.go +++ b/node/rpcstack.go @@ -30,8 +30,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rpc" "github.com/rs/cors" ) diff --git a/node/rpcstack_test.go b/node/rpcstack_test.go index e41cc51ad3..82db29612f 100644 --- a/node/rpcstack_test.go +++ b/node/rpcstack_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/internal/testlog" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rpc" "github.com/golang-jwt/jwt/v4" "github.com/gorilla/websocket" "github.com/stretchr/testify/assert" diff --git a/node/utils_test.go b/node/utils_test.go index 681f3a8b28..24bd5758ad 100644 --- a/node/utils_test.go +++ b/node/utils_test.go @@ -20,8 +20,8 @@ package node import ( - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/rpc" ) // NoopLifecycle is a trivial implementation of the Service interface. diff --git a/oss-fuzz.sh b/oss-fuzz.sh index 8978de70dd..2ed13fc530 100644 --- a/oss-fuzz.sh +++ b/oss-fuzz.sh @@ -16,7 +16,7 @@ ################################################################################ # This sets the -coverpgk for the coverage report when the corpus is executed through go test -coverpkg="github.com/ethereum/go-ethereum/..." +coverpkg="github.com/slingshot-finance/op-geth/..." function coverbuild { path=$1 @@ -81,134 +81,134 @@ function compile_fuzzer() { } go install github.com/holiman/gofuzz-shim@latest -repo=$GOPATH/src/github.com/ethereum/go-ethereum -compile_fuzzer github.com/ethereum/go-ethereum/accounts/abi \ +repo=$GOPATH/src/github.com/slingshot-finance/op-geth +compile_fuzzer github.com/slingshot-finance/op-geth/accounts/abi \ FuzzABI fuzzAbi \ $repo/accounts/abi/abifuzzer_test.go -compile_fuzzer github.com/ethereum/go-ethereum/common/bitutil \ +compile_fuzzer github.com/slingshot-finance/op-geth/common/bitutil \ FuzzEncoder fuzzBitutilEncoder \ $repo/common/bitutil/compress_test.go -compile_fuzzer github.com/ethereum/go-ethereum/common/bitutil \ +compile_fuzzer github.com/slingshot-finance/op-geth/common/bitutil \ FuzzDecoder fuzzBitutilDecoder \ $repo/common/bitutil/compress_test.go -compile_fuzzer github.com/ethereum/go-ethereum/core/vm/runtime \ +compile_fuzzer github.com/slingshot-finance/op-geth/core/vm/runtime \ FuzzVmRuntime fuzzVmRuntime\ $repo/core/vm/runtime/runtime_fuzz_test.go -compile_fuzzer github.com/ethereum/go-ethereum/core/vm \ +compile_fuzzer github.com/slingshot-finance/op-geth/core/vm \ FuzzPrecompiledContracts fuzzPrecompiledContracts\ $repo/core/vm/contracts_fuzz_test.go,$repo/core/vm/contracts_test.go -compile_fuzzer github.com/ethereum/go-ethereum/core/types \ +compile_fuzzer github.com/slingshot-finance/op-geth/core/types \ FuzzRLP fuzzRlp \ $repo/core/types/rlp_fuzzer_test.go -compile_fuzzer github.com/ethereum/go-ethereum/crypto/blake2b \ +compile_fuzzer github.com/slingshot-finance/op-geth/crypto/blake2b \ Fuzz fuzzBlake2b \ $repo/crypto/blake2b/blake2b_f_fuzz_test.go -compile_fuzzer github.com/ethereum/go-ethereum/accounts/keystore \ +compile_fuzzer github.com/slingshot-finance/op-geth/accounts/keystore \ FuzzPassword fuzzKeystore \ $repo/accounts/keystore/keystore_fuzzing_test.go pkg=$repo/trie/ -compile_fuzzer github.com/ethereum/go-ethereum/trie \ +compile_fuzzer github.com/slingshot-finance/op-geth/trie \ FuzzTrie fuzzTrie \ $pkg/trie_test.go,$pkg/database_test.go,$pkg/tracer_test.go,$pkg/proof_test.go,$pkg/iterator_test.go,$pkg/sync_test.go -compile_fuzzer github.com/ethereum/go-ethereum/trie \ +compile_fuzzer github.com/slingshot-finance/op-geth/trie \ FuzzStackTrie fuzzStackTrie \ $pkg/stacktrie_fuzzer_test.go,$pkg/iterator_test.go,$pkg/trie_test.go,$pkg/database_test.go,$pkg/tracer_test.go,$pkg/proof_test.go,$pkg/sync_test.go #compile_fuzzer tests/fuzzers/snap FuzzARange fuzz_account_range -compile_fuzzer github.com/ethereum/go-ethereum/eth/protocols/snap \ +compile_fuzzer github.com/slingshot-finance/op-geth/eth/protocols/snap \ FuzzARange fuzz_account_range \ $repo/eth/protocols/snap/handler_fuzzing_test.go -compile_fuzzer github.com/ethereum/go-ethereum/eth/protocols/snap \ +compile_fuzzer github.com/slingshot-finance/op-geth/eth/protocols/snap \ FuzzSRange fuzz_storage_range \ $repo/eth/protocols/snap/handler_fuzzing_test.go -compile_fuzzer github.com/ethereum/go-ethereum/eth/protocols/snap \ +compile_fuzzer github.com/slingshot-finance/op-geth/eth/protocols/snap \ FuzzByteCodes fuzz_byte_codes \ $repo/eth/protocols/snap/handler_fuzzing_test.go -compile_fuzzer github.com/ethereum/go-ethereum/eth/protocols/snap \ +compile_fuzzer github.com/slingshot-finance/op-geth/eth/protocols/snap \ FuzzTrieNodes fuzz_trie_nodes\ $repo/eth/protocols/snap/handler_fuzzing_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bn256 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bn256 \ FuzzAdd fuzzBn256Add\ $repo/tests/fuzzers/bn256/bn256_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bn256 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bn256 \ FuzzMul fuzzBn256Mul \ $repo/tests/fuzzers/bn256/bn256_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bn256 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bn256 \ FuzzPair fuzzBn256Pair \ $repo/tests/fuzzers/bn256/bn256_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/txfetcher \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/txfetcher \ Fuzz fuzzTxfetcher \ $repo/tests/fuzzers/txfetcher/txfetcher_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzG1Add fuzz_g1_add\ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzG1Mul fuzz_g1_mul\ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzG1MultiExp fuzz_g1_multiexp \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzG2Add fuzz_g2_add \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzG2Mul fuzz_g2_mul\ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzG2MultiExp fuzz_g2_multiexp \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzPairing fuzz_pairing \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzMapG1 fuzz_map_g1\ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzMapG2 fuzz_map_g2 \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzCrossG1Add fuzz_cross_g1_add \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzCrossG1MultiExp fuzz_cross_g1_multiexp \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzCrossG2Add fuzz_cross_g2_add \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/bls12381 \ FuzzCrossPairing fuzz_cross_pairing\ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/secp256k1 \ +compile_fuzzer github.com/slingshot-finance/op-geth/tests/fuzzers/secp256k1 \ Fuzz fuzzSecp256k1\ $repo/tests/fuzzers/secp256k1/secp_test.go diff --git a/p2p/dial.go b/p2p/dial.go index 5e4ab1d50d..4d29efb466 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -27,10 +27,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 13908f11ea..3b4931d9d5 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -27,11 +27,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/internal/testlog" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/netutil" ) // This test checks that dynamic dials are launched from discovery results. diff --git a/p2p/discover/common.go b/p2p/discover/common.go index c9f0477def..4ca8113404 100644 --- a/p2p/discover/common.go +++ b/p2p/discover/common.go @@ -21,11 +21,11 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/p2p/netutil" ) // UDPConn is a network connection on which discovery can operate. diff --git a/p2p/discover/lookup.go b/p2p/discover/lookup.go index b8d97b44e1..0137e59364 100644 --- a/p2p/discover/lookup.go +++ b/p2p/discover/lookup.go @@ -21,7 +21,7 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enode" ) // lookup performs a network search for nodes close to the given target. It approaches the diff --git a/p2p/discover/metrics.go b/p2p/discover/metrics.go index da8e9cb817..36260dbc68 100644 --- a/p2p/discover/metrics.go +++ b/p2p/discover/metrics.go @@ -20,7 +20,7 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/metrics" ) const ( diff --git a/p2p/discover/node.go b/p2p/discover/node.go index 9ffe101ccf..78bc87f698 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -24,9 +24,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enode" ) // node represents a host on the network. diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 3f9157808f..e475c2f8dd 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -24,7 +24,7 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" "golang.org/x/exp/slices" ) diff --git a/p2p/discover/table.go b/p2p/discover/table.go index 2b7a28708b..417cd16ba9 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index 3ba3422251..7f3efdf831 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -27,10 +27,10 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/p2p/netutil" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/table_util_test.go b/p2p/discover/table_util_test.go index d6309dfd6c..e00a2d11f5 100644 --- a/p2p/discover/table_util_test.go +++ b/p2p/discover/table_util_test.go @@ -26,9 +26,9 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" "golang.org/x/exp/slices" ) diff --git a/p2p/discover/v4_lookup_test.go b/p2p/discover/v4_lookup_test.go index 8867a5a8ac..39c47fa538 100644 --- a/p2p/discover/v4_lookup_test.go +++ b/p2p/discover/v4_lookup_test.go @@ -22,10 +22,10 @@ import ( "net" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/discover/v4wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/discover/v4wire" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" "golang.org/x/exp/slices" ) diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go index 988f16b01d..0e1f0d8222 100644 --- a/p2p/discover/v4_udp.go +++ b/p2p/discover/v4_udp.go @@ -29,11 +29,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover/v4wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/discover/v4wire" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/netutil" ) // Errors diff --git a/p2p/discover/v4_udp_test.go b/p2p/discover/v4_udp_test.go index 361e379626..352991a972 100644 --- a/p2p/discover/v4_udp_test.go +++ b/p2p/discover/v4_udp_test.go @@ -31,11 +31,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover/v4wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/internal/testlog" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/discover/v4wire" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" ) // shared test variables diff --git a/p2p/discover/v4wire/v4wire.go b/p2p/discover/v4wire/v4wire.go index 9c59359fb2..d35b1ad4b0 100644 --- a/p2p/discover/v4wire/v4wire.go +++ b/p2p/discover/v4wire/v4wire.go @@ -27,11 +27,11 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" ) // RPC packet types diff --git a/p2p/discover/v4wire/v4wire_test.go b/p2p/discover/v4wire/v4wire_test.go index 38820f3b48..fb4efaa296 100644 --- a/p2p/discover/v4wire/v4wire_test.go +++ b/p2p/discover/v4wire/v4wire_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" ) // EIP-8 test vectors. diff --git a/p2p/discover/v5_talk.go b/p2p/discover/v5_talk.go index c1f6787940..b6a403cdc6 100644 --- a/p2p/discover/v5_talk.go +++ b/p2p/discover/v5_talk.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover/v5wire" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/discover/v5wire" + "github.com/slingshot-finance/op-geth/p2p/enode" ) // This is a limit for the number of concurrent talk requests. diff --git a/p2p/discover/v5_udp.go b/p2p/discover/v5_udp.go index 8b3e33d37c..406540a8a1 100644 --- a/p2p/discover/v5_udp.go +++ b/p2p/discover/v5_udp.go @@ -28,12 +28,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover/v5wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/discover/v5wire" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/p2p/netutil" ) const ( diff --git a/p2p/discover/v5_udp_test.go b/p2p/discover/v5_udp_test.go index eaa969ea8b..c67c694823 100644 --- a/p2p/discover/v5_udp_test.go +++ b/p2p/discover/v5_udp_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover/v5wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/internal/testlog" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/discover/v5wire" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" "github.com/stretchr/testify/require" "golang.org/x/exp/slices" ) diff --git a/p2p/discover/v5wire/crypto.go b/p2p/discover/v5wire/crypto.go index fc0a0edef5..474e7b04cc 100644 --- a/p2p/discover/v5wire/crypto.go +++ b/p2p/discover/v5wire/crypto.go @@ -25,9 +25,9 @@ import ( "fmt" "hash" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enode" "golang.org/x/crypto/hkdf" ) diff --git a/p2p/discover/v5wire/crypto_test.go b/p2p/discover/v5wire/crypto_test.go index 72169b4314..f073eb1ba8 100644 --- a/p2p/discover/v5wire/crypto_test.go +++ b/p2p/discover/v5wire/crypto_test.go @@ -25,9 +25,9 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enode" ) func TestVector_ECDH(t *testing.T) { diff --git a/p2p/discover/v5wire/encoding.go b/p2p/discover/v5wire/encoding.go index 5108910620..6ec67404ce 100644 --- a/p2p/discover/v5wire/encoding.go +++ b/p2p/discover/v5wire/encoding.go @@ -28,10 +28,10 @@ import ( "fmt" "hash" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" ) // TODO concurrent WHOAREYOU tie-breaker diff --git a/p2p/discover/v5wire/encoding_test.go b/p2p/discover/v5wire/encoding_test.go index a5387311a5..4102b5b703 100644 --- a/p2p/discover/v5wire/encoding_test.go +++ b/p2p/discover/v5wire/encoding_test.go @@ -30,10 +30,10 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enode" ) // To regenerate discv5 test vectors, run diff --git a/p2p/discover/v5wire/msg.go b/p2p/discover/v5wire/msg.go index 401db2f6c5..d662add85f 100644 --- a/p2p/discover/v5wire/msg.go +++ b/p2p/discover/v5wire/msg.go @@ -20,11 +20,11 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" ) // Packet is implemented by all message types. diff --git a/p2p/discover/v5wire/session.go b/p2p/discover/v5wire/session.go index 862c21fcee..aa745744a8 100644 --- a/p2p/discover/v5wire/session.go +++ b/p2p/discover/v5wire/session.go @@ -22,10 +22,10 @@ import ( "encoding/binary" "time" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enode" ) const handshakeTimeout = time.Second diff --git a/p2p/dnsdisc/client.go b/p2p/dnsdisc/client.go index 8f1c221b80..36222e2bd6 100644 --- a/p2p/dnsdisc/client.go +++ b/p2p/dnsdisc/client.go @@ -27,12 +27,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" "golang.org/x/sync/singleflight" "golang.org/x/time/rate" ) diff --git a/p2p/dnsdisc/client_test.go b/p2p/dnsdisc/client_test.go index abc35ddbd3..d96d30a568 100644 --- a/p2p/dnsdisc/client_test.go +++ b/p2p/dnsdisc/client_test.go @@ -25,13 +25,13 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/internal/testlog" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" ) var signingKeyForTesting, _ = crypto.ToECDSA(hexutil.MustDecode("0xdc599867fc513f8f5e2c2c9c489cde5e71362d1d9ec6e693e0de063236ed1240")) diff --git a/p2p/dnsdisc/sync.go b/p2p/dnsdisc/sync.go index 073547c90d..71bc7b296d 100644 --- a/p2p/dnsdisc/sync.go +++ b/p2p/dnsdisc/sync.go @@ -21,8 +21,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/p2p/enode" ) // This is the number of consecutive leaf requests that may fail before diff --git a/p2p/dnsdisc/tree.go b/p2p/dnsdisc/tree.go index 06b7681f18..e38766e632 100644 --- a/p2p/dnsdisc/tree.go +++ b/p2p/dnsdisc/tree.go @@ -25,10 +25,10 @@ import ( "io" "strings" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" "golang.org/x/crypto/sha3" "golang.org/x/exp/slices" ) diff --git a/p2p/dnsdisc/tree_test.go b/p2p/dnsdisc/tree_test.go index 9ed17aa4b3..1c4b48d429 100644 --- a/p2p/dnsdisc/tree_test.go +++ b/p2p/dnsdisc/tree_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/p2p/enode" ) func TestParseRoot(t *testing.T) { diff --git a/p2p/enode/idscheme.go b/p2p/enode/idscheme.go index fd5d868b76..a64794d2b8 100644 --- a/p2p/enode/idscheme.go +++ b/p2p/enode/idscheme.go @@ -21,10 +21,10 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/enode/idscheme_test.go b/p2p/enode/idscheme_test.go index 0910e6e83f..2eb94b6dae 100644 --- a/p2p/enode/idscheme_test.go +++ b/p2p/enode/idscheme_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enode/iter_test.go b/p2p/enode/iter_test.go index b736ed450a..f55bf725a0 100644 --- a/p2p/enode/iter_test.go +++ b/p2p/enode/iter_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/p2p/enr" ) func TestReadNodes(t *testing.T) { diff --git a/p2p/enode/localnode.go b/p2p/enode/localnode.go index a18204e752..05ed3b6327 100644 --- a/p2p/enode/localnode.go +++ b/p2p/enode/localnode.go @@ -26,9 +26,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/p2p/netutil" ) const ( diff --git a/p2p/enode/localnode_test.go b/p2p/enode/localnode_test.go index 7f97ad392f..e92c8b8381 100644 --- a/p2p/enode/localnode_test.go +++ b/p2p/enode/localnode_test.go @@ -21,8 +21,8 @@ import ( "net" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enr" "github.com/stretchr/testify/assert" ) diff --git a/p2p/enode/node.go b/p2p/enode/node.go index d7a1a9a156..d610296a58 100644 --- a/p2p/enode/node.go +++ b/p2p/enode/node.go @@ -26,8 +26,8 @@ import ( "net" "strings" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" ) var errMissingPrefix = errors.New("missing 'enr:' prefix for base64-encoded record") diff --git a/p2p/enode/node_test.go b/p2p/enode/node_test.go index d15859c477..76a6a6d241 100644 --- a/p2p/enode/node_test.go +++ b/p2p/enode/node_test.go @@ -24,8 +24,8 @@ import ( "testing" "testing/quick" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" "github.com/stretchr/testify/assert" ) diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go index 7e7fb69b29..404fa65b8c 100644 --- a/p2p/enode/nodedb.go +++ b/p2p/enode/nodedb.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/enode/urlv4.go b/p2p/enode/urlv4.go index 0272eee987..95afd64d36 100644 --- a/p2p/enode/urlv4.go +++ b/p2p/enode/urlv4.go @@ -26,9 +26,9 @@ import ( "regexp" "strconv" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enr" ) var ( diff --git a/p2p/enode/urlv4_test.go b/p2p/enode/urlv4_test.go index 33de96cc57..7482775e95 100644 --- a/p2p/enode/urlv4_test.go +++ b/p2p/enode/urlv4_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/enr" ) func init() { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 2b093b2f1a..037d3119a5 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -40,7 +40,7 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/rlp" ) const SizeLimit = 300 // maximum encoded size of a node record in bytes diff --git a/p2p/enr/enr_test.go b/p2p/enr/enr_test.go index b85ee209d5..1c2df73162 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index 9945a436c9..58e80d80ed 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -22,7 +22,7 @@ import ( "io" "net" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index 3ab56ee350..9f080046d0 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -24,9 +24,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index a6e36b91a8..a9926db321 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -22,7 +22,7 @@ import ( "errors" "net" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/metrics" ) const ( diff --git a/p2p/msgrate/msgrate.go b/p2p/msgrate/msgrate.go index de1a3177db..1f4740ba5d 100644 --- a/p2p/msgrate/msgrate.go +++ b/p2p/msgrate/msgrate.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) // measurementImpact is the impact a single measurement has on a peer's final diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 2aa1f85585..519a17825e 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" natpmp "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/nat/natupnp_test.go b/p2p/nat/natupnp_test.go index 9072451d50..98ab295530 100644 --- a/p2p/nat/natupnp_test.go +++ b/p2p/nat/natupnp_test.go @@ -166,7 +166,7 @@ func TestUPNP_DDWRT(t *testing.T) { if os.Getenv("CI") != "" { t.Fatalf("not discovered") } else { - t.Skipf("UPnP not discovered (known issue, see https://github.com/ethereum/go-ethereum/issues/21476)") + t.Skipf("UPnP not discovered (known issue, see https://github.com/slingshot-finance/op-geth/issues/21476)") } } upnp, _ := discovered.(*upnp) diff --git a/p2p/netutil/iptrack.go b/p2p/netutil/iptrack.go index a070499e19..6e8358d2ed 100644 --- a/p2p/netutil/iptrack.go +++ b/p2p/netutil/iptrack.go @@ -19,7 +19,7 @@ package netutil import ( "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/slingshot-finance/op-geth/common/mclock" ) // IPTracker predicts the external endpoint, i.e. IP address and port, of the local host diff --git a/p2p/netutil/iptrack_test.go b/p2p/netutil/iptrack_test.go index ee3bba861e..d496cc80a2 100644 --- a/p2p/netutil/iptrack_test.go +++ b/p2p/netutil/iptrack_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/slingshot-finance/op-geth/common/mclock" ) const ( diff --git a/p2p/nodestate/nodestate.go b/p2p/nodestate/nodestate.go index 1e1757559c..2126ec4cd8 100644 --- a/p2p/nodestate/nodestate.go +++ b/p2p/nodestate/nodestate.go @@ -23,13 +23,13 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" ) var ( diff --git a/p2p/nodestate/nodestate_test.go b/p2p/nodestate/nodestate_test.go index d06ad755e2..b9cc7eea44 100644 --- a/p2p/nodestate/nodestate_test.go +++ b/p2p/nodestate/nodestate_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" ) func testSetup(flagPersist []bool, fieldType []reflect.Type) (*Setup, []Flags, []Field) { diff --git a/p2p/peer.go b/p2p/peer.go index 65a7903f58..05aef5194c 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rlp" "golang.org/x/exp/slices" ) diff --git a/p2p/peer_test.go b/p2p/peer_test.go index 4308bbd2eb..bb3d16b20a 100644 --- a/p2p/peer_test.go +++ b/p2p/peer_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" ) var discard = Protocol{ diff --git a/p2p/protocol.go b/p2p/protocol.go index 9bb6785a22..c22222af05 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/rlpx/buffer_test.go b/p2p/rlpx/buffer_test.go index 9fee4172bd..997dddc125 100644 --- a/p2p/rlpx/buffer_test.go +++ b/p2p/rlpx/buffer_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common/hexutil" "github.com/stretchr/testify/assert" ) diff --git a/p2p/rlpx/rlpx.go b/p2p/rlpx/rlpx.go index 8bd6f64b9b..fc8bd42745 100644 --- a/p2p/rlpx/rlpx.go +++ b/p2p/rlpx/rlpx.go @@ -34,9 +34,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/crypto/ecies" + "github.com/slingshot-finance/op-geth/rlp" "github.com/golang/snappy" "golang.org/x/crypto/sha3" ) diff --git a/p2p/rlpx/rlpx_test.go b/p2p/rlpx/rlpx_test.go index 136cb1b5bf..2df1ff9338 100644 --- a/p2p/rlpx/rlpx_test.go +++ b/p2p/rlpx/rlpx_test.go @@ -29,10 +29,10 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/crypto/ecies" + "github.com/slingshot-finance/op-geth/p2p/simulations/pipes" + "github.com/slingshot-finance/op-geth/rlp" "github.com/stretchr/testify/assert" ) diff --git a/p2p/server.go b/p2p/server.go index 7975b787bd..34a6b326b9 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -28,16 +28,16 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/discover" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/p2p/nat" + "github.com/slingshot-finance/op-geth/p2p/netutil" "golang.org/x/exp/slices" ) diff --git a/p2p/server_nat.go b/p2p/server_nat.go index 354597cc7a..b7a8e39325 100644 --- a/p2p/server_nat.go +++ b/p2p/server_nat.go @@ -20,10 +20,10 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/p2p/nat" ) const ( diff --git a/p2p/server_nat_test.go b/p2p/server_nat_test.go index de935fcfc5..c293db93c2 100644 --- a/p2p/server_nat_test.go +++ b/p2p/server_nat_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/internal/testlog" + "github.com/slingshot-finance/op-geth/log" ) func TestServerPortMapping(t *testing.T) { diff --git a/p2p/server_test.go b/p2p/server_test.go index a0491e984a..176a733453 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -29,12 +29,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/rlpx" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/internal/testlog" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/p2p/rlpx" ) type testTransport struct { diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index 63cc4936c1..5fb5fa84ae 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -34,12 +34,12 @@ import ( "syscall" "time" - "github.com/ethereum/go-ethereum/internal/reexec" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/internal/reexec" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/rpc" "github.com/gorilla/websocket" "golang.org/x/exp/slog" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index c52917fd0a..69ffc75718 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -24,13 +24,13 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/simulations/pipes" + "github.com/slingshot-finance/op-geth/rpc" "github.com/gorilla/websocket" ) diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go index 2a61508fe1..9705e6524e 100644 --- a/p2p/simulations/adapters/inproc_test.go +++ b/p2p/simulations/adapters/inproc_test.go @@ -23,7 +23,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" + "github.com/slingshot-finance/op-geth/p2p/simulations/pipes" ) func TestTCPPipe(t *testing.T) { diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index fb8463d221..460c5f2a87 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -25,14 +25,14 @@ import ( "os" "strconv" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/reexec" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/internal/reexec" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rpc" "github.com/gorilla/websocket" "golang.org/x/exp/slog" ) diff --git a/p2p/simulations/connect.go b/p2p/simulations/connect.go index ede96b34c1..b03036bb5a 100644 --- a/p2p/simulations/connect.go +++ b/p2p/simulations/connect.go @@ -20,7 +20,7 @@ import ( "errors" "strings" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enode" ) var ( diff --git a/p2p/simulations/connect_test.go b/p2p/simulations/connect_test.go index 0154a18b03..5fe1e963d4 100644 --- a/p2p/simulations/connect_test.go +++ b/p2p/simulations/connect_test.go @@ -19,9 +19,9 @@ package simulations import ( "testing" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/simulations/adapters" ) func newTestNetwork(t *testing.T, nodeCount int) (*Network, []enode.ID) { diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go index 70b35ad777..cbe922e303 100644 --- a/p2p/simulations/examples/ping-pong.go +++ b/p2p/simulations/examples/ping-pong.go @@ -25,12 +25,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/simulations" + "github.com/slingshot-finance/op-geth/p2p/simulations/adapters" ) var adapterType = flag.String("adapter", "sim", `node adapter to use (one of "sim", "exec" or "docker")`) diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go index 34521b4778..7365ea1ed8 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -30,11 +30,11 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/simulations/adapters" + "github.com/slingshot-finance/op-geth/rpc" "github.com/gorilla/websocket" "github.com/julienschmidt/httprouter" ) diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go index c53a49797b..881a8e939f 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -29,13 +29,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/simulations/adapters" + "github.com/slingshot-finance/op-geth/rpc" "github.com/mattn/go-colorable" "golang.org/x/exp/slog" ) diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index 0dc04e65f9..1db6a541d4 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/simulations/adapters" ) // a map of mocker names to its function diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go index 0112ee5cfd..63c4e480dd 100644 --- a/p2p/simulations/mocker_test.go +++ b/p2p/simulations/mocker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enode" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 4735e5cfa6..629d28b41f 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/slingshot-finance/op-geth/event" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/simulations/adapters" ) var DialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index 4ed1e4e6c3..fc99d0ecb2 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -27,10 +27,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/node" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/simulations/adapters" ) // Tests that a created snapshot with a minimal service only contains the expected connections diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go index ae62c42b9c..fdfc26b1bb 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enode" ) // Simulation provides a framework for running actions in a simulated network diff --git a/p2p/simulations/test.go b/p2p/simulations/test.go index 0edb07b127..56933d853b 100644 --- a/p2p/simulations/test.go +++ b/p2p/simulations/test.go @@ -19,10 +19,10 @@ package simulations import ( "testing" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/p2p" + "github.com/slingshot-finance/op-geth/p2p/enode" + "github.com/slingshot-finance/op-geth/p2p/enr" + "github.com/slingshot-finance/op-geth/rpc" ) // NoopService is the service that does not do anything diff --git a/p2p/tracker/tracker.go b/p2p/tracker/tracker.go index 6a733b9ba5..1a2d5c4ec5 100644 --- a/p2p/tracker/tracker.go +++ b/p2p/tracker/tracker.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" ) const ( diff --git a/p2p/transport.go b/p2p/transport.go index 4f6bb569bf..7b6c00cbb5 100644 --- a/p2p/transport.go +++ b/p2p/transport.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/rlpx" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/bitutil" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/p2p/rlpx" + "github.com/slingshot-finance/op-geth/rlp" ) const ( diff --git a/p2p/transport_test.go b/p2p/transport_test.go index 24e06c5a06..740e8610cf 100644 --- a/p2p/transport_test.go +++ b/p2p/transport_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/p2p/simulations/pipes" ) func TestProtocolHandshake(t *testing.T) { diff --git a/p2p/util.go b/p2p/util.go index 2c8f322a66..eee748c3c2 100644 --- a/p2p/util.go +++ b/p2p/util.go @@ -19,7 +19,7 @@ package p2p import ( "container/heap" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/slingshot-finance/op-geth/common/mclock" ) // expHeap tracks strings and their expiry time. diff --git a/p2p/util_test.go b/p2p/util_test.go index cc0d2b215f..c13c95392b 100644 --- a/p2p/util_test.go +++ b/p2p/util_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/slingshot-finance/op-geth/common/mclock" ) func TestExpHeap(t *testing.T) { diff --git a/params/bootnodes.go b/params/bootnodes.go index 5bec6ae469..25f4427849 100644 --- a/params/bootnodes.go +++ b/params/bootnodes.go @@ -16,7 +16,7 @@ package params -import "github.com/ethereum/go-ethereum/common" +import "github.com/slingshot-finance/op-geth/common" // MainnetBootnodes are the enode URLs of the P2P bootstrap nodes running on // the main Ethereum network. diff --git a/params/config.go b/params/config.go index b4a10cd6c5..226e6daeab 100644 --- a/params/config.go +++ b/params/config.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // Genesis hashes to enforce below configs on. diff --git a/params/config_test.go b/params/config_test.go index 14d7f833bb..198a373cbe 100644 --- a/params/config_test.go +++ b/params/config_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/math" + "github.com/slingshot-finance/op-geth/common/math" ) func TestCheckCompatible(t *testing.T) { diff --git a/params/dao.go b/params/dao.go index da3c8dfc99..6dfa4376f9 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/params/protocol_params.go b/params/protocol_params.go index 7a204a3fe2..2f7e4aa9a6 100644 --- a/params/protocol_params.go +++ b/params/protocol_params.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) var ( diff --git a/params/superchain.go b/params/superchain.go index 480632e9a7..3222e0d13e 100644 --- a/params/superchain.go +++ b/params/superchain.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/ethereum-optimism/superchain-registry/superchain" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) var OPStackSupport = ProtocolVersionV0{Build: [8]byte{}, Major: 6, Minor: 0, Patch: 0, PreRelease: 0}.Encode() diff --git a/rlp/decode.go b/rlp/decode.go index 9b17d2d810..766949cc22 100644 --- a/rlp/decode.go +++ b/rlp/decode.go @@ -28,7 +28,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/rlp/internal/rlpstruct" + "github.com/slingshot-finance/op-geth/rlp/internal/rlpstruct" "github.com/holiman/uint256" ) diff --git a/rlp/decode_test.go b/rlp/decode_test.go index 07d9c579a6..a834e41fca 100644 --- a/rlp/decode_test.go +++ b/rlp/decode_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common/math" + "github.com/slingshot-finance/op-geth/common/math" "github.com/holiman/uint256" ) diff --git a/rlp/encbuffer_example_test.go b/rlp/encbuffer_example_test.go index ee15d82a77..1451654ec9 100644 --- a/rlp/encbuffer_example_test.go +++ b/rlp/encbuffer_example_test.go @@ -20,7 +20,7 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/rlp" ) func ExampleEncoderBuffer() { diff --git a/rlp/encode.go b/rlp/encode.go index ffb42b2997..cc19814a9e 100644 --- a/rlp/encode.go +++ b/rlp/encode.go @@ -23,7 +23,7 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/rlp/internal/rlpstruct" + "github.com/slingshot-finance/op-geth/rlp/internal/rlpstruct" "github.com/holiman/uint256" ) diff --git a/rlp/encode_test.go b/rlp/encode_test.go index 314958eb56..936ed4e54a 100644 --- a/rlp/encode_test.go +++ b/rlp/encode_test.go @@ -26,7 +26,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common/math" + "github.com/slingshot-finance/op-geth/common/math" "github.com/holiman/uint256" ) diff --git a/rlp/encoder_example_test.go b/rlp/encoder_example_test.go index 4cd3cb8673..e47e4f4801 100644 --- a/rlp/encoder_example_test.go +++ b/rlp/encoder_example_test.go @@ -20,7 +20,7 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/rlp" ) type MyCoolType struct { diff --git a/rlp/iterator_test.go b/rlp/iterator_test.go index a22aaec862..37000247d1 100644 --- a/rlp/iterator_test.go +++ b/rlp/iterator_test.go @@ -19,7 +19,7 @@ package rlp import ( "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common/hexutil" ) // TestIterator tests some basic things about the ListIterator. A more diff --git a/rlp/rlpgen/gen.go b/rlp/rlpgen/gen.go index 0c65864826..c38a352ad9 100644 --- a/rlp/rlpgen/gen.go +++ b/rlp/rlpgen/gen.go @@ -23,7 +23,7 @@ import ( "go/types" "sort" - "github.com/ethereum/go-ethereum/rlp/internal/rlpstruct" + "github.com/slingshot-finance/op-geth/rlp/internal/rlpstruct" ) // buildContext keeps the data needed for make*Op. diff --git a/rlp/rlpgen/main.go b/rlp/rlpgen/main.go index b3a74b9df1..6853b18ea6 100644 --- a/rlp/rlpgen/main.go +++ b/rlp/rlpgen/main.go @@ -27,7 +27,7 @@ import ( "golang.org/x/tools/go/packages" ) -const pathOfPackageRLP = "github.com/ethereum/go-ethereum/rlp" +const pathOfPackageRLP = "github.com/slingshot-finance/op-geth/rlp" func main() { var ( diff --git a/rlp/rlpgen/testdata/bigint.out.txt b/rlp/rlpgen/testdata/bigint.out.txt index f54d1faa15..7c288d254a 100644 --- a/rlp/rlpgen/testdata/bigint.out.txt +++ b/rlp/rlpgen/testdata/bigint.out.txt @@ -1,6 +1,6 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/slingshot-finance/op-geth/rlp" import "io" func (obj *Test) EncodeRLP(_w io.Writer) error { diff --git a/rlp/rlpgen/testdata/nil.out.txt b/rlp/rlpgen/testdata/nil.out.txt index e0d5dcebad..e45b16c996 100644 --- a/rlp/rlpgen/testdata/nil.out.txt +++ b/rlp/rlpgen/testdata/nil.out.txt @@ -1,6 +1,6 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/slingshot-finance/op-geth/rlp" import "io" func (obj *Test) EncodeRLP(_w io.Writer) error { diff --git a/rlp/rlpgen/testdata/optional.out.txt b/rlp/rlpgen/testdata/optional.out.txt index 02df8e457f..8193eceed9 100644 --- a/rlp/rlpgen/testdata/optional.out.txt +++ b/rlp/rlpgen/testdata/optional.out.txt @@ -1,6 +1,6 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/slingshot-finance/op-geth/rlp" import "io" func (obj *Test) EncodeRLP(_w io.Writer) error { diff --git a/rlp/rlpgen/testdata/rawvalue.in.txt b/rlp/rlpgen/testdata/rawvalue.in.txt index 3a657bc907..b62fef83ce 100644 --- a/rlp/rlpgen/testdata/rawvalue.in.txt +++ b/rlp/rlpgen/testdata/rawvalue.in.txt @@ -2,7 +2,7 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/slingshot-finance/op-geth/rlp" type Test struct { RawValue rlp.RawValue diff --git a/rlp/rlpgen/testdata/rawvalue.out.txt b/rlp/rlpgen/testdata/rawvalue.out.txt index 3607c98636..3877d4918b 100644 --- a/rlp/rlpgen/testdata/rawvalue.out.txt +++ b/rlp/rlpgen/testdata/rawvalue.out.txt @@ -1,6 +1,6 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/slingshot-finance/op-geth/rlp" import "io" func (obj *Test) EncodeRLP(_w io.Writer) error { diff --git a/rlp/rlpgen/testdata/uint256.out.txt b/rlp/rlpgen/testdata/uint256.out.txt index 5e6d3ed992..3cf4e883e9 100644 --- a/rlp/rlpgen/testdata/uint256.out.txt +++ b/rlp/rlpgen/testdata/uint256.out.txt @@ -1,6 +1,6 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/slingshot-finance/op-geth/rlp" import "github.com/holiman/uint256" import "io" diff --git a/rlp/rlpgen/testdata/uints.out.txt b/rlp/rlpgen/testdata/uints.out.txt index 1a354956a4..cf32df819f 100644 --- a/rlp/rlpgen/testdata/uints.out.txt +++ b/rlp/rlpgen/testdata/uints.out.txt @@ -1,6 +1,6 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/slingshot-finance/op-geth/rlp" import "io" func (obj *Test) EncodeRLP(_w io.Writer) error { diff --git a/rlp/typecache.go b/rlp/typecache.go index 3e37c9d2fc..9ab86166ba 100644 --- a/rlp/typecache.go +++ b/rlp/typecache.go @@ -22,7 +22,7 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/rlp/internal/rlpstruct" + "github.com/slingshot-finance/op-geth/rlp/internal/rlpstruct" ) // typeinfo is an entry in the type cache. diff --git a/rpc/client.go b/rpc/client.go index 2b0016db8f..1db5711ddf 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -28,7 +28,7 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 044b57a9c4..c2145248ed 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/rpc" ) // In this example, our client wishes to track the latest 'block number' diff --git a/rpc/client_opt_test.go b/rpc/client_opt_test.go index d7cc2572a7..4263e8be2f 100644 --- a/rpc/client_opt_test.go +++ b/rpc/client_opt_test.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/rpc" ) // This example configures a HTTP-based RPC client with two options - one setting the diff --git a/rpc/client_test.go b/rpc/client_test.go index 8870ed1cb6..a9d36f486c 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -34,7 +34,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) func TestClientRequest(t *testing.T) { @@ -493,7 +493,7 @@ func TestClientSubscribeClose(t *testing.T) { } } -// This test reproduces https://github.com/ethereum/go-ethereum/issues/17837 where the +// This test reproduces https://github.com/slingshot-finance/op-geth/issues/17837 where the // client hangs during shutdown when Unsubscribe races with Client.Close. func TestClientCloseUnsubscribeRace(t *testing.T) { server := newTestServer() @@ -578,7 +578,7 @@ func TestClientSubscriptionUnsubscribeServer(t *testing.T) { } // This checks that the subscribed channel can be closed after Unsubscribe. -// It is the reproducer for https://github.com/ethereum/go-ethereum/issues/22322 +// It is the reproducer for https://github.com/slingshot-finance/op-geth/issues/22322 func TestClientSubscriptionChannelClose(t *testing.T) { t.Parallel() diff --git a/rpc/doc.go b/rpc/doc.go index 7c87793dca..d67e7e0614 100644 --- a/rpc/doc.go +++ b/rpc/doc.go @@ -98,7 +98,7 @@ Subscriptions are deleted when the user sends an unsubscribe request or when the connection which was used to create the subscription is closed. This can be initiated by the client and server. The server will close the connection for any write error. -For more information about subscriptions, see https://github.com/ethereum/go-ethereum/wiki/RPC-PUB-SUB. +For more information about subscriptions, see https://github.com/slingshot-finance/op-geth/wiki/RPC-PUB-SUB. # Reverse Calls diff --git a/rpc/endpoints.go b/rpc/endpoints.go index d78ebe2858..2eca18009a 100644 --- a/rpc/endpoints.go +++ b/rpc/endpoints.go @@ -20,7 +20,7 @@ import ( "net" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) // StartIPCEndpoint starts an IPC endpoint. diff --git a/rpc/handler.go b/rpc/handler.go index f44e4d7b01..4095242dec 100644 --- a/rpc/handler.go +++ b/rpc/handler.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) // handler handles JSON-RPC messages. There is one handler per connection. Note that diff --git a/rpc/ipc.go b/rpc/ipc.go index a08245b270..6a14ea54ae 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -20,8 +20,8 @@ import ( "context" "net" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/p2p/netutil" ) // ServeListener accepts connections on l, serving JSON-RPC on them. diff --git a/rpc/ipc_unix.go b/rpc/ipc_unix.go index 33c1cad549..62cecc9ffb 100644 --- a/rpc/ipc_unix.go +++ b/rpc/ipc_unix.go @@ -26,7 +26,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) const ( diff --git a/rpc/metrics.go b/rpc/metrics.go index ef7449ce05..4b3c933cdb 100644 --- a/rpc/metrics.go +++ b/rpc/metrics.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/metrics" ) var ( diff --git a/rpc/server.go b/rpc/server.go index 2742adf07b..3456a15461 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -22,7 +22,7 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) const MetadataApi = "rpc" diff --git a/rpc/service.go b/rpc/service.go index a180b8db93..71eaca3f94 100644 --- a/rpc/service.go +++ b/rpc/service.go @@ -25,7 +25,7 @@ import ( "sync" "unicode" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) var ( diff --git a/rpc/subscription_test.go b/rpc/subscription_test.go index 3a131c8e6b..07e244daae 100644 --- a/rpc/subscription_test.go +++ b/rpc/subscription_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" ) func TestNewID(t *testing.T) { diff --git a/rpc/types.go b/rpc/types.go index f88c37c59d..08100045b3 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -23,8 +23,8 @@ import ( "math" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) // API describes the set of methods offered over the RPC interface diff --git a/rpc/types_test.go b/rpc/types_test.go index 617f441d91..84ff153950 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -21,8 +21,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index 538e53a31b..92cd033da9 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -28,7 +28,7 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" "github.com/gorilla/websocket" ) diff --git a/rpc/websocket_test.go b/rpc/websocket_test.go index d3e15d94c9..ac3dcecca6 100644 --- a/rpc/websocket_test.go +++ b/rpc/websocket_test.go @@ -235,7 +235,7 @@ func TestClientWebsocketPing(t *testing.T) { // server can't handle the request. // Wait for the context's deadline to be reached before proceeding. - // This is important for reproducing https://github.com/ethereum/go-ethereum/issues/19798 + // This is important for reproducing https://github.com/slingshot-finance/op-geth/issues/19798 <-ctx.Done() close(sendPing) diff --git a/signer/core/api.go b/signer/core/api.go index 43eb89ee00..0a39425737 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -26,18 +26,18 @@ import ( "os" "reflect" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/accounts/scwallet" + "github.com/slingshot-finance/op-geth/accounts/usbwallet" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rpc" + "github.com/slingshot-finance/op-geth/signer/core/apitypes" + "github.com/slingshot-finance/op-geth/signer/storage" ) const ( diff --git a/signer/core/api_test.go b/signer/core/api_test.go index 69229dadaf..e5a558453a 100644 --- a/signer/core/api_test.go +++ b/signer/core/api_test.go @@ -26,17 +26,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/ethereum/go-ethereum/signer/fourbyte" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/signer/core" + "github.com/slingshot-finance/op-geth/signer/core/apitypes" + "github.com/slingshot-finance/op-geth/signer/fourbyte" + "github.com/slingshot-finance/op-geth/signer/storage" ) // Used for testing diff --git a/signer/core/apitypes/signed_data_internal_test.go b/signer/core/apitypes/signed_data_internal_test.go index 8067893c21..7becd40483 100644 --- a/signer/core/apitypes/signed_data_internal_test.go +++ b/signer/core/apitypes/signed_data_internal_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" ) func TestBytesPadding(t *testing.T) { diff --git a/signer/core/apitypes/types.go b/signer/core/apitypes/types.go index 8218e754d3..38b4336b43 100644 --- a/signer/core/apitypes/types.go +++ b/signer/core/apitypes/types.go @@ -28,12 +28,12 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" ) var typedDataReferenceTypeRegexp = regexp.MustCompile(`^[A-Za-z](\w*)(\[\])?$`) @@ -91,7 +91,7 @@ type SendTxArgs struct { // We accept "data" and "input" for backwards-compatibility reasons. // "input" is the newer name and should be preferred by clients. - // Issue detail: https://github.com/ethereum/go-ethereum/issues/15628 + // Issue detail: https://github.com/slingshot-finance/op-geth/issues/15628 Data *hexutil.Bytes `json:"data"` Input *hexutil.Bytes `json:"input,omitempty"` diff --git a/signer/core/auditlog.go b/signer/core/auditlog.go index d2207c9eb8..663718f337 100644 --- a/signer/core/auditlog.go +++ b/signer/core/auditlog.go @@ -21,11 +21,11 @@ import ( "encoding/json" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/signer/core/apitypes" "golang.org/x/exp/slog" ) diff --git a/signer/core/cliui.go b/signer/core/cliui.go index b1bd3206ed..25b7069a07 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -25,10 +25,10 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/console/prompt" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/log" ) type CommandlineUI struct { diff --git a/signer/core/gnosis_safe.go b/signer/core/gnosis_safe.go index 01724e5383..ffaa39eeb3 100644 --- a/signer/core/gnosis_safe.go +++ b/signer/core/gnosis_safe.go @@ -20,10 +20,10 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/signer/core/apitypes" ) // GnosisSafeTx is a type to parse the safe-tx returned by the relayer, diff --git a/signer/core/signed_data.go b/signer/core/signed_data.go index 3c2b6f5d45..c2aeedcf6f 100644 --- a/signer/core/signed_data.go +++ b/signer/core/signed_data.go @@ -23,14 +23,14 @@ import ( "fmt" "mime" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/consensus/clique" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/signer/core/apitypes" ) // sign receives a request and produces a signature @@ -302,7 +302,7 @@ func (api *SignerAPI) EcRecover(ctx context.Context, data hexutil.Bytes, sig hex // Note, the signature must conform to the secp256k1 curve R, S and V values, where // the V value must be 27 or 28 for legacy reasons. // - // https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover + // https://github.com/slingshot-finance/op-geth/wiki/Management-APIs#personal_ecRecover if len(sig) != 65 { return common.Address{}, errors.New("signature must be 65 bytes long") } diff --git a/signer/core/signed_data_test.go b/signer/core/signed_data_test.go index 1cf8b4bf38..945b4b5d87 100644 --- a/signer/core/signed_data_test.go +++ b/signer/core/signed_data_test.go @@ -27,13 +27,13 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/signer/core" + "github.com/slingshot-finance/op-geth/signer/core/apitypes" ) var typesStandard = apitypes.Types{ diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go index a0ce684417..0d6ac1ab09 100644 --- a/signer/core/stdioui.go +++ b/signer/core/stdioui.go @@ -19,9 +19,9 @@ package core import ( "context" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rpc" ) type StdIOUI struct { diff --git a/signer/core/uiapi.go b/signer/core/uiapi.go index 4a060147a6..3518c2430e 100644 --- a/signer/core/uiapi.go +++ b/signer/core/uiapi.go @@ -24,11 +24,11 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/accounts/keystore" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/crypto" ) // SignerUIAPI implements methods Clef provides for a UI to query, in the bidirectional communication diff --git a/signer/fourbyte/abi.go b/signer/fourbyte/abi.go index 352abc59e1..61c654d40b 100644 --- a/signer/fourbyte/abi.go +++ b/signer/fourbyte/abi.go @@ -22,8 +22,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/common" ) // decodedCallData is an internal type to represent a method call parsed according diff --git a/signer/fourbyte/abi_test.go b/signer/fourbyte/abi_test.go index 9656732dff..6044627bfa 100644 --- a/signer/fourbyte/abi_test.go +++ b/signer/fourbyte/abi_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/common" ) func verify(t *testing.T, jsondata, calldata string, exp []interface{}) { diff --git a/signer/fourbyte/fourbyte_test.go b/signer/fourbyte/fourbyte_test.go index a3dc3b5117..73dc9a8aae 100644 --- a/signer/fourbyte/fourbyte_test.go +++ b/signer/fourbyte/fourbyte_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/accounts/abi" + "github.com/slingshot-finance/op-geth/common" ) // Tests that all the selectors contained in the 4byte database are valid. diff --git a/signer/fourbyte/validation.go b/signer/fourbyte/validation.go index 58111e8e00..f9fdea7057 100644 --- a/signer/fourbyte/validation.go +++ b/signer/fourbyte/validation.go @@ -22,8 +22,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/signer/core/apitypes" ) // ValidateTransaction does a number of checks on the supplied transaction, and @@ -49,7 +49,7 @@ func (db *Database) ValidateTransaction(selector *string, tx *apitypes.SendTxArg if tx.To == nil { // Contract creation should contain sufficient data to deploy a contract. A // typical error is omitting sender due to some quirk in the javascript call - // e.g. https://github.com/ethereum/go-ethereum/issues/16106. + // e.g. https://github.com/slingshot-finance/op-geth/issues/16106. if len(data) == 0 { // Prevent sending ether into black hole (show stopper) if tx.Value.ToInt().Cmp(big.NewInt(0)) > 0 { diff --git a/signer/fourbyte/validation_test.go b/signer/fourbyte/validation_test.go index 74fed9fe01..6938801eb0 100644 --- a/signer/fourbyte/validation_test.go +++ b/signer/fourbyte/validation_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/signer/core/apitypes" ) func mixAddr(a string) (*common.MixedcaseAddress, error) { diff --git a/signer/rules/rules.go b/signer/rules/rules.go index c9921e57a9..9f29c8931e 100644 --- a/signer/rules/rules.go +++ b/signer/rules/rules.go @@ -24,11 +24,11 @@ import ( "strings" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/jsre/deps" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/internal/jsre/deps" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/signer/core" + "github.com/slingshot-finance/op-geth/signer/storage" ) // consoleOutput is an override for the console.log and console.error methods to diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go index d27de22b29..27228a4fb1 100644 --- a/signer/rules/rules_test.go +++ b/signer/rules/rules_test.go @@ -22,14 +22,14 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/slingshot-finance/op-geth/accounts" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/internal/ethapi" + "github.com/slingshot-finance/op-geth/signer/core" + "github.com/slingshot-finance/op-geth/signer/core/apitypes" + "github.com/slingshot-finance/op-geth/signer/storage" ) const JS = ` diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go index 928d643dd6..9b74a5455d 100644 --- a/signer/storage/aes_gcm_storage.go +++ b/signer/storage/aes_gcm_storage.go @@ -24,7 +24,7 @@ import ( "io" "os" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/log" ) type storedCredential struct { diff --git a/signer/storage/aes_gcm_storage_test.go b/signer/storage/aes_gcm_storage_test.go index a223b1a6b4..b262efccda 100644 --- a/signer/storage/aes_gcm_storage_test.go +++ b/signer/storage/aes_gcm_storage_test.go @@ -23,8 +23,8 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/log" "github.com/mattn/go-colorable" "golang.org/x/exp/slog" ) diff --git a/tests/block_test.go b/tests/block_test.go index aa6f27b8f3..15f81de7cd 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -21,8 +21,8 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" ) func TestBlockchain(t *testing.T) { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index e0130be48a..f6b0016f24 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -26,21 +26,21 @@ import ( "os" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/beacon" - "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/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus/beacon" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/triedb/hashdb" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index 03e14df7c4..fb0897b90e 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 62b978f9ef..66fa4d265f 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" ) //go:generate go run github.com/fjl/gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go diff --git a/tests/fuzzers/bls12381/bls12381_fuzz.go b/tests/fuzzers/bls12381/bls12381_fuzz.go index 9a5c566540..c1e4933832 100644 --- a/tests/fuzzers/bls12381/bls12381_fuzz.go +++ b/tests/fuzzers/bls12381/bls12381_fuzz.go @@ -30,8 +30,8 @@ import ( gnark "github.com/consensys/gnark-crypto/ecc/bls12-381" "github.com/consensys/gnark-crypto/ecc/bls12-381/fp" "github.com/consensys/gnark-crypto/ecc/bls12-381/fr" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/bls12381" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto/bls12381" blst "github.com/supranational/blst/bindings/go" ) diff --git a/tests/fuzzers/bls12381/precompile_fuzzer.go b/tests/fuzzers/bls12381/precompile_fuzzer.go index 763ed56e9f..ce8dd775b6 100644 --- a/tests/fuzzers/bls12381/precompile_fuzzer.go +++ b/tests/fuzzers/bls12381/precompile_fuzzer.go @@ -20,8 +20,8 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/vm" ) const ( diff --git a/tests/fuzzers/bn256/bn256_fuzz.go b/tests/fuzzers/bn256/bn256_fuzz.go index 75f7d59dee..68f142baaf 100644 --- a/tests/fuzzers/bn256/bn256_fuzz.go +++ b/tests/fuzzers/bn256/bn256_fuzz.go @@ -23,8 +23,8 @@ import ( "math/big" "github.com/consensys/gnark-crypto/ecc/bn254" - cloudflare "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" - google "github.com/ethereum/go-ethereum/crypto/bn256/google" + cloudflare "github.com/slingshot-finance/op-geth/crypto/bn256/cloudflare" + google "github.com/slingshot-finance/op-geth/crypto/bn256/google" ) func getG1Points(input io.Reader) (*cloudflare.G1, *google.G1, *bn254.G1Affine) { diff --git a/tests/fuzzers/difficulty/difficulty-fuzz.go b/tests/fuzzers/difficulty/difficulty-fuzz.go index fbbd7f6876..bbea6a53f3 100644 --- a/tests/fuzzers/difficulty/difficulty-fuzz.go +++ b/tests/fuzzers/difficulty/difficulty-fuzz.go @@ -23,8 +23,8 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/consensus/ethash" + "github.com/slingshot-finance/op-geth/core/types" ) type fuzzer struct { diff --git a/tests/fuzzers/rangeproof/rangeproof-fuzzer.go b/tests/fuzzers/rangeproof/rangeproof-fuzzer.go index 6b5ca90880..fbb689ce28 100644 --- a/tests/fuzzers/rangeproof/rangeproof-fuzzer.go +++ b/tests/fuzzers/rangeproof/rangeproof-fuzzer.go @@ -22,10 +22,10 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/trie" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/ethdb/memorydb" + "github.com/slingshot-finance/op-geth/trie" "golang.org/x/exp/slices" ) diff --git a/tests/fuzzers/secp256k1/secp_test.go b/tests/fuzzers/secp256k1/secp_test.go index ca3039764b..6d10ab941c 100644 --- a/tests/fuzzers/secp256k1/secp_test.go +++ b/tests/fuzzers/secp256k1/secp_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/slingshot-finance/op-geth/crypto/secp256k1" ) func TestFuzzer(t *testing.T) { diff --git a/tests/fuzzers/txfetcher/txfetcher_fuzzer.go b/tests/fuzzers/txfetcher/txfetcher_fuzzer.go index 51f2fc3b4d..d3ededf250 100644 --- a/tests/fuzzers/txfetcher/txfetcher_fuzzer.go +++ b/tests/fuzzers/txfetcher/txfetcher_fuzzer.go @@ -23,10 +23,10 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/fetcher" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/mclock" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/eth/fetcher" ) var ( diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 80ad89e03b..03d89fcebd 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index cd15ae31b5..0abcc0de03 100644 --- a/tests/gen_difficultytest.go +++ b/tests/gen_difficultytest.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index 71f0063178..ed15f29af2 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 9b5aecbfe6..960388876c 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core/types" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index 99b7e4d333..e74f702ae2 100644 --- a/tests/init.go +++ b/tests/init.go @@ -21,7 +21,7 @@ import ( "math/big" "sort" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/params" ) func u64(val uint64) *uint64 { return &val } diff --git a/tests/init_test.go b/tests/init_test.go index 3ab15e7658..b5adbca199 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -30,7 +30,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index e4bd5450a8..c452e0e145 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -24,7 +24,7 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index bb0fb41ec4..b226033cf4 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -30,13 +30,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers/logger" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/eth/tracers/logger" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 39864b77b8..aab6519b99 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -25,22 +25,22 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/common/math" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/state" + "github.com/slingshot-finance/op-geth/core/state/snapshot" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/core/vm" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie" + "github.com/slingshot-finance/op-geth/trie/triedb/hashdb" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" "golang.org/x/crypto/sha3" ) diff --git a/tests/transaction_test.go b/tests/transaction_test.go index cb0f262318..d1c7971617 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -19,7 +19,7 @@ package tests import ( "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/slingshot-finance/op-geth/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 391aa57584..ebca43f95f 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -19,12 +19,12 @@ package tests import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" + "github.com/slingshot-finance/op-geth/core" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/trie/committer.go b/trie/committer.go index 92163cdb3b..56ced88828 100644 --- a/trie/committer.go +++ b/trie/committer.go @@ -19,8 +19,8 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/trie/trienode" ) // committer is the tool used for the trie Commit operation. The committer will diff --git a/trie/database.go b/trie/database.go index e20f7ef903..6cdd2632e9 100644 --- a/trie/database.go +++ b/trie/database.go @@ -19,13 +19,13 @@ package trie import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/trie/triedb/hashdb" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/trie/trienode" + "github.com/slingshot-finance/op-geth/trie/triestate" ) // Config defines all necessary options for database. diff --git a/trie/database_test.go b/trie/database_test.go index d508c65533..78d8bec28c 100644 --- a/trie/database_test.go +++ b/trie/database_test.go @@ -17,10 +17,10 @@ package trie import ( - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/trie/triedb/hashdb" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" ) // newTestDatabase initializes the trie database with specified scheme. diff --git a/trie/errors.go b/trie/errors.go index 7be7041c7f..39578abc9c 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // ErrCommitted is returned when a already committed trie is requested for usage. diff --git a/trie/hasher.go b/trie/hasher.go index 1e063d8020..120230b984 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -19,8 +19,8 @@ package trie import ( "sync" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" "golang.org/x/crypto/sha3" ) diff --git a/trie/iterator.go b/trie/iterator.go index 83ccc0740f..0447f95203 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,8 +21,8 @@ import ( "container/heap" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" ) // NodeResolver is used for looking up trie nodes before reaching into the real diff --git a/trie/iterator_test.go b/trie/iterator_test.go index 9679b49ca7..1cbbfeee49 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -22,11 +22,11 @@ import ( "math/rand" "testing" - "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" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/trie/trienode" ) func TestEmptyIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index 15bbf62f1c..e3bf088adc 100644 --- a/trie/node.go +++ b/trie/node.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/rlp" ) var indices = []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "[17]"} diff --git a/trie/node_enc.go b/trie/node_enc.go index 1b2eca682f..0d7b12ed1b 100644 --- a/trie/node_enc.go +++ b/trie/node_enc.go @@ -17,7 +17,7 @@ package trie import ( - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/rlp" ) func nodeToBytes(n node) []byte { diff --git a/trie/node_test.go b/trie/node_test.go index 9b8b33748f..25d6d2476f 100644 --- a/trie/node_test.go +++ b/trie/node_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" ) func newTestFullNode(v []byte) []interface{} { @@ -96,7 +96,7 @@ func TestDecodeFullNode(t *testing.T) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/slingshot-finance/op-geth/trie // BenchmarkEncodeShortNode // BenchmarkEncodeShortNode-8 16878850 70.81 ns/op 48 B/op 1 allocs/op func BenchmarkEncodeShortNode(b *testing.B) { @@ -114,7 +114,7 @@ func BenchmarkEncodeShortNode(b *testing.B) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/slingshot-finance/op-geth/trie // BenchmarkEncodeFullNode // BenchmarkEncodeFullNode-8 4323273 284.4 ns/op 576 B/op 1 allocs/op func BenchmarkEncodeFullNode(b *testing.B) { @@ -132,7 +132,7 @@ func BenchmarkEncodeFullNode(b *testing.B) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/slingshot-finance/op-geth/trie // BenchmarkDecodeShortNode // BenchmarkDecodeShortNode-8 7925638 151.0 ns/op 157 B/op 4 allocs/op func BenchmarkDecodeShortNode(b *testing.B) { @@ -153,7 +153,7 @@ func BenchmarkDecodeShortNode(b *testing.B) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/slingshot-finance/op-geth/trie // BenchmarkDecodeShortNodeUnsafe // BenchmarkDecodeShortNodeUnsafe-8 9027476 128.6 ns/op 109 B/op 3 allocs/op func BenchmarkDecodeShortNodeUnsafe(b *testing.B) { @@ -174,7 +174,7 @@ func BenchmarkDecodeShortNodeUnsafe(b *testing.B) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/slingshot-finance/op-geth/trie // BenchmarkDecodeFullNode // BenchmarkDecodeFullNode-8 1597462 761.9 ns/op 1280 B/op 18 allocs/op func BenchmarkDecodeFullNode(b *testing.B) { @@ -195,7 +195,7 @@ func BenchmarkDecodeFullNode(b *testing.B) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/slingshot-finance/op-geth/trie // BenchmarkDecodeFullNodeUnsafe // BenchmarkDecodeFullNodeUnsafe-8 1789070 687.1 ns/op 704 B/op 17 allocs/op func BenchmarkDecodeFullNodeUnsafe(b *testing.B) { diff --git a/trie/preimages.go b/trie/preimages.go index 66f34117c1..c3d619256b 100644 --- a/trie/preimages.go +++ b/trie/preimages.go @@ -19,9 +19,9 @@ package trie import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/ethdb" ) // preimageStore is the store for caching preimages of node key. diff --git a/trie/proof.go b/trie/proof.go index a526a53402..1231605b71 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -21,9 +21,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" ) // Prove constructs a merkle proof for key. The result contains all encoded nodes diff --git a/trie/proof_test.go b/trie/proof_test.go index 59ae201cea..b69e257224 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -24,10 +24,10 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb/memorydb" "golang.org/x/exp/slices" ) diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 7f0685e306..d32fcb3721 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -17,10 +17,10 @@ package trie import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie/trienode" ) // SecureTrie is the old name of StateTrie. diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go index 2087866d38..7367755746 100644 --- a/trie/secure_trie_test.go +++ b/trie/secure_trie_test.go @@ -23,11 +23,11 @@ import ( "sync" "testing" - "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" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/trie/trienode" ) func newEmptySecure() *StateTrie { diff --git a/trie/stacktrie.go b/trie/stacktrie.go index f2f5355c49..418a695b7f 100644 --- a/trie/stacktrie.go +++ b/trie/stacktrie.go @@ -21,10 +21,10 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" ) var ( diff --git a/trie/stacktrie_fuzzer_test.go b/trie/stacktrie_fuzzer_test.go index 1b3f9dbe9c..2a0b8dbc90 100644 --- a/trie/stacktrie_fuzzer_test.go +++ b/trie/stacktrie_fuzzer_test.go @@ -22,11 +22,11 @@ import ( "fmt" "testing" - "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" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/trie/trienode" "golang.org/x/crypto/sha3" "golang.org/x/exp/slices" ) diff --git a/trie/stacktrie_test.go b/trie/stacktrie_test.go index 909a77062a..0b858623c9 100644 --- a/trie/stacktrie_test.go +++ b/trie/stacktrie_test.go @@ -22,10 +22,10 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/trie/testutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/trie/testutil" "github.com/stretchr/testify/assert" "golang.org/x/exp/slices" ) diff --git a/trie/sync.go b/trie/sync.go index 589d28364b..07e445d7f6 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -21,13 +21,13 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "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/metrics" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/prque" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" ) // ErrNotRequested is returned by the trie sync when it's requested to process a diff --git a/trie/sync_test.go b/trie/sync_test.go index 585181b48c..6a0945c817 100644 --- a/trie/sync_test.go +++ b/trie/sync_test.go @@ -22,13 +22,13 @@ import ( "math/rand" "testing" - "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" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/ethdb/memorydb" + "github.com/slingshot-finance/op-geth/trie/trienode" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/testutil/utils.go b/trie/testutil/utils.go index a75d0431b0..345267ccad 100644 --- a/trie/testutil/utils.go +++ b/trie/testutil/utils.go @@ -21,9 +21,9 @@ import ( "encoding/binary" mrand "math/rand" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/trie/trienode" ) // Prng is a pseudo random number generator seeded by strong randomness. diff --git a/trie/tracer.go b/trie/tracer.go index 5786af4d3e..c4eede7792 100644 --- a/trie/tracer.go +++ b/trie/tracer.go @@ -17,7 +17,7 @@ package trie import ( - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // tracer tracks the changes of trie nodes. During the trie operations, diff --git a/trie/tracer_test.go b/trie/tracer_test.go index acb8c2f6bf..913e481137 100644 --- a/trie/tracer_test.go +++ b/trie/tracer_test.go @@ -20,10 +20,10 @@ import ( "bytes" "testing" - "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/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/trie/trienode" ) var ( diff --git a/trie/trie.go b/trie/trie.go index 07467ac69c..cc0e9deecb 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -22,10 +22,10 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/trie/trienode" ) // Trie is a Merkle Patricia Trie. Use New to create a trie that sits on diff --git a/trie/trie_id.go b/trie/trie_id.go index 8ab490ca3b..3369bd1f78 100644 --- a/trie/trie_id.go +++ b/trie/trie_id.go @@ -16,7 +16,7 @@ package trie -import "github.com/ethereum/go-ethereum/common" +import "github.com/slingshot-finance/op-geth/common" // ID is the identifier for uniquely identifying a trie. type ID struct { diff --git a/trie/trie_reader.go b/trie/trie_reader.go index 4215964559..c506392aec 100644 --- a/trie/trie_reader.go +++ b/trie/trie_reader.go @@ -17,10 +17,10 @@ package trie import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/trie/triestate" ) // Reader wraps the Node method of a backing trie store. diff --git a/trie/trie_test.go b/trie/trie_test.go index c5bd3faf53..f11381fa25 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -30,13 +30,13 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "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" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie/trienode" "golang.org/x/crypto/sha3" ) diff --git a/trie/triedb/hashdb/database.go b/trie/triedb/hashdb/database.go index e45ccdba32..4145cd3f8d 100644 --- a/trie/triedb/hashdb/database.go +++ b/trie/triedb/hashdb/database.go @@ -24,15 +24,15 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "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/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/metrics" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie/trienode" + "github.com/slingshot-finance/op-geth/trie/triestate" ) var ( diff --git a/trie/triedb/pathdb/database.go b/trie/triedb/pathdb/database.go index f2d6cea635..1f4e73f689 100644 --- a/trie/triedb/pathdb/database.go +++ b/trie/triedb/pathdb/database.go @@ -23,14 +23,14 @@ import ( "sync" "time" - "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/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/params" + "github.com/slingshot-finance/op-geth/trie/trienode" + "github.com/slingshot-finance/op-geth/trie/triestate" ) const ( diff --git a/trie/triedb/pathdb/database_test.go b/trie/triedb/pathdb/database_test.go index 5509682c39..12308571f6 100644 --- a/trie/triedb/pathdb/database_test.go +++ b/trie/triedb/pathdb/database_test.go @@ -24,14 +24,14 @@ import ( "math/rand" "testing" - "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" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/testutil" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie/testutil" + "github.com/slingshot-finance/op-geth/trie/trienode" + "github.com/slingshot-finance/op-geth/trie/triestate" ) func updateTrie(addrHash common.Hash, root common.Hash, dirties, cleans map[common.Hash][]byte) (common.Hash, *trienode.NodeSet) { diff --git a/trie/triedb/pathdb/difflayer.go b/trie/triedb/pathdb/difflayer.go index 10567715d2..3d01edde66 100644 --- a/trie/triedb/pathdb/difflayer.go +++ b/trie/triedb/pathdb/difflayer.go @@ -20,10 +20,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/trie/trienode" + "github.com/slingshot-finance/op-geth/trie/triestate" ) // diffLayer represents a collection of modifications made to the in-memory tries diff --git a/trie/triedb/pathdb/difflayer_test.go b/trie/triedb/pathdb/difflayer_test.go index 9b5907c3c5..fc5ad7e409 100644 --- a/trie/triedb/pathdb/difflayer_test.go +++ b/trie/triedb/pathdb/difflayer_test.go @@ -20,10 +20,10 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/trie/testutil" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/trie/testutil" + "github.com/slingshot-finance/op-geth/trie/trienode" ) func emptyLayer() *diskLayer { @@ -35,21 +35,21 @@ func emptyLayer() *diskLayer { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/slingshot-finance/op-geth/trie // BenchmarkSearch128Layers // BenchmarkSearch128Layers-8 243826 4755 ns/op func BenchmarkSearch128Layers(b *testing.B) { benchmarkSearch(b, 0, 128) } // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/slingshot-finance/op-geth/trie // BenchmarkSearch512Layers // BenchmarkSearch512Layers-8 49686 24256 ns/op func BenchmarkSearch512Layers(b *testing.B) { benchmarkSearch(b, 0, 512) } // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/slingshot-finance/op-geth/trie // BenchmarkSearch1Layer // BenchmarkSearch1Layer-8 14062725 88.40 ns/op func BenchmarkSearch1Layer(b *testing.B) { benchmarkSearch(b, 127, 128) } @@ -102,7 +102,7 @@ func benchmarkSearch(b *testing.B, depth int, total int) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/slingshot-finance/op-geth/trie // BenchmarkPersist // BenchmarkPersist-8 10 111252975 ns/op func BenchmarkPersist(b *testing.B) { diff --git a/trie/triedb/pathdb/disklayer.go b/trie/triedb/pathdb/disklayer.go index ef697cbce8..62f35a8d80 100644 --- a/trie/triedb/pathdb/disklayer.go +++ b/trie/triedb/pathdb/disklayer.go @@ -22,12 +22,12 @@ import ( "sync" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/trie/trienode" + "github.com/slingshot-finance/op-geth/trie/triestate" "golang.org/x/crypto/sha3" ) diff --git a/trie/triedb/pathdb/errors.go b/trie/triedb/pathdb/errors.go index 78ee4459fe..7f1c2901ea 100644 --- a/trie/triedb/pathdb/errors.go +++ b/trie/triedb/pathdb/errors.go @@ -20,8 +20,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/common/hexutil" ) var ( diff --git a/trie/triedb/pathdb/history.go b/trie/triedb/pathdb/history.go index 6e3f3faaed..ce95c43862 100644 --- a/trie/triedb/pathdb/history.go +++ b/trie/triedb/pathdb/history.go @@ -23,11 +23,11 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/trie/triestate" "golang.org/x/exp/slices" ) diff --git a/trie/triedb/pathdb/history_test.go b/trie/triedb/pathdb/history_test.go index a3257441de..21660bb585 100644 --- a/trie/triedb/pathdb/history_test.go +++ b/trie/triedb/pathdb/history_test.go @@ -22,13 +22,13 @@ import ( "reflect" "testing" - "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/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/testutil" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie/testutil" + "github.com/slingshot-finance/op-geth/trie/triestate" ) // randomStateSet generates a random state change set. diff --git a/trie/triedb/pathdb/journal.go b/trie/triedb/pathdb/journal.go index ac770763e3..287d033adc 100644 --- a/trie/triedb/pathdb/journal.go +++ b/trie/triedb/pathdb/journal.go @@ -23,14 +23,14 @@ import ( "io" "time" - "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" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie/trienode" + "github.com/slingshot-finance/op-geth/trie/triestate" ) var ( diff --git a/trie/triedb/pathdb/layertree.go b/trie/triedb/pathdb/layertree.go index d314779910..6f52e87200 100644 --- a/trie/triedb/pathdb/layertree.go +++ b/trie/triedb/pathdb/layertree.go @@ -21,10 +21,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/trie/trienode" + "github.com/slingshot-finance/op-geth/trie/triestate" ) // layerTree is a group of state layers identified by the state root. diff --git a/trie/triedb/pathdb/metrics.go b/trie/triedb/pathdb/metrics.go index 9e2b1dcbf5..20e5b53b58 100644 --- a/trie/triedb/pathdb/metrics.go +++ b/trie/triedb/pathdb/metrics.go @@ -16,7 +16,7 @@ package pathdb -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/slingshot-finance/op-geth/metrics" var ( cleanHitMeter = metrics.NewRegisteredMeter("pathdb/clean/hit", nil) diff --git a/trie/triedb/pathdb/nodebuffer.go b/trie/triedb/pathdb/nodebuffer.go index 4a7d328b9a..18c1f0d6cd 100644 --- a/trie/triedb/pathdb/nodebuffer.go +++ b/trie/triedb/pathdb/nodebuffer.go @@ -21,12 +21,12 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/log" + "github.com/slingshot-finance/op-geth/trie/trienode" ) // nodebuffer is a collection of modified trie nodes to aggregate the disk diff --git a/trie/triedb/pathdb/testutils.go b/trie/triedb/pathdb/testutils.go index d6fdacb421..c4a7a73465 100644 --- a/trie/triedb/pathdb/testutils.go +++ b/trie/triedb/pathdb/testutils.go @@ -20,11 +20,11 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/trie/trienode" + "github.com/slingshot-finance/op-geth/trie/triestate" "golang.org/x/exp/slices" ) diff --git a/trie/trienode/node.go b/trie/trienode/node.go index 95315c2e9a..8ce22e2b77 100644 --- a/trie/trienode/node.go +++ b/trie/trienode/node.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/slingshot-finance/op-geth/common" ) // Node is a wrapper which contains the encoded blob of the trie node and its diff --git a/trie/trienode/proof.go b/trie/trienode/proof.go index 012f0087dd..ebad3cf90b 100644 --- a/trie/trienode/proof.go +++ b/trie/trienode/proof.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/rlp" ) // ProofSet stores a set of trie nodes. It implements trie.Database and can also diff --git a/trie/triestate/state.go b/trie/triestate/state.go index 4c47e9c397..a4c7449b4d 100644 --- a/trie/triestate/state.go +++ b/trie/triestate/state.go @@ -21,11 +21,11 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/crypto" + "github.com/slingshot-finance/op-geth/rlp" + "github.com/slingshot-finance/op-geth/trie/trienode" "golang.org/x/crypto/sha3" ) diff --git a/trie/utils/verkle.go b/trie/utils/verkle.go index ce059edc64..de6960db81 100644 --- a/trie/utils/verkle.go +++ b/trie/utils/verkle.go @@ -21,8 +21,8 @@ import ( "sync" "github.com/crate-crypto/go-ipa/bandersnatch/fr" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/metrics" + "github.com/slingshot-finance/op-geth/common/lru" + "github.com/slingshot-finance/op-geth/metrics" "github.com/gballet/go-verkle" "github.com/holiman/uint256" ) diff --git a/trie/utils/verkle_test.go b/trie/utils/verkle_test.go index 28b059c379..ffa2b77a00 100644 --- a/trie/utils/verkle_test.go +++ b/trie/utils/verkle_test.go @@ -64,7 +64,7 @@ func TestTreeKey(t *testing.T) { // goos: darwin // goarch: amd64 -// pkg: github.com/ethereum/go-ethereum/trie/utils +// pkg: github.com/slingshot-finance/op-geth/trie/utils // cpu: VirtualApple @ 2.50GHz // BenchmarkTreeKey // BenchmarkTreeKey-8 398731 2961 ns/op 32 B/op 1 allocs/op @@ -82,7 +82,7 @@ func BenchmarkTreeKey(b *testing.B) { // goos: darwin // goarch: amd64 -// pkg: github.com/ethereum/go-ethereum/trie/utils +// pkg: github.com/slingshot-finance/op-geth/trie/utils // cpu: VirtualApple @ 2.50GHz // BenchmarkTreeKeyWithEvaluation // BenchmarkTreeKeyWithEvaluation-8 513855 2324 ns/op 32 B/op 1 allocs/op @@ -102,7 +102,7 @@ func BenchmarkTreeKeyWithEvaluation(b *testing.B) { // goos: darwin // goarch: amd64 -// pkg: github.com/ethereum/go-ethereum/trie/utils +// pkg: github.com/slingshot-finance/op-geth/trie/utils // cpu: VirtualApple @ 2.50GHz // BenchmarkStorageKey // BenchmarkStorageKey-8 230516 4584 ns/op 96 B/op 3 allocs/op @@ -120,7 +120,7 @@ func BenchmarkStorageKey(b *testing.B) { // goos: darwin // goarch: amd64 -// pkg: github.com/ethereum/go-ethereum/trie/utils +// pkg: github.com/slingshot-finance/op-geth/trie/utils // cpu: VirtualApple @ 2.50GHz // BenchmarkStorageKeyWithEvaluation // BenchmarkStorageKeyWithEvaluation-8 320125 3753 ns/op 96 B/op 3 allocs/op diff --git a/trie/verkle.go b/trie/verkle.go index 89e2e53408..fc5d3f3831 100644 --- a/trie/verkle.go +++ b/trie/verkle.go @@ -22,11 +22,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/utils" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/ethdb" + "github.com/slingshot-finance/op-geth/trie/trienode" + "github.com/slingshot-finance/op-geth/trie/utils" "github.com/gballet/go-verkle" "github.com/holiman/uint256" ) diff --git a/trie/verkle_test.go b/trie/verkle_test.go index bd31ea3879..829628c5f3 100644 --- a/trie/verkle_test.go +++ b/trie/verkle_test.go @@ -22,11 +22,11 @@ import ( "reflect" "testing" - "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/trie/triedb/pathdb" - "github.com/ethereum/go-ethereum/trie/utils" + "github.com/slingshot-finance/op-geth/common" + "github.com/slingshot-finance/op-geth/core/rawdb" + "github.com/slingshot-finance/op-geth/core/types" + "github.com/slingshot-finance/op-geth/trie/triedb/pathdb" + "github.com/slingshot-finance/op-geth/trie/utils" ) var (