From 3896177670bc402bd372c77d7d0544fd3e79b7d3 Mon Sep 17 00:00:00 2001 From: Alan Orwick Date: Mon, 25 Oct 2021 09:49:51 -0500 Subject: [PATCH] Refactoring go mod name via GoLand shift + f6 --- 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 | 38 +++++------ 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 | 4 +- accounts/abi/bind/bind_test.go | 2 +- accounts/abi/bind/template.go | 2 +- accounts/abi/bind/util.go | 6 +- accounts/abi/bind/util_test.go | 12 ++-- 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 | 8 +-- 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 ++-- build/ci.go | 6 +- cmd/abidump/main.go | 4 +- cmd/abigen/main.go | 14 ++-- cmd/bootnode/main.go | 14 ++-- cmd/checkpoint-admin/common.go | 18 ++--- cmd/checkpoint-admin/exec.go | 24 +++---- cmd/checkpoint-admin/main.go | 6 +- cmd/checkpoint-admin/status.go | 4 +- cmd/clef/main.go | 38 +++++------ cmd/devp2p/crawl.go | 4 +- cmd/devp2p/discv4cmd.go | 12 ++-- cmd/devp2p/discv5cmd.go | 6 +- 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 | 10 +-- cmd/devp2p/internal/ethtest/chain_test.go | 4 +- cmd/devp2p/internal/ethtest/helpers.go | 14 ++-- cmd/devp2p/internal/ethtest/large.go | 6 +- cmd/devp2p/internal/ethtest/suite.go | 8 +-- cmd/devp2p/internal/ethtest/suite_test.go | 10 +-- cmd/devp2p/internal/ethtest/transaction.go | 10 +-- cmd/devp2p/internal/ethtest/types.go | 8 +-- 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 | 4 +- cmd/devp2p/main.go | 6 +- cmd/devp2p/nodeset.go | 4 +- cmd/devp2p/nodesetcmd.go | 8 +-- cmd/devp2p/rlpxcmd.go | 12 ++-- cmd/devp2p/runtest.go | 6 +- cmd/ethkey/changepassword.go | 4 +- cmd/ethkey/generate.go | 6 +- cmd/ethkey/inspect.go | 6 +- cmd/ethkey/main.go | 2 +- cmd/ethkey/message.go | 8 +-- cmd/ethkey/run_test.go | 2 +- cmd/ethkey/utils.go | 4 +- cmd/evm/compiler.go | 2 +- cmd/evm/disasm.go | 2 +- cmd/evm/internal/compiler/compiler.go | 2 +- cmd/evm/internal/t8ntool/execution.go | 30 ++++---- cmd/evm/internal/t8ntool/flags.go | 4 +- cmd/evm/internal/t8ntool/gen_stenv.go | 4 +- cmd/evm/internal/t8ntool/transaction.go | 14 ++-- cmd/evm/internal/t8ntool/transition.go | 22 +++--- cmd/evm/main.go | 6 +- cmd/evm/runner.go | 20 +++--- cmd/evm/staterunner.go | 8 +-- cmd/evm/t8n_test.go | 2 +- cmd/faucet/faucet.go | 34 +++++----- cmd/faucet/faucet_test.go | 2 +- cmd/geth/accountcmd.go | 10 +-- cmd/geth/chaincmd.go | 24 +++---- cmd/geth/config.go | 24 +++---- cmd/geth/consolecmd.go | 8 +-- cmd/geth/consolecmd_test.go | 2 +- cmd/geth/dao_test.go | 6 +- cmd/geth/dbcmd.go | 16 ++--- cmd/geth/les_test.go | 4 +- cmd/geth/main.go | 28 ++++---- cmd/geth/misccmd.go | 6 +- cmd/geth/run_test.go | 4 +- cmd/geth/snapshot.go | 22 +++--- cmd/geth/usage.go | 6 +- cmd/geth/version_check.go | 2 +- cmd/p2psim/main.go | 12 ++-- cmd/puppeth/genesis.go | 14 ++-- cmd/puppeth/genesis_test.go | 2 +- cmd/puppeth/module.go | 2 +- cmd/puppeth/module_dashboard.go | 2 +- cmd/puppeth/module_ethstats.go | 2 +- cmd/puppeth/module_explorer.go | 2 +- cmd/puppeth/module_faucet.go | 4 +- cmd/puppeth/module_nginx.go | 2 +- cmd/puppeth/module_node.go | 4 +- cmd/puppeth/puppeth.go | 2 +- cmd/puppeth/ssh.go | 2 +- cmd/puppeth/wizard.go | 6 +- cmd/puppeth/wizard_dashboard.go | 2 +- cmd/puppeth/wizard_ethstats.go | 2 +- cmd/puppeth/wizard_explorer.go | 2 +- cmd/puppeth/wizard_faucet.go | 4 +- cmd/puppeth/wizard_genesis.go | 8 +-- cmd/puppeth/wizard_intro.go | 2 +- cmd/puppeth/wizard_netstats.go | 4 +- cmd/puppeth/wizard_network.go | 2 +- cmd/puppeth/wizard_nginx.go | 2 +- cmd/puppeth/wizard_node.go | 6 +- cmd/rlpdump/main.go | 2 +- cmd/utils/cmd.go | 22 +++--- cmd/utils/customflags.go | 2 +- cmd/utils/flags.go | 68 +++++++++---------- cmd/utils/flags_legacy.go | 2 +- cmd/utils/prompt.go | 2 +- common/bitutil/compress_test.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/clique/api.go | 12 ++-- consensus/clique/clique.go | 28 ++++---- consensus/clique/clique_test.go | 14 ++-- consensus/clique/snapshot.go | 10 +-- consensus/clique/snapshot_test.go | 14 ++-- consensus/consensus.go | 10 +-- consensus/ethash/algorithm.go | 8 +-- consensus/ethash/algorithm_test.go | 6 +- consensus/ethash/api.go | 6 +- consensus/ethash/consensus.go | 20 +++--- consensus/ethash/consensus_test.go | 8 +-- consensus/ethash/difficulty.go | 2 +- consensus/ethash/ethash.go | 8 +-- consensus/ethash/ethash_test.go | 6 +- consensus/ethash/sealer.go | 8 +-- consensus/ethash/sealer_test.go | 8 +-- consensus/misc/dao.go | 6 +- consensus/misc/eip1559.go | 8 +-- consensus/misc/eip1559_test.go | 6 +- consensus/misc/forks.go | 6 +- consensus/misc/gaslimit.go | 2 +- console/bridge.go | 12 ++-- console/bridge_test.go | 2 +- console/console.go | 10 +-- console/console_test.go | 18 ++--- contracts/checkpointoracle/contract/oracle.go | 12 ++-- contracts/checkpointoracle/oracle.go | 8 +-- contracts/checkpointoracle/oracle_test.go | 14 ++-- 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 | 10 +-- core/blockchain.go | 32 ++++----- core/blockchain_insert.go | 8 +-- core/blockchain_repair_test.go | 12 ++-- core/blockchain_sethead_test.go | 12 ++-- core/blockchain_snapshot_test.go | 14 ++-- core/blockchain_test.go | 22 +++--- 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 | 2 +- core/chain_indexer.go | 12 ++-- core/chain_indexer_test.go | 6 +- core/chain_makers.go | 16 ++--- core/chain_makers_test.go | 12 ++-- core/dao_test.go | 10 +-- core/error.go | 2 +- core/events.go | 4 +- core/evm.go | 8 +-- core/forkid/forkid.go | 8 +-- core/forkid/forkid_test.go | 6 +- core/gen_genesis.go | 8 +-- core/gen_genesis_account.go | 6 +- core/genesis.go | 24 +++---- core/genesis_test.go | 12 ++-- core/headerchain.go | 14 ++-- core/headerchain_test.go | 12 ++-- core/mkalloc.go | 4 +- core/rawdb/accessors_chain.go | 14 ++-- core/rawdb/accessors_chain_test.go | 10 +-- core/rawdb/accessors_indexes.go | 12 ++-- core/rawdb/accessors_indexes_test.go | 10 +-- core/rawdb/accessors_metadata.go | 10 +-- core/rawdb/accessors_snapshot.go | 6 +- core/rawdb/accessors_state.go | 6 +- core/rawdb/chain_iterator.go | 12 ++-- core/rawdb/chain_iterator_test.go | 4 +- core/rawdb/database.go | 10 +-- core/rawdb/freezer.go | 12 ++-- core/rawdb/freezer_batch.go | 4 +- core/rawdb/freezer_table.go | 6 +- core/rawdb/freezer_table_test.go | 2 +- core/rawdb/freezer_test.go | 4 +- core/rawdb/schema.go | 4 +- core/rawdb/table.go | 2 +- core/rawdb/table_test.go | 2 +- core/rlp_test.go | 14 ++-- core/state/access_list.go | 2 +- core/state/database.go | 10 +-- core/state/dump.go | 12 ++-- core/state/iterator.go | 8 +-- core/state/iterator_test.go | 4 +- core/state/journal.go | 2 +- core/state/metrics.go | 2 +- core/state/pruner/bloom.go | 6 +- core/state/pruner/pruner.go | 18 ++--- core/state/snapshot/account.go | 4 +- core/state/snapshot/conversion.go | 12 ++-- core/state/snapshot/difflayer.go | 4 +- core/state/snapshot/difflayer_test.go | 6 +- core/state/snapshot/disklayer.go | 10 +-- core/state/snapshot/disklayer_test.go | 12 ++-- core/state/snapshot/generate.go | 22 +++--- core/state/snapshot/generate_test.go | 14 ++-- 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/snapshot.go | 14 ++-- core/state/snapshot/snapshot_test.go | 6 +- core/state/snapshot/sort.go | 2 +- core/state/snapshot/wipe.go | 10 +-- core/state/snapshot/wipe_test.go | 6 +- core/state/state_object.go | 10 +-- core/state/state_object_test.go | 2 +- core/state/state_test.go | 8 +-- core/state/statedb.go | 18 ++--- core/state/statedb_test.go | 6 +- core/state/sync.go | 10 +-- core/state/sync_test.go | 16 ++--- core/state/trie_prefetcher.go | 6 +- core/state/trie_prefetcher_test.go | 4 +- core/state_prefetcher.go | 10 +-- core/state_processor.go | 18 ++--- core/state_processor_test.go | 20 +++--- core/state_transition.go | 12 ++-- core/tx_cacher.go | 2 +- core/tx_journal.go | 8 +-- core/tx_list.go | 4 +- core/tx_list_test.go | 4 +- core/tx_noncer.go | 4 +- core/tx_pool.go | 18 ++--- core/tx_pool_test.go | 16 ++--- core/types.go | 6 +- core/types/access_list_tx.go | 2 +- core/types/block.go | 6 +- core/types/block_test.go | 10 +-- core/types/bloom9.go | 4 +- core/types/bloom9_test.go | 4 +- core/types/dynamic_fee_tx.go | 2 +- core/types/gen_access_tuple.go | 2 +- core/types/gen_log_json.go | 4 +- core/types/gen_receipt_json.go | 4 +- core/types/hashing.go | 6 +- core/types/hashing_test.go | 12 ++-- core/types/legacy_tx.go | 2 +- core/types/log.go | 6 +- core/types/log_test.go | 4 +- core/types/receipt.go | 10 +-- core/types/receipt_test.go | 8 +-- core/types/state_account.go | 2 +- core/types/transaction.go | 10 +-- core/types/transaction_marshalling.go | 4 +- core/types/transaction_signing.go | 6 +- core/types/transaction_signing_test.go | 6 +- core/types/transaction_test.go | 6 +- core/types/types_test.go | 6 +- core/vm/access_list_tracer.go | 4 +- core/vm/analysis_test.go | 2 +- core/vm/common.go | 4 +- core/vm/contract.go | 2 +- core/vm/contracts.go | 14 ++-- core/vm/contracts_test.go | 2 +- core/vm/eips.go | 2 +- core/vm/evm.go | 6 +- core/vm/gas_table.go | 6 +- core/vm/gas_table_test.go | 10 +-- core/vm/gen_structlog.go | 6 +- core/vm/instructions.go | 6 +- core/vm/instructions_test.go | 6 +- core/vm/interface.go | 4 +- core/vm/interpreter.go | 6 +- core/vm/jump_table.go | 2 +- core/vm/logger.go | 10 +-- core/vm/logger_json.go | 4 +- core/vm/logger_test.go | 6 +- core/vm/operations_acl.go | 6 +- core/vm/runtime/env.go | 4 +- core/vm/runtime/runtime.go | 12 ++-- core/vm/runtime/runtime_example_test.go | 4 +- core/vm/runtime/runtime_test.go | 22 +++--- 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/secp256k1/dummy.go | 6 +- crypto/signature_cgo.go | 4 +- crypto/signature_test.go | 6 +- eth/api.go | 22 +++--- eth/api_backend.go | 32 ++++----- eth/api_test.go | 8 +-- eth/backend.go | 58 ++++++++-------- eth/bloombits.go | 4 +- eth/catalyst/api.go | 22 +++--- eth/catalyst/api_test.go | 18 ++--- eth/catalyst/api_types.go | 4 +- eth/catalyst/gen_blockparams.go | 4 +- eth/catalyst/gen_ed.go | 4 +- eth/discovery.go | 10 +-- eth/downloader/api.go | 6 +- eth/downloader/downloader.go | 26 +++---- eth/downloader/downloader_test.go | 18 ++--- eth/downloader/events.go | 2 +- eth/downloader/metrics.go | 2 +- eth/downloader/peer.go | 10 +-- eth/downloader/queue.go | 12 ++-- eth/downloader/queue_test.go | 14 ++-- eth/downloader/resultstore.go | 2 +- eth/downloader/statesync.go | 14 ++-- eth/downloader/testchain_test.go | 14 ++-- eth/downloader/types.go | 2 +- eth/ethconfig/config.go | 24 +++---- eth/ethconfig/gen_config.go | 14 ++-- eth/fetcher/block_fetcher.go | 14 ++-- eth/fetcher/block_fetcher_test.go | 16 ++--- eth/fetcher/tx_fetcher.go | 12 ++-- eth/fetcher/tx_fetcher_test.go | 8 +-- eth/filters/api.go | 14 ++-- eth/filters/api_test.go | 4 +- eth/filters/bench_test.go | 14 ++-- eth/filters/filter.go | 14 ++-- eth/filters/filter_system.go | 16 ++--- eth/filters/filter_system_test.go | 22 +++--- eth/filters/filter_test.go | 14 ++-- eth/gasprice/feehistory.go | 10 +-- eth/gasprice/feehistory_test.go | 2 +- eth/gasprice/gasprice.go | 14 ++-- eth/gasprice/gasprice_test.go | 20 +++--- eth/handler.go | 28 ++++---- eth/handler_eth.go | 14 ++-- eth/handler_eth_test.go | 28 ++++---- eth/handler_snap.go | 6 +- eth/handler_test.go | 22 +++--- eth/peer.go | 4 +- eth/peerset.go | 8 +-- eth/protocols/eth/broadcast.go | 4 +- eth/protocols/eth/discovery.go | 10 +-- eth/protocols/eth/handler.go | 18 ++--- eth/protocols/eth/handler_test.go | 26 +++---- eth/protocols/eth/handlers.go | 10 +-- eth/protocols/eth/handshake.go | 6 +- eth/protocols/eth/handshake_test.go | 10 +-- eth/protocols/eth/peer.go | 10 +-- 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 | 22 +++--- 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/sync.go | 28 ++++---- eth/protocols/snap/sync_test.go | 18 ++--- eth/protocols/snap/tracker.go | 2 +- eth/state_accessor.go | 14 ++-- eth/sync.go | 12 ++-- eth/sync_test.go | 8 +-- eth/tracers/api.go | 28 ++++---- eth/tracers/api_test.go | 28 ++++---- eth/tracers/tracer.go | 12 ++-- eth/tracers/tracer_test.go | 8 +-- eth/tracers/tracers.go | 2 +- eth/tracers/tracers_test.go | 22 +++--- ethclient/ethclient.go | 12 ++-- ethclient/ethclient_test.go | 24 +++---- 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 +- ethstats/ethstats.go | 28 ++++---- event/example_feed_test.go | 2 +- event/example_scope_test.go | 2 +- event/example_subscription_test.go | 2 +- event/subscription.go | 2 +- go.mod | 2 +- graphql/graphql.go | 18 ++--- graphql/graphql_test.go | 20 +++--- graphql/service.go | 4 +- interfaces.go | 4 +- internal/debug/api.go | 2 +- internal/debug/flags.go | 6 +- internal/debug/trace.go | 2 +- internal/ethapi/addrlock.go | 2 +- internal/ethapi/api.go | 40 +++++------ internal/ethapi/backend.go | 26 +++---- internal/ethapi/transaction_args.go | 12 ++-- internal/flags/helpers.go | 2 +- internal/guide/guide_test.go | 6 +- internal/jsre/jsre.go | 2 +- internal/testlog/testlog.go | 2 +- les/api.go | 8 +-- les/api_backend.go | 32 ++++----- les/api_test.go | 28 ++++---- les/benchmark.go | 22 +++--- les/bloombits.go | 4 +- les/checkpointoracle/oracle.go | 12 ++-- les/client.go | 52 +++++++------- les/client_handler.go | 20 +++--- les/commons.go | 28 ++++---- les/costtracker.go | 12 ++-- les/distributor.go | 4 +- les/distributor_test.go | 2 +- les/downloader/api.go | 6 +- les/downloader/downloader.go | 26 +++---- les/downloader/downloader_test.go | 18 ++--- les/downloader/events.go | 2 +- les/downloader/metrics.go | 2 +- les/downloader/peer.go | 10 +-- les/downloader/queue.go | 12 ++-- les/downloader/queue_test.go | 14 ++-- les/downloader/resultstore.go | 2 +- les/downloader/statesync.go | 14 ++-- les/downloader/testchain_test.go | 14 ++-- les/downloader/types.go | 2 +- les/enr_entry.go | 8 +-- les/fetcher.go | 20 +++--- les/fetcher/block_fetcher.go | 14 ++-- les/fetcher/block_fetcher_test.go | 16 ++--- les/fetcher_test.go | 10 +-- les/flowcontrol/control.go | 4 +- les/flowcontrol/logger.go | 2 +- les/flowcontrol/manager.go | 4 +- les/flowcontrol/manager_test.go | 2 +- les/handler_test.go | 26 +++---- les/metrics.go | 4 +- les/odr.go | 8 +-- les/odr_requests.go | 18 ++--- les/odr_test.go | 22 +++--- les/peer.go | 28 ++++---- les/peer_test.go | 16 ++--- les/protocol.go | 12 ++-- les/pruner.go | 8 +-- les/pruner_test.go | 4 +- les/request_test.go | 12 ++-- les/retrieve.go | 2 +- les/server.go | 28 ++++---- les/server_handler.go | 28 ++++---- les/server_requests.go | 18 ++--- les/servingqueue.go | 4 +- les/state_accessor.go | 10 +-- les/sync.go | 14 ++-- les/sync_test.go | 12 ++-- les/test_helper.go | 42 ++++++------ les/txrelay.go | 6 +- les/ulc.go | 4 +- les/ulc_test.go | 8 +-- les/utils/expiredvalue.go | 2 +- les/utils/expiredvalue_test.go | 2 +- les/utils/limiter.go | 2 +- les/utils/limiter_test.go | 2 +- les/utils/timeutils.go | 2 +- les/utils/timeutils_test.go | 2 +- les/utils/weighted_select.go | 2 +- les/vflux/client/api.go | 6 +- les/vflux/client/fillset.go | 4 +- les/vflux/client/fillset_test.go | 8 +-- les/vflux/client/queueiterator.go | 4 +- les/vflux/client/queueiterator_test.go | 8 +-- les/vflux/client/requestbasket.go | 4 +- les/vflux/client/requestbasket_test.go | 2 +- les/vflux/client/serverpool.go | 18 ++--- les/vflux/client/serverpool_test.go | 10 +-- les/vflux/client/timestats.go | 4 +- les/vflux/client/timestats_test.go | 2 +- les/vflux/client/valuetracker.go | 12 ++-- les/vflux/client/valuetracker_test.go | 8 +-- les/vflux/client/wrsiterator.go | 6 +- les/vflux/client/wrsiterator_test.go | 4 +- les/vflux/requests.go | 2 +- les/vflux/server/balance.go | 8 +-- les/vflux/server/balance_test.go | 14 ++-- les/vflux/server/balance_tracker.go | 12 ++-- les/vflux/server/clientdb.go | 14 ++-- les/vflux/server/clientdb_test.go | 8 +-- les/vflux/server/clientpool.go | 16 ++--- les/vflux/server/clientpool_test.go | 10 +-- les/vflux/server/metrics.go | 2 +- les/vflux/server/prioritypool.go | 10 +-- les/vflux/server/prioritypool_test.go | 8 +-- les/vflux/server/service.go | 10 +-- les/vflux/server/status.go | 2 +- light/lightchain.go | 22 +++--- light/lightchain_test.go | 14 ++-- light/nodeset.go | 8 +-- light/odr.go | 10 +-- light/odr_test.go | 26 +++---- light/odr_util.go | 10 +-- light/postprocess.go | 20 +++--- light/trie.go | 16 ++--- light/trie_test.go | 16 ++--- light/txpool.go | 18 ++--- light/txpool_test.go | 14 ++-- metrics/cpu_enabled.go | 2 +- metrics/cputime_unix.go | 2 +- metrics/exp/exp.go | 6 +- metrics/influxdb/influxdb.go | 4 +- metrics/influxdb/influxdbv2.go | 4 +- metrics/librato/librato.go | 2 +- metrics/metrics.go | 2 +- metrics/prometheus/collector.go | 2 +- metrics/prometheus/collector_test.go | 2 +- metrics/prometheus/prometheus.go | 4 +- miner/miner.go | 20 +++--- miner/miner_test.go | 22 +++--- miner/stress/1559/main.go | 32 ++++----- miner/stress/clique/main.go | 30 ++++---- miner/stress/ethash/main.go | 32 ++++----- miner/unconfirmed.go | 6 +- miner/unconfirmed_test.go | 2 +- miner/worker.go | 20 +++--- miner/worker_test.go | 26 +++---- mobile/accounts.go | 8 +-- mobile/big.go | 2 +- mobile/bind.go | 10 +-- mobile/common.go | 4 +- mobile/discover.go | 2 +- mobile/ethclient.go | 4 +- mobile/ethereum.go | 4 +- mobile/geth.go | 22 +++--- mobile/init.go | 2 +- mobile/interface.go | 2 +- mobile/interface_test.go | 2 +- mobile/logger.go | 2 +- mobile/p2p.go | 2 +- mobile/params.go | 6 +- mobile/primitives.go | 2 +- mobile/types.go | 6 +- mobile/vm.go | 2 +- node/api.go | 14 ++-- node/api_test.go | 2 +- node/config.go | 12 ++-- node/config_test.go | 4 +- node/defaults.go | 6 +- node/endpoints.go | 4 +- node/node.go | 14 ++-- 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 +- p2p/dial.go | 8 +-- p2p/dial_test.go | 10 +-- p2p/discover/common.go | 10 +-- p2p/discover/lookup.go | 2 +- p2p/discover/node.go | 6 +- p2p/discover/ntp.go | 2 +- p2p/discover/table.go | 8 +-- p2p/discover/table_test.go | 8 +-- p2p/discover/table_util_test.go | 8 +-- 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_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 | 8 +-- p2p/discover/v5wire/session.go | 6 +- p2p/dnsdisc/client.go | 10 +-- p2p/dnsdisc/client_test.go | 12 ++-- 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/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_test.go | 12 ++-- p2p/simulations/adapters/exec.go | 10 +-- p2p/simulations/adapters/inproc.go | 14 ++-- p2p/simulations/adapters/inproc_test.go | 2 +- p2p/simulations/adapters/types.go | 14 ++-- 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/dao.go | 2 +- rlp/decode_test.go | 2 +- rlp/encode_test.go | 2 +- rlp/iterator_test.go | 2 +- rpc/client.go | 2 +- rpc/client_example_test.go | 4 +- rpc/client_test.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/types.go | 4 +- rpc/types_test.go | 4 +- rpc/websocket.go | 2 +- signer/core/api.go | 20 +++--- signer/core/api_test.go | 22 +++--- signer/core/apitypes/types.go | 6 +- 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_internal_test.go | 2 +- signer/core/signed_data_test.go | 12 ++-- 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 | 4 +- 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_util.go | 24 +++---- tests/difficulty_test.go | 4 +- tests/difficulty_test_util.go | 10 +-- tests/fuzzers/abi/abifuzzer.go | 2 +- tests/fuzzers/bitutil/compress_fuzz.go | 2 +- tests/fuzzers/bls12381/bls12381_fuzz.go | 2 +- tests/fuzzers/bls12381/precompile_fuzzer.go | 4 +- tests/fuzzers/bn256/bn256_fuzz.go | 4 +- tests/fuzzers/difficulty/debug/main.go | 2 +- tests/fuzzers/difficulty/difficulty-fuzz.go | 4 +- tests/fuzzers/keystore/keystore-fuzzer.go | 2 +- tests/fuzzers/les/debug/main.go | 2 +- tests/fuzzers/les/les-fuzzer.go | 22 +++--- tests/fuzzers/rangeproof/debug/main.go | 2 +- tests/fuzzers/rangeproof/rangeproof-fuzzer.go | 6 +- tests/fuzzers/rlp/rlp_fuzzer.go | 4 +- tests/fuzzers/runtime/runtime_fuzz.go | 2 +- tests/fuzzers/secp256k1/secp_fuzzer.go | 2 +- tests/fuzzers/stacktrie/debug/main.go | 2 +- tests/fuzzers/stacktrie/trie_fuzzer.go | 6 +- tests/fuzzers/trie/trie-fuzzer.go | 6 +- tests/fuzzers/txfetcher/txfetcher_fuzzer.go | 8 +-- tests/fuzzers/vflux/clientpool-fuzzer.go | 16 ++--- tests/fuzzers/vflux/debug/main.go | 4 +- tests/gen_btheader.go | 8 +-- tests/gen_difficultytest.go | 4 +- tests/gen_stenv.go | 4 +- tests/gen_sttransaction.go | 6 +- tests/init.go | 2 +- tests/init_test.go | 2 +- tests/rlp_test_util.go | 2 +- tests/state_test.go | 2 +- tests/state_test_util.go | 26 +++---- tests/transaction_test.go | 2 +- tests/transaction_test_util.go | 12 ++-- trie/committer.go | 4 +- trie/database.go | 12 ++-- trie/database_test.go | 4 +- trie/errors.go | 2 +- trie/hasher.go | 4 +- trie/iterator.go | 6 +- trie/iterator_test.go | 8 +-- trie/node.go | 4 +- trie/node_test.go | 2 +- trie/proof.go | 10 +-- trie/proof_test.go | 6 +- trie/secure_trie.go | 8 +-- trie/secure_trie_test.go | 6 +- trie/stacktrie.go | 8 +-- trie/stacktrie_test.go | 6 +- trie/sync.go | 8 +-- trie/sync_bloom.go | 10 +-- trie/sync_test.go | 6 +- trie/trie.go | 10 +-- trie/trie_test.go | 14 ++-- 771 files changed, 3292 insertions(+), 3292 deletions(-) diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go index 5ca7c241db..667e03b9f6 100644 --- a/accounts/abi/abi.go +++ b/accounts/abi/abi.go @@ -23,8 +23,8 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/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 a022ec5f9d..314cb3f42b 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index a4307a9529..58cc993926 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -24,13 +24,13 @@ import ( "io/ioutil" "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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/external" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/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 c16990f395..7af01af72e 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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 0325230c5a..55f0d7f9d7 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,25 +24,25 @@ 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/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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/bloombits" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/eth/filters" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" ) // 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 a4e3178eb7..8de4142caf 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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" ) func TestSimulatedBackend(t *testing.T) { diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index 3a20d22575..87d66ff544 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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/event" ) // SignerFn is a signer function callback when a contract requires a method to diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go index 7b023e3b48..48e52eaf5f 100644 --- a/accounts/abi/bind/base_test.go +++ b/accounts/abi/bind/base_test.go @@ -23,14 +23,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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/rlp" ) type mockCaller struct { diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index 0e98709b14..ec350ebae7 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -30,8 +30,8 @@ import ( "text/template" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/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 6d9052f88b..8a8d0fbc57 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) var bindTests = []struct { diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 492bad8c57..3f6193f63a 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/spruce-solutions/go-quai/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index 118abc59a7..e1313a842f 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,9 +21,9 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/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 b01bbaa1e4..5456f7f494 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/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/accounts/abi/bind/backends" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index b238a36d7c..ca8a09aa66 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/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 3332f8a072..8ed528ea0d 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/accounts/abi/method.go b/accounts/abi/method.go index f69e3ee9b5..f1baf2cf13 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/spruce-solutions/go-quai/crypto" ) // FunctionType represents different types of functions a contract might have. diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index 0cd91cb4fa..813cd035bd 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/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 5c7cb1cc1a..1954e0d6cb 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/spruce-solutions/go-quai/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 eae3b0df20..b184d5a941 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/spruce-solutions/go-quai/common" ) type packUnpackTest struct { diff --git a/accounts/abi/topics.go b/accounts/abi/topics.go index 360df7d5e8..caf5407a62 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/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 4a539a7116..575081672a 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" ) func TestMakeTopics(t *testing.T) { diff --git a/accounts/abi/type.go b/accounts/abi/type.go index ffa3acafe9..777e70a1a9 100644 --- a/accounts/abi/type.go +++ b/accounts/abi/type.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) // Type enumerator diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index 8c3aedca6a..c380a4c744 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/spruce-solutions/go-quai/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 ec06984936..f298f5c22a 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,7 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) var ( diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index e617f8abc5..956d11a393 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" "github.com/stretchr/testify/require" ) diff --git a/accounts/accounts.go b/accounts/accounts.go index 7178578091..8bc5fc1c41 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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/event" "golang.org/x/crypto/sha3" ) diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go index e8274f9f04..fccb39f98e 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/spruce-solutions/go-quai/common/hexutil" ) func TestTextHash(t *testing.T) { diff --git a/accounts/external/backend.go b/accounts/external/backend.go index e3f754eafc..80c50a552a 100644 --- a/accounts/external/backend.go +++ b/accounts/external/backend.go @@ -21,15 +21,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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rpc" + "github.com/spruce-solutions/go-quai/signer/core/apitypes" ) type ExternalBackend struct { diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go index a3ec6e9c56..9f42f122a9 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" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/log" ) // Minimum amount of time between cache reloads. This limit applies if the platform does diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index a847545bc8..aa2736f378 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -29,8 +29,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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" ) var ( diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index 8b309321d3..b6bcf7d84d 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -25,7 +25,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/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 8f4987e0fa..b4d74814a2 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" "github.com/google/uuid" ) diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 43fa02d291..7be3a0d59a 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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/event" ) var ( diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go index cb5de11c0d..6aec062fde 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -28,10 +28,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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/passphrase.go b/accounts/keystore/passphrase.go index fdddee04ee..eb27d093f1 100644 --- a/accounts/keystore/passphrase.go +++ b/accounts/keystore/passphrase.go @@ -38,10 +38,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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/crypto" "github.com/google/uuid" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" diff --git a/accounts/keystore/passphrase_test.go b/accounts/keystore/passphrase_test.go index 630682cebd..4dce463525 100644 --- a/accounts/keystore/passphrase_test.go +++ b/accounts/keystore/passphrase_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) const ( diff --git a/accounts/keystore/plain.go b/accounts/keystore/plain.go index f62a133ce1..c93d035e0c 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/spruce-solutions/go-quai/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/plain_test.go b/accounts/keystore/plain_test.go index b831925838..342a5cc718 100644 --- a/accounts/keystore/plain_test.go +++ b/accounts/keystore/plain_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/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..b1eda619c7 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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/crypto" "github.com/google/uuid" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/wallet.go b/accounts/keystore/wallet.go index 1066095f6d..6f2519265b 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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index ad176040d6..9dd9149b39 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -22,7 +22,7 @@ package keystore import ( "time" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" "github.com/rjeczalik/notify" ) diff --git a/accounts/manager.go b/accounts/manager.go index 1e111d1948..349dccdafe 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/event" ) // managerSubBufferSize determines how many incoming wallet events diff --git a/accounts/scwallet/hub.go b/accounts/scwallet/hub.go index 811f8c695e..28a464ba16 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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" pcsc "github.com/gballet/go-libpcsclite" ) diff --git a/accounts/scwallet/securechannel.go b/accounts/scwallet/securechannel.go index 10887a8b43..64f5d3ee5d 100644 --- a/accounts/scwallet/securechannel.go +++ b/accounts/scwallet/securechannel.go @@ -26,7 +26,7 @@ import ( "crypto/sha512" "fmt" - "github.com/ethereum/go-ethereum/crypto" + "github.com/spruce-solutions/go-quai/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 b4d229bc0b..33dec15097 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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/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 23be98a084..31de7032cc 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -23,9 +23,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" "github.com/karalabe/usb" ) diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index 3de3b4091c..7b2881056d 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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index c2182b88d0..0fe41cbe2d 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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/usbwallet/trezor" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" "github.com/golang/protobuf/proto" ) diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index b6f1814488..0fc881b354 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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" "github.com/karalabe/usb" ) diff --git a/build/ci.go b/build/ci.go index a8dc0557bf..9e733575b0 100644 --- a/build/ci.go +++ b/build/ci.go @@ -60,9 +60,9 @@ import ( "time" "github.com/cespare/cp" - "github.com/ethereum/go-ethereum/crypto/signify" - "github.com/ethereum/go-ethereum/internal/build" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/crypto/signify" + "github.com/spruce-solutions/go-quai/internal/build" + "github.com/spruce-solutions/go-quai/params" ) var ( diff --git a/cmd/abidump/main.go b/cmd/abidump/main.go index 4f942749df..093b5e79fd 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/spruce-solutions/go-quai/signer/core/apitypes" + "github.com/spruce-solutions/go-quai/signer/fourbyte" ) func init() { diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index 7b3b35e4e5..7d80cbb8de 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -25,13 +25,13 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "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/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/common/compiler" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/internal/flags" + "github.com/spruce-solutions/go-quai/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 036b968ef8..c44fd998d8 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,13 +24,13 @@ import ( "net" "os" - "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/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/discover" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/nat" + "github.com/spruce-solutions/go-quai/p2p/netutil" ) func main() { diff --git a/cmd/checkpoint-admin/common.go b/cmd/checkpoint-admin/common.go index 05a45dfbf9..44712cb320 100644 --- a/cmd/checkpoint-admin/common.go +++ b/cmd/checkpoint-admin/common.go @@ -19,15 +19,15 @@ package main import ( "strconv" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/external" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/checkpointoracle" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/accounts/external" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/contracts/checkpointoracle" + "github.com/spruce-solutions/go-quai/ethclient" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/checkpoint-admin/exec.go b/cmd/checkpoint-admin/exec.go index 7a42d58737..5d1bd39144 100644 --- a/cmd/checkpoint-admin/exec.go +++ b/cmd/checkpoint-admin/exec.go @@ -25,18 +25,18 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "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/contracts/checkpointoracle" - "github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/contracts/checkpointoracle" + "github.com/spruce-solutions/go-quai/contracts/checkpointoracle/contract" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethclient" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/checkpoint-admin/main.go b/cmd/checkpoint-admin/main.go index 0fb5532147..6cddab3a90 100644 --- a/cmd/checkpoint-admin/main.go +++ b/cmd/checkpoint-admin/main.go @@ -22,9 +22,9 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common/fdlimit" + "github.com/spruce-solutions/go-quai/internal/flags" + "github.com/spruce-solutions/go-quai/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/checkpoint-admin/status.go b/cmd/checkpoint-admin/status.go index f613501eb3..7f131fee40 100644 --- a/cmd/checkpoint-admin/status.go +++ b/cmd/checkpoint-admin/status.go @@ -19,8 +19,8 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/common" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/clef/main.go b/cmd/clef/main.go index 61d2811f65..561b6b49f3 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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/internal/flags" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/rpc" + "github.com/spruce-solutions/go-quai/signer/core" + "github.com/spruce-solutions/go-quai/signer/core/apitypes" + "github.com/spruce-solutions/go-quai/signer/fourbyte" + "github.com/spruce-solutions/go-quai/signer/rules" + "github.com/spruce-solutions/go-quai/signer/storage" "github.com/mattn/go-colorable" "github.com/mattn/go-isatty" "gopkg.in/urfave/cli.v1" diff --git a/cmd/devp2p/crawl.go b/cmd/devp2p/crawl.go index 9259b4894c..f6b030440f 100644 --- a/cmd/devp2p/crawl.go +++ b/cmd/devp2p/crawl.go @@ -19,8 +19,8 @@ package main import ( "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" ) type crawler struct { diff --git a/cmd/devp2p/discv4cmd.go b/cmd/devp2p/discv4cmd.go index 3b6dc09a1c..54b2343671 100644 --- a/cmd/devp2p/discv4cmd.go +++ b/cmd/devp2p/discv4cmd.go @@ -22,12 +22,12 @@ 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/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/cmd/devp2p/internal/v4test" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/discover" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/devp2p/discv5cmd.go b/cmd/devp2p/discv5cmd.go index e20d7c9cfa..53ca753ed9 100644 --- a/cmd/devp2p/discv5cmd.go +++ b/cmd/devp2p/discv5cmd.go @@ -20,9 +20,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v5test" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/spruce-solutions/go-quai/cmd/devp2p/internal/v5test" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/p2p/discover" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/devp2p/dns_cloudflare.go b/cmd/devp2p/dns_cloudflare.go index 596254df91..3b26508be0 100644 --- a/cmd/devp2p/dns_cloudflare.go +++ b/cmd/devp2p/dns_cloudflare.go @@ -22,8 +22,8 @@ import ( "strings" "github.com/cloudflare/cloudflare-go" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/dnsdisc" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/dnsdisc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/devp2p/dns_route53.go b/cmd/devp2p/dns_route53.go index 1d4f975dda..2a2fae6a82 100644 --- a/cmd/devp2p/dns_route53.go +++ b/cmd/devp2p/dns_route53.go @@ -30,8 +30,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/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/dnsdisc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/devp2p/dnscmd.go b/cmd/devp2p/dnscmd.go index 66deef56ea..e5a316ac96 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/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/console/prompt" + "github.com/spruce-solutions/go-quai/p2p/dnsdisc" + "github.com/spruce-solutions/go-quai/p2p/enode" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/devp2p/enrcmd.go b/cmd/devp2p/enrcmd.go index 48ede616ee..488a8ca365 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/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/devp2p/internal/ethtest/chain.go b/cmd/devp2p/internal/ethtest/chain.go index 7dcb412b53..d741968cec 100644 --- a/cmd/devp2p/internal/ethtest/chain.go +++ b/cmd/devp2p/internal/ethtest/chain.go @@ -26,11 +26,11 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" ) type Chain struct { diff --git a/cmd/devp2p/internal/ethtest/chain_test.go b/cmd/devp2p/internal/ethtest/chain_test.go index ec98833ab5..8c4f01d458 100644 --- a/cmd/devp2p/internal/ethtest/chain_test.go +++ b/cmd/devp2p/internal/ethtest/chain_test.go @@ -21,8 +21,8 @@ import ( "strconv" "testing" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/p2p" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/p2p" "github.com/stretchr/testify/assert" ) diff --git a/cmd/devp2p/internal/ethtest/helpers.go b/cmd/devp2p/internal/ethtest/helpers.go index 88d8e143c1..14f041cf14 100644 --- a/cmd/devp2p/internal/ethtest/helpers.go +++ b/cmd/devp2p/internal/ethtest/helpers.go @@ -24,13 +24,13 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "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/internal/utesting" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/rlpx" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/internal/utesting" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/rlpx" ) var ( diff --git a/cmd/devp2p/internal/ethtest/large.go b/cmd/devp2p/internal/ethtest/large.go index 22421355ab..a4bb4a6137 100644 --- a/cmd/devp2p/internal/ethtest/large.go +++ b/cmd/devp2p/internal/ethtest/large.go @@ -20,9 +20,9 @@ import ( "crypto/rand" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" ) // largeNumber returns a very large big.Int. diff --git a/cmd/devp2p/internal/ethtest/suite.go b/cmd/devp2p/internal/ethtest/suite.go index bbc955cd7b..8589f251ce 100644 --- a/cmd/devp2p/internal/ethtest/suite.go +++ b/cmd/devp2p/internal/ethtest/suite.go @@ -19,10 +19,10 @@ package ethtest import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/internal/utesting" + "github.com/spruce-solutions/go-quai/p2p/enode" ) // Suite represents a structure used to test a node's conformance diff --git a/cmd/devp2p/internal/ethtest/suite_test.go b/cmd/devp2p/internal/ethtest/suite_test.go index 6d14404e66..c8317e6fd4 100644 --- a/cmd/devp2p/internal/ethtest/suite_test.go +++ b/cmd/devp2p/internal/ethtest/suite_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/eth" - "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/spruce-solutions/go-quai/eth" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/internal/utesting" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" ) var ( diff --git a/cmd/devp2p/internal/ethtest/transaction.go b/cmd/devp2p/internal/ethtest/transaction.go index d2dbe0a7d6..52245868c6 100644 --- a/cmd/devp2p/internal/ethtest/transaction.go +++ b/cmd/devp2p/internal/ethtest/transaction.go @@ -22,11 +22,11 @@ import ( "strings" "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/internal/utesting" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/internal/utesting" + "github.com/spruce-solutions/go-quai/params" ) //var faucetAddr = common.HexToAddress("0x71562b71999873DB5b286dF957af199Ec94617F7") diff --git a/cmd/devp2p/internal/ethtest/types.go b/cmd/devp2p/internal/ethtest/types.go index e49ea284e9..dd3e96b346 100644 --- a/cmd/devp2p/internal/ethtest/types.go +++ b/cmd/devp2p/internal/ethtest/types.go @@ -20,10 +20,10 @@ import ( "crypto/ecdsa" "fmt" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/rlpx" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/rlpx" + "github.com/spruce-solutions/go-quai/rlp" ) type Message interface { diff --git a/cmd/devp2p/internal/v4test/discv4tests.go b/cmd/devp2p/internal/v4test/discv4tests.go index 04ad67637a..2cce45af09 100644 --- a/cmd/devp2p/internal/v4test/discv4tests.go +++ b/cmd/devp2p/internal/v4test/discv4tests.go @@ -23,9 +23,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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/internal/utesting" + "github.com/spruce-solutions/go-quai/p2p/discover/v4wire" ) const ( diff --git a/cmd/devp2p/internal/v4test/framework.go b/cmd/devp2p/internal/v4test/framework.go index 9286594181..46f7c78e85 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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/discover/v4wire" + "github.com/spruce-solutions/go-quai/p2p/enode" ) const waitTime = 300 * time.Millisecond diff --git a/cmd/devp2p/internal/v5test/discv5tests.go b/cmd/devp2p/internal/v5test/discv5tests.go index 7866498f73..d7f2e9c406 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/spruce-solutions/go-quai/internal/utesting" + "github.com/spruce-solutions/go-quai/p2p/discover/v5wire" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/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 9eac37520f..93d0679cae 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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/discover/v5wire" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" ) // readError represents an error during packet reading. diff --git a/cmd/devp2p/keycmd.go b/cmd/devp2p/keycmd.go index 869b8c2a44..1b16571818 100644 --- a/cmd/devp2p/keycmd.go +++ b/cmd/devp2p/keycmd.go @@ -20,8 +20,8 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enode" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/devp2p/main.go b/cmd/devp2p/main.go index 4a4e905a42..24b9c44be9 100644 --- a/cmd/devp2p/main.go +++ b/cmd/devp2p/main.go @@ -22,9 +22,9 @@ import ( "path/filepath" "sort" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/internal/debug" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/devp2p/nodeset.go b/cmd/devp2p/nodeset.go index 1d78e34c73..931ae29ed6 100644 --- a/cmd/devp2p/nodeset.go +++ b/cmd/devp2p/nodeset.go @@ -25,8 +25,8 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/p2p/enode" ) const jsonIndent = " " diff --git a/cmd/devp2p/nodesetcmd.go b/cmd/devp2p/nodesetcmd.go index 999cc7921b..e61d6aff7a 100644 --- a/cmd/devp2p/nodesetcmd.go +++ b/cmd/devp2p/nodesetcmd.go @@ -25,10 +25,10 @@ import ( "strings" "time" - "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/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/devp2p/rlpxcmd.go b/cmd/devp2p/rlpxcmd.go index 24a16f0b3c..e651b13c75 100644 --- a/cmd/devp2p/rlpxcmd.go +++ b/cmd/devp2p/rlpxcmd.go @@ -20,12 +20,12 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/cmd/devp2p/internal/ethtest" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/rlpx" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/cmd/devp2p/internal/ethtest" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/internal/utesting" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/rlpx" + "github.com/spruce-solutions/go-quai/rlp" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/devp2p/runtest.go b/cmd/devp2p/runtest.go index 4168f8555b..660a6b92c5 100644 --- a/cmd/devp2p/runtest.go +++ b/cmd/devp2p/runtest.go @@ -19,9 +19,9 @@ package main import ( "os" - "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/cmd/devp2p/internal/v4test" + "github.com/spruce-solutions/go-quai/internal/utesting" + "github.com/spruce-solutions/go-quai/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/changepassword.go b/cmd/ethkey/changepassword.go index b9402c2f96..bdacf9334d 100644 --- a/cmd/ethkey/changepassword.go +++ b/cmd/ethkey/changepassword.go @@ -21,8 +21,8 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index 629d23da5b..9fcd42857d 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -23,9 +23,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/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/crypto" "github.com/google/uuid" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index b646e43aa5..3a16ac3562 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -21,9 +21,9 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index 6db39174c4..2654dade67 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/spruce-solutions/go-quai/internal/flags" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index 69c8cf0923..4ee54dfc7e 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,10 +21,10 @@ import ( "fmt" "io/ioutil" - "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/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index 6006f6b5bb..0cc526d8e0 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "github.com/spruce-solutions/go-quai/internal/cmdtest" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index f2986e8ee9..5b4712f0e2 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,8 +22,8 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index 40ad9313c5..a580168c8d 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" + "github.com/spruce-solutions/go-quai/cmd/evm/internal/compiler" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index f9719497fe..7e4a96cbae 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/spruce-solutions/go-quai/core/asm" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go index 54981b6697..9bdf5cb284 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/spruce-solutions/go-quai/core/asm" ) func Compile(fn string, src []byte, debug bool) (string, error) { diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go index fae65767be..9b9fd3522f 100644 --- a/cmd/evm/internal/t8ntool/execution.go +++ b/cmd/evm/internal/t8ntool/execution.go @@ -21,21 +21,21 @@ import ( "math/big" "os" - "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/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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/consensus/misc" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" "golang.org/x/crypto/sha3" ) diff --git a/cmd/evm/internal/t8ntool/flags.go b/cmd/evm/internal/t8ntool/flags.go index 05b6ed1647..51282d584c 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/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/tests" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/internal/t8ntool/gen_stenv.go b/cmd/evm/internal/t8ntool/gen_stenv.go index 1bb3c6a46b..bc310a9982 100644 --- a/cmd/evm/internal/t8ntool/gen_stenv.go +++ b/cmd/evm/internal/t8ntool/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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/cmd/evm/internal/t8ntool/transaction.go b/cmd/evm/internal/t8ntool/transaction.go index aecbad79df..14c9694280 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/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/tests" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go index 7407ed0a44..bdeb2bd5ef 100644 --- a/cmd/evm/internal/t8ntool/transition.go +++ b/cmd/evm/internal/t8ntool/transition.go @@ -27,17 +27,17 @@ import ( "path" "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/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/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/tests" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 26064efc3c..ec23da0ea1 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,9 +22,9 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/cmd/evm/internal/t8ntool" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/spruce-solutions/go-quai/cmd/evm/internal/t8ntool" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/internal/flags" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index cedbd22815..29f269b295 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -28,16 +28,16 @@ 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/log" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/cmd/evm/internal/compiler" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/core/vm/runtime" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index ab27046091..5d49804649 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -23,10 +23,10 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/tests" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/tests" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/t8n_test.go b/cmd/evm/t8n_test.go index ad518a91a2..072f1f2f1c 100644 --- a/cmd/evm/t8n_test.go +++ b/cmd/evm/t8n_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "github.com/spruce-solutions/go-quai/internal/cmdtest" ) func TestMain(m *testing.M) { diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 3b0e78ef62..648c009287 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -41,23 +41,23 @@ import ( "sync" "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/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "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/nat" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/ethclient" + "github.com/spruce-solutions/go-quai/ethstats" + "github.com/spruce-solutions/go-quai/les" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/nat" + "github.com/spruce-solutions/go-quai/params" "github.com/gorilla/websocket" ) diff --git a/cmd/faucet/faucet_test.go b/cmd/faucet/faucet_test.go index 58a1f22b54..92935c2421 100644 --- a/cmd/faucet/faucet_test.go +++ b/cmd/faucet/faucet_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) func TestFacebook(t *testing.T) { diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index 86bf6c865c..68d2fffd0f 100644 --- a/cmd/geth/accountcmd.go +++ b/cmd/geth/accountcmd.go @@ -20,11 +20,11 @@ import ( "fmt" "io/ioutil" - "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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index caf025660a..8e60808b95 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -26,18 +26,18 @@ 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/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/node" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index c97a64f173..b4245257dd 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -27,18 +27,18 @@ import ( "gopkg.in/urfave/cli.v1" - "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/eth/catalyst" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/ethapi" - "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/spruce-solutions/go-quai/accounts/external" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/accounts/scwallet" + "github.com/spruce-solutions/go-quai/accounts/usbwallet" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/eth/catalyst" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/params" "github.com/naoina/toml" ) diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 97ebf4a08d..5e62ef7e00 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -22,10 +22,10 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/console" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 845ede2f9c..1317756234 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/params" ) const ( diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index dc4a0a3d99..7348b64f68 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/params" ) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured) diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go index d516936dd7..23378da2eb 100644 --- a/cmd/geth/dbcmd.go +++ b/cmd/geth/dbcmd.go @@ -24,14 +24,14 @@ import ( "strconv" "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/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/console/prompt" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/trie" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/les_test.go b/cmd/geth/les_test.go index 151c12c68c..8ef5477e0d 100644 --- a/cmd/geth/les_test.go +++ b/cmd/geth/les_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/rpc" ) type gethrpc struct { diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 294c24cdbb..1be203800b 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -25,20 +25,20 @@ 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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/console/prompt" + "github.com/spruce-solutions/go-quai/eth" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/ethclient" + "github.com/spruce-solutions/go-quai/internal/debug" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/internal/flags" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/node" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index b347d31d97..89dab5d8a2 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -23,9 +23,9 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go index 527c38a657..1b8ffba51b 100644 --- a/cmd/geth/run_test.go +++ b/cmd/geth/run_test.go @@ -25,8 +25,8 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/internal/cmdtest" + "github.com/spruce-solutions/go-quai/rpc" ) func tmpdir(t *testing.T) string { diff --git a/cmd/geth/snapshot.go b/cmd/geth/snapshot.go index 50f746418c..e0e237bf74 100644 --- a/cmd/geth/snapshot.go +++ b/cmd/geth/snapshot.go @@ -23,17 +23,17 @@ 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/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/state/pruner" + "github.com/spruce-solutions/go-quai/core/state/snapshot" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 0b1b7ff790..cf076276a3 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -22,9 +22,9 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/spruce-solutions/go-quai/cmd/utils" + "github.com/spruce-solutions/go-quai/internal/debug" + "github.com/spruce-solutions/go-quai/internal/flags" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/version_check.go b/cmd/geth/version_check.go index 2101a69e98..3f4fc11715 100644 --- a/cmd/geth/version_check.go +++ b/cmd/geth/version_check.go @@ -25,7 +25,7 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" "github.com/jedisct1/go-minisign" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index 812954a680..d74bf22329 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -45,12 +45,12 @@ import ( "strings" "text/tabwriter" - "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/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/simulations" + "github.com/spruce-solutions/go-quai/p2p/simulations/adapters" + "github.com/spruce-solutions/go-quai/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go index ef1f977bf0..61c88ade86 100644 --- a/cmd/puppeth/genesis.go +++ b/cmd/puppeth/genesis.go @@ -22,13 +22,13 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - math2 "github.com/ethereum/go-ethereum/common/math" - "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/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + math2 "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" ) // alethGenesisSpec represents the genesis specification format used by the diff --git a/cmd/puppeth/genesis_test.go b/cmd/puppeth/genesis_test.go index aaa72d73cb..13e61817f2 100644 --- a/cmd/puppeth/genesis_test.go +++ b/cmd/puppeth/genesis_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/core" + "github.com/spruce-solutions/go-quai/core" ) // Tests the go-ethereum to Aleth chainspec conversion for the Stureby testnet. diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index b6a029a01a..b7de0fcdeb 100644 --- a/cmd/puppeth/module.go +++ b/cmd/puppeth/module.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 35cfada66f..b90783a168 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // dashboardContent is the actual dashboard HTML content to serve up when users diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index abed4db5fc..b9f4759b58 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // ethstatsDockerfile is the Dockerfile required to build an ethstats backend diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go index 05821dfc5e..be5075df73 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // explorerDockerfile is the Dockerfile required to run a block explorer. diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go index 88cb80ae4c..1178808153 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/log" ) // faucetDockerfile is the Dockerfile required to build a faucet container to diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index 1b1ae61ff5..b366aec20a 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // nginxDockerfile is theis the Dockerfile required to build an nginx reverse- diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go index 3ea96870d4..b7e0abfd17 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -26,8 +26,8 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/log" ) // nodeDockerfile is the Dockerfile required to run an Ethereum node. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index c3de5f9360..c072e3b636 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index 039cb6cb45..edab32ebe7 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" "golang.org/x/crypto/ssh/terminal" diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go index 83536506c4..432b3bdb60 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -31,9 +31,9 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index b64bdca0b9..9f1013810e 100644 --- a/cmd/puppeth/wizard_dashboard.go +++ b/cmd/puppeth/wizard_dashboard.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // deployDashboard queries the user for various input on deploying a web-service diff --git a/cmd/puppeth/wizard_ethstats.go b/cmd/puppeth/wizard_ethstats.go index 95cab9da46..af27a9e210 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // deployEthstats queries the user for various input on deploying an ethstats diff --git a/cmd/puppeth/wizard_explorer.go b/cmd/puppeth/wizard_explorer.go index 1df9cbc0f3..5d71b5a4d5 100644 --- a/cmd/puppeth/wizard_explorer.go +++ b/cmd/puppeth/wizard_explorer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // deployExplorer creates a new block explorer based on some user input. diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go index 65d4e8b8ed..08abcba91b 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/log" ) // deployFaucet queries the user for various input on deploying a faucet, after diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go index ae5977b372..0a32ab96b0 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -29,10 +29,10 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" ) // makeGenesis creates a new genesis struct based on some user input. diff --git a/cmd/puppeth/wizard_intro.go b/cmd/puppeth/wizard_intro.go index 75fb04b76f..fef700eec2 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index 7b5671e6df..07aa815115 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/log" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index d015e06ebb..b6319d52fa 100644 --- a/cmd/puppeth/wizard_network.go +++ b/cmd/puppeth/wizard_network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // manageServers displays a list of servers the user can disconnect from, and an diff --git a/cmd/puppeth/wizard_nginx.go b/cmd/puppeth/wizard_nginx.go index 8397b7fd57..5b7f35c98f 100644 --- a/cmd/puppeth/wizard_nginx.go +++ b/cmd/puppeth/wizard_nginx.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // ensureVirtualHost checks whether a reverse-proxy is running on the specified diff --git a/cmd/puppeth/wizard_node.go b/cmd/puppeth/wizard_node.go index 2bae332142..d6664e50d8 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/log" ) // deployNode creates a new node configuration based on some user input. diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index d0f993c5b8..77c74dbd3d 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/rlp" ) var ( diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index d4051e59ef..5a4fc1f6be 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -28,17 +28,17 @@ 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/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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/internal/debug" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/rlp" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index 0a72e80349..884ef4fb25 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -26,7 +26,7 @@ import ( "path" "strings" - "github.com/ethereum/go-ethereum/common/math" + "github.com/spruce-solutions/go-quai/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 8bf26c05a5..284429ac02 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -33,40 +33,40 @@ import ( "text/template" "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/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/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/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "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/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/les" - "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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/fdlimit" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/clique" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/eth" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/eth/gasprice" + "github.com/spruce-solutions/go-quai/eth/tracers" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/ethstats" + "github.com/spruce-solutions/go-quai/graphql" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/internal/flags" + "github.com/spruce-solutions/go-quai/les" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/metrics/exp" + "github.com/spruce-solutions/go-quai/metrics/influxdb" + "github.com/spruce-solutions/go-quai/miner" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/nat" + "github.com/spruce-solutions/go-quai/p2p/netutil" + "github.com/spruce-solutions/go-quai/params" pcsclite "github.com/gballet/go-libpcsclite" gopsutil "github.com/shirou/gopsutil/mem" "gopkg.in/urfave/cli.v1" diff --git a/cmd/utils/flags_legacy.go b/cmd/utils/flags_legacy.go index a0f64f609b..06116007b5 100644 --- a/cmd/utils/flags_legacy.go +++ b/cmd/utils/flags_legacy.go @@ -19,7 +19,7 @@ package utils import ( "fmt" - "github.com/ethereum/go-ethereum/eth/ethconfig" + "github.com/spruce-solutions/go-quai/eth/ethconfig" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/prompt.go b/cmd/utils/prompt.go index 5c7cbabcb0..3ca9271332 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/spruce-solutions/go-quai/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 13a13011dc..331519798a 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/spruce-solutions/go-quai/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index 80180d9186..31ffe5e5f5 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/spruce-solutions/go-quai/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index f896ec65be..cc590e164b 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/spruce-solutions/go-quai/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/prque/lazyqueue.go b/common/prque/lazyqueue.go index 37c2f3bd42..c439090362 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/spruce-solutions/go-quai/common/mclock" ) // LazyQueue is a priority queue data structure where priorities can change over diff --git a/common/prque/lazyqueue_test.go b/common/prque/lazyqueue_test.go index 9a831d628b..2d0c98d016 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/spruce-solutions/go-quai/common/mclock" ) const ( diff --git a/common/types.go b/common/types.go index 2205835cb5..4b5f462172 100644 --- a/common/types.go +++ b/common/types.go @@ -28,7 +28,7 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/spruce-solutions/go-quai/common/hexutil" "golang.org/x/crypto/sha3" ) diff --git a/consensus/clique/api.go b/consensus/clique/api.go index 3a8cfb3f07..e89df12b49 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/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 ae0678f72c..546171ec72 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -27,20 +27,20 @@ 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/misc" - "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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/misc" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/rpc" + "github.com/spruce-solutions/go-quai/trie" lru "github.com/hashicorp/golang-lru" "golang.org/x/crypto/sha3" ) diff --git a/consensus/clique/clique_test.go b/consensus/clique/clique_test.go index e05421fcb7..385801905b 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/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 e1acb25c7b..1377f51a18 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -22,11 +22,11 @@ import ( "sort" "time" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index 6ee852cdf1..b24bbc2d15 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -23,13 +23,13 @@ import ( "sort" "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" ) // testerAccountPool is a pool to maintain currently active tester accounts, diff --git a/consensus/consensus.go b/consensus/consensus.go index 872d2f0899..f4f8184c4b 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" ) // ChainHeaderReader defines a small collection of methods needed to access the local diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index 065e60b90b..6ff7d95795 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -27,10 +27,10 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/bitutil" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" "golang.org/x/crypto/sha3" ) diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index adf39fa7e9..812dd0a406 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -26,9 +26,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" ) // prepare converts an ethash cache or dataset from a byte stream into the internal diff --git a/consensus/ethash/api.go b/consensus/ethash/api.go index f4d3802e0b..4e4e36f5a2 100644 --- a/consensus/ethash/api.go +++ b/consensus/ethash/api.go @@ -19,9 +19,9 @@ package ethash import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" ) var errEthashStopped = errors.New("ethash stopped") diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 76a09508b5..416cc44c29 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -25,16 +25,16 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "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/core/state" - "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/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/misc" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" "golang.org/x/crypto/sha3" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 1dd6e6e641..a2eddaf912 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -25,10 +25,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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" ) type diffTest struct { diff --git a/consensus/ethash/difficulty.go b/consensus/ethash/difficulty.go index 7c7a87ea37..787fe86f62 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/spruce-solutions/go-quai/core/types" "github.com/holiman/uint256" ) diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index ec06d02a54..e032992c72 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -34,10 +34,10 @@ import ( "unsafe" "github.com/edsrzf/mmap-go" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/rpc" "github.com/hashicorp/golang-lru/simplelru" ) diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index 3830bccd18..c8d230ec83 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" ) // Tests that ethash works correctly in test mode. diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index 51c69efd70..2ce23e5269 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -30,10 +30,10 @@ 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/types" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core/types" ) const ( diff --git a/consensus/ethash/sealer_test.go b/consensus/ethash/sealer_test.go index 151adc97da..e9f28af832 100644 --- a/consensus/ethash/sealer_test.go +++ b/consensus/ethash/sealer_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/internal/testlog" + "github.com/spruce-solutions/go-quai/log" ) // Tests whether remote HTTP servers are correctly notified of new work. diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index b1140e8031..3e79bd72a7 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/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" ) var ( diff --git a/consensus/misc/eip1559.go b/consensus/misc/eip1559.go index bbb01e8b46..be52bfd339 100644 --- a/consensus/misc/eip1559.go +++ b/consensus/misc/eip1559.go @@ -20,10 +20,10 @@ import ( "fmt" "math/big" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" ) // VerifyEip1559Header verifies some header attributes which were changed in EIP-1559, diff --git a/consensus/misc/eip1559_test.go b/consensus/misc/eip1559_test.go index ae2de9e371..4e1da70ebf 100644 --- a/consensus/misc/eip1559_test.go +++ b/consensus/misc/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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" ) // copyConfig does a _shallow_ copy of a given config. Safe to set new values, but diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 7d435b2a5b..1b383b98eb 100644 --- a/consensus/misc/forks.go +++ b/consensus/misc/forks.go @@ -19,9 +19,9 @@ package misc import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/consensus/misc/gaslimit.go b/consensus/misc/gaslimit.go index 25f35300b9..94b39031ef 100644 --- a/consensus/misc/gaslimit.go +++ b/consensus/misc/gaslimit.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/params" ) // VerifyGaslimit verifies the header gas limit according increase/decrease diff --git a/console/bridge.go b/console/bridge.go index 21ef0e8e7b..c4a4121d37 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -25,12 +25,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/spruce-solutions/go-quai/accounts/scwallet" + "github.com/spruce-solutions/go-quai/accounts/usbwallet" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/console/prompt" + "github.com/spruce-solutions/go-quai/internal/jsre" + "github.com/spruce-solutions/go-quai/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..f27bc10b7b 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/spruce-solutions/go-quai/internal/jsre" ) // TestUndefinedAsParam ensures that personal functions can receive diff --git a/console/console.go b/console/console.go index dd39300d0a..fc51b19298 100644 --- a/console/console.go +++ b/console/console.go @@ -29,11 +29,11 @@ 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/rpc" + "github.com/spruce-solutions/go-quai/console/prompt" + "github.com/spruce-solutions/go-quai/internal/jsre" + "github.com/spruce-solutions/go-quai/internal/jsre/deps" + "github.com/spruce-solutions/go-quai/internal/web3ext" + "github.com/spruce-solutions/go-quai/rpc" "github.com/mattn/go-colorable" "github.com/peterh/liner" ) diff --git a/console/console_test.go b/console/console_test.go index f6ab781410..6e4cdc7b52 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -26,15 +26,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/console/prompt" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/eth" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/internal/jsre" + "github.com/spruce-solutions/go-quai/miner" + "github.com/spruce-solutions/go-quai/node" ) const ( diff --git a/contracts/checkpointoracle/contract/oracle.go b/contracts/checkpointoracle/contract/oracle.go index a4a308f5c5..0a85eef552 100644 --- a/contracts/checkpointoracle/contract/oracle.go +++ b/contracts/checkpointoracle/contract/oracle.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - 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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/contracts/checkpointoracle/oracle.go b/contracts/checkpointoracle/oracle.go index 7f3127d0b8..73873ca308 100644 --- a/contracts/checkpointoracle/oracle.go +++ b/contracts/checkpointoracle/oracle.go @@ -23,10 +23,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/contracts/checkpointoracle/contract" + "github.com/spruce-solutions/go-quai/core/types" ) // CheckpointOracle is a Go wrapper around an on-chain checkpoint oracle contract. diff --git a/contracts/checkpointoracle/oracle_test.go b/contracts/checkpointoracle/oracle_test.go index 61dd8aec79..cacc2eb3b8 100644 --- a/contracts/checkpointoracle/oracle_test.go +++ b/contracts/checkpointoracle/oracle_test.go @@ -27,13 +27,13 @@ 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/contracts/checkpointoracle/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/accounts/abi/bind/backends" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/contracts/checkpointoracle/contract" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" ) var ( diff --git a/core/asm/asm.go b/core/asm/asm.go index 4257198cc7..1f5277e54f 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/spruce-solutions/go-quai/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index 7997099298..970e3f68f2 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -22,8 +22,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index 31dd8e60a8..6719ffa4ed 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,15 +23,15 @@ import ( "os" "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index 30be5af1a5..c1f2b4f63b 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -19,11 +19,11 @@ package core import ( "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/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/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 86925d2a88..a1b14a8b0e 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "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/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index 8d2108b6e5..175c8350bc 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -30,22 +30,22 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "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/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/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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/common/prque" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/state/snapshot" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/blockchain_insert.go b/core/blockchain_insert.go index cb8473c084..0baab38716 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" ) // insertStats tracks and reports on block insertion. diff --git a/core/blockchain_repair_test.go b/core/blockchain_repair_test.go index c60fdfb585..834c826d71 100644 --- a/core/blockchain_repair_test.go +++ b/core/blockchain_repair_test.go @@ -27,12 +27,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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/params" ) // Tests a recovery for a short canonical chain where a recent block was already diff --git a/core/blockchain_sethead_test.go b/core/blockchain_sethead_test.go index 754d9256a8..8d24d5782f 100644 --- a/core/blockchain_sethead_test.go +++ b/core/blockchain_sethead_test.go @@ -28,12 +28,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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/params" ) // 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 8dd9914961..6d86f56e2f 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/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/params" ) // snapshotTestBasic wraps the common testing fields in the snapshot tests. diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 3645395459..253bf74dce 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -27,17 +27,17 @@ 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/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/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" ) // So we can deterministically seed different blockchains diff --git a/core/blocks.go b/core/blocks.go index f20ba4aaf2..eb144e4545 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/spruce-solutions/go-quai/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 d0e04a8863..24a46933e4 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/bitutil" + "github.com/spruce-solutions/go-quai/core/bloombits" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" ) const ( diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go index 646151db0b..4b74c54d76 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/spruce-solutions/go-quai/core/types" ) var ( diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index 88e3ed6b06..8f9415d37d 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/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 f2a8bda17c..65a573e3b4 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/spruce-solutions/go-quai/common/bitutil" + "github.com/spruce-solutions/go-quai/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 923579221f..5a27d4f617 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/spruce-solutions/go-quai/common" ) const testSectionSize = 4096 diff --git a/core/chain_indexer.go b/core/chain_indexer.go index f208117255..9ea86c7cac 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -24,12 +24,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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/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 a3093c0bab..2fea0979cf 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index a7a0736463..c119048bc5 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -20,14 +20,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/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/misc" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/params" ) // BlockGen creates blocks for testing. diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 05a8a63bcf..237bfa1c68 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -20,12 +20,12 @@ import ( "fmt" "math/big" - "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/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index 24d45d6bf7..e2482dd650 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,11 +20,11 @@ import ( "math/big" "testing" - "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/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/error.go b/core/error.go index 126b645e3f..5391542e4d 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/spruce-solutions/go-quai/core/types" ) var ( diff --git a/core/events.go b/core/events.go index ac935a137f..c1771580ce 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/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 f22b8c45aa..69d0e453ab 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,10 +19,10 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/forkid/forkid.go b/core/forkid/forkid.go index 0ad44e9823..467c5fc90c 100644 --- a/core/forkid/forkid.go +++ b/core/forkid/forkid.go @@ -26,10 +26,10 @@ import ( "reflect" "strings" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" ) var ( diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go index de2bfc808e..48cc53f0e9 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -21,9 +21,9 @@ import ( "math" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/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 4e0844e889..61a674b375 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index a9d47e6ba3..d46581a7ef 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index 0c1f1ba818..e274c6dc34 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -25,18 +25,18 @@ import ( "math/big" "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/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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) //go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go diff --git a/core/genesis_test.go b/core/genesis_test.go index 180abd3e0e..44831ff78c 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -22,12 +22,12 @@ 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index 5835a2df83..e62ed83696 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -26,13 +26,13 @@ import ( "sync/atomic" "time" - "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/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/headerchain_test.go b/core/headerchain_test.go index d3b525090c..69e00d0f19 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/log" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" ) func verifyUnbrokenCanonchain(hc *HeaderChain) error { diff --git a/core/mkalloc.go b/core/mkalloc.go index df167d7082..c848e94375 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -35,8 +35,8 @@ import ( "sort" "strconv" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index 85a36efb96..0767df6031 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -24,13 +24,13 @@ import ( "math/big" "sort" - "github.com/ethereum/go-ethereum/common" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" ) // ReadCanonicalHash retrieves the hash assigned to a canonical block number. diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index 8b7f2101d3..4967def166 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -27,11 +27,11 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index 25a44354bf..3367f130c2 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/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 9e28887efd..e5000c699a 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -22,11 +22,11 @@ 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/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index 079e335fa6..847aab1bc3 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" ) // ReadDatabaseVersion retrieves the version number of the database. diff --git a/core/rawdb/accessors_snapshot.go b/core/rawdb/accessors_snapshot.go index 88446e0792..8a815be1d6 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" ) // ReadSnapshotDisabled retrieves if the snapshot maintenance is disabled. diff --git a/core/rawdb/accessors_state.go b/core/rawdb/accessors_state.go index 6112de03ad..48a412c4e5 100644 --- a/core/rawdb/accessors_state.go +++ b/core/rawdb/accessors_state.go @@ -17,9 +17,9 @@ package rawdb import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" ) // ReadPreimage retrieves a single preimage of the provided hash. diff --git a/core/rawdb/chain_iterator.go b/core/rawdb/chain_iterator.go index ad222005be..3dab4dcb10 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/prque" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/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 a812b7ec57..300b01da56 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" ) func TestChainIterator(t *testing.T) { diff --git a/core/rawdb/database.go b/core/rawdb/database.go index 0e116ef999..10ae8969d4 100644 --- a/core/rawdb/database.go +++ b/core/rawdb/database.go @@ -24,11 +24,11 @@ import ( "sync/atomic" "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/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/ethdb/leveldb" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/log" "github.com/olekukonko/tablewriter" ) diff --git a/core/rawdb/freezer.go b/core/rawdb/freezer.go index d042956500..2ef7cd1f02 100644 --- a/core/rawdb/freezer.go +++ b/core/rawdb/freezer.go @@ -26,12 +26,12 @@ import ( "sync/atomic" "time" - "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/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/params" "github.com/prometheus/tsdb/fileutil" ) diff --git a/core/rawdb/freezer_batch.go b/core/rawdb/freezer_batch.go index 8297c0ac1d..c8c050324a 100644 --- a/core/rawdb/freezer_batch.go +++ b/core/rawdb/freezer_batch.go @@ -20,8 +20,8 @@ import ( "fmt" "sync/atomic" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/rlp" "github.com/golang/snappy" ) diff --git a/core/rawdb/freezer_table.go b/core/rawdb/freezer_table.go index 22405cf9b4..c3705fcd45 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" "github.com/golang/snappy" ) diff --git a/core/rawdb/freezer_table_test.go b/core/rawdb/freezer_table_test.go index 803809b520..e84ff78282 100644 --- a/core/rawdb/freezer_table_test.go +++ b/core/rawdb/freezer_table_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/spruce-solutions/go-quai/metrics" "github.com/stretchr/testify/require" ) diff --git a/core/rawdb/freezer_test.go b/core/rawdb/freezer_test.go index 7359131c89..c83c3ed49e 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/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/rlp" "github.com/stretchr/testify/require" ) diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go index 3df974995c..5ec2d4d474 100644 --- a/core/rawdb/schema.go +++ b/core/rawdb/schema.go @@ -21,8 +21,8 @@ import ( "bytes" "encoding/binary" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/metrics" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/metrics" ) // The fields below define the low level database schema prefixing. diff --git a/core/rawdb/table.go b/core/rawdb/table.go index 02e23b5174..ecea2f974f 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/spruce-solutions/go-quai/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..ce521dc9b9 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/spruce-solutions/go-quai/ethdb" ) func TestTableDatabase(t *testing.T) { testTableDatabase(t, "prefix") } diff --git a/core/rlp_test.go b/core/rlp_test.go index e846a81fba..5ba27e1918 100644 --- a/core/rlp_test.go +++ b/core/rlp_test.go @@ -21,13 +21,13 @@ import ( "math/big" "testing" - "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/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/state/access_list.go b/core/state/access_list.go index 4194691345..b42b8c76a5 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/spruce-solutions/go-quai/common" ) type accessList struct { diff --git a/core/state/database.go b/core/state/database.go index bbcd2358e5..13de6419a0 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -21,11 +21,11 @@ import ( "fmt" "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/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/dump.go b/core/state/dump.go index bfcc035435..6f9ecea91f 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) // DumpConfig is a set of options to control what portions of the statewill be diff --git a/core/state/iterator.go b/core/state/iterator.go index 611df52431..13f251f3c9 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -20,10 +20,10 @@ import ( "bytes" "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/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 d1afe9ca3e..8782bce36e 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb" ) // 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 2070f30875..a04c1902e6 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/spruce-solutions/go-quai/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 7b40ff37af..e73825f691 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/spruce-solutions/go-quai/metrics" var ( accountUpdatedMeter = metrics.NewRegisteredMeter("state/update/account", nil) diff --git a/core/state/pruner/bloom.go b/core/state/pruner/bloom.go index 1cd03cf536..d342404335 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/log" bloomfilter "github.com/holiman/bloomfilter/v2" ) diff --git a/core/state/pruner/pruner.go b/core/state/pruner/pruner.go index d20917f938..0238640566 100644 --- a/core/state/pruner/pruner.go +++ b/core/state/pruner/pruner.go @@ -27,15 +27,15 @@ 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/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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state/snapshot" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) const ( diff --git a/core/state/snapshot/account.go b/core/state/snapshot/account.go index b92e942950..3def81eacc 100644 --- a/core/state/snapshot/account.go +++ b/core/state/snapshot/account.go @@ -20,8 +20,8 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/rlp" ) // Account is a modified version of a state.Account, where the root is replaced diff --git a/core/state/snapshot/conversion.go b/core/state/snapshot/conversion.go index f70cbf1e68..ac6f6191a5 100644 --- a/core/state/snapshot/conversion.go +++ b/core/state/snapshot/conversion.go @@ -26,12 +26,12 @@ import ( "sync" "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/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) // trieKV represents a trie key-value pair diff --git a/core/state/snapshot/difflayer.go b/core/state/snapshot/difflayer.go index ee88938b77..430da87a14 100644 --- a/core/state/snapshot/difflayer.go +++ b/core/state/snapshot/difflayer.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/rlp" bloomfilter "github.com/holiman/bloomfilter/v2" ) diff --git a/core/state/snapshot/difflayer_test.go b/core/state/snapshot/difflayer_test.go index 919af5fa86..c2f0c5de17 100644 --- a/core/state/snapshot/difflayer_test.go +++ b/core/state/snapshot/difflayer_test.go @@ -22,9 +22,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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/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 7cbf6e293d..7d6146fceb 100644 --- a/core/state/snapshot/disklayer.go +++ b/core/state/snapshot/disklayer.go @@ -21,11 +21,11 @@ import ( "sync" "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/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/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 ccde2fc094..988834dbcd 100644 --- a/core/state/snapshot/disklayer_test.go +++ b/core/state/snapshot/disklayer_test.go @@ -23,12 +23,12 @@ 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" - "github.com/ethereum/go-ethereum/ethdb/leveldb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/ethdb/leveldb" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/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 3e11b4ac6b..5f68c52cf5 100644 --- a/core/state/snapshot/generate.go +++ b/core/state/snapshot/generate.go @@ -25,17 +25,17 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "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/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) var ( diff --git a/core/state/snapshot/generate_test.go b/core/state/snapshot/generate_test.go index 582da6a2e7..579546d670 100644 --- a/core/state/snapshot/generate_test.go +++ b/core/state/snapshot/generate_test.go @@ -23,13 +23,13 @@ import ( "testing" "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/ethdb/memorydb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" "golang.org/x/crypto/sha3" ) diff --git a/core/state/snapshot/iterator.go b/core/state/snapshot/iterator.go index c1a196c7ff..7da136aa68 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/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..13f5b7caf3 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/spruce-solutions/go-quai/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 48069b8fcf..ea1afd19e5 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/spruce-solutions/go-quai/common" ) // weightedIterator is a iterator with an assigned weight. It is used to prioritise diff --git a/core/state/snapshot/iterator_test.go b/core/state/snapshot/iterator_test.go index 2c7e876e08..171071e28c 100644 --- a/core/state/snapshot/iterator_test.go +++ b/core/state/snapshot/iterator_test.go @@ -24,8 +24,8 @@ import ( "testing" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/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 5cfb9a9f2a..c3ffdabe11 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) const journalVersion uint64 = 0 diff --git a/core/state/snapshot/snapshot.go b/core/state/snapshot/snapshot.go index 8889fa9fec..f9aecb82b4 100644 --- a/core/state/snapshot/snapshot.go +++ b/core/state/snapshot/snapshot.go @@ -24,13 +24,13 @@ import ( "sync" "sync/atomic" - "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/metrics" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) var ( diff --git a/core/state/snapshot/snapshot_test.go b/core/state/snapshot/snapshot_test.go index 4b787cfe2e..b86de03d9a 100644 --- a/core/state/snapshot/snapshot_test.go +++ b/core/state/snapshot/snapshot_test.go @@ -24,9 +24,9 @@ import ( "testing" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/rlp" ) // randomHash generates a random blob of data and returns it as a hash. diff --git a/core/state/snapshot/sort.go b/core/state/snapshot/sort.go index 88841231d9..b1fd44d214 100644 --- a/core/state/snapshot/sort.go +++ b/core/state/snapshot/sort.go @@ -19,7 +19,7 @@ package snapshot import ( "bytes" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) // hashes is a helper to implement sort.Interface. diff --git a/core/state/snapshot/wipe.go b/core/state/snapshot/wipe.go index 2cab57393b..62165896f7 100644 --- a/core/state/snapshot/wipe.go +++ b/core/state/snapshot/wipe.go @@ -20,11 +20,11 @@ import ( "bytes" "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/metrics" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" ) // wipeSnapshot starts a goroutine to iterate over the entire key-value database diff --git a/core/state/snapshot/wipe_test.go b/core/state/snapshot/wipe_test.go index 2c45652a96..a186fa7919 100644 --- a/core/state/snapshot/wipe_test.go +++ b/core/state/snapshot/wipe_test.go @@ -20,9 +20,9 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" ) // Tests that given a database with random data content, all parts of a snapshot diff --git a/core/state/state_object.go b/core/state/state_object.go index 138fcbdecd..16713de107 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -23,11 +23,11 @@ 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_object_test.go b/core/state/state_object_test.go index 42fd778025..7326c1ddcf 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/spruce-solutions/go-quai/common" ) func BenchmarkCutOriginal(b *testing.B) { diff --git a/core/state/state_test.go b/core/state/state_test.go index 0a55d7781f..46f7bf3444 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,10 +21,10 @@ import ( "math/big" "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" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" ) type stateTest struct { diff --git a/core/state/statedb.go b/core/state/statedb.go index e3541339ea..057b3b1ebe 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -24,15 +24,15 @@ 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/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state/snapshot" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) type revision struct { diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index e9576d4dc4..84049077ba 100644 --- a/core/state/statedb_test.go +++ b/core/state/statedb_test.go @@ -29,9 +29,9 @@ import ( "testing" "testing/quick" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" ) // Tests that updating a state trie does not leak any database writes prior to diff --git a/core/state/sync.go b/core/state/sync.go index 734961d9c5..bc6615c82a 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -19,11 +19,11 @@ package state import ( "bytes" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index beb8fcfd9c..a9d55db85b 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -21,14 +21,14 @@ 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/ethdb/memorydb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) // testAccount is the data associated with an account used by the state tests. diff --git a/core/state/trie_prefetcher.go b/core/state/trie_prefetcher.go index 25c3730e3f..43cfc23dd1 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" ) var ( diff --git a/core/state/trie_prefetcher_test.go b/core/state/trie_prefetcher_test.go index 35dc7a2c0d..d7337e5682 100644 --- a/core/state/trie_prefetcher_test.go +++ b/core/state/trie_prefetcher_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" ) func filledStateDB() *StateDB { diff --git a/core/state_prefetcher.go b/core/state_prefetcher.go index 1cb4113734..9d51f51889 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/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/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 ee3473098a..8e4a67ea99 100644 --- a/core/state_processor.go +++ b/core/state_processor.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" - "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/log" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/misc" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/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 e5d39af66a..a1bbf3f574 100644 --- a/core/state_processor_test.go +++ b/core/state_processor_test.go @@ -20,16 +20,16 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/consensus/misc" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/consensus/misc" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" "golang.org/x/crypto/sha3" ) diff --git a/core/state_transition.go b/core/state_transition.go index 0987629018..78ae7567d4 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -21,12 +21,12 @@ 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/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + cmath "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" ) var emptyCodeHash = crypto.Keccak256Hash(nil) diff --git a/core/tx_cacher.go b/core/tx_cacher.go index b1e5d676a2..5c9a446d45 100644 --- a/core/tx_cacher.go +++ b/core/tx_cacher.go @@ -19,7 +19,7 @@ package core import ( "runtime" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/core/types" ) // senderCacher is a concurrent transaction sender recoverer and cacher. diff --git a/core/tx_journal.go b/core/tx_journal.go index d282126a08..5cc92620bc 100644 --- a/core/tx_journal.go +++ b/core/tx_journal.go @@ -21,10 +21,10 @@ import ( "io" "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" ) // errNoActiveJournal is returned if a transaction is attempted to be inserted diff --git a/core/tx_list.go b/core/tx_list.go index ea96f3ebbd..9f0954171a 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -25,8 +25,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" ) // nonceHeap is a heap.Interface implementation over 64bit unsigned integers for diff --git a/core/tx_list_test.go b/core/tx_list_test.go index 3a5842d2e8..45d8b1a03a 100644 --- a/core/tx_list_test.go +++ b/core/tx_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/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" ) // Tests that transactions can be added to strict lists and list contents and diff --git a/core/tx_noncer.go b/core/tx_noncer.go index aa87c643ae..6e92a6bd7e 100644 --- a/core/tx_noncer.go +++ b/core/tx_noncer.go @@ -19,8 +19,8 @@ package core import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/state" ) // txNoncer is a tiny virtual state database to manage the executable nonces of diff --git a/core/tx_pool.go b/core/tx_pool.go index 43356229db..6858eeaa62 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -25,15 +25,15 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "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/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/prque" + "github.com/spruce-solutions/go-quai/consensus/misc" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/params" ) const ( diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index f1a482ea2d..3792ccf6ab 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -28,14 +28,14 @@ import ( "testing" "time" - "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/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" ) var ( diff --git a/core/types.go b/core/types.go index ee6de8e9db..0401f64efe 100644 --- a/core/types.go +++ b/core/types.go @@ -17,9 +17,9 @@ package core import ( - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" ) // Validator is an interface which defines the standard for block validation. It diff --git a/core/types/access_list_tx.go b/core/types/access_list_tx.go index ee5f194b77..4257b89f4a 100644 --- a/core/types/access_list_tx.go +++ b/core/types/access_list_tx.go @@ -19,7 +19,7 @@ package types import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) //go:generate gencodec -type AccessTuple -out gen_access_tuple.go diff --git a/core/types/block.go b/core/types/block.go index c41c7126a0..e7715fac7b 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -27,9 +27,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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/rlp" ) var ( diff --git a/core/types/block_test.go b/core/types/block_test.go index 910c5bce85..030f694dcf 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -23,11 +23,11 @@ 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/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/types/bloom9.go b/core/types/bloom9.go index 1793c2adc7..49a575ba0d 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/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index 893df486dd..38f55a8972 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" ) func TestBloom(t *testing.T) { diff --git a/core/types/dynamic_fee_tx.go b/core/types/dynamic_fee_tx.go index 585c029d89..0c8c5930ab 100644 --- a/core/types/dynamic_fee_tx.go +++ b/core/types/dynamic_fee_tx.go @@ -19,7 +19,7 @@ package types import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) type DynamicFeeTx struct { diff --git a/core/types/gen_access_tuple.go b/core/types/gen_access_tuple.go index fc48a84cc0..caff97eb77 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/spruce-solutions/go-quai/common" ) // MarshalJSON marshals as JSON. diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 90e1c14d90..de7003a59c 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index bb892f85be..909e6b8a19 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/hashing.go b/core/types/hashing.go index 3227cf8a72..744b905005 100644 --- a/core/types/hashing.go +++ b/core/types/hashing.go @@ -20,9 +20,9 @@ import ( "bytes" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/types/hashing_test.go b/core/types/hashing_test.go index 6d1ebf897c..395d5de0f9 100644 --- a/core/types/hashing_test.go +++ b/core/types/hashing_test.go @@ -24,12 +24,12 @@ import ( mrand "math/rand" "testing" - "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/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) func TestDeriveSha(t *testing.T) { diff --git a/core/types/legacy_tx.go b/core/types/legacy_tx.go index cb86bed772..3c73dbc339 100644 --- a/core/types/legacy_tx.go +++ b/core/types/legacy_tx.go @@ -19,7 +19,7 @@ package types import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) // LegacyTx is the transaction data of regular Ethereum transactions. diff --git a/core/types/log.go b/core/types/log.go index 88274e39da..d2990124a3 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -19,9 +19,9 @@ package types import ( "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/rlp" ) //go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go diff --git a/core/types/log_test.go b/core/types/log_test.go index 0e56acfe4a..5088f6c6e3 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index 8f8adf1f1d..060af97888 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" ) //go:generate 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 492493d5c9..cc11c012de 100644 --- a/core/types/receipt_test.go +++ b/core/types/receipt_test.go @@ -23,10 +23,10 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" ) func TestDecodeEmptyTypedReceipt(t *testing.T) { diff --git a/core/types/state_account.go b/core/types/state_account.go index 68804bf311..2f9bb0f5ba 100644 --- a/core/types/state_account.go +++ b/core/types/state_account.go @@ -19,7 +19,7 @@ package types import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) // StateAccount is the Ethereum consensus representation of accounts. diff --git a/core/types/transaction.go b/core/types/transaction.go index 8280e8ac44..5642455d9c 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/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" ) var ( diff --git a/core/types/transaction_marshalling.go b/core/types/transaction_marshalling.go index aad31a5a97..dddbba3e69 100644 --- a/core/types/transaction_marshalling.go +++ b/core/types/transaction_marshalling.go @@ -21,8 +21,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" ) // txJSON is the JSON representation of transactions. diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index dd9223b747..e4f98b7cba 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/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 689fc38a9b..e3f8802c0f 100644 --- a/core/types/transaction_signing_test.go +++ b/core/types/transaction_signing_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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index 58c95071b2..5ebaa24d15 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -27,9 +27,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/types/types_test.go b/core/types/types_test.go index 1fb386d5de..26621df784 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/rlp" ) type devnull struct{ len int } diff --git a/core/vm/access_list_tracer.go b/core/vm/access_list_tracer.go index 11b4e29426..2d707dcc0f 100644 --- a/core/vm/access_list_tracer.go +++ b/core/vm/access_list_tracer.go @@ -20,8 +20,8 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" ) // accessList is an accumulator for the set of accounts and storage slots an EVM diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go index d7f21e04aa..915ac5d101 100644 --- a/core/vm/analysis_test.go +++ b/core/vm/analysis_test.go @@ -19,7 +19,7 @@ package vm import ( "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/spruce-solutions/go-quai/crypto" ) func TestJumpDestAnalysis(t *testing.T) { diff --git a/core/vm/common.go b/core/vm/common.go index 90ba4a4ad1..57cd9554ea 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" "github.com/holiman/uint256" ) diff --git a/core/vm/contract.go b/core/vm/contract.go index 61dbd5007a..026b8c9bb5 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/spruce-solutions/go-quai/common" "github.com/holiman/uint256" ) diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 9210f5486c..bca5031648 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -22,13 +22,13 @@ import ( "errors" "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/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/crypto/blake2b" + "github.com/spruce-solutions/go-quai/crypto/bls12381" + "github.com/spruce-solutions/go-quai/crypto/bn256" + "github.com/spruce-solutions/go-quai/params" //lint:ignore SA1019 Needed for precompile "golang.org/x/crypto/ripemd160" diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 30d9b49f71..4dfc8ea156 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/spruce-solutions/go-quai/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/eips.go b/core/vm/eips.go index 4070a2db53..080b3fe15b 100644 --- a/core/vm/eips.go +++ b/core/vm/eips.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/params" "github.com/holiman/uint256" ) diff --git a/core/vm/evm.go b/core/vm/evm.go index 3b4bd69d75..183cc02b17 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" "github.com/holiman/uint256" ) diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 19d2198af6..93421a0b5c 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/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 6cd126c9b4..98450a35ff 100644 --- a/core/vm/gas_table_test.go +++ b/core/vm/gas_table_test.go @@ -21,11 +21,11 @@ import ( "math/big" "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/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/params" ) func TestMemoryGasCost(t *testing.T) { diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go index 365f3b7914..ac5c4fe693 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -5,9 +5,9 @@ package vm 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" "github.com/holiman/uint256" ) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index bda480f083..4edaefb545 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -17,9 +17,9 @@ package vm import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" "github.com/holiman/uint256" "golang.org/x/crypto/sha3" ) diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 560d26a0b8..ee70e1e0bd 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -23,9 +23,9 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" "github.com/holiman/uint256" ) diff --git a/core/vm/interface.go b/core/vm/interface.go index ad9b05d666..c6bdd2b3ba 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 9fb83799c9..92a31256f3 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -20,9 +20,9 @@ import ( "hash" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/log" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 329ad77cbf..6096f35bde 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -17,7 +17,7 @@ package vm import ( - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index 52dc0b8a0e..33015cd916 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -24,11 +24,11 @@ import ( "strings" "time" - "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/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" "github.com/holiman/uint256" ) diff --git a/core/vm/logger_json.go b/core/vm/logger_json.go index 479a00c0ac..b21446d050 100644 --- a/core/vm/logger_json.go +++ b/core/vm/logger_json.go @@ -22,8 +22,8 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" ) type JSONLogger struct { diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index 730d8374bb..2c7a02d021 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/params" "github.com/holiman/uint256" ) diff --git a/core/vm/operations_acl.go b/core/vm/operations_acl.go index 483226eefa..b294c64d92 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/params" ) func makeGasSStoreFunc(clearingRefund uint64) gasFunc { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index dcb0974284..68d41a4879 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/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 103ce3e175..b2c2a231a7 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -21,12 +21,12 @@ import ( "math/big" "time" - "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/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/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..0bd1a6602a 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 3f792c9116..5ad0caae94 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_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" - "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/params" + "github.com/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/asm" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/eth/tracers" + "github.com/spruce-solutions/go-quai/params" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index 10c12901af..3df832ecc7 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/spruce-solutions/go-quai/params" ) func minSwapStack(n int) int { diff --git a/crypto/bls12381/g1_test.go b/crypto/bls12381/g1_test.go index eef9f45055..c712fc5a3f 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/spruce-solutions/go-quai/common" ) func (g *G1) one() *PointG1 { diff --git a/crypto/bls12381/g2_test.go b/crypto/bls12381/g2_test.go index f16f0e5eea..df49c16525 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/spruce-solutions/go-quai/common" ) func (g *G2) one() *PointG2 { diff --git a/crypto/bls12381/pairing_test.go b/crypto/bls12381/pairing_test.go index 77676fe9b1..5715328af8 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/spruce-solutions/go-quai/common" ) func TestPairingExpected(t *testing.T) { diff --git a/crypto/bls12381/utils.go b/crypto/bls12381/utils.go index de8bf495fe..ef94a0ef3b 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/spruce-solutions/go-quai/common" ) func bigFromHex(hex string) *big.Int { diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go index e3c9b60518..e8bd3da103 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/spruce-solutions/go-quai/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..d0d242195c 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/spruce-solutions/go-quai/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 40969a2895..a99ea2ad41 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -30,9 +30,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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/rlp" "golang.org/x/crypto/sha3" ) diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index f9b0d3e834..f8d8df3226 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -26,8 +26,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index 0a6aeb2b51..1f365d57ec 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/spruce-solutions/go-quai/crypto" ) func TestKDF(t *testing.T) { diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 0bd3877ddd..e6f3932338 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/ethereum/go-ethereum/crypto" + ethcrypto "github.com/spruce-solutions/go-quai/crypto" ) var ( diff --git a/crypto/secp256k1/dummy.go b/crypto/secp256k1/dummy.go index 65a75080f6..9a2461a728 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/spruce-solutions/go-quai/crypto/secp256k1/libsecp256k1/include" + _ "github.com/spruce-solutions/go-quai/crypto/secp256k1/libsecp256k1/src" + _ "github.com/spruce-solutions/go-quai/crypto/secp256k1/libsecp256k1/src/modules/recovery" ) diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index bd72d97d3b..4ec2d257ac 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -24,8 +24,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/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..77d3431168 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" ) var ( diff --git a/eth/api.go b/eth/api.go index 41d3772746..f70c44d3f5 100644 --- a/eth/api.go +++ b/eth/api.go @@ -28,17 +28,17 @@ import ( "strings" "time" - "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/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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/rpc" + "github.com/spruce-solutions/go-quai/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index 376078e55c..6e97dd4384 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -21,22 +21,22 @@ import ( "errors" "math/big" - "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/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/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/bloombits" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/eth/gasprice" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/miner" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" ) // EthAPIBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index 39a1d58460..ded7b81954 100644 --- a/eth/api_test.go +++ b/eth/api_test.go @@ -25,10 +25,10 @@ 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/crypto" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/crypto" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/backend.go b/eth/backend.go index 7fcca2cf05..2c5901e1c5 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -26,35 +26,35 @@ import ( "sync/atomic" "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/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/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/filters" - "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/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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/clique" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/bloombits" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state/pruner" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/eth/filters" + "github.com/spruce-solutions/go-quai/eth/gasprice" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/eth/protocols/snap" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/miner" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/dnsdisc" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/rpc" ) // Config contains the configuration options of the ETH protocol. diff --git a/eth/bloombits.go b/eth/bloombits.go index 0cb7050d23..ece6ddb205 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/spruce-solutions/go-quai/common/bitutil" + "github.com/spruce-solutions/go-quai/core/rawdb" ) const ( diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go index 97b8f7b498..6212373dcb 100644 --- a/eth/catalyst/api.go +++ b/eth/catalyst/api.go @@ -23,17 +23,17 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/misc" - "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/eth" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - chainParams "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/misc" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + chainParams "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" + "github.com/spruce-solutions/go-quai/trie" ) // Register adds catalyst APIs to the node. diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go index f8550fa59b..1e8a854031 100644 --- a/eth/catalyst/api_test.go +++ b/eth/catalyst/api_test.go @@ -20,15 +20,15 @@ import ( "math/big" "testing" - "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" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/eth" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/params" ) var ( diff --git a/eth/catalyst/api_types.go b/eth/catalyst/api_types.go index d5d351a991..f5dabf128d 100644 --- a/eth/catalyst/api_types.go +++ b/eth/catalyst/api_types.go @@ -17,8 +17,8 @@ package catalyst import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" ) //go:generate go run github.com/fjl/gencodec -type assembleBlockParams -field-override assembleBlockParamsMarshaling -out gen_blockparams.go diff --git a/eth/catalyst/gen_blockparams.go b/eth/catalyst/gen_blockparams.go index a9a08ec3a8..558232870e 100644 --- a/eth/catalyst/gen_blockparams.go +++ b/eth/catalyst/gen_blockparams.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" ) var _ = (*assembleBlockParamsMarshaling)(nil) diff --git a/eth/catalyst/gen_ed.go b/eth/catalyst/gen_ed.go index 4c2e4c8ead..fb3ec0936b 100644 --- a/eth/catalyst/gen_ed.go +++ b/eth/catalyst/gen_ed.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" ) var _ = (*executableDataMarshaling)(nil) diff --git a/eth/discovery.go b/eth/discovery.go index 82f5448511..e1858a3705 100644 --- a/eth/discovery.go +++ b/eth/discovery.go @@ -17,11 +17,11 @@ package eth import ( - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/rlp" ) // ethEntry is the "eth" ENR entry which advertises eth protocol diff --git a/eth/downloader/api.go b/eth/downloader/api.go index 2024d23dea..d61a0dbf21 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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/rpc" ) // PublicDownloaderAPI provides an API which gives information about the current synchronisation status. diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 0b764ec62a..5b68336e36 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,19 +25,19 @@ 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/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/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state/snapshot" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/eth/protocols/snap" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index 773bbbbdcb..419db7467e 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -26,15 +26,15 @@ import ( "testing" "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/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state/snapshot" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/trie" ) // Reduce some of the parameters to make the tester faster. diff --git a/eth/downloader/events.go b/eth/downloader/events.go index 25255a3a72..f7651aeb98 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/spruce-solutions/go-quai/core/types" type DoneEvent struct { Latest *types.Header diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index a36154a052..4635004998 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/spruce-solutions/go-quai/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index fe66f9b730..bab18a84e5 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -27,11 +27,11 @@ import ( "sync/atomic" "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/msgrate" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 6ba51cfbf1..d81f05a02f 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/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/prque" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/trie" ) const ( diff --git a/eth/downloader/queue_test.go b/eth/downloader/queue_test.go index ecf42000f0..43c5958431 100644 --- a/eth/downloader/queue_test.go +++ b/eth/downloader/queue_test.go @@ -24,13 +24,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/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" ) var ( diff --git a/eth/downloader/resultstore.go b/eth/downloader/resultstore.go index 227492e962..f3b2a0a368 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/spruce-solutions/go-quai/core/types" ) // resultStore implements a structure for maintaining fetchResults, tracking their diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index 6c53e5577a..5863fb30f3 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -21,13 +21,13 @@ import ( "sync" "time" - "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/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/trie" "golang.org/x/crypto/sha3" ) diff --git a/eth/downloader/testchain_test.go b/eth/downloader/testchain_test.go index 15cd1f1e94..f963cd3434 100644 --- a/eth/downloader/testchain_test.go +++ b/eth/downloader/testchain_test.go @@ -21,13 +21,13 @@ import ( "math/big" "sync" - "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/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" ) // Test chain parameters. diff --git a/eth/downloader/types.go b/eth/downloader/types.go index b507e95c37..bb9caa1cd8 100644 --- a/eth/downloader/types.go +++ b/eth/downloader/types.go @@ -19,7 +19,7 @@ package downloader import ( "fmt" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/core/types" ) // peerDropFn is a callback type for dropping a peer detected as malicious. diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index a72690a18e..c49d970d13 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -25,18 +25,18 @@ import ( "runtime" "time" - "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/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/clique" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/gasprice" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/miner" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/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 2310dd4499..324e115c84 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -6,13 +6,13 @@ import ( "math/big" "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/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/gasprice" + "github.com/spruce-solutions/go-quai/miner" + "github.com/spruce-solutions/go-quai/params" ) // MarshalTOML marshals as TOML. diff --git a/eth/fetcher/block_fetcher.go b/eth/fetcher/block_fetcher.go index 2b92910d2b..fb2f113c54 100644 --- a/eth/fetcher/block_fetcher.go +++ b/eth/fetcher/block_fetcher.go @@ -22,13 +22,13 @@ 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/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/prque" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/trie" ) const ( diff --git a/eth/fetcher/block_fetcher_test.go b/eth/fetcher/block_fetcher_test.go index 1892ffed28..44b6f2f0e1 100644 --- a/eth/fetcher/block_fetcher_test.go +++ b/eth/fetcher/block_fetcher_test.go @@ -24,14 +24,14 @@ 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/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" ) var ( diff --git a/eth/fetcher/tx_fetcher.go b/eth/fetcher/tx_fetcher.go index 3ba7753916..f454c47e40 100644 --- a/eth/fetcher/tx_fetcher.go +++ b/eth/fetcher/tx_fetcher.go @@ -24,12 +24,12 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" ) const ( diff --git a/eth/fetcher/tx_fetcher_test.go b/eth/fetcher/tx_fetcher_test.go index 796d4caf0f..aea7745f72 100644 --- a/eth/fetcher/tx_fetcher_test.go +++ b/eth/fetcher/tx_fetcher_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 15e120ac25..90a8a93d15 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,13 +25,13 @@ 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/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/rpc" ) // filter is a helper struct that holds meta information over the filter type diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 02229a7549..9a73d2adb5 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index a1405438c5..f8c36ea2fc 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/bitutil" + "github.com/spruce-solutions/go-quai/core/bloombits" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index a4a0f9ecca..df0f03687c 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -21,13 +21,13 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/bloombits" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 3368132757..a6cd9f9154 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -24,14 +24,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "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/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rpc" ) // Type determines the kind of filter and is used to put the filter in to diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index efeab58d7d..bf988dfc32 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -26,17 +26,17 @@ 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/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/bloombits" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" ) var ( diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index fd25013cc6..4bcc7c6d4f 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,13 +23,13 @@ import ( "os" "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/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/feehistory.go b/eth/gasprice/feehistory.go index 079232accd..bce68e6ee4 100644 --- a/eth/gasprice/feehistory.go +++ b/eth/gasprice/feehistory.go @@ -26,11 +26,11 @@ import ( "sort" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/misc" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rpc" ) var ( diff --git a/eth/gasprice/feehistory_test.go b/eth/gasprice/feehistory_test.go index c259eb0acf..be1229825c 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/spruce-solutions/go-quai/rpc" ) func TestFeeHistory(t *testing.T) { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 364f8737b7..9a611fd978 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -22,13 +22,13 @@ import ( "sort" "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/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" lru "github.com/hashicorp/golang-lru" ) diff --git a/eth/gasprice/gasprice_test.go b/eth/gasprice/gasprice_test.go index feecfddec7..2baa8412c4 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" ) const testHead = 32 diff --git a/eth/handler.go b/eth/handler.go index eb67b4443c..27bb8c59eb 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -24,20 +24,20 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "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/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/fetcher" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/eth/protocols/snap" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" ) const ( diff --git a/eth/handler_eth.go b/eth/handler_eth.go index 7d4fe9ad89..cbc26b4fad 100644 --- a/eth/handler_eth.go +++ b/eth/handler_eth.go @@ -23,13 +23,13 @@ import ( "sync/atomic" "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/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/trie" ) // 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 4ee2eba710..260cdf5d95 100644 --- a/eth/handler_eth_test.go +++ b/eth/handler_eth_test.go @@ -24,20 +24,20 @@ 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/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/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" ) // 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..0e0ee314a0 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/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/eth/protocols/snap" + "github.com/spruce-solutions/go-quai/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 090bd9239c..b2d4505a76 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -21,17 +21,17 @@ import ( "sort" "sync" - "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/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/params" ) var ( diff --git a/eth/peer.go b/eth/peer.go index 1cea9c640e..446189180e 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/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 1e864a8e46..e2330e7736 100644 --- a/eth/peerset.go +++ b/eth/peerset.go @@ -21,10 +21,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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/eth/protocols/snap" + "github.com/spruce-solutions/go-quai/p2p" ) var ( diff --git a/eth/protocols/eth/broadcast.go b/eth/protocols/eth/broadcast.go index 7a48a0e816..3124191528 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" ) const ( diff --git a/eth/protocols/eth/discovery.go b/eth/protocols/eth/discovery.go index 74514fc8ad..9a35cb5004 100644 --- a/eth/protocols/eth/discovery.go +++ b/eth/protocols/eth/discovery.go @@ -17,11 +17,11 @@ package eth import ( - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/rlp" ) // enrEntry is the ENR entry which advertises `eth` protocol on the discovery. diff --git a/eth/protocols/eth/handler.go b/eth/protocols/eth/handler.go index 6124d2cb4f..cb6bfd8725 100644 --- a/eth/protocols/eth/handler.go +++ b/eth/protocols/eth/handler.go @@ -21,15 +21,15 @@ 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/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" ) const ( diff --git a/eth/protocols/eth/handler_test.go b/eth/protocols/eth/handler_test.go index f5e4bb2edb..e4685e4569 100644 --- a/eth/protocols/eth/handler_test.go +++ b/eth/protocols/eth/handler_test.go @@ -22,19 +22,19 @@ import ( "math/rand" "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/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/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" ) var ( diff --git a/eth/protocols/eth/handlers.go b/eth/protocols/eth/handlers.go index 95d86d39b4..cd1ad73d91 100644 --- a/eth/protocols/eth/handlers.go +++ b/eth/protocols/eth/handlers.go @@ -20,11 +20,11 @@ import ( "encoding/json" "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/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) // handleGetBlockHeaders66 is the eth/66 version of handleGetBlockHeaders diff --git a/eth/protocols/eth/handshake.go b/eth/protocols/eth/handshake.go index 57a4e0bc34..df325f0cfa 100644 --- a/eth/protocols/eth/handshake.go +++ b/eth/protocols/eth/handshake.go @@ -21,9 +21,9 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/p2p" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/p2p" ) const ( diff --git a/eth/protocols/eth/handshake_test.go b/eth/protocols/eth/handshake_test.go index a3e023fc16..aadef695c1 100644 --- a/eth/protocols/eth/handshake_test.go +++ b/eth/protocols/eth/handshake_test.go @@ -20,11 +20,11 @@ import ( "errors" "testing" - "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/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" ) // Tests that handshake failures are detected and reported correctly. diff --git a/eth/protocols/eth/peer.go b/eth/protocols/eth/peer.go index 7076ae9278..848f7c8f33 100644 --- a/eth/protocols/eth/peer.go +++ b/eth/protocols/eth/peer.go @@ -22,11 +22,11 @@ import ( "sync" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/rlp" ) const ( diff --git a/eth/protocols/eth/peer_test.go b/eth/protocols/eth/peer_test.go index fc93443708..9d4b3acd2d 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/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 73a0b98b32..7095742419 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/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 8e1138167a..ac235d6546 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/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..2074cf7f11 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/spruce-solutions/go-quai/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..b058aa18de 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/spruce-solutions/go-quai/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 c62f9cfca5..7bb83593f9 100644 --- a/eth/protocols/snap/handler.go +++ b/eth/protocols/snap/handler.go @@ -21,17 +21,17 @@ 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/light" - "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/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) const ( diff --git a/eth/protocols/snap/peer.go b/eth/protocols/snap/peer.go index cf0ce65bd7..8b74c6e5fc 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/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 5528e9212e..23337a1bed 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/state/snapshot" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/state/snapshot" + "github.com/spruce-solutions/go-quai/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocols/snap/range.go b/eth/protocols/snap/range.go index 2627cb954b..46cc6a1eb6 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/spruce-solutions/go-quai/common" "github.com/holiman/uint256" ) diff --git a/eth/protocols/snap/range_test.go b/eth/protocols/snap/range_test.go index c6dc8fb718..2bc7aeb999 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/spruce-solutions/go-quai/common" ) // Tests that given a starting hash and a density, the hash ranger can correctly diff --git a/eth/protocols/snap/sync.go b/eth/protocols/snap/sync.go index 9ef9d75711..389568b303 100644 --- a/eth/protocols/snap/sync.go +++ b/eth/protocols/snap/sync.go @@ -27,20 +27,20 @@ import ( "sync" "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/state/snapshot" - "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/light" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/state/snapshot" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/msgrate" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" "golang.org/x/crypto/sha3" ) diff --git a/eth/protocols/snap/sync_test.go b/eth/protocols/snap/sync_test.go index 47ab1f026d..60f136fdab 100644 --- a/eth/protocols/snap/sync_test.go +++ b/eth/protocols/snap/sync_test.go @@ -27,15 +27,15 @@ 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/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" "golang.org/x/crypto/sha3" ) diff --git a/eth/protocols/snap/tracker.go b/eth/protocols/snap/tracker.go index 2cf59cc23a..dc2cd01624 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/spruce-solutions/go-quai/p2p/tracker" ) // requestTracker is a singleton tracker for request times. diff --git a/eth/state_accessor.go b/eth/state_accessor.go index 42163ceb46..c308e928a1 100644 --- a/eth/state_accessor.go +++ b/eth/state_accessor.go @@ -21,13 +21,13 @@ import ( "fmt" "time" - "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/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/trie" ) // stateAtBlock retrieves the state database associated with a certain block. diff --git a/eth/sync.go b/eth/sync.go index 90a9eacc82..6b8f4683a5 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,12 +21,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/eth/downloader" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/log" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index e96b9ee81f..15f5763925 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" ) // Tests that fast sync is disabled after a successful sync cycle. diff --git a/eth/tracers/api.go b/eth/tracers/api.go index 5019fb6f73..482b32d54b 100644 --- a/eth/tracers/api.go +++ b/eth/tracers/api.go @@ -28,20 +28,20 @@ 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/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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/rpc" ) const ( diff --git a/eth/tracers/api_test.go b/eth/tracers/api_test.go index 9afd59d596..447eb4f8a7 100644 --- a/eth/tracers/api_test.go +++ b/eth/tracers/api_test.go @@ -29,20 +29,20 @@ import ( "testing" "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/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/ethdb" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" ) var ( diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index ed56004533..93b606782e 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -25,12 +25,12 @@ import ( "time" "unsafe" - "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/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" "gopkg.in/olebedev/go-duktape.v3" ) diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go index 3decca225d..379e7c4a64 100644 --- a/eth/tracers/tracer_test.go +++ b/eth/tracers/tracer_test.go @@ -23,10 +23,10 @@ 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/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/params" ) type account struct{} diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 4e1ef23ad2..f95a30e571 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -21,7 +21,7 @@ import ( "strings" "unicode" - "github.com/ethereum/go-ethereum/eth/tracers/internal/tracers" + "github.com/spruce-solutions/go-quai/eth/tracers/internal/tracers" ) // all contains all the built in JavaScript tracers by name. diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go index 1f5bd9afef..9c28164189 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -27,17 +27,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/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/tests" ) // To generate a new callTracer test, copy paste the makeTest method below into diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index f25768ccca..009e5da29f 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -24,12 +24,12 @@ 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/internal/ethapi" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 15e9723b58..97378506c6 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -26,18 +26,18 @@ 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/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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/eth" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" ) // Verify that Client implements the ethereum interfaces. diff --git a/ethclient/gethclient/gethclient.go b/ethclient/gethclient/gethclient.go index 538e23727d..c80c00d292 100644 --- a/ethclient/gethclient/gethclient.go +++ b/ethclient/gethclient/gethclient.go @@ -23,12 +23,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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/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 ca2cb1abda..2beab869f8 100644 --- a/ethclient/gethclient/gethclient_test.go +++ b/ethclient/gethclient/gethclient_test.go @@ -22,19 +22,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/rawdb" - "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/ethclient" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/eth" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/ethclient" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" ) var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index 9de020b352..01bd7d1e8b 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/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 06ee2211e6..132842824e 100644 --- a/ethdb/dbtest/testsuite.go +++ b/ethdb/dbtest/testsuite.go @@ -22,7 +22,7 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/spruce-solutions/go-quai/ethdb" ) // TestDatabaseSuite runs a suite of tests against a KeyValueStore database diff --git a/ethdb/leveldb/leveldb.go b/ethdb/leveldb/leveldb.go index 9ff1a2ce1d..2d96672c3a 100644 --- a/ethdb/leveldb/leveldb.go +++ b/ethdb/leveldb/leveldb.go @@ -27,10 +27,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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/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 421d9b4693..3ca9aeb277 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/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/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 fedc9e326c..890fd78425 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb" ) var ( diff --git a/ethdb/memorydb/memorydb_test.go b/ethdb/memorydb/memorydb_test.go index dba18ad306..0728d1efdf 100644 --- a/ethdb/memorydb/memorydb_test.go +++ b/ethdb/memorydb/memorydb_test.go @@ -19,8 +19,8 @@ package memorydb import ( "testing" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/dbtest" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/ethdb/dbtest" ) func TestMemoryDB(t *testing.T) { diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index db651b6048..b0cf7d39c2 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,20 +30,20 @@ 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/les" - "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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + ethproto "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/les" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/miner" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/rpc" "github.com/gorilla/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 9b5ad50df5..1e10b07598 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/spruce-solutions/go-quai/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 825a8deeac..527d224095 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/spruce-solutions/go-quai/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..17684024e6 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/spruce-solutions/go-quai/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index 6c62874719..2c5e14667f 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/spruce-solutions/go-quai/common/mclock" ) // Subscription represents a stream of events. The carrier of the events is typically a diff --git a/go.mod b/go.mod index b38c33f71f..7571f05f64 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ethereum/go-ethereum +module github.com/spruce-solutions/go-quai go 1.15 diff --git a/graphql/graphql.go b/graphql/graphql.go index 0ca274ae0e..a1ac71fc80 100644 --- a/graphql/graphql.go +++ b/graphql/graphql.go @@ -25,15 +25,15 @@ import ( "strconv" "time" - "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/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/rpc" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/filters" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/rpc" ) var ( diff --git a/graphql/graphql_test.go b/graphql/graphql_test.go index 4e0f099e42..f7130faac1 100644 --- a/graphql/graphql_test.go +++ b/graphql/graphql_test.go @@ -25,16 +25,16 @@ 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/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/node" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/eth" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/params" "github.com/stretchr/testify/assert" ) diff --git a/graphql/service.go b/graphql/service.go index bcb0a4990d..11988d764d 100644 --- a/graphql/service.go +++ b/graphql/service.go @@ -20,8 +20,8 @@ import ( "encoding/json" "net/http" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/node" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/node" "github.com/graph-gophers/graphql-go" ) diff --git a/interfaces.go b/interfaces.go index b9d0bb880e..c5890f768a 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" ) // NotFound is returned by API methods if the requested item does not exist. diff --git a/internal/debug/api.go b/internal/debug/api.go index 1ea0c6377f..270f41992e 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/spruce-solutions/go-quai/log" "github.com/hashicorp/go-bexpr" ) diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 3aa990adfb..61cdd15727 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,9 +24,9 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/exp" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/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 a273e4a9db..680c189c57 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -24,7 +24,7 @@ import ( "os" "runtime/trace" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 61ddff688c..e2df76babc 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/spruce-solutions/go-quai/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 7e777388e9..6f8ce2f724 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -26,26 +26,26 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "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/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/consensus/misc" - "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/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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/accounts/scwallet" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/consensus/clique" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/consensus/misc" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/rpc" "github.com/tyler-smith/go-bip39" ) diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index f34bab7e6e..fecfc64c5d 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -21,19 +21,19 @@ import ( "context" "math/big" - "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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/bloombits" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" ) // Backend interface provides the common API services (that are provided by diff --git a/internal/ethapi/transaction_args.go b/internal/ethapi/transaction_args.go index d933dabbe0..a7edfd5913 100644 --- a/internal/ethapi/transaction_args.go +++ b/internal/ethapi/transaction_args.go @@ -23,12 +23,12 @@ 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/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rpc" ) // TransactionArgs represents the arguments to construct a new transaction diff --git a/internal/flags/helpers.go b/internal/flags/helpers.go index 43bbcf0201..9d47b9a166 100644 --- a/internal/flags/helpers.go +++ b/internal/flags/helpers.go @@ -20,7 +20,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/params" "gopkg.in/urfave/cli.v1" ) diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index abc48e0e4b..507a08b278 100644 --- a/internal/guide/guide_test.go +++ b/internal/guide/guide_test.go @@ -30,9 +30,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/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" ) // Tests that the account management snippets work correctly. diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index bc8869b254..340baa7edf 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -27,7 +27,7 @@ import ( "time" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) // JSRE is a JS runtime environment embedding the goja interpreter. diff --git a/internal/testlog/testlog.go b/internal/testlog/testlog.go index 684339f16d..ed0d80780d 100644 --- a/internal/testlog/testlog.go +++ b/internal/testlog/testlog.go @@ -21,7 +21,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // Handler returns a log handler which logs to the unit test log of t. diff --git a/les/api.go b/les/api.go index 782bb31ef2..1cc7a470df 100644 --- a/les/api.go +++ b/les/api.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/mclock" - vfs "github.com/ethereum/go-ethereum/les/vflux/server" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/mclock" + vfs "github.com/spruce-solutions/go-quai/les/vflux/server" + "github.com/spruce-solutions/go-quai/p2p/enode" ) var ( diff --git a/les/api_backend.go b/les/api_backend.go index 54216f7aa5..570787f387 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -21,22 +21,22 @@ import ( "errors" "math/big" - "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/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/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/bloombits" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/eth/gasprice" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" ) type LesApiBackend struct { diff --git a/les/api_test.go b/les/api_test.go index 6a19b0fe4f..064e7d1cb6 100644 --- a/les/api_test.go +++ b/les/api_test.go @@ -28,20 +28,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/eth" - ethdownloader "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/les/downloader" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "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" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/eth" + ethdownloader "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/les/downloader" + "github.com/spruce-solutions/go-quai/les/flowcontrol" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/simulations" + "github.com/spruce-solutions/go-quai/p2p/simulations/adapters" + "github.com/spruce-solutions/go-quai/rpc" "github.com/mattn/go-colorable" ) diff --git a/les/benchmark.go b/les/benchmark.go index 28bbf5ded2..acaa2dbd94 100644 --- a/les/benchmark.go +++ b/les/benchmark.go @@ -24,17 +24,17 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "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/les/flowcontrol" - "github.com/ethereum/go-ethereum/log" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/les/flowcontrol" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" ) // requestBenchmark is an interface for different randomized request generators diff --git a/les/bloombits.go b/les/bloombits.go index a98524ce2e..e930393955 100644 --- a/les/bloombits.go +++ b/les/bloombits.go @@ -19,8 +19,8 @@ package les import ( "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/light" + "github.com/spruce-solutions/go-quai/common/bitutil" + "github.com/spruce-solutions/go-quai/light" ) const ( diff --git a/les/checkpointoracle/oracle.go b/les/checkpointoracle/oracle.go index 003eb17df7..df88a46ea6 100644 --- a/les/checkpointoracle/oracle.go +++ b/les/checkpointoracle/oracle.go @@ -25,12 +25,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/checkpointoracle" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/contracts/checkpointoracle" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" ) // CheckpointOracle is responsible for offering the latest stable checkpoint diff --git a/les/client.go b/les/client.go index d80a18cbe9..c57742f41b 100644 --- a/les/client.go +++ b/les/client.go @@ -21,32 +21,32 @@ import ( "fmt" "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/common/mclock" - "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/types" - "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/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/les/downloader" - "github.com/ethereum/go-ethereum/les/vflux" - vfc "github.com/ethereum/go-ethereum/les/vflux/client" - "github.com/ethereum/go-ethereum/light" - "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/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/bloombits" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/eth/filters" + "github.com/spruce-solutions/go-quai/eth/gasprice" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/les/downloader" + "github.com/spruce-solutions/go-quai/les/vflux" + vfc "github.com/spruce-solutions/go-quai/les/vflux/client" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/rpc" ) type LightEthereum struct { diff --git a/les/client_handler.go b/les/client_handler.go index feca215cbf..6e7665965d 100644 --- a/les/client_handler.go +++ b/les/client_handler.go @@ -24,16 +24,16 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/les/downloader" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/les/downloader" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/params" ) // clientHandler is responsible for receiving and processing all incoming server diff --git a/les/commons.go b/les/commons.go index afe9f0e94a..aa5692f766 100644 --- a/les/commons.go +++ b/les/commons.go @@ -21,20 +21,20 @@ import ( "math/big" "sync" - "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/eth/ethconfig" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/checkpointoracle" - "github.com/ethereum/go-ethereum/light" - "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/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/ethclient" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/les/checkpointoracle" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" ) func errResp(code errCode, format string, v ...interface{}) error { diff --git a/les/costtracker.go b/les/costtracker.go index 43e32a5b2d..11480009c0 100644 --- a/les/costtracker.go +++ b/les/costtracker.go @@ -23,12 +23,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/les/flowcontrol" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" ) const makeCostStats = false // make request cost statistics during operation diff --git a/les/distributor.go b/les/distributor.go index 31150e4d73..5c61643ec0 100644 --- a/les/distributor.go +++ b/les/distributor.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/les/utils" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/les/utils" ) // requestDistributor implements a mechanism that distributes requests to diff --git a/les/distributor_test.go b/les/distributor_test.go index 9a93dba145..59c2017f48 100644 --- a/les/distributor_test.go +++ b/les/distributor_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/spruce-solutions/go-quai/common/mclock" ) type testDistReq struct { diff --git a/les/downloader/api.go b/les/downloader/api.go index 2024d23dea..d61a0dbf21 100644 --- a/les/downloader/api.go +++ b/les/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/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/rpc" ) // PublicDownloaderAPI provides an API which gives information about the current synchronisation status. diff --git a/les/downloader/downloader.go b/les/downloader/downloader.go index 6aadfbf4b6..ca05c66082 100644 --- a/les/downloader/downloader.go +++ b/les/downloader/downloader.go @@ -28,19 +28,19 @@ 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/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/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state/snapshot" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/eth/protocols/snap" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" ) var ( diff --git a/les/downloader/downloader_test.go b/les/downloader/downloader_test.go index 17cd3630c9..8991154160 100644 --- a/les/downloader/downloader_test.go +++ b/les/downloader/downloader_test.go @@ -26,15 +26,15 @@ import ( "testing" "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/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state/snapshot" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/trie" ) // Reduce some of the parameters to make the tester faster. diff --git a/les/downloader/events.go b/les/downloader/events.go index 25255a3a72..f7651aeb98 100644 --- a/les/downloader/events.go +++ b/les/downloader/events.go @@ -16,7 +16,7 @@ package downloader -import "github.com/ethereum/go-ethereum/core/types" +import "github.com/spruce-solutions/go-quai/core/types" type DoneEvent struct { Latest *types.Header diff --git a/les/downloader/metrics.go b/les/downloader/metrics.go index c38732043a..07157fa500 100644 --- a/les/downloader/metrics.go +++ b/les/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/spruce-solutions/go-quai/metrics" ) var ( diff --git a/les/downloader/peer.go b/les/downloader/peer.go index 8632948329..c686d3ab73 100644 --- a/les/downloader/peer.go +++ b/les/downloader/peer.go @@ -27,11 +27,11 @@ import ( "sync/atomic" "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/eth/protocols/eth" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/msgrate" ) const ( diff --git a/les/downloader/queue.go b/les/downloader/queue.go index b10abd6a1f..97202fb8c9 100644 --- a/les/downloader/queue.go +++ b/les/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/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/prque" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/trie" ) const ( diff --git a/les/downloader/queue_test.go b/les/downloader/queue_test.go index cde5f306a2..f8a8b442fc 100644 --- a/les/downloader/queue_test.go +++ b/les/downloader/queue_test.go @@ -24,13 +24,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/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" ) var ( diff --git a/les/downloader/resultstore.go b/les/downloader/resultstore.go index e214662754..4c4e7c41b3 100644 --- a/les/downloader/resultstore.go +++ b/les/downloader/resultstore.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/core/types" ) // resultStore implements a structure for maintaining fetchResults, tracking their diff --git a/les/downloader/statesync.go b/les/downloader/statesync.go index 6c53e5577a..5863fb30f3 100644 --- a/les/downloader/statesync.go +++ b/les/downloader/statesync.go @@ -21,13 +21,13 @@ import ( "sync" "time" - "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/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/trie" "golang.org/x/crypto/sha3" ) diff --git a/les/downloader/testchain_test.go b/les/downloader/testchain_test.go index b9865f7e03..8088989565 100644 --- a/les/downloader/testchain_test.go +++ b/les/downloader/testchain_test.go @@ -21,13 +21,13 @@ import ( "math/big" "sync" - "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/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" ) // Test chain parameters. diff --git a/les/downloader/types.go b/les/downloader/types.go index ff70bfa0e3..aceecc8c15 100644 --- a/les/downloader/types.go +++ b/les/downloader/types.go @@ -19,7 +19,7 @@ package downloader import ( "fmt" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/core/types" ) // peerDropFn is a callback type for dropping a peer detected as malicious. diff --git a/les/enr_entry.go b/les/enr_entry.go index 307313fb10..e6ffb148f6 100644 --- a/les/enr_entry.go +++ b/les/enr_entry.go @@ -17,10 +17,10 @@ package les import ( - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/p2p/dnsdisc" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/p2p/dnsdisc" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/rlp" ) // lesEntry is the "les" ENR entry. This is set for LES servers only. diff --git a/les/fetcher.go b/les/fetcher.go index 439159103a..d155a436bb 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,16 +22,16 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "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/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/fetcher" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/les/fetcher" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" ) const ( diff --git a/les/fetcher/block_fetcher.go b/les/fetcher/block_fetcher.go index 82082a038c..72d2076f60 100644 --- a/les/fetcher/block_fetcher.go +++ b/les/fetcher/block_fetcher.go @@ -25,13 +25,13 @@ 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/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/prque" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/trie" ) const ( diff --git a/les/fetcher/block_fetcher_test.go b/les/fetcher/block_fetcher_test.go index b6d1125b56..77fac295ed 100644 --- a/les/fetcher/block_fetcher_test.go +++ b/les/fetcher/block_fetcher_test.go @@ -24,14 +24,14 @@ 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/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" ) var ( diff --git a/les/fetcher_test.go b/les/fetcher_test.go index 4f74e84773..7467cf7fc8 100644 --- a/les/fetcher_test.go +++ b/les/fetcher_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "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/p2p/enode" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/p2p/enode" ) // verifyImportEvent verifies that one single event arrive on an import channel. diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index 4f0de82318..7228dc3057 100644 --- a/les/flowcontrol/control.go +++ b/les/flowcontrol/control.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/log" ) const ( diff --git a/les/flowcontrol/logger.go b/les/flowcontrol/logger.go index 428d7fbf22..6465f16c77 100644 --- a/les/flowcontrol/logger.go +++ b/les/flowcontrol/logger.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/spruce-solutions/go-quai/common/mclock" ) // logger collects events in string format and discards events older than the diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index c9e681c144..7e8d835433 100644 --- a/les/flowcontrol/manager.go +++ b/les/flowcontrol/manager.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/common/prque" ) // cmNodeFields are ClientNode fields used by the client manager diff --git a/les/flowcontrol/manager_test.go b/les/flowcontrol/manager_test.go index 9d2f887636..9ba60b2d3d 100644 --- a/les/flowcontrol/manager_test.go +++ b/les/flowcontrol/manager_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/spruce-solutions/go-quai/common/mclock" ) type testNode struct { diff --git a/les/handler_test.go b/les/handler_test.go index be87f32435..de9b3524b2 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,19 +23,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "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/les/downloader" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/les/downloader" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) func expectResponse(r p2p.MsgReader, msgcode, reqID, bv uint64, data interface{}) error { diff --git a/les/metrics.go b/les/metrics.go index 07d3133c95..3d7ceefc03 100644 --- a/les/metrics.go +++ b/les/metrics.go @@ -17,8 +17,8 @@ package les import ( - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index 10ff0854d3..fac1b383f7 100644 --- a/les/odr.go +++ b/les/odr.go @@ -22,10 +22,10 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/light" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index a684717653..afdc16e9f9 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -21,15 +21,15 @@ import ( "errors" "fmt" - "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/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index e24e41ae4a..4b06bf1147 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -26,17 +26,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "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/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" ) type odrTestFn func(ctx context.Context, db ethdb.Database, config *params.ChainConfig, bc *core.BlockChain, lc *light.LightChain, bhash common.Hash) []byte diff --git a/les/peer.go b/les/peer.go index c6c672942b..f2f785158c 100644 --- a/les/peer.go +++ b/les/peer.go @@ -27,20 +27,20 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/les/utils" - vfc "github.com/ethereum/go-ethereum/les/vflux/client" - vfs "github.com/ethereum/go-ethereum/les/vflux/server" - "github.com/ethereum/go-ethereum/light" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/les/flowcontrol" + "github.com/spruce-solutions/go-quai/les/utils" + vfc "github.com/spruce-solutions/go-quai/les/vflux/client" + vfs "github.com/spruce-solutions/go-quai/les/vflux/server" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" ) var ( diff --git a/les/peer_test.go b/les/peer_test.go index d5fab6827e..0337c5508c 100644 --- a/les/peer_test.go +++ b/les/peer_test.go @@ -25,14 +25,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "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/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" ) type testServerPeerSub struct { diff --git a/les/protocol.go b/les/protocol.go index 06db9024eb..98e1267202 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -23,12 +23,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - vfc "github.com/ethereum/go-ethereum/les/vflux/client" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + vfc "github.com/spruce-solutions/go-quai/les/vflux/client" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/pruner.go b/les/pruner.go index a1bd51d86c..f5333aae30 100644 --- a/les/pruner.go +++ b/les/pruner.go @@ -20,10 +20,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" ) // pruner is responsible for pruning historical light chain data. diff --git a/les/pruner_test.go b/les/pruner_test.go index c6f198c088..7037555568 100644 --- a/les/pruner_test.go +++ b/les/pruner_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/light" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/light" ) func TestLightPruner(t *testing.T) { diff --git a/les/request_test.go b/les/request_test.go index f79e8fee34..65b8eaa234 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,12 +21,12 @@ 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/light" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/light" ) var testBankSecureTrieKey = secAddr(bankAddr) diff --git a/les/retrieve.go b/les/retrieve.go index 307af04212..adc574ea0f 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/light" + "github.com/spruce-solutions/go-quai/light" ) var ( diff --git a/les/server.go b/les/server.go index c135e65f2d..81bb0025ed 100644 --- a/les/server.go +++ b/les/server.go @@ -20,20 +20,20 @@ import ( "crypto/ecdsa" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/flowcontrol" - vfs "github.com/ethereum/go-ethereum/les/vflux/server" - "github.com/ethereum/go-ethereum/light" - "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/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/les/flowcontrol" + vfs "github.com/spruce-solutions/go-quai/les/vflux/server" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rpc" ) var ( diff --git a/les/server_handler.go b/les/server_handler.go index 6ccc788949..f6aac2a2d7 100644 --- a/les/server_handler.go +++ b/les/server_handler.go @@ -22,20 +22,20 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "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/ethdb" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/les/flowcontrol" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) const ( diff --git a/les/server_requests.go b/les/server_requests.go index 5e5a977f7e..8149740ad3 100644 --- a/les/server_requests.go +++ b/les/server_requests.go @@ -20,15 +20,15 @@ import ( "encoding/binary" "encoding/json" - "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/light" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) // serverBackend defines the backend functions needed for serving LES requests diff --git a/les/servingqueue.go b/les/servingqueue.go index 10c7e6f48c..8baecc8eca 100644 --- a/les/servingqueue.go +++ b/les/servingqueue.go @@ -21,8 +21,8 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/common/prque" ) // servingQueue allows running tasks in a limited number of threads and puts the diff --git a/les/state_accessor.go b/les/state_accessor.go index 112e6fd44d..4ec54604d5 100644 --- a/les/state_accessor.go +++ b/les/state_accessor.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "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/light" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/light" ) // stateAtBlock retrieves the state database associated with a certain block. diff --git a/les/sync.go b/les/sync.go index aafcbab6ce..865b39892b 100644 --- a/les/sync.go +++ b/les/sync.go @@ -21,13 +21,13 @@ import ( "errors" "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/les/downloader" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/les/downloader" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" ) var errInvalidCheckpoint = errors.New("invalid advertised checkpoint") diff --git a/les/sync_test.go b/les/sync_test.go index 1e6f375b1e..fc9c235e96 100644 --- a/les/sync_test.go +++ b/les/sync_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/params" ) // Test light syncing which will download all headers from genesis. diff --git a/les/test_helper.go b/les/test_helper.go index ca93ebf902..073fe8ba3c 100644 --- a/les/test_helper.go +++ b/les/test_helper.go @@ -29,27 +29,27 @@ 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/common/mclock" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract" - "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/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les/checkpointoracle" - "github.com/ethereum/go-ethereum/les/flowcontrol" - vfs "github.com/ethereum/go-ethereum/les/vflux/server" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/accounts/abi/bind/backends" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/contracts/checkpointoracle/contract" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/forkid" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/les/checkpointoracle" + "github.com/spruce-solutions/go-quai/les/flowcontrol" + vfs "github.com/spruce-solutions/go-quai/les/vflux/server" + "github.com/spruce-solutions/go-quai/light" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" ) var ( diff --git a/les/txrelay.go b/les/txrelay.go index 40a51fb76f..529c28a72d 100644 --- a/les/txrelay.go +++ b/les/txrelay.go @@ -21,9 +21,9 @@ import ( "math/rand" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/rlp" ) type lesTxRelay struct { diff --git a/les/ulc.go b/les/ulc.go index b97217e796..a7a9259f28 100644 --- a/les/ulc.go +++ b/les/ulc.go @@ -19,8 +19,8 @@ package les import ( "errors" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" ) type ulc struct { diff --git a/les/ulc_test.go b/les/ulc_test.go index 40c8aafb9a..40d4495253 100644 --- a/les/ulc_test.go +++ b/les/ulc_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" ) func TestULCAnnounceThresholdLes2(t *testing.T) { testULCAnnounceThreshold(t, 2) } diff --git a/les/utils/expiredvalue.go b/les/utils/expiredvalue.go index 3fd52616fa..2a45683ed5 100644 --- a/les/utils/expiredvalue.go +++ b/les/utils/expiredvalue.go @@ -20,7 +20,7 @@ import ( "math" "sync" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/spruce-solutions/go-quai/common/mclock" ) // ExpiredValue is a scalar value that is continuously expired (decreased diff --git a/les/utils/expiredvalue_test.go b/les/utils/expiredvalue_test.go index 1c751d8cc6..951f8958c4 100644 --- a/les/utils/expiredvalue_test.go +++ b/les/utils/expiredvalue_test.go @@ -19,7 +19,7 @@ package utils import ( "testing" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/spruce-solutions/go-quai/common/mclock" ) func TestValueExpiration(t *testing.T) { diff --git a/les/utils/limiter.go b/les/utils/limiter.go index 0cc2d7b262..60a977f5c0 100644 --- a/les/utils/limiter.go +++ b/les/utils/limiter.go @@ -20,7 +20,7 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enode" ) const maxSelectionWeight = 1000000000 // maximum selection weight of each individual node/address group diff --git a/les/utils/limiter_test.go b/les/utils/limiter_test.go index 43af3309ab..fdd37856de 100644 --- a/les/utils/limiter_test.go +++ b/les/utils/limiter_test.go @@ -20,7 +20,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enode" ) const ( diff --git a/les/utils/timeutils.go b/les/utils/timeutils.go index 62a4285d15..0daa2419f4 100644 --- a/les/utils/timeutils.go +++ b/les/utils/timeutils.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/spruce-solutions/go-quai/common/mclock" ) type UpdateTimer struct { diff --git a/les/utils/timeutils_test.go b/les/utils/timeutils_test.go index 9f9e1c2dc9..76d873b1f5 100644 --- a/les/utils/timeutils_test.go +++ b/les/utils/timeutils_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/spruce-solutions/go-quai/common/mclock" ) func TestUpdateTimer(t *testing.T) { diff --git a/les/utils/weighted_select.go b/les/utils/weighted_select.go index 486b00820a..c3b2d79798 100644 --- a/les/utils/weighted_select.go +++ b/les/utils/weighted_select.go @@ -20,7 +20,7 @@ import ( "math" "math/rand" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) type ( diff --git a/les/vflux/client/api.go b/les/vflux/client/api.go index 135273ef96..fefaeca428 100644 --- a/les/vflux/client/api.go +++ b/les/vflux/client/api.go @@ -19,9 +19,9 @@ package client import ( "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/les/utils" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/p2p/enode" ) // PrivateClientAPI implements the vflux client side API diff --git a/les/vflux/client/fillset.go b/les/vflux/client/fillset.go index 0da850bcac..d5e3f78427 100644 --- a/les/vflux/client/fillset.go +++ b/les/vflux/client/fillset.go @@ -19,8 +19,8 @@ package client import ( "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nodestate" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) // FillSet tries to read nodes from an input iterator and add them to a node set by diff --git a/les/vflux/client/fillset_test.go b/les/vflux/client/fillset_test.go index 58240682c6..bd2209fa72 100644 --- a/les/vflux/client/fillset_test.go +++ b/les/vflux/client/fillset_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "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/p2p/nodestate" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) type testIter struct { diff --git a/les/vflux/client/queueiterator.go b/les/vflux/client/queueiterator.go index ad3f8df5bb..c3df193af4 100644 --- a/les/vflux/client/queueiterator.go +++ b/les/vflux/client/queueiterator.go @@ -19,8 +19,8 @@ package client import ( "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nodestate" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) // QueueIterator returns nodes from the specified selectable set in the same order as diff --git a/les/vflux/client/queueiterator_test.go b/les/vflux/client/queueiterator_test.go index 400d978e19..ce5ea8fbb3 100644 --- a/les/vflux/client/queueiterator_test.go +++ b/les/vflux/client/queueiterator_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "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/p2p/nodestate" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) func testNode(i int) *enode.Node { diff --git a/les/vflux/client/requestbasket.go b/les/vflux/client/requestbasket.go index 55d4b165df..a4ccc7cb70 100644 --- a/les/vflux/client/requestbasket.go +++ b/les/vflux/client/requestbasket.go @@ -19,8 +19,8 @@ package client import ( "io" - "github.com/ethereum/go-ethereum/les/utils" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/rlp" ) const basketFactor = 1000000 // reference basket amount and value scale factor diff --git a/les/vflux/client/requestbasket_test.go b/les/vflux/client/requestbasket_test.go index 7c5f87c618..c3e265f0db 100644 --- a/les/vflux/client/requestbasket_test.go +++ b/les/vflux/client/requestbasket_test.go @@ -20,7 +20,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/les/utils" + "github.com/spruce-solutions/go-quai/les/utils" ) func checkU64(t *testing.T, name string, value, exp uint64) { diff --git a/les/vflux/client/serverpool.go b/les/vflux/client/serverpool.go index cc0254c127..7bcd7e88fb 100644 --- a/les/vflux/client/serverpool.go +++ b/les/vflux/client/serverpool.go @@ -24,15 +24,15 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/utils" - "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/p2p/nodestate" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/p2p/nodestate" + "github.com/spruce-solutions/go-quai/rlp" ) const ( diff --git a/les/vflux/client/serverpool_test.go b/les/vflux/client/serverpool_test.go index c777d6c16d..39d8afdc88 100644 --- a/les/vflux/client/serverpool_test.go +++ b/les/vflux/client/serverpool_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" ) const ( diff --git a/les/vflux/client/timestats.go b/les/vflux/client/timestats.go index 7f1ffdbe26..4fa6444edd 100644 --- a/les/vflux/client/timestats.go +++ b/les/vflux/client/timestats.go @@ -21,8 +21,8 @@ import ( "math" "time" - "github.com/ethereum/go-ethereum/les/utils" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/rlp" ) const ( diff --git a/les/vflux/client/timestats_test.go b/les/vflux/client/timestats_test.go index a28460171e..ab02f255a8 100644 --- a/les/vflux/client/timestats_test.go +++ b/les/vflux/client/timestats_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/les/utils" + "github.com/spruce-solutions/go-quai/les/utils" ) func TestTransition(t *testing.T) { diff --git a/les/vflux/client/valuetracker.go b/les/vflux/client/valuetracker.go index f5390d0920..b6965da8fb 100644 --- a/les/vflux/client/valuetracker.go +++ b/les/vflux/client/valuetracker.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/utils" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/rlp" ) const ( diff --git a/les/vflux/client/valuetracker_test.go b/les/vflux/client/valuetracker_test.go index 87a337be8d..f3adaebb63 100644 --- a/les/vflux/client/valuetracker_test.go +++ b/les/vflux/client/valuetracker_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/p2p/enode" - "github.com/ethereum/go-ethereum/les/utils" + "github.com/spruce-solutions/go-quai/les/utils" ) const ( diff --git a/les/vflux/client/wrsiterator.go b/les/vflux/client/wrsiterator.go index 8a2e39ad44..b54c4f809a 100644 --- a/les/vflux/client/wrsiterator.go +++ b/les/vflux/client/wrsiterator.go @@ -19,9 +19,9 @@ package client import ( "sync" - "github.com/ethereum/go-ethereum/les/utils" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nodestate" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) // WrsIterator returns nodes from the specified selectable set with a weighted random diff --git a/les/vflux/client/wrsiterator_test.go b/les/vflux/client/wrsiterator_test.go index 77bb5ee0ca..9bfcab7748 100644 --- a/les/vflux/client/wrsiterator_test.go +++ b/les/vflux/client/wrsiterator_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/p2p/nodestate" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) var ( diff --git a/les/vflux/requests.go b/les/vflux/requests.go index 11255607e8..b68ff1aa10 100644 --- a/les/vflux/requests.go +++ b/les/vflux/requests.go @@ -21,7 +21,7 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/rlp" ) var ErrNoReply = errors.New("no reply for given request") diff --git a/les/vflux/server/balance.go b/les/vflux/server/balance.go index 2bc1ddd189..527aeffb3b 100644 --- a/les/vflux/server/balance.go +++ b/les/vflux/server/balance.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/les/utils" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nodestate" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) var errBalanceOverflow = errors.New("balance overflow") diff --git a/les/vflux/server/balance_test.go b/les/vflux/server/balance_test.go index 5af89c18ab..0eeda3abda 100644 --- a/les/vflux/server/balance_test.go +++ b/les/vflux/server/balance_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/les/utils" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/nodestate" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) type zeroExpirer struct{} diff --git a/les/vflux/server/balance_tracker.go b/les/vflux/server/balance_tracker.go index 746697a8c7..9dfb504e67 100644 --- a/les/vflux/server/balance_tracker.go +++ b/les/vflux/server/balance_tracker.go @@ -20,12 +20,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/utils" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/nodestate" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) const ( diff --git a/les/vflux/server/clientdb.go b/les/vflux/server/clientdb.go index 30cd9a6528..411d91d0cf 100644 --- a/les/vflux/server/clientdb.go +++ b/les/vflux/server/clientdb.go @@ -21,13 +21,13 @@ import ( "encoding/binary" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/utils" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/rlp" lru "github.com/hashicorp/golang-lru" ) diff --git a/les/vflux/server/clientdb_test.go b/les/vflux/server/clientdb_test.go index 353d84aead..95ba83116c 100644 --- a/les/vflux/server/clientdb_test.go +++ b/les/vflux/server/clientdb_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/les/utils" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/p2p/enode" ) func expval(v uint64) utils.ExpiredValue { diff --git a/les/vflux/server/clientpool.go b/les/vflux/server/clientpool.go index 351961b74e..819d2446f9 100644 --- a/les/vflux/server/clientpool.go +++ b/les/vflux/server/clientpool.go @@ -21,14 +21,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/utils" - "github.com/ethereum/go-ethereum/les/vflux" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nodestate" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/les/vflux" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/nodestate" + "github.com/spruce-solutions/go-quai/rlp" ) var ( diff --git a/les/vflux/server/clientpool_test.go b/les/vflux/server/clientpool_test.go index 0953e9c800..d9240c5018 100644 --- a/les/vflux/server/clientpool_test.go +++ b/les/vflux/server/clientpool_test.go @@ -22,11 +22,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/p2p/nodestate" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) const defaultConnectedBias = time.Minute * 3 diff --git a/les/vflux/server/metrics.go b/les/vflux/server/metrics.go index 307b8347af..bb2477dbd9 100644 --- a/les/vflux/server/metrics.go +++ b/les/vflux/server/metrics.go @@ -17,7 +17,7 @@ package server import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/spruce-solutions/go-quai/metrics" ) var ( diff --git a/les/vflux/server/prioritypool.go b/les/vflux/server/prioritypool.go index 480f77e6af..5d978d6653 100644 --- a/les/vflux/server/prioritypool.go +++ b/les/vflux/server/prioritypool.go @@ -21,11 +21,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nodestate" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/common/prque" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) const ( diff --git a/les/vflux/server/prioritypool_test.go b/les/vflux/server/prioritypool_test.go index 5152312116..55f4e833eb 100644 --- a/les/vflux/server/prioritypool_test.go +++ b/les/vflux/server/prioritypool_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "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/p2p/nodestate" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) const ( diff --git a/les/vflux/server/service.go b/les/vflux/server/service.go index 80a0f47543..b54f9c361c 100644 --- a/les/vflux/server/service.go +++ b/les/vflux/server/service.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/les/utils" - "github.com/ethereum/go-ethereum/les/vflux" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/les/utils" + "github.com/spruce-solutions/go-quai/les/vflux" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/rlp" ) type ( diff --git a/les/vflux/server/status.go b/les/vflux/server/status.go index 469190777b..47feb766c4 100644 --- a/les/vflux/server/status.go +++ b/les/vflux/server/status.go @@ -19,7 +19,7 @@ package server import ( "reflect" - "github.com/ethereum/go-ethereum/p2p/nodestate" + "github.com/spruce-solutions/go-quai/p2p/nodestate" ) type peerWrapper struct{ clientPeer } // the NodeStateMachine type system needs this wrapper diff --git a/light/lightchain.go b/light/lightchain.go index 14237c94fa..863529b31e 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -26,17 +26,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "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/ethdb" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" lru "github.com/hashicorp/golang-lru" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index 9179fd98ab..03f81dba57 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -22,13 +22,13 @@ 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/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index 3662596785..fb8cdff842 100644 --- a/light/nodeset.go +++ b/light/nodeset.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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/rlp" ) // NodeSet stores a set of trie nodes. It implements trie.Database and can also diff --git a/light/odr.go b/light/odr.go index f2dd969ad8..87f068f67c 100644 --- a/light/odr.go +++ b/light/odr.go @@ -21,11 +21,11 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" ) // NoOdr is the default context passed to an ODR capable function when the ODR diff --git a/light/odr_test.go b/light/odr_test.go index 5f15bb081a..ec753fcee5 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,19 +24,19 @@ import ( "testing" "time" - "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" - "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/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index e80a41ff18..1cd5d95a7b 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -22,11 +22,11 @@ import ( "errors" "math/big" - "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/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/rlp" ) // errNonCanonicalHash is returned if the requested chain data doesn't belong diff --git a/light/postprocess.go b/light/postprocess.go index 4f79e0dc5c..641e2ff57e 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -26,16 +26,16 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/bitutil" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) // IndexerConfig includes a set of configs for chain indexers. diff --git a/light/trie.go b/light/trie.go index dd72fcd936..747fdcf380 100644 --- a/light/trie.go +++ b/light/trie.go @@ -21,14 +21,14 @@ import ( "errors" "fmt" - "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/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) var ( diff --git a/light/trie_test.go b/light/trie_test.go index d5a1969d94..829cca1fc5 100644 --- a/light/trie_test.go +++ b/light/trie_test.go @@ -24,14 +24,14 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "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/trie" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index ae419b8121..82624d9691 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -23,15 +23,15 @@ import ( "sync" "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/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index cc2651d29a..431951eb84 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -23,13 +23,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/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/params" ) type testTxRelay struct { diff --git a/metrics/cpu_enabled.go b/metrics/cpu_enabled.go index 533d40b85a..51c500ad53 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/spruce-solutions/go-quai/log" "github.com/shirou/gopsutil/cpu" ) diff --git a/metrics/cputime_unix.go b/metrics/cputime_unix.go index 3c56a75d00..ecec75ff06 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/spruce-solutions/go-quai/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index 3ebe8cc68a..e53c01608a 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/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/metrics/prometheus" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index 52d0091034..d6f723b858 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -5,8 +5,8 @@ import ( uurl "net/url" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" "github.com/influxdata/influxdb/client" ) diff --git a/metrics/influxdb/influxdbv2.go b/metrics/influxdb/influxdbv2.go index 00901f52c9..b9b5da8811 100644 --- a/metrics/influxdb/influxdbv2.go +++ b/metrics/influxdb/influxdbv2.go @@ -13,8 +13,8 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" influxdb2 "github.com/influxdata/influxdb-client-go/v2" "github.com/influxdata/influxdb-client-go/v2/api" ) diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index b16493413e..9577d21c8e 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/spruce-solutions/go-quai/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index 747d6471a7..946b0b557e 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/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 3959cbf5e1..f7b29b540f 100644 --- a/metrics/prometheus/collector.go +++ b/metrics/prometheus/collector.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/metrics" + "github.com/spruce-solutions/go-quai/metrics" ) var ( diff --git a/metrics/prometheus/collector_test.go b/metrics/prometheus/collector_test.go index 43f2f804d3..f7974b7c1f 100644 --- a/metrics/prometheus/collector_test.go +++ b/metrics/prometheus/collector_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/spruce-solutions/go-quai/metrics" ) func TestMain(m *testing.M) { diff --git a/metrics/prometheus/prometheus.go b/metrics/prometheus/prometheus.go index 9ad5ec7e99..f914f42cb2 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/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" ) // Handler returns an HTTP handler which dump metrics in Prometheus format. diff --git a/miner/miner.go b/miner/miner.go index 1d9fe69692..dcaae3b0b9 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -22,16 +22,16 @@ import ( "math/big" "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/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" ) // Backend wraps all methods required for mining. diff --git a/miner/miner_test.go b/miner/miner_test.go index da1e472dbd..fdca62a4ca 100644 --- a/miner/miner_test.go +++ b/miner/miner_test.go @@ -21,17 +21,17 @@ 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/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/clique" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/trie" ) type mockBackend struct { diff --git a/miner/stress/1559/main.go b/miner/stress/1559/main.go index 90f210b272..22eea70ec9 100644 --- a/miner/stress/1559/main.go +++ b/miner/stress/1559/main.go @@ -26,22 +26,22 @@ import ( "path/filepath" "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/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/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/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/fdlimit" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/eth" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/miner" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" ) var ( diff --git a/miner/stress/clique/main.go b/miner/stress/clique/main.go index 2aad40bb51..d1a9b839c3 100644 --- a/miner/stress/clique/main.go +++ b/miner/stress/clique/main.go @@ -26,21 +26,21 @@ import ( "os" "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/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/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/fdlimit" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/eth" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/miner" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" ) func main() { diff --git a/miner/stress/ethash/main.go b/miner/stress/ethash/main.go index 2110456354..6f07c7122e 100644 --- a/miner/stress/ethash/main.go +++ b/miner/stress/ethash/main.go @@ -26,22 +26,22 @@ import ( "path/filepath" "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/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/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/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/fdlimit" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/eth" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/miner" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" ) func main() { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 0489f1ea4a..05d205a9e6 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -20,9 +20,9 @@ import ( "container/ring" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" ) // chainRetriever is used by the unconfirmed block set to verify whether a previously diff --git a/miner/unconfirmed_test.go b/miner/unconfirmed_test.go index dc83cb9265..7b80d3644b 100644 --- a/miner/unconfirmed_test.go +++ b/miner/unconfirmed_test.go @@ -19,7 +19,7 @@ package miner import ( "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/core/types" ) // noopChainRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index 0798a3b3a2..ffa2c475eb 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -24,16 +24,16 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "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" - "github.com/ethereum/go-ethereum/core/state" - "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/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/misc" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/trie" ) const ( diff --git a/miner/worker_test.go b/miner/worker_test.go index 5b35c66dce..1764f85f94 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -23,19 +23,19 @@ 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/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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/clique" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/params" ) const ( diff --git a/mobile/accounts.go b/mobile/accounts.go index 6b9a045365..4be9cec105 100644 --- a/mobile/accounts.go +++ b/mobile/accounts.go @@ -23,10 +23,10 @@ import ( "errors" "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/crypto" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" ) const ( diff --git a/mobile/big.go b/mobile/big.go index c08bcf93f2..d17b1c2656 100644 --- a/mobile/big.go +++ b/mobile/big.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index e32d864aa5..b050aa8fd7 100644 --- a/mobile/bind.go +++ b/mobile/bind.go @@ -22,11 +22,11 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/accounts/abi/bind" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" ) // Signer is an interface defining the callback when a contract requires a diff --git a/mobile/common.go b/mobile/common.go index 124712b4b1..ca0c2aff9e 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,8 +24,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index 2c699f08be..64d6298818 100644 --- a/mobile/discover.go +++ b/mobile/discover.go @@ -22,7 +22,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enode" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 662125c4ad..201874cb52 100644 --- a/mobile/ethclient.go +++ b/mobile/ethclient.go @@ -21,8 +21,8 @@ package geth import ( "math/big" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethclient" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index 97c46ddca7..f19e139bda 100644 --- a/mobile/ethereum.go +++ b/mobile/ethereum.go @@ -21,8 +21,8 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai" + "github.com/spruce-solutions/go-quai/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index 704d432e04..fd65dbcdcf 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,17 +24,17 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/eth/downloader" + "github.com/spruce-solutions/go-quai/eth/ethconfig" + "github.com/spruce-solutions/go-quai/ethclient" + "github.com/spruce-solutions/go-quai/ethstats" + "github.com/spruce-solutions/go-quai/internal/debug" + "github.com/spruce-solutions/go-quai/les" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/nat" + "github.com/spruce-solutions/go-quai/params" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index 2025d85edc..f2e04a2526 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index d5200d5b1b..cee5d52d79 100644 --- a/mobile/interface.go +++ b/mobile/interface.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/interface_test.go b/mobile/interface_test.go index 4bd1af47aa..2e737aeaeb 100644 --- a/mobile/interface_test.go +++ b/mobile/interface_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) func TestInterfaceGetSet(t *testing.T) { diff --git a/mobile/logger.go b/mobile/logger.go index 7078c4fd2c..8bb1ea9e5a 100644 --- a/mobile/logger.go +++ b/mobile/logger.go @@ -19,7 +19,7 @@ package geth import ( "os" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go). diff --git a/mobile/p2p.go b/mobile/p2p.go index a80d9fff2e..552730e7d5 100644 --- a/mobile/p2p.go +++ b/mobile/p2p.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/p2p" + "github.com/spruce-solutions/go-quai/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index 0fc197c9e5..041cf193af 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -21,9 +21,9 @@ package geth import ( "encoding/json" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/params" ) // MainnetGenesis returns the JSON spec to use for the main Ethereum network. It diff --git a/mobile/primitives.go b/mobile/primitives.go index 7e1ab26ef0..3c96bd9c67 100644 --- a/mobile/primitives.go +++ b/mobile/primitives.go @@ -22,7 +22,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) // Strings represents s slice of strs. diff --git a/mobile/types.go b/mobile/types.go index d1427ac11d..b7e8897572 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,9 +23,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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/rlp" ) type jsonEncoder interface { diff --git a/mobile/vm.go b/mobile/vm.go index 72093e3d5b..30f7f34b60 100644 --- a/mobile/vm.go +++ b/mobile/vm.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/core/types" ) // Log represents a contract log event. These events are generated by the LOG diff --git a/node/api.go b/node/api.go index be20b89d95..a1912c2027 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/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/internal/debug" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/rpc" ) // apis returns the collection of built-in RPC APIs. diff --git a/node/api_test.go b/node/api_test.go index 9549adf9c2..3bc8d3c9a9 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/spruce-solutions/go-quai/rpc" "github.com/stretchr/testify/assert" ) diff --git a/node/config.go b/node/config.go index 26f00cd678..0ce805f361 100644 --- a/node/config.go +++ b/node/config.go @@ -26,12 +26,12 @@ import ( "strings" "sync" - "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/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/rpc" ) const ( diff --git a/node/config_test.go b/node/config_test.go index 00c24a2391..ece3a9904e 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -24,8 +24,8 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index a5b32d7d13..c4185446af 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/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/nat" + "github.com/spruce-solutions/go-quai/rpc" ) const ( diff --git a/node/endpoints.go b/node/endpoints.go index 1f85a52131..542b18f2cf 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/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rpc" ) // StartHTTPEndpoint starts the HTTP RPC endpoint. diff --git a/node/node.go b/node/node.go index ceab1c9090..5ccb6493b4 100644 --- a/node/node.go +++ b/node/node.go @@ -26,13 +26,13 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/accounts" - "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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/rpc" "github.com/prometheus/tsdb/fileutil" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index d54fe03067..730b229d20 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/spruce-solutions/go-quai/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 e104630600..ed9d0e0243 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -28,10 +28,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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/rpc" "github.com/stretchr/testify/assert" ) diff --git a/node/rpcstack.go b/node/rpcstack.go index 2c55a070b2..13aa806e6e 100644 --- a/node/rpcstack.go +++ b/node/rpcstack.go @@ -29,8 +29,8 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rpc" "github.com/rs/cors" ) diff --git a/node/rpcstack_test.go b/node/rpcstack_test.go index f92f0ba396..254913829e 100644 --- a/node/rpcstack_test.go +++ b/node/rpcstack_test.go @@ -25,9 +25,9 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/spruce-solutions/go-quai/internal/testlog" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rpc" "github.com/gorilla/websocket" "github.com/stretchr/testify/assert" ) diff --git a/node/utils_test.go b/node/utils_test.go index b7474bb706..e29a73efbe 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/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/rpc" ) // NoopLifecycle is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index 0d70e6f4a3..befd37175e 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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index cd8dedff1c..414b1ca672 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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/internal/testlog" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/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 e389821fda..ac26ab8f6a 100644 --- a/p2p/discover/common.go +++ b/p2p/discover/common.go @@ -20,11 +20,11 @@ import ( "crypto/ecdsa" "net" - "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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/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 9ab4a71ce7..49915e1413 100644 --- a/p2p/discover/lookup.go +++ b/p2p/discover/lookup.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enode" ) // lookup performs a network search for nodes close to the given target. It approaches the diff --git a/p2p/discover/node.go b/p2p/discover/node.go index 9ffe101ccf..265f5bf118 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/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enode" ) // node represents a host on the network. diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 1bb52399fb..3de8b4510b 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,7 +25,7 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index d08f8a6c69..64aefd7f09 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -32,10 +32,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index 5f40c967fd..670b631251 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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/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 47a2e7ac3c..295c3d1a61 100644 --- a/p2p/discover/table_util_test.go +++ b/p2p/discover/table_util_test.go @@ -27,10 +27,10 @@ import ( "sort" "sync" - "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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" ) var nullNode *enode.Node diff --git a/p2p/discover/v4_lookup_test.go b/p2p/discover/v4_lookup_test.go index a00de9ca18..c10d73bcd6 100644 --- a/p2p/discover/v4_lookup_test.go +++ b/p2p/discover/v4_lookup_test.go @@ -23,10 +23,10 @@ import ( "sort" "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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/discover/v4wire" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" ) func TestUDPv4_Lookup(t *testing.T) { diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go index 334716aebe..7d099d284e 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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/discover/v4wire" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/netutil" ) // Errors diff --git a/p2p/discover/v4_udp_test.go b/p2p/discover/v4_udp_test.go index e36912f010..518cfcd6b0 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/spruce-solutions/go-quai/internal/testlog" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/discover/v4wire" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" ) // shared test variables diff --git a/p2p/discover/v4wire/v4wire.go b/p2p/discover/v4wire/v4wire.go index 23e7134414..3b7d0f7707 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/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" ) // RPC packet types diff --git a/p2p/discover/v4wire/v4wire_test.go b/p2p/discover/v4wire/v4wire_test.go index 3b4161998d..4042dcfda1 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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/rlp" ) // EIP-8 test vectors. diff --git a/p2p/discover/v5_udp.go b/p2p/discover/v5_udp.go index 71a39ea5a5..04e225be9a 100644 --- a/p2p/discover/v5_udp.go +++ b/p2p/discover/v5_udp.go @@ -29,12 +29,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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/discover/v5wire" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/p2p/netutil" ) const ( diff --git a/p2p/discover/v5_udp_test.go b/p2p/discover/v5_udp_test.go index f061f5ab41..e3f1e98352 100644 --- a/p2p/discover/v5_udp_test.go +++ b/p2p/discover/v5_udp_test.go @@ -28,12 +28,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/spruce-solutions/go-quai/internal/testlog" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/discover/v5wire" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" ) // Real sockets, real crypto: this test checks end-to-end connectivity for UDPv5. diff --git a/p2p/discover/v5wire/crypto.go b/p2p/discover/v5wire/crypto.go index fc0a0edef5..7a177f221a 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/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/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..c228b4dba2 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/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enode" ) func TestVector_ECDH(t *testing.T) { diff --git a/p2p/discover/v5wire/encoding.go b/p2p/discover/v5wire/encoding.go index f502339e1e..7c9abc0be1 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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" ) // TODO concurrent WHOAREYOU tie-breaker diff --git a/p2p/discover/v5wire/encoding_test.go b/p2p/discover/v5wire/encoding_test.go index b13041d1b9..0bf126de83 100644 --- a/p2p/discover/v5wire/encoding_test.go +++ b/p2p/discover/v5wire/encoding_test.go @@ -31,10 +31,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/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enode" ) // To regenerate discv5 test vectors, run diff --git a/p2p/discover/v5wire/msg.go b/p2p/discover/v5wire/msg.go index 7c3686111b..e5b660a406 100644 --- a/p2p/discover/v5wire/msg.go +++ b/p2p/discover/v5wire/msg.go @@ -20,10 +20,10 @@ import ( "fmt" "net" - "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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" ) // Packet is implemented by all message types. diff --git a/p2p/discover/v5wire/session.go b/p2p/discover/v5wire/session.go index d52b5c1181..732c1f9e62 100644 --- a/p2p/discover/v5wire/session.go +++ b/p2p/discover/v5wire/session.go @@ -22,9 +22,9 @@ import ( "encoding/binary" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enode" "github.com/hashicorp/golang-lru/simplelru" ) diff --git a/p2p/dnsdisc/client.go b/p2p/dnsdisc/client.go index 096df06a54..ba440aa640 100644 --- a/p2p/dnsdisc/client.go +++ b/p2p/dnsdisc/client.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" lru "github.com/hashicorp/golang-lru" "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 9320dd667a..39f735fad5 100644 --- a/p2p/dnsdisc/client_test.go +++ b/p2p/dnsdisc/client_test.go @@ -26,12 +26,12 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/internal/testlog" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" ) const ( diff --git a/p2p/dnsdisc/sync.go b/p2p/dnsdisc/sync.go index 073547c90d..afbca1e2b0 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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/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 410ec3b854..9ef5130e36 100644 --- a/p2p/dnsdisc/tree.go +++ b/p2p/dnsdisc/tree.go @@ -26,10 +26,10 @@ import ( "sort" "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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/dnsdisc/tree_test.go b/p2p/dnsdisc/tree_test.go index 4048c35d63..21ab6365a7 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/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/p2p/enode" ) func TestParseRoot(t *testing.T) { diff --git a/p2p/enode/idscheme.go b/p2p/enode/idscheme.go index c1834f0699..9aa6d70dd7 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/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/enode/idscheme_test.go b/p2p/enode/idscheme_test.go index 0910e6e83f..706bc9b6d9 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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/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 5014346af4..ad8e93a288 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/spruce-solutions/go-quai/p2p/enr" ) func TestReadNodes(t *testing.T) { diff --git a/p2p/enode/localnode.go b/p2p/enode/localnode.go index 4827b6c0ae..1577506e1d 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/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/p2p/netutil" ) const ( diff --git a/p2p/enode/localnode_test.go b/p2p/enode/localnode_test.go index 312df813bb..db796d6bb9 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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enr" "github.com/stretchr/testify/assert" ) diff --git a/p2p/enode/node.go b/p2p/enode/node.go index d747ca3313..0f42aeaa44 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/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/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..d3eab0eaf0 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/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" "github.com/stretchr/testify/assert" ) diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go index d1712f7597..f4be5f5a12 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/spruce-solutions/go-quai/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 c445049102..260a43d603 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/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enr" ) var ( diff --git a/p2p/enode/urlv4_test.go b/p2p/enode/urlv4_test.go index 33de96cc57..85ed3f3317 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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/enr" ) func init() { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 05e43fd805..91c5882e43 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/spruce-solutions/go-quai/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 bf3f104744..696a93ad7d 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/spruce-solutions/go-quai/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index f2118401af..d470fb8ec1 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -21,7 +21,7 @@ import ( "io" "net" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index bd048138c3..57be12830d 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -25,9 +25,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/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 1bb505cdfb..3aa839bad2 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -21,7 +21,7 @@ package p2p import ( "net" - "github.com/ethereum/go-ethereum/metrics" + "github.com/spruce-solutions/go-quai/metrics" ) const ( diff --git a/p2p/msgrate/msgrate.go b/p2p/msgrate/msgrate.go index 5bfa27b433..67aad1c06b 100644 --- a/p2p/msgrate/msgrate.go +++ b/p2p/msgrate/msgrate.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/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 9d5519b9c4..83990bd4aa 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/spruce-solutions/go-quai/log" natpmp "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/netutil/iptrack.go b/p2p/netutil/iptrack.go index b9cbd5e1ca..6d647e651b 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/spruce-solutions/go-quai/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 a9a2998a65..f66b6bfc16 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/spruce-solutions/go-quai/common/mclock" ) const ( diff --git a/p2p/nodestate/nodestate.go b/p2p/nodestate/nodestate.go index 9323d53cbd..da8e8de4cb 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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" ) var ( diff --git a/p2p/nodestate/nodestate_test.go b/p2p/nodestate/nodestate_test.go index d06ad755e2..83f6dbe9ec 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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" ) func testSetup(flagPersist []bool, fieldType []reflect.Type) (*Setup, []Flags, []Field) { diff --git a/p2p/peer.go b/p2p/peer.go index b6d0dbd1ae..ad1acfd2af 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -25,13 +25,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/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" ) var ( diff --git a/p2p/peer_test.go b/p2p/peer_test.go index 4308bbd2eb..27b58cdeed 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/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" ) var discard = Protocol{ diff --git a/p2p/protocol.go b/p2p/protocol.go index fa23a087c2..fb93e099ed 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,8 +19,8 @@ package p2p import ( "fmt" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/rlpx/buffer_test.go b/p2p/rlpx/buffer_test.go index 9fee4172bd..ae25668b82 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/spruce-solutions/go-quai/common/hexutil" "github.com/stretchr/testify/assert" ) diff --git a/p2p/rlpx/rlpx.go b/p2p/rlpx/rlpx.go index 326c7c4941..5e861ad8a2 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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/crypto/ecies" + "github.com/spruce-solutions/go-quai/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 28759f2b49..a6c95d76ac 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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/crypto/ecies" + "github.com/spruce-solutions/go-quai/p2p/simulations/pipes" + "github.com/spruce-solutions/go-quai/rlp" "github.com/stretchr/testify/assert" ) diff --git a/p2p/server.go b/p2p/server.go index bcfc1bd10b..31bc7a8d16 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -29,16 +29,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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/discover" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/p2p/nat" + "github.com/spruce-solutions/go-quai/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index a5b3190aed..318dd07437 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -27,12 +27,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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/internal/testlog" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/p2p/rlpx" ) type testTransport struct { diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index 35ccdfb068..1a5816ae43 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -35,11 +35,11 @@ import ( "time" "github.com/docker/docker/pkg/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/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/rpc" "github.com/gorilla/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index 1cb26a8ea0..2a3cf75773 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/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/simulations/pipes" + "github.com/spruce-solutions/go-quai/rpc" "github.com/gorilla/websocket" ) diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go index 2a61508fe1..5b9f613967 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/spruce-solutions/go-quai/p2p/simulations/pipes" ) func TestTCPPipe(t *testing.T) { diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index 1da464a10d..cd4efd9c2a 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -26,13 +26,13 @@ import ( "strconv" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/crypto" - "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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rpc" "github.com/gorilla/websocket" ) diff --git a/p2p/simulations/connect.go b/p2p/simulations/connect.go index ede96b34c1..35fe3c07da 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/spruce-solutions/go-quai/p2p/enode" ) var ( diff --git a/p2p/simulations/connect_test.go b/p2p/simulations/connect_test.go index 0154a18b03..ef0a3bb552 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/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/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 0cddd9b505..0afb135893 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/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/simulations" + "github.com/spruce-solutions/go-quai/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 27ed5b75d2..4cb1ed3e2b 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -29,11 +29,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/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/simulations/adapters" + "github.com/spruce-solutions/go-quai/rpc" "github.com/gorilla/websocket" "github.com/julienschmidt/httprouter" ) diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go index 6d7f0b6d7a..5e6052923e 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/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/simulations/adapters" + "github.com/spruce-solutions/go-quai/rpc" "github.com/mattn/go-colorable" ) diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index fd25e2c918..36c918bfd3 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/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/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 56d81942bb..6757ce1bc5 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/spruce-solutions/go-quai/p2p/enode" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 9b5e2c37f5..326d7ef525 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -27,11 +27,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/spruce-solutions/go-quai/event" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/simulations/adapters" ) var DialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index d5651441a2..41ed159a79 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/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/node" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/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..5f55f0abdc 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/spruce-solutions/go-quai/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..5a8eedcd1b 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/spruce-solutions/go-quai/p2p" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rpc" ) // NoopService is the service that does not do anything diff --git a/p2p/tracker/tracker.go b/p2p/tracker/tracker.go index 69a49087e2..05dd882575 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/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" ) const ( diff --git a/p2p/transport.go b/p2p/transport.go index d594259866..a6689e0029 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/bitutil" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/p2p/rlpx" + "github.com/spruce-solutions/go-quai/rlp" ) const ( diff --git a/p2p/transport_test.go b/p2p/transport_test.go index 753ea30bf1..98e0473605 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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/p2p/simulations/pipes" ) func TestProtocolHandshake(t *testing.T) { diff --git a/p2p/util.go b/p2p/util.go index 3c5f6b8508..a45bb81f38 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/spruce-solutions/go-quai/common/mclock" ) // expHeap tracks strings and their expiry time. diff --git a/p2p/util_test.go b/p2p/util_test.go index cc0d2b215f..c57625811b 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/spruce-solutions/go-quai/common/mclock" ) func TestExpHeap(t *testing.T) { diff --git a/params/bootnodes.go b/params/bootnodes.go index 026c2ab877..f06658a04f 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/spruce-solutions/go-quai/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 97648c1ea1..c0c23b3f9e 100644 --- a/params/config.go +++ b/params/config.go @@ -21,7 +21,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" "golang.org/x/crypto/sha3" ) diff --git a/params/dao.go b/params/dao.go index da3c8dfc99..11575dc3cd 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/spruce-solutions/go-quai/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/rlp/decode_test.go b/rlp/decode_test.go index 7c3dafeac4..e3e5a81751 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/spruce-solutions/go-quai/common/math" ) func TestStreamKind(t *testing.T) { diff --git a/rlp/encode_test.go b/rlp/encode_test.go index a63743440d..00b05c55c7 100644 --- a/rlp/encode_test.go +++ b/rlp/encode_test.go @@ -27,7 +27,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common/math" + "github.com/spruce-solutions/go-quai/common/math" ) type testEncoder struct { diff --git a/rlp/iterator_test.go b/rlp/iterator_test.go index 53c3819186..fe13adb95d 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/spruce-solutions/go-quai/common/hexutil" ) // TestIterator tests some basic things about the ListIterator. A more diff --git a/rpc/client.go b/rpc/client.go index e9deb3f6db..44783a9bcd 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/spruce-solutions/go-quai/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 044b57a9c4..8c81c4f283 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/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/rpc" ) // In this example, our client wishes to track the latest 'block number' diff --git a/rpc/client_test.go b/rpc/client_test.go index 224eb0c5c8..603a63f668 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -33,7 +33,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) func TestClientRequest(t *testing.T) { diff --git a/rpc/endpoints.go b/rpc/endpoints.go index d78ebe2858..482b705b37 100644 --- a/rpc/endpoints.go +++ b/rpc/endpoints.go @@ -20,7 +20,7 @@ import ( "net" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) // StartIPCEndpoint starts an IPC endpoint. diff --git a/rpc/handler.go b/rpc/handler.go index 85f774a1b7..4bfe2c7376 100644 --- a/rpc/handler.go +++ b/rpc/handler.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/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 07a211c627..ab0e8e761b 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/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/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 249a9cf044..4dced02e37 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/spruce-solutions/go-quai/log" ) // ipcListen will create a Unix socket on the given endpoint. diff --git a/rpc/metrics.go b/rpc/metrics.go index 7fb6fc0a17..e1ffa22022 100644 --- a/rpc/metrics.go +++ b/rpc/metrics.go @@ -19,7 +19,7 @@ package rpc import ( "fmt" - "github.com/ethereum/go-ethereum/metrics" + "github.com/spruce-solutions/go-quai/metrics" ) var ( diff --git a/rpc/server.go b/rpc/server.go index 64e078a7fd..bf0c215a55 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -22,7 +22,7 @@ import ( "sync/atomic" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) const MetadataApi = "rpc" diff --git a/rpc/service.go b/rpc/service.go index bef891ea11..b91008ee26 100644 --- a/rpc/service.go +++ b/rpc/service.go @@ -26,7 +26,7 @@ import ( "sync" "unicode" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) var ( diff --git a/rpc/types.go b/rpc/types.go index d9c2317a78..e821d85df4 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -24,8 +24,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/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 f110dee7c6..65e96a6154 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index 5571324af8..024ccf612c 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -28,7 +28,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" "github.com/gorilla/websocket" ) diff --git a/signer/core/api.go b/signer/core/api.go index fb68018a6b..539ae71728 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -25,16 +25,16 @@ 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/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/accounts/scwallet" + "github.com/spruce-solutions/go-quai/accounts/usbwallet" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/signer/core/apitypes" + "github.com/spruce-solutions/go-quai/signer/storage" ) const ( diff --git a/signer/core/api_test.go b/signer/core/api_test.go index 36f12f71a5..8ff9fbda03 100644 --- a/signer/core/api_test.go +++ b/signer/core/api_test.go @@ -27,17 +27,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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/signer/core" + "github.com/spruce-solutions/go-quai/signer/core/apitypes" + "github.com/spruce-solutions/go-quai/signer/fourbyte" + "github.com/spruce-solutions/go-quai/signer/storage" ) //Used for testing diff --git a/signer/core/apitypes/types.go b/signer/core/apitypes/types.go index 625959219f..429a4bf566 100644 --- a/signer/core/apitypes/types.go +++ b/signer/core/apitypes/types.go @@ -22,9 +22,9 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" ) type ValidationInfo struct { diff --git a/signer/core/auditlog.go b/signer/core/auditlog.go index 84877ee712..dfa1c9d67f 100644 --- a/signer/core/auditlog.go +++ b/signer/core/auditlog.go @@ -20,11 +20,11 @@ import ( "context" "encoding/json" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/signer/core/apitypes" ) type AuditLogger struct { diff --git a/signer/core/cliui.go b/signer/core/cliui.go index 05c60906cc..1bd9c90e46 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -24,10 +24,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/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/console/prompt" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/log" ) type CommandlineUI struct { diff --git a/signer/core/gnosis_safe.go b/signer/core/gnosis_safe.go index bdf7f837a0..d314375727 100644 --- a/signer/core/gnosis_safe.go +++ b/signer/core/gnosis_safe.go @@ -4,10 +4,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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/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 6c2fd5f8fe..f63ff8c770 100644 --- a/signer/core/signed_data.go +++ b/signer/core/signed_data.go @@ -30,15 +30,15 @@ import ( "strings" "unicode" - "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/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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/consensus/clique" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/signer/core/apitypes" ) type SigFormat struct { diff --git a/signer/core/signed_data_internal_test.go b/signer/core/signed_data_internal_test.go index 9768ee0b3f..0a0f3f24a2 100644 --- a/signer/core/signed_data_internal_test.go +++ b/signer/core/signed_data_internal_test.go @@ -21,7 +21,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/spruce-solutions/go-quai/common/hexutil" ) func TestBytesPadding(t *testing.T) { diff --git a/signer/core/signed_data_test.go b/signer/core/signed_data_test.go index 23b7b9897b..898246d492 100644 --- a/signer/core/signed_data_test.go +++ b/signer/core/signed_data_test.go @@ -26,12 +26,12 @@ 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/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/signer/core" ) var typesStandard = core.Types{ diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go index 6963a89122..3ed9350cdb 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/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rpc" ) type StdIOUI struct { diff --git a/signer/core/uiapi.go b/signer/core/uiapi.go index 3a0327d869..d3c8c07505 100644 --- a/signer/core/uiapi.go +++ b/signer/core/uiapi.go @@ -24,11 +24,11 @@ import ( "io/ioutil" "math/big" - "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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/accounts/keystore" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/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 d8fbabd3b1..4ee878496c 100644 --- a/signer/fourbyte/abi.go +++ b/signer/fourbyte/abi.go @@ -23,8 +23,8 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/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 68c027ecea..169cd1b947 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/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/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 cf54c9b9c2..577b289e74 100644 --- a/signer/fourbyte/fourbyte_test.go +++ b/signer/fourbyte/fourbyte_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/accounts/abi" + "github.com/spruce-solutions/go-quai/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..bec368eeb5 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/signer/core/apitypes" ) // ValidateTransaction does a number of checks on the supplied transaction, and diff --git a/signer/fourbyte/validation_test.go b/signer/fourbyte/validation_test.go index c3085696f4..0163a2b564 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/signer/core/apitypes" ) func mixAddr(a string) (*common.MixedcaseAddress, error) { diff --git a/signer/rules/rules.go b/signer/rules/rules.go index 03e5136730..39ab94531b 100644 --- a/signer/rules/rules.go +++ b/signer/rules/rules.go @@ -23,11 +23,11 @@ import ( "strings" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/rules/deps" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/signer/core" + "github.com/spruce-solutions/go-quai/signer/rules/deps" + "github.com/spruce-solutions/go-quai/signer/storage" ) var ( diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go index d506ef2db0..9b54345d3d 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/spruce-solutions/go-quai/accounts" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/internal/ethapi" + "github.com/spruce-solutions/go-quai/signer/core" + "github.com/spruce-solutions/go-quai/signer/core/apitypes" + "github.com/spruce-solutions/go-quai/signer/storage" ) const JS = ` diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go index 1dad34a3eb..1286dbfb70 100644 --- a/signer/storage/aes_gcm_storage.go +++ b/signer/storage/aes_gcm_storage.go @@ -25,7 +25,7 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/log" ) type storedCredential struct { diff --git a/signer/storage/aes_gcm_storage_test.go b/signer/storage/aes_gcm_storage_test.go index 664ef12994..366c6f4dc2 100644 --- a/signer/storage/aes_gcm_storage_test.go +++ b/signer/storage/aes_gcm_storage_test.go @@ -23,8 +23,8 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/log" "github.com/mattn/go-colorable" ) diff --git a/tests/block_test_util.go b/tests/block_test_util.go index bcf861e09b..01a7fbfeff 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -25,18 +25,18 @@ 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" - "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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/consensus" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index acbf96e712..3f8cb2fd99 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index fe6e90b027..b512a72d4b 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" ) //go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go diff --git a/tests/fuzzers/abi/abifuzzer.go b/tests/fuzzers/abi/abifuzzer.go index 60233d158a..d773032cdc 100644 --- a/tests/fuzzers/abi/abifuzzer.go +++ b/tests/fuzzers/abi/abifuzzer.go @@ -21,7 +21,7 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/spruce-solutions/go-quai/accounts/abi" fuzz "github.com/google/gofuzz" ) diff --git a/tests/fuzzers/bitutil/compress_fuzz.go b/tests/fuzzers/bitutil/compress_fuzz.go index 5903cf2f93..b45fbfde6b 100644 --- a/tests/fuzzers/bitutil/compress_fuzz.go +++ b/tests/fuzzers/bitutil/compress_fuzz.go @@ -19,7 +19,7 @@ package bitutil import ( "bytes" - "github.com/ethereum/go-ethereum/common/bitutil" + "github.com/spruce-solutions/go-quai/common/bitutil" ) // Fuzz implements a go-fuzz fuzzer method to test various encoding method diff --git a/tests/fuzzers/bls12381/bls12381_fuzz.go b/tests/fuzzers/bls12381/bls12381_fuzz.go index b283ed11fe..6b1c300281 100644 --- a/tests/fuzzers/bls12381/bls12381_fuzz.go +++ b/tests/fuzzers/bls12381/bls12381_fuzz.go @@ -29,7 +29,7 @@ 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/crypto/bls12381" + "github.com/spruce-solutions/go-quai/crypto/bls12381" ) func FuzzCrossPairing(data []byte) int { diff --git a/tests/fuzzers/bls12381/precompile_fuzzer.go b/tests/fuzzers/bls12381/precompile_fuzzer.go index bc3c456526..348ed4345c 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/vm" ) const ( diff --git a/tests/fuzzers/bn256/bn256_fuzz.go b/tests/fuzzers/bn256/bn256_fuzz.go index 030ac19b3f..208a0bcc4b 100644 --- a/tests/fuzzers/bn256/bn256_fuzz.go +++ b/tests/fuzzers/bn256/bn256_fuzz.go @@ -13,8 +13,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/spruce-solutions/go-quai/crypto/bn256/cloudflare" + google "github.com/spruce-solutions/go-quai/crypto/bn256/google" ) func getG1Points(input io.Reader) (*cloudflare.G1, *google.G1, *bn254.G1Affine) { diff --git a/tests/fuzzers/difficulty/debug/main.go b/tests/fuzzers/difficulty/debug/main.go index 23516b3a0d..a6c23c82b9 100644 --- a/tests/fuzzers/difficulty/debug/main.go +++ b/tests/fuzzers/difficulty/debug/main.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/tests/fuzzers/difficulty" + "github.com/spruce-solutions/go-quai/tests/fuzzers/difficulty" ) func main() { diff --git a/tests/fuzzers/difficulty/difficulty-fuzz.go b/tests/fuzzers/difficulty/difficulty-fuzz.go index e4c5dcf57c..06089ca5c8 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/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core/types" ) type fuzzer struct { diff --git a/tests/fuzzers/keystore/keystore-fuzzer.go b/tests/fuzzers/keystore/keystore-fuzzer.go index e3bcae92e1..95c7c311dc 100644 --- a/tests/fuzzers/keystore/keystore-fuzzer.go +++ b/tests/fuzzers/keystore/keystore-fuzzer.go @@ -19,7 +19,7 @@ package keystore import ( "os" - "github.com/ethereum/go-ethereum/accounts/keystore" + "github.com/spruce-solutions/go-quai/accounts/keystore" ) func Fuzz(input []byte) int { diff --git a/tests/fuzzers/les/debug/main.go b/tests/fuzzers/les/debug/main.go index 09e087d4c8..a73594b604 100644 --- a/tests/fuzzers/les/debug/main.go +++ b/tests/fuzzers/les/debug/main.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/tests/fuzzers/les" + "github.com/spruce-solutions/go-quai/tests/fuzzers/les" ) func main() { diff --git a/tests/fuzzers/les/les-fuzzer.go b/tests/fuzzers/les/les-fuzzer.go index 3e10171873..d7d818c462 100644 --- a/tests/fuzzers/les/les-fuzzer.go +++ b/tests/fuzzers/les/les-fuzzer.go @@ -22,17 +22,17 @@ import ( "io" "math/big" - "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" - l "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/consensus/ethash" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + l "github.com/spruce-solutions/go-quai/les" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" + "github.com/spruce-solutions/go-quai/trie" ) var ( diff --git a/tests/fuzzers/rangeproof/debug/main.go b/tests/fuzzers/rangeproof/debug/main.go index a81c69fea5..0bfd35d7bc 100644 --- a/tests/fuzzers/rangeproof/debug/main.go +++ b/tests/fuzzers/rangeproof/debug/main.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/tests/fuzzers/rangeproof" + "github.com/spruce-solutions/go-quai/tests/fuzzers/rangeproof" ) func main() { diff --git a/tests/fuzzers/rangeproof/rangeproof-fuzzer.go b/tests/fuzzers/rangeproof/rangeproof-fuzzer.go index 09ee6bb9c7..cdf477f0aa 100644 --- a/tests/fuzzers/rangeproof/rangeproof-fuzzer.go +++ b/tests/fuzzers/rangeproof/rangeproof-fuzzer.go @@ -23,9 +23,9 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/trie" ) type kv struct { diff --git a/tests/fuzzers/rlp/rlp_fuzzer.go b/tests/fuzzers/rlp/rlp_fuzzer.go index 18b36287b5..6356c5bb0e 100644 --- a/tests/fuzzers/rlp/rlp_fuzzer.go +++ b/tests/fuzzers/rlp/rlp_fuzzer.go @@ -20,8 +20,8 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/rlp" ) func decodeEncode(input []byte, val interface{}, i int) { diff --git a/tests/fuzzers/runtime/runtime_fuzz.go b/tests/fuzzers/runtime/runtime_fuzz.go index 9b96045752..73afecc376 100644 --- a/tests/fuzzers/runtime/runtime_fuzz.go +++ b/tests/fuzzers/runtime/runtime_fuzz.go @@ -17,7 +17,7 @@ package runtime import ( - "github.com/ethereum/go-ethereum/core/vm/runtime" + "github.com/spruce-solutions/go-quai/core/vm/runtime" ) // Fuzz is the basic entry point for the go-fuzz tool diff --git a/tests/fuzzers/secp256k1/secp_fuzzer.go b/tests/fuzzers/secp256k1/secp_fuzzer.go index 53845b6433..6a17bedd6a 100644 --- a/tests/fuzzers/secp256k1/secp_fuzzer.go +++ b/tests/fuzzers/secp256k1/secp_fuzzer.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/btcsuite/btcd/btcec" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/spruce-solutions/go-quai/crypto/secp256k1" fuzz "github.com/google/gofuzz" ) diff --git a/tests/fuzzers/stacktrie/debug/main.go b/tests/fuzzers/stacktrie/debug/main.go index 1ec28a8ef1..cfc6d5073b 100644 --- a/tests/fuzzers/stacktrie/debug/main.go +++ b/tests/fuzzers/stacktrie/debug/main.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/tests/fuzzers/stacktrie" + "github.com/spruce-solutions/go-quai/tests/fuzzers/stacktrie" ) func main() { diff --git a/tests/fuzzers/stacktrie/trie_fuzzer.go b/tests/fuzzers/stacktrie/trie_fuzzer.go index e73ef4851a..279c44b1aa 100644 --- a/tests/fuzzers/stacktrie/trie_fuzzer.go +++ b/tests/fuzzers/stacktrie/trie_fuzzer.go @@ -25,9 +25,9 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/trie" "golang.org/x/crypto/sha3" ) diff --git a/tests/fuzzers/trie/trie-fuzzer.go b/tests/fuzzers/trie/trie-fuzzer.go index e993af47cf..5dcbd02e73 100644 --- a/tests/fuzzers/trie/trie-fuzzer.go +++ b/tests/fuzzers/trie/trie-fuzzer.go @@ -21,9 +21,9 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/trie" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/trie" ) // randTest performs random trie operations. diff --git a/tests/fuzzers/txfetcher/txfetcher_fuzzer.go b/tests/fuzzers/txfetcher/txfetcher_fuzzer.go index d1d6fdc665..ba715bf838 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/eth/fetcher" ) var ( diff --git a/tests/fuzzers/vflux/clientpool-fuzzer.go b/tests/fuzzers/vflux/clientpool-fuzzer.go index 0414c001ec..a5d0d89eb7 100644 --- a/tests/fuzzers/vflux/clientpool-fuzzer.go +++ b/tests/fuzzers/vflux/clientpool-fuzzer.go @@ -24,14 +24,14 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/les/vflux" - vfs "github.com/ethereum/go-ethereum/les/vflux/server" - "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/rlp" + "github.com/spruce-solutions/go-quai/common/mclock" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/les/vflux" + vfs "github.com/spruce-solutions/go-quai/les/vflux/server" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/p2p/enode" + "github.com/spruce-solutions/go-quai/p2p/enr" + "github.com/spruce-solutions/go-quai/rlp" ) var ( diff --git a/tests/fuzzers/vflux/debug/main.go b/tests/fuzzers/vflux/debug/main.go index 1d4a5ff19c..0f1e12f580 100644 --- a/tests/fuzzers/vflux/debug/main.go +++ b/tests/fuzzers/vflux/debug/main.go @@ -21,8 +21,8 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/tests/fuzzers/vflux" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/tests/fuzzers/vflux" ) func main() { diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 4387f8db41..51c277f6d4 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index cd15ae31b5..7a2efc2b59 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index ecf7af8503..94f8fc2bbd 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 7693a207a5..0a61ba6e22 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -6,9 +6,9 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core/types" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index b0a38e68b0..882e9e4cd3 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/spruce-solutions/go-quai/params" ) // Forks table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index 312ad8869a..282936d4de 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/spruce-solutions/go-quai/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 9069ec55a1..7fc4f36f06 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/spruce-solutions/go-quai/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index 9554e75630..4653d3c318 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/spruce-solutions/go-quai/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index f7fb08bfbc..9ad68bc4c6 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -24,19 +24,19 @@ 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/common/math" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/core/state" + "github.com/spruce-solutions/go-quai/core/state/snapshot" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/core/vm" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" "golang.org/x/crypto/sha3" ) diff --git a/tests/transaction_test.go b/tests/transaction_test.go index cb0f262318..1fd38190f0 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/spruce-solutions/go-quai/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 82ee01de15..003364c92a 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/hexutil" + "github.com/spruce-solutions/go-quai/core" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/params" + "github.com/spruce-solutions/go-quai/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/trie/committer.go b/trie/committer.go index 0721990a21..3ba8834849 100644 --- a/trie/committer.go +++ b/trie/committer.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" "golang.org/x/crypto/sha3" ) diff --git a/trie/database.go b/trie/database.go index f140a56642..303b8dd17e 100644 --- a/trie/database.go +++ b/trie/database.go @@ -26,12 +26,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/metrics" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" + "github.com/spruce-solutions/go-quai/rlp" ) var ( diff --git a/trie/database_test.go b/trie/database_test.go index 81c469500f..bdca160b78 100644 --- a/trie/database_test.go +++ b/trie/database_test.go @@ -19,8 +19,8 @@ package trie import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" ) // Tests that the trie database returns a missing trie node error if attempting diff --git a/trie/errors.go b/trie/errors.go index 567b80078c..7bfabee30f 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -19,7 +19,7 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/spruce-solutions/go-quai/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index 3a62a2f119..fc8a7d5ec4 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/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/rlp" "golang.org/x/crypto/sha3" ) diff --git a/trie/iterator.go b/trie/iterator.go index 406f216c22..068721967c 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,9 +21,9 @@ import ( "container/heap" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/rlp" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/iterator_test.go b/trie/iterator_test.go index 95cafdd3bd..7ba8b16462 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -23,10 +23,10 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index f4055e779a..a6cc1048cf 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/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/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_test.go b/trie/node_test.go index 52720f1c77..9fc40b431c 100644 --- a/trie/node_test.go +++ b/trie/node_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/rlp" ) func newTestFullNode(v []byte) []interface{} { diff --git a/trie/proof.go b/trie/proof.go index 08a9e40422..8830e93d90 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" ) // 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 a35b7144c0..e05d28f59f 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 18be12d34a..d62a309b72 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -19,10 +19,10 @@ package trie import ( "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/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" ) // SecureTrie wraps a trie with key hashing. In a secure trie, all diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go index fb6c38ee22..424dfb9b73 100644 --- a/trie/secure_trie_test.go +++ b/trie/secure_trie_test.go @@ -22,9 +22,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/stacktrie.go b/trie/stacktrie.go index f9ff10b62d..ce8d5084f5 100644 --- a/trie/stacktrie.go +++ b/trie/stacktrie.go @@ -25,10 +25,10 @@ import ( "io" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" ) var ErrCommitDisabled = errors.New("no database for committing") diff --git a/trie/stacktrie_test.go b/trie/stacktrie_test.go index bd2574d5d1..b0a0d4f23c 100644 --- a/trie/stacktrie_test.go +++ b/trie/stacktrie_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/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" ) func TestSizeBug(t *testing.T) { diff --git a/trie/sync.go b/trie/sync.go index 3a6076ff8f..61897a1c9a 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,10 +20,10 @@ import ( "errors" "fmt" - "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/ethdb" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/common/prque" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb" ) // ErrNotRequested is returned by the trie sync when it's requested to process a diff --git a/trie/sync_bloom.go b/trie/sync_bloom.go index 91e5e6711d..8da7517cb3 100644 --- a/trie/sync_bloom.go +++ b/trie/sync_bloom.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "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/metrics" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/rawdb" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/metrics" bloomfilter "github.com/holiman/bloomfilter/v2" ) diff --git a/trie/sync_test.go b/trie/sync_test.go index cb3283875d..fca07dce71 100644 --- a/trie/sync_test.go +++ b/trie/sync_test.go @@ -20,9 +20,9 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index 13343112b8..52bc9d61ee 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -23,11 +23,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/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/log" + "github.com/spruce-solutions/go-quai/rlp" ) var ( diff --git a/trie/trie_test.go b/trie/trie_test.go index be0df8a544..0fdb4fdcf0 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -31,13 +31,13 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "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/leveldb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/spruce-solutions/go-quai/common" + "github.com/spruce-solutions/go-quai/core/types" + "github.com/spruce-solutions/go-quai/crypto" + "github.com/spruce-solutions/go-quai/ethdb" + "github.com/spruce-solutions/go-quai/ethdb/leveldb" + "github.com/spruce-solutions/go-quai/ethdb/memorydb" + "github.com/spruce-solutions/go-quai/rlp" "golang.org/x/crypto/sha3" )