From e0691478dca3e8a0d420df03e052d31a888e63b4 Mon Sep 17 00:00:00 2001 From: Philip Fan Date: Thu, 4 Nov 2021 16:13:04 +0800 Subject: [PATCH] all: update the go import with v4 suffix --- accounts/abi/abi.go | 4 +- accounts/abi/abi_test.go | 6 +-- accounts/abi/bind/auth.go | 12 ++--- accounts/abi/bind/backend.go | 6 +-- accounts/abi/bind/backends/simulated.go | 34 ++++++------ accounts/abi/bind/base.go | 12 ++--- accounts/abi/bind/bind.go | 4 +- accounts/abi/bind/bind_test.go | 16 +++--- 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/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_passphrase.go | 6 +-- accounts/keystore/keystore_passphrase_test.go | 2 +- accounts/keystore/keystore_plain.go | 2 +- accounts/keystore/keystore_plain_test.go | 4 +- accounts/keystore/keystore_test.go | 6 +-- accounts/keystore/keystore_wallet.go | 6 +-- accounts/keystore/presale.go | 4 +- accounts/keystore/watch.go | 3 +- accounts/manager.go | 2 +- accounts/usbwallet/hub.go | 6 +-- accounts/usbwallet/ledger.go | 12 ++--- accounts/usbwallet/trezor.go | 12 ++--- accounts/usbwallet/wallet.go | 10 ++-- build/ci.go | 9 ++-- cmd/abigen/main.go | 4 +- cmd/bootnode/main.go | 14 ++--- cmd/clef/main.go | 18 +++---- cmd/efsn/accountcmd.go | 10 ++-- cmd/efsn/bugcmd.go | 6 +-- cmd/efsn/chaincmd.go | 22 ++++---- cmd/efsn/config.go | 8 +-- cmd/efsn/consolecmd.go | 8 +-- cmd/efsn/consolecmd_test.go | 2 +- cmd/efsn/dao_test.go | 6 +-- cmd/efsn/dbcmd.go | 16 +++--- cmd/efsn/main.go | 26 ++++----- cmd/efsn/misccmd.go | 4 +- cmd/efsn/rawtx.go | 12 ++--- cmd/efsn/run_test.go | 2 +- cmd/efsn/usage.go | 4 +- cmd/ethkey/changepassphrase.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 | 28 +++++----- cmd/evm/internal/t8ntool/flags.go | 4 +- cmd/evm/internal/t8ntool/gen_stenv.go | 4 +- cmd/evm/internal/t8ntool/transaction.go | 16 +++--- 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/p2psim/main.go | 12 ++--- cmd/puppeth/genesis.go | 8 +-- 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/module_wallet.go | 2 +- 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/puppeth/wizard_wallet.go | 2 +- cmd/rlpdump/main.go | 2 +- cmd/utils/cmd.go | 20 +++---- cmd/utils/customflags.go | 2 +- cmd/utils/flags.go | 54 +++++++++---------- cmd/utils/prompt.go | 2 +- common/bitutil/compress_test.go | 2 +- common/fsnargs.go | 2 +- common/fsnparams.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/ticket.go | 2 +- common/timelock.go | 2 +- common/types.go | 2 +- consensus/consensus.go | 10 ++-- consensus/datong/api.go | 10 ++-- consensus/datong/checkpoints.go | 8 +-- consensus/datong/consensus.go | 32 +++++------ consensus/datong/report.go | 10 ++-- consensus/datong/snapshot.go | 6 +-- consensus/datong/votefork.go | 4 +- consensus/misc/dao.go | 8 +-- consensus/misc/eip1559.go | 4 +- consensus/misc/forks.go | 6 +-- consensus/misc/gaslimit.go | 2 +- console/bridge.go | 10 ++-- console/console.go | 10 ++-- console/console_test.go | 14 ++--- core/asm/asm.go | 2 +- core/asm/compiler.go | 4 +- core/bench_test.go | 16 +++--- core/block_validator.go | 16 +++--- core/block_validator_test.go | 8 +-- core/blockchain.go | 32 +++++------ core/blockchain_test.go | 20 +++---- core/blocks.go | 2 +- 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 | 8 +-- core/chain_makers.go | 16 +++--- core/chain_makers_test.go | 10 ++-- core/dao_test.go | 6 +-- core/error.go | 2 +- core/events.go | 4 +- core/evm.go | 8 +-- core/gen_genesis.go | 8 +-- core/gen_genesis_account.go | 6 +-- core/genesis.go | 26 ++++----- core/genesis_test.go | 10 ++-- core/headerchain.go | 16 +++--- core/helper_test.go | 6 +-- core/mkalloc.go | 4 +- core/rawdb/accessors_chain.go | 14 ++--- core/rawdb/accessors_chain_test.go | 8 +-- core/rawdb/accessors_indexes.go | 12 ++--- core/rawdb/accessors_indexes_test.go | 10 ++-- core/rawdb/accessors_metadata.go | 10 ++-- core/rawdb/accessors_state.go | 6 +-- core/rawdb/database.go | 10 ++-- core/rawdb/freezer.go | 10 ++-- core/rawdb/freezer_table.go | 6 +-- core/rawdb/freezer_table_test.go | 2 +- core/rawdb/schema.go | 4 +- core/rawdb/table.go | 2 +- core/rawdb/table_test.go | 2 +- core/state/access_list.go | 2 +- core/state/database.go | 8 +-- core/state/dump.go | 10 ++-- core/state/iterator.go | 6 +-- core/state/iterator_test.go | 4 +- core/state/journal.go | 2 +- core/state/state_object.go | 6 +-- core/state/state_test.go | 6 +-- core/state/statedb.go | 14 ++--- core/state/statedb_test.go | 6 +-- core/state/sync.go | 8 +-- core/state/sync_test.go | 8 +-- core/state_processor.go | 16 +++--- core/state_transition.go | 20 +++---- 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 | 22 ++++---- core/tx_pool_test.go | 14 ++--- core/types.go | 6 +-- core/types/access_list_tx.go | 2 +- core/types/block.go | 6 +-- core/types/block_test.go | 4 +- core/types/bloom9.go | 4 +- core/types/bloom9_test.go | 2 +- core/types/dynamic_fee_tx.go | 2 +- core/types/gen_access_tuple.go | 2 +- core/types/gen_header_json.go | 4 +- 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/transaction.go | 8 +-- 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/vm/analysis_test.go | 2 +- core/vm/common.go | 4 +- core/vm/contract.go | 2 +- core/vm/contracts.go | 12 ++--- core/vm/contracts_test.go | 2 +- core/vm/eips.go | 4 +- core/vm/evm.go | 6 +-- core/vm/fsncontract.go | 4 +- core/vm/gas_table.go | 6 +-- 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/noop.go | 4 +- 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 | 10 ++-- core/vm/stack_table.go | 2 +- crypto/bn256/bn256_fast.go | 3 +- crypto/bn256/bn256_slow.go | 3 +- crypto/crypto.go | 6 +-- crypto/crypto_test.go | 4 +- crypto/ecies/ecies_test.go | 2 +- crypto/ecies/params.go | 2 +- crypto/secp256k1/dummy.go | 7 +-- crypto/signature_cgo.go | 5 +- crypto/signature_test.go | 6 +-- eth/api.go | 20 +++---- eth/api_backend.go | 30 +++++------ eth/api_test.go | 6 +-- eth/backend.go | 50 ++++++++--------- eth/bloombits.go | 14 ++--- eth/downloader/api.go | 10 ++-- eth/downloader/downloader.go | 20 +++---- eth/downloader/downloader_test.go | 18 +++---- eth/downloader/events.go | 2 +- eth/downloader/metrics.go | 2 +- eth/downloader/peer.go | 6 +-- eth/downloader/queue.go | 12 ++--- eth/downloader/resultstore.go | 2 +- eth/downloader/statesync.go | 14 ++--- eth/downloader/types.go | 2 +- eth/ethconfig/config.go | 10 ++-- eth/ethconfig/gen_config.go | 8 +-- eth/fetcher/fetcher.go | 12 ++--- eth/fetcher/fetcher_test.go | 12 ++--- eth/fetcher/metrics.go | 2 +- eth/filters/api.go | 12 ++--- eth/filters/api_test.go | 4 +- eth/filters/bench_test.go | 16 +++--- eth/filters/filter.go | 14 ++--- eth/filters/filter_system.go | 16 +++--- eth/filters/filter_system_test.go | 22 ++++---- eth/filters/filter_test.go | 18 +++---- eth/gasprice/gasprice.go | 14 ++--- eth/handler.go | 30 +++++------ eth/handler_test.go | 26 ++++----- eth/helper_test.go | 26 ++++----- eth/metrics.go | 4 +- eth/peer.go | 10 ++-- eth/protocol.go | 10 ++-- eth/protocol_test.go | 14 ++--- eth/state_accessor.go | 14 ++--- eth/sync.go | 10 ++-- eth/sync_test.go | 6 +-- eth/tracers/api.go | 28 +++++----- eth/tracers/tracer.go | 12 ++--- eth/tracers/tracer_test.go | 6 +-- eth/tracers/tracers.go | 2 +- eth/tracers/tracers_test.go | 6 +-- ethclient/ethclient.go | 10 ++-- ethclient/ethclient_test.go | 2 +- ethclient/signer.go | 4 +- ethdb/dbtest/testsuite.go | 2 +- ethdb/leveldb/leveldb.go | 9 ++-- ethdb/leveldb/leveldb_test.go | 4 +- ethdb/memorydb/memorydb.go | 4 +- ethdb/memorydb/memorydb_test.go | 4 +- ethstats/ethstats.go | 24 ++++----- event/example_feed_test.go | 2 +- event/example_scope_test.go | 2 +- event/example_subscription_test.go | 2 +- event/subscription.go | 2 +- go.mod | 15 ++++++ interfaces.go | 4 +- internal/debug/api.go | 2 +- internal/debug/flags.go | 6 +-- internal/debug/trace.go | 5 +- internal/ethapi/addrlock.go | 2 +- internal/ethapi/api.go | 36 ++++++------- internal/ethapi/api_fsn.go | 20 +++---- internal/ethapi/backend.go | 24 ++++----- internal/ethapi/transaction_args.go | 12 ++--- internal/flags/helpers.go | 2 +- internal/guide/guide_test.go | 4 +- internal/jsre/jsre.go | 2 +- les/api_backend.go | 32 +++++------ les/backend.go | 44 +++++++-------- les/bloombits.go | 4 +- les/commons.go | 16 +++--- les/fetcher.go | 14 ++--- les/flowcontrol/control.go | 2 +- les/flowcontrol/manager.go | 2 +- les/freeclient.go | 10 ++-- les/freeclient_test.go | 4 +- les/handler.go | 34 ++++++------ les/handler_test.go | 26 ++++----- les/helper_test.go | 28 +++++----- les/metrics.go | 4 +- les/odr.go | 8 +-- les/odr_requests.go | 18 +++---- les/odr_test.go | 22 ++++---- les/peer.go | 14 ++--- les/protocol.go | 12 ++--- les/request_test.go | 10 ++-- les/retrieve.go | 4 +- les/server.go | 28 +++++----- les/serverpool.go | 14 ++--- les/sync.go | 6 +-- les/txrelay.go | 4 +- light/lightchain.go | 22 ++++---- light/lightchain_test.go | 12 ++--- 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 | 12 ++--- light/trie_test.go | 12 ++--- light/txpool.go | 18 +++---- light/txpool_test.go | 12 ++--- metrics/exp/exp.go | 2 +- metrics/influxdb/influxdb.go | 4 +- metrics/librato/librato.go | 2 +- metrics/metrics.go | 2 +- miner/miner.go | 20 +++---- miner/unconfirmed.go | 6 +-- miner/unconfirmed_test.go | 4 +- miner/worker.go | 22 ++++---- miner/worker_test.go | 18 +++---- mobile/accounts.go | 8 +-- mobile/android_test.go | 4 +- mobile/big.go | 2 +- mobile/bind.go | 8 +-- mobile/common.go | 2 +- 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/logger.go | 2 +- mobile/p2p.go | 2 +- mobile/params.go | 6 +-- mobile/types.go | 6 +-- mobile/vm.go | 2 +- node/api.go | 10 ++-- node/config.go | 18 +++---- node/config_test.go | 4 +- node/defaults.go | 6 +-- node/node.go | 16 +++--- node/node_example_test.go | 6 +-- node/node_test.go | 6 +-- node/service.go | 12 ++--- node/utils_test.go | 4 +- p2p/dial.go | 6 +-- p2p/dial_test.go | 4 +- p2p/discover/database.go | 6 +-- p2p/discover/node.go | 6 +-- p2p/discover/node_test.go | 4 +- p2p/discover/ntp.go | 2 +- p2p/discover/table.go | 8 +-- p2p/discover/table_test.go | 4 +- p2p/discover/udp.go | 10 ++-- p2p/discover/udp_test.go | 6 +-- p2p/discv5/database.go | 6 +-- p2p/discv5/metrics.go | 2 +- p2p/discv5/net.go | 12 ++--- p2p/discv5/net_test.go | 4 +- p2p/discv5/node.go | 4 +- p2p/discv5/node_test.go | 4 +- p2p/discv5/ntp.go | 2 +- p2p/discv5/sim_test.go | 2 +- p2p/discv5/table.go | 2 +- p2p/discv5/table_test.go | 4 +- p2p/discv5/ticket.go | 8 +-- p2p/discv5/topic.go | 4 +- p2p/discv5/topic_test.go | 4 +- p2p/discv5/udp.go | 12 ++--- p2p/discv5/udp_test.go | 6 +-- p2p/enr/enr.go | 2 +- p2p/enr/enr_test.go | 4 +- p2p/enr/entries.go | 4 +- p2p/enr/idscheme.go | 6 +-- p2p/message.go | 6 +-- p2p/metrics.go | 2 +- p2p/nat/nat.go | 2 +- p2p/peer.go | 10 ++-- p2p/protocol.go | 2 +- p2p/rlpx.go | 10 ++-- p2p/rlpx_test.go | 10 ++-- p2p/server.go | 16 +++--- p2p/server_test.go | 6 +-- p2p/simulations/adapters/docker.go | 4 +- p2p/simulations/adapters/exec.go | 10 ++-- p2p/simulations/adapters/inproc.go | 14 ++--- p2p/simulations/adapters/inproc_test.go | 2 +- p2p/simulations/adapters/types.go | 10 ++-- p2p/simulations/examples/ping-pong.go | 14 ++--- p2p/simulations/http.go | 10 ++-- p2p/simulations/http_test.go | 12 ++--- p2p/simulations/mocker.go | 6 +-- p2p/simulations/mocker_test.go | 2 +- p2p/simulations/network.go | 10 ++-- p2p/simulations/network_test.go | 4 +- p2p/simulations/simulation.go | 2 +- p2p/testing/peerpool.go | 4 +- p2p/testing/protocolsession.go | 8 +-- p2p/testing/protocoltester.go | 16 +++--- 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 | 2 +- rpc/client_test.go | 2 +- rpc/endpoints.go | 2 +- rpc/http.go | 2 +- rpc/ipc.go | 4 +- rpc/json.go | 2 +- rpc/server.go | 2 +- rpc/types.go | 4 +- rpc/types_test.go | 2 +- rpc/websocket.go | 2 +- signer/core/abihelper.go | 4 +- signer/core/abihelper_test.go | 4 +- signer/core/api.go | 16 +++--- signer/core/api_test.go | 14 ++--- signer/core/auditlog.go | 10 ++-- signer/core/cliui.go | 6 +-- signer/core/stdioui.go | 6 +-- signer/core/types.go | 8 +-- signer/core/validation.go | 2 +- signer/core/validation_test.go | 4 +- signer/rules/rules.go | 12 ++--- signer/rules/rules_test.go | 14 ++--- signer/storage/aes_gcm_storage.go | 2 +- signer/storage/aes_gcm_storage_test.go | 4 +- tests/block_test_util.go | 22 ++++---- tests/gen_btheader.go | 8 +-- tests/gen_stenv.go | 4 +- tests/gen_sttransaction.go | 4 +- tests/gen_tttransaction.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 | 24 ++++----- 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 | 4 +- 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 | 4 +- trie/trie.go | 6 +-- trie/trie_test.go | 8 +-- 504 files changed, 2000 insertions(+), 1977 deletions(-) diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go index 4014a342..b0a2c23d 100644 --- a/accounts/abi/abi.go +++ b/accounts/abi/abi.go @@ -23,8 +23,8 @@ import ( "fmt" "io" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 9e5be3c5..70140f76 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -26,9 +26,9 @@ import ( "strings" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index 3aa10e7b..2e278f3e 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -23,12 +23,12 @@ import ( "io" "io/ioutil" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/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 51133161..b7518b4f 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - ethereum "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" + ethereum "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 4f60f8c2..9c973334 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -20,27 +20,27 @@ import ( "context" "errors" "fmt" - "github.com/FusionFoundation/efsn/consensus/datong" + "github.com/FusionFoundation/efsn/v4/consensus/datong" "math/big" "sync" "time" - "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/accounts/abi" - "github.com/FusionFoundation/efsn/accounts/abi/bind" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/bloombits" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/eth/filters" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/accounts/abi" + "github.com/FusionFoundation/efsn/v4/accounts/abi/bind"∂ + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/bloombits" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/eth/filters" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rpc" ) // This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend. diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index a645bfa8..67612e60 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - ethereum "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/accounts/abi" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/event" + ethereum "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/accounts/abi" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/event" ) // SignerFn is a signer function callback when a contract requires a method to diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index 3df15f6b..ddb21839 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -30,8 +30,8 @@ import ( "text/template" "unicode" - "github.com/FusionFoundation/efsn/accounts/abi" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/accounts/abi" + "github.com/FusionFoundation/efsn/v4/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 9258da39..72f7929c 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -23,14 +23,14 @@ import ( "strings" "testing" - ethereum "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/accounts/abi" - "github.com/FusionFoundation/efsn/accounts/abi/bind" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" + ethereum "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/accounts/abi" + "github.com/FusionFoundation/efsn/v4/accounts/abi/bind" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" ) type mockCaller struct { diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 2d98b89d..e65b0d3e 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/FusionFoundation/efsn/accounts/abi" +import "github.com/FusionFoundation/efsn/v4/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 3c8247b8..b767fadc 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,9 +21,9 @@ import ( "errors" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/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 b1889a9b..02663ae4 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/accounts/abi/bind" - "github.com/FusionFoundation/efsn/accounts/abi/bind/backends" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/accounts/abi/bind" + "github.com/FusionFoundation/efsn/v4/accounts/abi/bind/backends" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index 9dfe0c25..2d7963db 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 a3cb360f..54b20fa2 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/accounts/abi/method.go b/accounts/abi/method.go index fdb8fbc8..e0a8a6bd 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/crypto" ) // FunctionType represents different types of functions a contract might have. diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index bca634c2..5f501406 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -22,8 +22,8 @@ import ( "math/big" "reflect" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 28052132..251dd36b 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/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 1ea29c2f..d13664a0 100644 --- a/accounts/abi/packing_test.go +++ b/accounts/abi/packing_test.go @@ -19,7 +19,7 @@ package abi import ( "math/big" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) type packUnpackTest struct { diff --git a/accounts/abi/topics.go b/accounts/abi/topics.go index e946f32b..69425536 100644 --- a/accounts/abi/topics.go +++ b/accounts/abi/topics.go @@ -23,8 +23,8 @@ import ( "math/big" "reflect" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 9a43b979..531b24f3 100644 --- a/accounts/abi/topics_test.go +++ b/accounts/abi/topics_test.go @@ -21,8 +21,8 @@ import ( "reflect" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" ) func TestMakeTopics(t *testing.T) { diff --git a/accounts/abi/type.go b/accounts/abi/type.go index 9b6532c2..f4dad2ab 100644 --- a/accounts/abi/type.go +++ b/accounts/abi/type.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // Type enumerator diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index e98e8e15..8ffbbb42 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" "github.com/davecgh/go-spew/spew" ) diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go index b0fc3381..c89e1206 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,7 @@ import ( "math/big" "reflect" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) var ( diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index e1a1ee87..b1838fab 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" "github.com/stretchr/testify/require" ) diff --git a/accounts/accounts.go b/accounts/accounts.go index a8c74b3d..917d777e 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -20,10 +20,10 @@ package accounts import ( "math/big" - ethereum "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/event" + ethereum "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/event" ) // Account represents an Ethereum account located at a specific location defined diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go index a6c26da1..8e985a9c 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -27,10 +27,10 @@ import ( "sync" "time" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/log" mapset "github.com/deckarep/golang-set" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/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 fc990cda..cc3356b0 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -27,10 +27,10 @@ import ( "testing" "time" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" ) var ( diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index 0fc9a0f1..61e9828d 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -24,8 +24,8 @@ import ( "sync" "time" + "github.com/FusionFoundation/efsn/v4/log" mapset "github.com/deckarep/golang-set" - "github.com/FusionFoundation/efsn/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 e80f24a5..d9dfc495 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" "github.com/google/uuid" ) diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 29a57891..857d3230 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/event" ) var ( diff --git a/accounts/keystore/keystore_passphrase.go b/accounts/keystore/keystore_passphrase.go index 800ee778..696d73bc 100644 --- a/accounts/keystore/keystore_passphrase.go +++ b/accounts/keystore/keystore_passphrase.go @@ -38,9 +38,9 @@ import ( "os" "path/filepath" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/crypto" "github.com/google/uuid" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" diff --git a/accounts/keystore/keystore_passphrase_test.go b/accounts/keystore/keystore_passphrase_test.go index 8c94f63d..9bf405b3 100644 --- a/accounts/keystore/keystore_passphrase_test.go +++ b/accounts/keystore/keystore_passphrase_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) const ( diff --git a/accounts/keystore/keystore_plain.go b/accounts/keystore/keystore_plain.go index d90c9ce6..d3826d13 100644 --- a/accounts/keystore/keystore_plain.go +++ b/accounts/keystore/keystore_plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/keystore_plain_test.go b/accounts/keystore/keystore_plain_test.go index f66384fb..c73fb22d 100644 --- a/accounts/keystore/keystore_plain_test.go +++ b/accounts/keystore/keystore_plain_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" ) func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) { diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go index 2693cde8..2c16c4c4 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/keystore_wallet.go b/accounts/keystore/keystore_wallet.go index bee19cc4..30a0d8d5 100644 --- a/accounts/keystore/keystore_wallet.go +++ b/accounts/keystore/keystore_wallet.go @@ -19,9 +19,9 @@ package keystore import ( "math/big" - ethereum "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/core/types" + ethereum "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/core/types" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 04e4edcd..ab9f40d4 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/crypto" "github.com/google/uuid" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index f393b07f..7bd124dd 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -14,6 +14,7 @@ // You should have received a copy of the GNU Lesser General Public License // along with the go-ethereum library. If not, see . +//go:build (darwin && !ios) || freebsd || (linux && !arm64) || netbsd || solaris // +build darwin,!ios freebsd linux,!arm64 netbsd solaris package keystore @@ -21,7 +22,7 @@ package keystore import ( "time" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" "github.com/rjeczalik/notify" ) diff --git a/accounts/manager.go b/accounts/manager.go index ee4431e9..cb782b29 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/v4/event" ) // Manager is an overarching account manager that can communicate with various diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go index 209d1fa8..8ef4e38b 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" "github.com/karalabe/hid" ) diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index 18bbdc31..2a77b4ea 100644 --- a/accounts/usbwallet/ledger.go +++ b/accounts/usbwallet/ledger.go @@ -28,12 +28,12 @@ import ( "io" "math/big" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index 7cf2b26a..0e3adbb5 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -27,12 +27,12 @@ import ( "io" "math/big" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/accounts/usbwallet/internal/trezor" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/accounts/usbwallet/internal/trezor" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/log" "github.com/golang/protobuf/proto" ) diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index 04ef999d..37b29be7 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -25,11 +25,11 @@ import ( "sync" "time" - ethereum "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/log" + ethereum "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/log" "github.com/karalabe/hid" ) diff --git a/build/ci.go b/build/ci.go index 23820f38..cc9aaae4 100644 --- a/build/ci.go +++ b/build/ci.go @@ -14,6 +14,7 @@ // You should have received a copy of the GNU Lesser General Public License // along with the go-ethereum library. If not, see . +//go:build none // +build none /* @@ -58,8 +59,8 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/internal/build" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/internal/build" + "github.com/FusionFoundation/efsn/v4/params" ) var ( @@ -739,7 +740,7 @@ func doAndroidArchive(cmdline []string) { // Build the Android archive and Maven resources build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind")) build.MustRun(gomobileTool("init", "--ndk", os.Getenv("ANDROID_NDK"))) - build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/FusionFoundation/efsn/mobile")) + build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/FusionFoundation/efsn/v4/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven @@ -864,7 +865,7 @@ func doXCodeFramework(cmdline []string) { // Build the iOS XCode framework build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind")) build.MustRun(gomobileTool("init")) - bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "--tags", "ios", "-v", "github.com/FusionFoundation/efsn/mobile") + bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "--tags", "ios", "-v", "github.com/FusionFoundation/efsn/v4/mobile") if *local { // If we're building locally, use the build folder and stop afterwards diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index bcc67896..a1fda953 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/FusionFoundation/efsn/accounts/abi/bind" - "github.com/FusionFoundation/efsn/common/compiler" + "github.com/FusionFoundation/efsn/v4/accounts/abi/bind" + "github.com/FusionFoundation/efsn/v4/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 28b4c87c..aaf4f101 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,13 +24,13 @@ import ( "net" "os" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/discv5" - "github.com/FusionFoundation/efsn/p2p/nat" - "github.com/FusionFoundation/efsn/p2p/netutil" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/discv5" + "github.com/FusionFoundation/efsn/v4/p2p/nat" + "github.com/FusionFoundation/efsn/v4/p2p/netutil" ) func main() { diff --git a/cmd/clef/main.go b/cmd/clef/main.go index 19c15f08..7b8118af 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -35,15 +35,15 @@ import ( "runtime" "strings" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/rpc" - "github.com/FusionFoundation/efsn/signer/core" - "github.com/FusionFoundation/efsn/signer/rules" - "github.com/FusionFoundation/efsn/signer/storage" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/rpc" + "github.com/FusionFoundation/efsn/v4/signer/core" + "github.com/FusionFoundation/efsn/v4/signer/rules" + "github.com/FusionFoundation/efsn/v4/signer/storage" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/accountcmd.go b/cmd/efsn/accountcmd.go index b08532ec..10c0e33e 100644 --- a/cmd/efsn/accountcmd.go +++ b/cmd/efsn/accountcmd.go @@ -21,11 +21,11 @@ import ( "fmt" "io/ioutil" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/bugcmd.go b/cmd/efsn/bugcmd.go index 07b65c2b..e6da25b6 100644 --- a/cmd/efsn/bugcmd.go +++ b/cmd/efsn/bugcmd.go @@ -26,10 +26,10 @@ import ( "runtime" "strings" - "github.com/FusionFoundation/efsn/cmd/internal/browser" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/cmd/internal/browser" + "github.com/FusionFoundation/efsn/v4/params" - "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/v4/cmd/utils" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/chaincmd.go b/cmd/efsn/chaincmd.go index 84d0a1a8..da339368 100644 --- a/cmd/efsn/chaincmd.go +++ b/cmd/efsn/chaincmd.go @@ -26,17 +26,17 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/node" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/config.go b/cmd/efsn/config.go index 75c7b00f..85ddc3fe 100644 --- a/cmd/efsn/config.go +++ b/cmd/efsn/config.go @@ -20,7 +20,7 @@ import ( "bufio" "errors" "fmt" - "github.com/FusionFoundation/efsn/eth/ethconfig" + "github.com/FusionFoundation/efsn/v4/eth/ethconfig" "io" "os" "reflect" @@ -28,9 +28,9 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/params" "github.com/naoina/toml" ) diff --git a/cmd/efsn/consolecmd.go b/cmd/efsn/consolecmd.go index f4b78316..f4338f6c 100644 --- a/cmd/efsn/consolecmd.go +++ b/cmd/efsn/consolecmd.go @@ -24,10 +24,10 @@ import ( "strings" "syscall" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/console" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/console" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/consolecmd_test.go b/cmd/efsn/consolecmd_test.go index 6f0b3a09..96039804 100644 --- a/cmd/efsn/consolecmd_test.go +++ b/cmd/efsn/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/params" ) const ( diff --git a/cmd/efsn/dao_test.go b/cmd/efsn/dao_test.go index 2f132d5d..b82fd745 100644 --- a/cmd/efsn/dao_test.go +++ b/cmd/efsn/dao_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/params" ) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured) diff --git a/cmd/efsn/dbcmd.go b/cmd/efsn/dbcmd.go index 7d2a1f09..0303c9c9 100644 --- a/cmd/efsn/dbcmd.go +++ b/cmd/efsn/dbcmd.go @@ -24,14 +24,14 @@ import ( "strconv" "time" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/console/prompt" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/console/prompt" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/trie" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/main.go b/cmd/efsn/main.go index a0620960..b4ed18e1 100644 --- a/cmd/efsn/main.go +++ b/cmd/efsn/main.go @@ -27,19 +27,19 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/console/prompt" - "github.com/FusionFoundation/efsn/eth" - "github.com/FusionFoundation/efsn/ethclient" - "github.com/FusionFoundation/efsn/internal/debug" - "github.com/FusionFoundation/efsn/internal/ethapi" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" - "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/console/prompt" + "github.com/FusionFoundation/efsn/v4/eth" + "github.com/FusionFoundation/efsn/v4/ethclient" + "github.com/FusionFoundation/efsn/v4/internal/debug" + "github.com/FusionFoundation/efsn/v4/internal/ethapi" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/metrics" + "github.com/FusionFoundation/efsn/v4/node" gopsutil "github.com/shirou/gopsutil/mem" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/misccmd.go b/cmd/efsn/misccmd.go index a70fb71b..1ab716c5 100644 --- a/cmd/efsn/misccmd.go +++ b/cmd/efsn/misccmd.go @@ -22,8 +22,8 @@ import ( "runtime" "strings" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/rawtx.go b/cmd/efsn/rawtx.go index 461b1b41..61b7a56c 100644 --- a/cmd/efsn/rawtx.go +++ b/cmd/efsn/rawtx.go @@ -7,12 +7,12 @@ import ( "math/big" "strconv" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/rlp" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/run_test.go b/cmd/efsn/run_test.go index 03d20ed4..a0fee8c7 100644 --- a/cmd/efsn/run_test.go +++ b/cmd/efsn/run_test.go @@ -22,8 +22,8 @@ import ( "os" "testing" + "github.com/FusionFoundation/efsn/v4/internal/cmdtest" "github.com/docker/docker/pkg/reexec" - "github.com/FusionFoundation/efsn/internal/cmdtest" ) func tmpdir(t *testing.T) string { diff --git a/cmd/efsn/usage.go b/cmd/efsn/usage.go index 59fc9200..98a23f33 100644 --- a/cmd/efsn/usage.go +++ b/cmd/efsn/usage.go @@ -22,8 +22,8 @@ import ( "io" "sort" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/internal/debug" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/internal/debug" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/changepassphrase.go b/cmd/ethkey/changepassphrase.go index 79d9a210..57d027d7 100644 --- a/cmd/ethkey/changepassphrase.go +++ b/cmd/ethkey/changepassphrase.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "strings" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index de6355cf..446c04f3 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -23,9 +23,9 @@ import ( "os" "path/filepath" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/crypto" "github.com/google/uuid" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index ccda7b1a..2a31b968 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -21,9 +21,9 @@ import ( "fmt" "io/ioutil" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index f47931a1..59fc16c2 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/FusionFoundation/efsn/internal/flags" + "github.com/FusionFoundation/efsn/v4/internal/flags" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index ac1f4fbd..975730d1 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,10 +21,10 @@ import ( "fmt" "io/ioutil" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index 78d7c83e..a929e7b1 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" + "github.com/FusionFoundation/efsn/v4/internal/cmdtest" "github.com/docker/docker/pkg/reexec" - "github.com/FusionFoundation/efsn/internal/cmdtest" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 91a0d2a3..ac86421a 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,8 +22,8 @@ import ( "io/ioutil" "strings" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index 76e127a2..d75664ec 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "io/ioutil" - "github.com/FusionFoundation/efsn/cmd/evm/internal/compiler" + "github.com/FusionFoundation/efsn/v4/cmd/evm/internal/compiler" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 58aff327..578fb281 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/FusionFoundation/efsn/core/asm" + "github.com/FusionFoundation/efsn/v4/core/asm" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go index ac096b4a..4b377e11 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/FusionFoundation/efsn/core/asm" + "github.com/FusionFoundation/efsn/v4/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 366bf169..bbb95d8d 100644 --- a/cmd/evm/internal/t8ntool/execution.go +++ b/cmd/evm/internal/t8ntool/execution.go @@ -21,20 +21,20 @@ import ( "math/big" "os" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/consensus/misc" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/consensus/misc" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/trie" "golang.org/x/crypto/sha3" ) diff --git a/cmd/evm/internal/t8ntool/flags.go b/cmd/evm/internal/t8ntool/flags.go index f45c6ead..8ca53c4f 100644 --- a/cmd/evm/internal/t8ntool/flags.go +++ b/cmd/evm/internal/t8ntool/flags.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/tests" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/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 8e9a7590..234641f9 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/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/cmd/evm/internal/t8ntool/transaction.go b/cmd/evm/internal/t8ntool/transaction.go index b74514e0..20ea8446 100644 --- a/cmd/evm/internal/t8ntool/transaction.go +++ b/cmd/evm/internal/t8ntool/transaction.go @@ -24,14 +24,14 @@ import ( "os" "strings" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/tests" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/tests" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go index 50ac3d01..32ebe60d 100644 --- a/cmd/evm/internal/t8ntool/transition.go +++ b/cmd/evm/internal/t8ntool/transition.go @@ -27,17 +27,17 @@ import ( "path" "strings" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/tests" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/tests" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/main.go b/cmd/evm/main.go index fc7bf315..2669d59a 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,9 +22,9 @@ import ( "math/big" "os" - "github.com/FusionFoundation/efsn/cmd/evm/internal/t8ntool" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/internal/flags" + "github.com/FusionFoundation/efsn/v4/cmd/evm/internal/t8ntool" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/internal/flags" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 0bf8acd8..8b6b828b 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -28,16 +28,16 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/cmd/evm/internal/compiler" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/core/vm/runtime" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/cmd/evm/internal/compiler" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/core/vm/runtime" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index e66d51d8..f432bb3c 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -23,10 +23,10 @@ import ( "io/ioutil" "os" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/tests" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/tests" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/t8n_test.go b/cmd/evm/t8n_test.go index e2c445c7..244a6a6c 100644 --- a/cmd/evm/t8n_test.go +++ b/cmd/evm/t8n_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/FusionFoundation/efsn/internal/cmdtest" + "github.com/FusionFoundation/efsn/v4/internal/cmdtest" "github.com/docker/docker/pkg/reexec" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 33ff9879..52c27621 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -27,7 +27,7 @@ import ( "errors" "flag" "fmt" - "github.com/FusionFoundation/efsn/eth/ethconfig" + "github.com/FusionFoundation/efsn/v4/eth/ethconfig" "html/template" "io/ioutil" "math" @@ -42,22 +42,22 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/ethclient" - "github.com/FusionFoundation/efsn/ethstats" - "github.com/FusionFoundation/efsn/les" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/discv5" - "github.com/FusionFoundation/efsn/p2p/nat" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/ethclient" + "github.com/FusionFoundation/efsn/v4/ethstats" + "github.com/FusionFoundation/efsn/v4/les" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/discv5" + "github.com/FusionFoundation/efsn/v4/p2p/nat" + "github.com/FusionFoundation/efsn/v4/params" "golang.org/x/net/websocket" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index 38b24d2e..cc5f1302 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -45,12 +45,12 @@ import ( "strings" "text/tabwriter" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/simulations" - "github.com/FusionFoundation/efsn/p2p/simulations/adapters" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/simulations" + "github.com/FusionFoundation/efsn/v4/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/v4/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go index e06d880b..c47ac25d 100644 --- a/cmd/puppeth/genesis.go +++ b/cmd/puppeth/genesis.go @@ -21,10 +21,10 @@ import ( "errors" "math" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/params" ) // cppEthereumGenesisSpec represents the genesis specification format used by the diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index 5f7726c7..3dae30fe 100644 --- a/cmd/puppeth/module.go +++ b/cmd/puppeth/module.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 8226a056..dc2c70d5 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/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 224926ff..58e6aa14 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/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 734a09a1..687ab0d9 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/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 11809c6b..5a65de66 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 ea1c30e1..28049752 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/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 8ebe917b..3f2887cc 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -26,8 +26,8 @@ import ( "strings" "text/template" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/log" ) // nodeDockerfile is the Dockerfile required to run an Ethereum node. diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go index 8a2fbc88..ead04d1f 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index eb93c021..7efd28b1 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index 2135e095..f0fd6cb7 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go index 6b941dbb..d73f114e 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -30,9 +30,9 @@ import ( "strings" "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index 8aa7d5d9..82bbb189 100644 --- a/cmd/puppeth/wizard_dashboard.go +++ b/cmd/puppeth/wizard_dashboard.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/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 8a091824..be3c8dfa 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/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 41503790..0f400362 100644 --- a/cmd/puppeth/wizard_explorer.go +++ b/cmd/puppeth/wizard_explorer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/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 a72d7eac..b0a19311 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/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 a3b4da93..d78d9ad3 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -25,10 +25,10 @@ import ( "math/rand" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/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 72aa27ec..0c1740b4 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index 7684a72b..27d0db77 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/log" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index 9104d401..bf6de7ea 100644 --- a/cmd/puppeth/wizard_network.go +++ b/cmd/puppeth/wizard_network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/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 f5c5cc4b..2744e9b1 100644 --- a/cmd/puppeth/wizard_nginx.go +++ b/cmd/puppeth/wizard_nginx.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/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 4464293c..cdfb158b 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/log" ) // deployNode creates a new node configuration based on some user input. diff --git a/cmd/puppeth/wizard_wallet.go b/cmd/puppeth/wizard_wallet.go index 7b4de987..64cdd0a7 100644 --- a/cmd/puppeth/wizard_wallet.go +++ b/cmd/puppeth/wizard_wallet.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) // deployWallet creates a new web wallet based on some user input. diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index 92c3b247..8350b236 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/rlp" ) var ( diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index d13081eb..6091b28f 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -27,16 +27,16 @@ import ( "strings" "syscall" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/internal/debug" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/internal/debug" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index cfae4008..54133a1a 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 6c21898c..4b9903d1 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,33 +28,33 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/fdlimit" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/eth" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/eth/ethconfig" - "github.com/FusionFoundation/efsn/eth/gasprice" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/ethstats" - "github.com/FusionFoundation/efsn/les" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" - "github.com/FusionFoundation/efsn/metrics/influxdb" - "github.com/FusionFoundation/efsn/miner" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/discv5" - "github.com/FusionFoundation/efsn/p2p/nat" - "github.com/FusionFoundation/efsn/p2p/netutil" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/fdlimit" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/eth" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/eth/ethconfig" + "github.com/FusionFoundation/efsn/v4/eth/gasprice" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/ethstats" + "github.com/FusionFoundation/efsn/v4/les" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/metrics" + "github.com/FusionFoundation/efsn/v4/metrics/influxdb" + "github.com/FusionFoundation/efsn/v4/miner" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/discv5" + "github.com/FusionFoundation/efsn/v4/p2p/nat" + "github.com/FusionFoundation/efsn/v4/p2p/netutil" + "github.com/FusionFoundation/efsn/v4/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/prompt.go b/cmd/utils/prompt.go index b8e442b0..87a2c62f 100644 --- a/cmd/utils/prompt.go +++ b/cmd/utils/prompt.go @@ -20,7 +20,7 @@ package utils import ( "fmt" - "github.com/FusionFoundation/efsn/console/prompt" + "github.com/FusionFoundation/efsn/v4/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 8a9885b5..e2c4cb07 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/fsnargs.go b/common/fsnargs.go index 7340a8f3..c7aed41a 100644 --- a/common/fsnargs.go +++ b/common/fsnargs.go @@ -3,7 +3,7 @@ package common import ( "math/big" - "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/hexutil" ) type FSNBaseArgsInterface interface { diff --git a/common/fsnparams.go b/common/fsnparams.go index 2c95140c..9be18f0b 100644 --- a/common/fsnparams.go +++ b/common/fsnparams.go @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/rlp" ) /////////////////// param type /////////////////////// diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index ab16a61d..72a1c2d8 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/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index 3e8d3bad..20bef357 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/prque/lazyqueue.go b/common/prque/lazyqueue.go index a5b61ad9..87384528 100644 --- a/common/prque/lazyqueue.go +++ b/common/prque/lazyqueue.go @@ -20,7 +20,7 @@ import ( "container/heap" "time" - "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/v4/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 3caa9b39..8028fa6f 100644 --- a/common/prque/lazyqueue_test.go +++ b/common/prque/lazyqueue_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/v4/common/mclock" ) const ( diff --git a/common/ticket.go b/common/ticket.go index ce89f117..55164458 100644 --- a/common/ticket.go +++ b/common/ticket.go @@ -5,7 +5,7 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) // TicketPrice place holder for ticket price diff --git a/common/timelock.go b/common/timelock.go index 39449bed..ad356244 100644 --- a/common/timelock.go +++ b/common/timelock.go @@ -6,7 +6,7 @@ import ( "math/big" "sort" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) // TimeLockType wacom diff --git a/common/types.go b/common/types.go index a7e7da06..7700b81a 100644 --- a/common/types.go +++ b/common/types.go @@ -26,7 +26,7 @@ import ( "reflect" "strings" - "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/hexutil" "golang.org/x/crypto/sha3" ) diff --git a/consensus/consensus.go b/consensus/consensus.go index 67c6dcc8..c98fa13e 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -20,11 +20,11 @@ package consensus import ( "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rpc" ) // ChainReader defines a small collection of methods needed to access the local diff --git a/consensus/datong/api.go b/consensus/datong/api.go index 9193b65e..58df8bc5 100644 --- a/consensus/datong/api.go +++ b/consensus/datong/api.go @@ -6,11 +6,11 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/rpc" ) // API wacom diff --git a/consensus/datong/checkpoints.go b/consensus/datong/checkpoints.go index 62a296bf..93493114 100644 --- a/consensus/datong/checkpoints.go +++ b/consensus/datong/checkpoints.go @@ -6,10 +6,10 @@ import ( "io/ioutil" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" ) var ( diff --git a/consensus/datong/consensus.go b/consensus/datong/consensus.go index 5a8fb592..33902585 100644 --- a/consensus/datong/consensus.go +++ b/consensus/datong/consensus.go @@ -6,27 +6,27 @@ import ( "encoding/json" "errors" "fmt" - "github.com/FusionFoundation/efsn/consensus/misc" + "github.com/FusionFoundation/efsn/v4/consensus/misc" "math/big" "sort" "sync" "time" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - cmath "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/rpc" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + cmath "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/rpc" + "github.com/FusionFoundation/efsn/v4/trie" "golang.org/x/crypto/sha3" ) diff --git a/consensus/datong/report.go b/consensus/datong/report.go index 3908c686..55c6b2e4 100644 --- a/consensus/datong/report.go +++ b/consensus/datong/report.go @@ -6,11 +6,11 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/rlp" ) const ( diff --git a/consensus/datong/snapshot.go b/consensus/datong/snapshot.go index 4516a12d..49aa947b 100644 --- a/consensus/datong/snapshot.go +++ b/consensus/datong/snapshot.go @@ -3,9 +3,9 @@ package datong import ( "errors" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" ) // Snapshot wacom diff --git a/consensus/datong/votefork.go b/consensus/datong/votefork.go index ecdca461..9f8c03a1 100644 --- a/consensus/datong/votefork.go +++ b/consensus/datong/votefork.go @@ -3,8 +3,8 @@ package datong import ( "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/state" ) //-------------------------- vote1 fork ------------------------- diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 570bd0ec..3d92e049 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,10 +21,10 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/params" ) var ( diff --git a/consensus/misc/eip1559.go b/consensus/misc/eip1559.go index b5bdf609..7688394d 100644 --- a/consensus/misc/eip1559.go +++ b/consensus/misc/eip1559.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/params" ) // VerifyEip1559Header verifies some header attributes which were changed in EIP-1559, diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 1967b454..80bf47de 100644 --- a/consensus/misc/forks.go +++ b/consensus/misc/forks.go @@ -19,9 +19,9 @@ package misc import ( "fmt" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/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 32f03edb..7bb59e0b 100644 --- a/consensus/misc/gaslimit.go +++ b/consensus/misc/gaslimit.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/params" ) // VerifyGaslimit verifies the header gas limit according increase/decrease diff --git a/console/bridge.go b/console/bridge.go index 40b7bd38..e4ae3d52 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -24,11 +24,11 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/accounts/usbwallet" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/console/prompt" - "github.com/FusionFoundation/efsn/internal/jsre" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/accounts/usbwallet" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/console/prompt" + "github.com/FusionFoundation/efsn/v4/internal/jsre" + "github.com/FusionFoundation/efsn/v4/rpc" "github.com/dop251/goja" ) diff --git a/console/console.go b/console/console.go index 77632682..20721c8b 100644 --- a/console/console.go +++ b/console/console.go @@ -28,11 +28,11 @@ import ( "strings" "syscall" - "github.com/FusionFoundation/efsn/console/prompt" - "github.com/FusionFoundation/efsn/internal/jsre" - "github.com/FusionFoundation/efsn/internal/jsre/deps" - "github.com/FusionFoundation/efsn/internal/web3ext" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/console/prompt" + "github.com/FusionFoundation/efsn/v4/internal/jsre" + "github.com/FusionFoundation/efsn/v4/internal/jsre/deps" + "github.com/FusionFoundation/efsn/v4/internal/web3ext" + "github.com/FusionFoundation/efsn/v4/rpc" "github.com/dop251/goja" "github.com/mattn/go-colorable" "github.com/peterh/liner" diff --git a/console/console_test.go b/console/console_test.go index 949e60f3..ba001566 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -20,20 +20,20 @@ import ( "bytes" "errors" "fmt" - "github.com/FusionFoundation/efsn/console/prompt" - "github.com/FusionFoundation/efsn/eth/ethconfig" + "github.com/FusionFoundation/efsn/v4/console/prompt" + "github.com/FusionFoundation/efsn/v4/eth/ethconfig" "io/ioutil" "os" "strings" "testing" "time" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/eth" - "github.com/FusionFoundation/efsn/internal/jsre" - "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/eth" + "github.com/FusionFoundation/efsn/v4/internal/jsre" + "github.com/FusionFoundation/efsn/v4/node" ) const ( diff --git a/core/asm/asm.go b/core/asm/asm.go index 90fcb105..2159c42b 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/v4/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index 10b67ba4..c59cf278 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -22,8 +22,8 @@ import ( "os" "strings" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index ff1fea6c..c261f99e 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index e963edd8..980abf2c 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -19,14 +19,14 @@ package core import ( "fmt" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/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 5fb4a0ca..fc4b35b2 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index 2111bb82..9597e8c8 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -28,22 +28,22 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/common/prque" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/common/prque" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/metrics" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 92da8a21..d8f1d7e3 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -24,16 +24,16 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" ) // So we can deterministically seed different blockchains diff --git a/core/blocks.go b/core/blocks.go index cf4a7ae2..4b74b3dd 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -16,7 +16,7 @@ package core -import "github.com/FusionFoundation/efsn/common" +import "github.com/FusionFoundation/efsn/v4/common" // BadHashes represent a set of manually tracked bad hashes (usually hard forks) var BadHashes = map[common.Hash]bool{ diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go index f620ad9a..bbf2dae6 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -19,7 +19,7 @@ package bloombits import ( "errors" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/core/types" ) var ( diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index 8d756aea..88af6d64 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/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 da821823..e4fe6208 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common/bitutil" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common/bitutil" + "github.com/FusionFoundation/efsn/v4/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 b5710420..b052bb98 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) const testSectionSize = 4096 diff --git a/core/chain_indexer.go b/core/chain_indexer.go index 2afd0dbc..b32552e9 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -24,12 +24,12 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/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 da346da3..8417d4ea 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index 340a0948..5806eeec 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/consensus/misc" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/consensus/misc" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" ) // BlockGen creates blocks for testing. diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index ff7707da..9ad0896d 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index 317b12ae..41a8d965 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/error.go b/core/error.go index 43eccbb8..8bd21af3 100644 --- a/core/error.go +++ b/core/error.go @@ -19,7 +19,7 @@ package core import ( "errors" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/core/types" ) var ( diff --git a/core/events.go b/core/events.go index 8c47ad91..f944abc6 100644 --- a/core/events.go +++ b/core/events.go @@ -17,8 +17,8 @@ package core import ( - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 7d4bd9c1..27c51abc 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,10 +19,10 @@ package core import ( "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index 0b6f8753..33fe00d5 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index b8206089..c913987d 100644 --- a/core/gen_genesis_account.go +++ b/core/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index e67c0613..17795a83 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -25,19 +25,19 @@ import ( "math/big" "strings" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/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 d92b6fa9..854611a4 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -21,13 +21,13 @@ import ( "reflect" "testing" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" "github.com/davecgh/go-spew/spew" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index 8c7b909e..1904430b 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -26,14 +26,14 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/helper_test.go b/core/helper_test.go index 0fa78c7d..f650ea0b 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -19,9 +19,9 @@ package core import ( "container/list" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index 71f7bede..e3682243 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -34,8 +34,8 @@ import ( "sort" "strconv" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index 2c0d53b8..c4a51977 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -22,13 +22,13 @@ import ( "math/big" "sort" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/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 669bccec..1760aaa5 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -27,10 +27,10 @@ import ( "reflect" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index 93f8c373..3836de95 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -20,12 +20,12 @@ import ( "bytes" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/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 5698e381..fe79beff 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/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index 1532a197..a3ae07c3 100644 --- a/core/rawdb/accessors_metadata.go +++ b/core/rawdb/accessors_metadata.go @@ -18,12 +18,12 @@ package rawdb import ( "encoding/json" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/ethdb" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" ) // ReadDatabaseVersion retrieves the version number of the database. diff --git a/core/rawdb/accessors_state.go b/core/rawdb/accessors_state.go index bfa07603..1e38b755 100644 --- a/core/rawdb/accessors_state.go +++ b/core/rawdb/accessors_state.go @@ -17,9 +17,9 @@ package rawdb import ( - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" ) // ReadPreimage retrieves a single preimage of the provided hash. diff --git a/core/rawdb/database.go b/core/rawdb/database.go index cb8d2cb8..96ff774a 100644 --- a/core/rawdb/database.go +++ b/core/rawdb/database.go @@ -24,11 +24,11 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/ethdb/leveldb" - "github.com/FusionFoundation/efsn/ethdb/memorydb" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/ethdb/leveldb" + "github.com/FusionFoundation/efsn/v4/ethdb/memorydb" + "github.com/FusionFoundation/efsn/v4/log" "github.com/olekukonko/tablewriter" ) diff --git a/core/rawdb/freezer.go b/core/rawdb/freezer.go index 3a161da6..ad3fb8d0 100644 --- a/core/rawdb/freezer.go +++ b/core/rawdb/freezer.go @@ -26,11 +26,11 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/metrics" + "github.com/FusionFoundation/efsn/v4/params" "github.com/prometheus/tsdb/fileutil" ) diff --git a/core/rawdb/freezer_table.go b/core/rawdb/freezer_table.go index af677c1a..f9513219 100644 --- a/core/rawdb/freezer_table.go +++ b/core/rawdb/freezer_table.go @@ -26,9 +26,9 @@ import ( "sync" "sync/atomic" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/metrics" "github.com/golang/snappy" ) diff --git a/core/rawdb/freezer_table_test.go b/core/rawdb/freezer_table_test.go index e0e0fcba..e5be5e72 100644 --- a/core/rawdb/freezer_table_test.go +++ b/core/rawdb/freezer_table_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/v4/metrics" ) func init() { diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go index a1fa9560..7df11a3b 100644 --- a/core/rawdb/schema.go +++ b/core/rawdb/schema.go @@ -21,8 +21,8 @@ import ( "bytes" "encoding/binary" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/metrics" ) // The fields below define the low level database schema prefixing. diff --git a/core/rawdb/table.go b/core/rawdb/table.go index 149e3ad1..81be9c2a 100644 --- a/core/rawdb/table.go +++ b/core/rawdb/table.go @@ -17,7 +17,7 @@ package rawdb import ( - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/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 51931c71..fb0ca50c 100644 --- a/core/rawdb/table_test.go +++ b/core/rawdb/table_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/ethdb" ) func TestTableDatabase(t *testing.T) { testTableDatabase(t, "prefix") } diff --git a/core/state/access_list.go b/core/state/access_list.go index 389925b2..2659a201 100644 --- a/core/state/access_list.go +++ b/core/state/access_list.go @@ -17,7 +17,7 @@ package state import ( - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) type accessList struct { diff --git a/core/state/database.go b/core/state/database.go index 34a3eba3..c173a9bf 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -20,10 +20,10 @@ import ( "errors" "fmt" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/trie" "github.com/VictoriaMetrics/fastcache" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/dump.go b/core/state/dump.go index d7440be5..512c075e 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -19,14 +19,14 @@ package state import ( "encoding/json" "fmt" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/log" "math/big" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/trie" ) // DumpConfig is a set of options to control what portions of the state will be diff --git a/core/state/iterator.go b/core/state/iterator.go index 3e7a7582..bfc9ee3e 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -20,9 +20,9 @@ import ( "bytes" "fmt" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/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 a641efac..9a5445c9 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 fdf55d8e..430933fe 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -19,7 +19,7 @@ package state import ( "math/big" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // journalEntry is a modification entry in the state change journal that can be diff --git a/core/state/state_object.go b/core/state/state_object.go index 22732bfa..ee649710 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index c30cf8a6..d283b6ab 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index a7d8ac87..f0f9f571 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -22,18 +22,18 @@ import ( "compress/gzip" "encoding/binary" "fmt" - "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/rawdb" "io" "math/big" "sort" "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/trie" ) type revision struct { diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index 4db658e1..a77f933e 100644 --- a/core/state/statedb_test.go +++ b/core/state/statedb_test.go @@ -30,9 +30,9 @@ import ( check "gopkg.in/check.v1" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" ) // 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 48cacea1..81601685 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -19,10 +19,10 @@ package state import ( "bytes" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 2fa67757..3a0336ac 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/trie" ) // testAccount is the data associated with an account used by the state tests. diff --git a/core/state_processor.go b/core/state_processor.go index 556f0183..3f9733e3 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -18,14 +18,14 @@ package core import ( "fmt" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/consensus/misc" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/consensus/misc" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/params" "math/big" ) diff --git a/core/state_transition.go b/core/state_transition.go index 166c09d0..f27ca802 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -19,21 +19,21 @@ package core import ( "encoding/json" "fmt" - cmath "github.com/FusionFoundation/efsn/common/math" + cmath "github.com/FusionFoundation/efsn/v4/common/math" "math" "math/big" "reflect" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" ) var emptyCodeHash = crypto.Keccak256Hash(nil) diff --git a/core/tx_cacher.go b/core/tx_cacher.go index c33c29dc..a6264209 100644 --- a/core/tx_cacher.go +++ b/core/tx_cacher.go @@ -19,7 +19,7 @@ package core import ( "runtime" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/core/types" ) // senderCacher is a concurrent transaction sender recoverer anc cacher. diff --git a/core/tx_journal.go b/core/tx_journal.go index 0fb14b7f..bf46abf9 100644 --- a/core/tx_journal.go +++ b/core/tx_journal.go @@ -21,10 +21,10 @@ import ( "io" "os" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/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 5ee50a10..2cd69586 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -23,8 +23,8 @@ import ( "sort" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 232c5a10..4c141cfc 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -20,8 +20,8 @@ import ( "math/rand" "testing" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/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 dcae0e5f..9626d82b 100644 --- a/core/tx_noncer.go +++ b/core/tx_noncer.go @@ -19,8 +19,8 @@ package core import ( "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 1d175bcf..a31b5f3b 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -20,23 +20,23 @@ import ( "bytes" "errors" "fmt" - "github.com/FusionFoundation/efsn/consensus/misc" + "github.com/FusionFoundation/efsn/v4/consensus/misc" "math" "math/big" "sort" "sync" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/prque" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/prque" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/metrics" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" ) const ( diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 2f2d6662..34759460 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index 24d43176..20fa2c5e 100644 --- a/core/types.go +++ b/core/types.go @@ -17,9 +17,9 @@ package core import ( - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/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 426ab69f..4ffa4c17 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) //go:generate gencodec -type AccessTuple -out gen_access_tuple.go diff --git a/core/types/block.go b/core/types/block.go index 5b7bac3c..dfc3fdd3 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -19,9 +19,9 @@ package types import ( "encoding/binary" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/rlp" "io" "math/big" "reflect" diff --git a/core/types/block_test.go b/core/types/block_test.go index d35ff85f..5c7b509f 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -23,8 +23,8 @@ import ( "reflect" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index 4fed2b2b..dcfe164f 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index b5d357b3..f0d389f4 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -54,7 +54,7 @@ func TestBloom(t *testing.T) { import ( "testing" - "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/v4/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/dynamic_fee_tx.go b/core/types/dynamic_fee_tx.go index 14c799a1..932b9abf 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) type DynamicFeeTx struct { diff --git a/core/types/gen_access_tuple.go b/core/types/gen_access_tuple.go index a51e9c1a..2b6feba9 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // MarshalJSON marshals as JSON. diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 568a6dd1..5f09566f 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 19df4dd9..a141e109 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/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 717d0eed..0a67b14b 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/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/hashing.go b/core/types/hashing.go index 637f68bb..c776bcdb 100644 --- a/core/types/hashing.go +++ b/core/types/hashing.go @@ -20,9 +20,9 @@ import ( "bytes" "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/types/hashing_test.go b/core/types/hashing_test.go index 79d85fc6..a77f40f6 100644 --- a/core/types/hashing_test.go +++ b/core/types/hashing_test.go @@ -24,12 +24,12 @@ import ( mrand "math/rand" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/trie" ) func TestDeriveSha(t *testing.T) { diff --git a/core/types/legacy_tx.go b/core/types/legacy_tx.go index 529480aa..d8dc5503 100644 --- a/core/types/legacy_tx.go +++ b/core/types/legacy_tx.go @@ -19,7 +19,7 @@ package types import ( "math/big" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // LegacyTx is the transaction data of regular Ethereum transactions. diff --git a/core/types/log.go b/core/types/log.go index 8153dec2..24c8d22c 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -19,9 +19,9 @@ package types import ( "io" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/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 e5f6a6da..01819cf3 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" "github.com/davecgh/go-spew/spew" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index f1ddeab7..546ec370 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -24,11 +24,11 @@ import ( "math/big" "unsafe" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/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 19ba0ae8..5b83f9c5 100644 --- a/core/types/receipt_test.go +++ b/core/types/receipt_test.go @@ -23,10 +23,10 @@ import ( "reflect" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" ) func TestDecodeEmptyTypedReceipt(t *testing.T) { diff --git a/core/types/transaction.go b/core/types/transaction.go index aff8f4d7..ea16fd1f 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -20,15 +20,15 @@ import ( "bytes" "container/heap" "errors" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common/math" "io" "math/big" "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" ) //go:generate gencodec -type txdata -field-override txdataMarshaling -out gen_tx_json.go diff --git a/core/types/transaction_marshalling.go b/core/types/transaction_marshalling.go index 1c80a9d5..7bf7d394 100644 --- a/core/types/transaction_marshalling.go +++ b/core/types/transaction_marshalling.go @@ -21,8 +21,8 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" ) // txJSON is the JSON representation of transactions. diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index 41768c06..18260662 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -22,9 +22,9 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/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 ae3ae16b..d8be378a 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/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index a85437e2..e8b62a73 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go index 4ab765cd..331618df 100644 --- a/core/vm/analysis_test.go +++ b/core/vm/analysis_test.go @@ -19,7 +19,7 @@ package vm import ( "testing" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/crypto" ) func TestJumpDestAnalysis(t *testing.T) { diff --git a/core/vm/common.go b/core/vm/common.go index 3ca82fa3..9a87f6d2 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -17,8 +17,8 @@ package vm import ( - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" "github.com/holiman/uint256" ) diff --git a/core/vm/contract.go b/core/vm/contract.go index b47d8e65..50266e46 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -20,7 +20,7 @@ import ( "github.com/holiman/uint256" "math/big" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 45c7eb0f..78626836 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -22,12 +22,12 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/crypto/blake2b" - "github.com/FusionFoundation/efsn/crypto/bn256" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/crypto/blake2b" + "github.com/FusionFoundation/efsn/v4/crypto/bn256" + "github.com/FusionFoundation/efsn/v4/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 70a8fba9..9f6cae01 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -21,7 +21,7 @@ import ( "math/big" "testing" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/eips.go b/core/vm/eips.go index ce1b4656..6e094f91 100644 --- a/core/vm/eips.go +++ b/core/vm/eips.go @@ -20,8 +20,8 @@ import ( "fmt" "sort" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/params" "github.com/holiman/uint256" ) diff --git a/core/vm/evm.go b/core/vm/evm.go index 678571c2..5aab288e 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -22,9 +22,9 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/params" ) // emptyCodeHash is used by create to ensure deployment is disallowed to already diff --git a/core/vm/fsncontract.go b/core/vm/fsncontract.go index 26b97931..89b01315 100644 --- a/core/vm/fsncontract.go +++ b/core/vm/fsncontract.go @@ -4,8 +4,8 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/params" ) var ( diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index c0b92a87..d65a661d 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -19,9 +19,9 @@ package vm import ( "errors" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/params" ) // memoryGasCosts calculates the quadratic gas for memory expansion. It does so diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go index 818f74ee..cc42d17d 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -5,9 +5,9 @@ package vm import ( "encoding/json" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" "github.com/holiman/uint256" ) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 66c5c2a8..88981a2a 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -20,9 +20,9 @@ import ( "github.com/holiman/uint256" "golang.org/x/crypto/sha3" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/params" ) func opAdd(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) { diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 38383f5e..75c2aaae 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -23,9 +23,9 @@ import ( "io/ioutil" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/params" "github.com/holiman/uint256" ) diff --git a/core/vm/interface.go b/core/vm/interface.go index 9991fa6e..52998ec8 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 204cd5e6..fac20e19 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -20,9 +20,9 @@ import ( "hash" "sync/atomic" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/log" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index d6463b15..d62fb033 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -17,7 +17,7 @@ package vm import ( - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index fe7d6ece..9ac94576 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -24,11 +24,11 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/params" "github.com/holiman/uint256" ) diff --git a/core/vm/logger_json.go b/core/vm/logger_json.go index f894d3c3..4d0eb3d0 100644 --- a/core/vm/logger_json.go +++ b/core/vm/logger_json.go @@ -22,8 +22,8 @@ import ( "math/big" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" ) type JSONLogger struct { diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index 7be2125d..825a8a6b 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/params" "github.com/holiman/uint256" ) diff --git a/core/vm/noop.go b/core/vm/noop.go index aa0a1903..9e2a8412 100644 --- a/core/vm/noop.go +++ b/core/vm/noop.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" ) func NoopCanTransfer(db StateDB, from common.Address, balance *big.Int) bool { diff --git a/core/vm/operations_acl.go b/core/vm/operations_acl.go index bb2157cc..656462bc 100644 --- a/core/vm/operations_acl.go +++ b/core/vm/operations_acl.go @@ -19,9 +19,9 @@ package vm import ( "errors" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/params" ) func makeGasSStoreFunc(clearingRefund uint64) gasFunc { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index dfbc2013..e1b694fa 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -17,8 +17,8 @@ package runtime import ( - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 0a98c811..d22b9107 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -21,12 +21,12 @@ import ( "math/big" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/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 2f9235b0..d29718ba 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/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/vm/runtime" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 5a7dc04d..14705690 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -21,11 +21,11 @@ import ( "strings" "testing" - "github.com/FusionFoundation/efsn/accounts/abi" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/accounts/abi" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/ethdb" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index 1508e669..00bb1b53 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -17,7 +17,7 @@ package vm import ( - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/params" ) func minSwapStack(n int) int { diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go index 3f6c5226..8f969ab8 100644 --- a/crypto/bn256/bn256_fast.go +++ b/crypto/bn256/bn256_fast.go @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. +//go:build amd64 || arm64 // +build amd64 arm64 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 import ( - bn256cf "github.com/FusionFoundation/efsn/crypto/bn256/cloudflare" + bn256cf "github.com/FusionFoundation/efsn/v4/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 7e64ab9a..a864589d 100644 --- a/crypto/bn256/bn256_slow.go +++ b/crypto/bn256/bn256_slow.go @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. +//go:build !amd64 && !arm64 // +build !amd64,!arm64 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import bn256 "github.com/FusionFoundation/efsn/crypto/bn256/google" +import bn256 "github.com/FusionFoundation/efsn/v4/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 b3783224..8fedd701 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -30,9 +30,9 @@ import ( "math/big" "os" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/rlp" "golang.org/x/crypto/sha3" ) diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 58c67e75..7d10d654 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -26,8 +26,8 @@ import ( "reflect" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index e2a7e7fe..c555715d 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -39,7 +39,7 @@ import ( "math/big" "testing" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/crypto" ) func TestKDF(t *testing.T) { diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 8e33689a..5bd973cb 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/FusionFoundation/efsn/crypto" + ethcrypto "github.com/FusionFoundation/efsn/v4/crypto" ) var ( diff --git a/crypto/secp256k1/dummy.go b/crypto/secp256k1/dummy.go index b98ea1ee..5dd48889 100644 --- a/crypto/secp256k1/dummy.go +++ b/crypto/secp256k1/dummy.go @@ -1,3 +1,4 @@ +//go:build dummy // +build dummy // This file is part of a workaround for `go mod vendor` which won't vendor @@ -14,7 +15,7 @@ package secp256k1 import ( - _ "github.com/FusionFoundation/efsn/crypto/secp256k1/libsecp256k1/include" - _ "github.com/FusionFoundation/efsn/crypto/secp256k1/libsecp256k1/src" - _ "github.com/FusionFoundation/efsn/crypto/secp256k1/libsecp256k1/src/modules/recovery" + _ "github.com/FusionFoundation/efsn/v4/crypto/secp256k1/libsecp256k1/include" + _ "github.com/FusionFoundation/efsn/v4/crypto/secp256k1/libsecp256k1/src" + _ "github.com/FusionFoundation/efsn/v4/crypto/secp256k1/libsecp256k1/src/modules/recovery" ) diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index b5fce01e..e2d101cb 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -14,6 +14,7 @@ // You should have received a copy of the GNU Lesser General Public License // along with the go-ethereum library. If not, see . +//go:build !nacl && !js && cgo && !gofuzz // +build !nacl,!js,cgo,!gofuzz package crypto @@ -23,8 +24,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/crypto/secp256k1" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/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 a3455f3f..2fe3ce4a 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" ) var ( diff --git a/eth/api.go b/eth/api.go index 3b1e0619..082ea873 100644 --- a/eth/api.go +++ b/eth/api.go @@ -28,16 +28,16 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/internal/ethapi" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/rpc" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/internal/ethapi" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/rpc" + "github.com/FusionFoundation/efsn/v4/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index 6bea9ba8..bef32bbe 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -21,21 +21,21 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/bloombits" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/eth/gasprice" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/bloombits" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/eth/gasprice" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rpc" ) // EthAPIBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index 0b9f76d6..229354b4 100644 --- a/eth/api_test.go +++ b/eth/api_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/ethdb" "github.com/davecgh/go-spew/spew" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/backend.go b/eth/backend.go index f7995b59..d5a08fd5 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -20,36 +20,36 @@ package eth import ( "errors" "fmt" - "github.com/FusionFoundation/efsn/eth/ethconfig" - "github.com/FusionFoundation/efsn/eth/tracers" + "github.com/FusionFoundation/efsn/v4/eth/ethconfig" + "github.com/FusionFoundation/efsn/v4/eth/tracers" "math/big" "runtime" "sync" "sync/atomic" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/bloombits" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/eth/filters" - "github.com/FusionFoundation/efsn/eth/gasprice" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/internal/ethapi" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/miner" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/bloombits" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/eth/filters" + "github.com/FusionFoundation/efsn/v4/eth/gasprice" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/internal/ethapi" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/miner" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/rpc" ) type LesServer interface { diff --git a/eth/bloombits.go b/eth/bloombits.go index 25e6a89c..fef6692b 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -20,13 +20,13 @@ import ( "context" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/bitutil" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/bloombits" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/bitutil" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/bloombits" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" ) const ( diff --git a/eth/downloader/api.go b/eth/downloader/api.go index 3407f9c9..72fb3eb1 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -20,9 +20,9 @@ import ( "context" "sync" - ethereum "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/rpc" + ethereum "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/rpc" ) // PublicDownloaderAPI provides an API which gives information about the current synchronisation status. @@ -40,8 +40,8 @@ type PublicDownloaderAPI struct { // installSyncSubscription channel. func NewPublicDownloaderAPI(d *Downloader, m *event.TypeMux) *PublicDownloaderAPI { api := &PublicDownloaderAPI{ - d: d, - mux: m, + d: d, + mux: m, installSyncSubscription: make(chan chan interface{}), uninstallSyncSubscription: make(chan *uninstallSyncSubscriptionRequest), } diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 078c55d0..13903ac3 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,16 +25,16 @@ import ( "sync/atomic" "time" - ethereum "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/trie" + ethereum "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/metrics" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/trie" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index 0f7cb298..769b3f0f 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/trie" ) var ( diff --git a/eth/downloader/events.go b/eth/downloader/events.go index e45f75b3..24f3d7a8 100644 --- a/eth/downloader/events.go +++ b/eth/downloader/events.go @@ -16,7 +16,7 @@ package downloader -import "github.com/FusionFoundation/efsn/core/types" +import "github.com/FusionFoundation/efsn/v4/core/types" type DoneEvent struct { Latest *types.Header diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index 2bec1056..44935041 100644 --- a/eth/downloader/metrics.go +++ b/eth/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/v4/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index 47f5a4d3..e899c711 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 0716282a..3d4f3186 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -26,12 +26,12 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/prque" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/prque" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/metrics" + "github.com/FusionFoundation/efsn/v4/trie" ) const ( diff --git a/eth/downloader/resultstore.go b/eth/downloader/resultstore.go index e9ea542e..f4869559 100644 --- a/eth/downloader/resultstore.go +++ b/eth/downloader/resultstore.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/core/types" ) // resultStore implements a structure for maintaining fetchResults, tracking their diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index 3eff66a6..7b9828ac 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -21,13 +21,13 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/trie" "golang.org/x/crypto/sha3" ) diff --git a/eth/downloader/types.go b/eth/downloader/types.go index 7019cb12..d73e709a 100644 --- a/eth/downloader/types.go +++ b/eth/downloader/types.go @@ -19,7 +19,7 @@ package downloader import ( "fmt" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/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 36b29f97..e82bbda0 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -22,11 +22,11 @@ import ( "os/user" "time" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/eth/gasprice" - "github.com/FusionFoundation/efsn/miner" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/eth/gasprice" + "github.com/FusionFoundation/efsn/v4/miner" + "github.com/FusionFoundation/efsn/v4/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 9f282220..f0b096f3 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -5,10 +5,10 @@ package ethconfig import ( "time" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/eth/gasprice" - "github.com/FusionFoundation/efsn/miner" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/eth/gasprice" + "github.com/FusionFoundation/efsn/v4/miner" ) // MarshalTOML marshals as TOML. diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go index 43ee2d83..577b5c1f 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,12 +22,12 @@ import ( "math/rand" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/prque" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/prque" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/trie" ) const ( diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 1fb5d409..85d93894 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index 60eff661..73c75bce 100644 --- a/eth/fetcher/metrics.go +++ b/eth/fetcher/metrics.go @@ -19,7 +19,7 @@ package fetcher import ( - "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/v4/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 8cd012c3..c94ef52a 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,12 +25,12 @@ import ( "sync" "time" - ethereum "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/rpc" + ethereum "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 993923b9..a2c1551b 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index abc394eb..cc5b2709 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/bitutil" - "github.com/FusionFoundation/efsn/core/bloombits" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/bitutil" + "github.com/FusionFoundation/efsn/v4/core/bloombits" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 0ed2b411..07c2160c 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -21,13 +21,13 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/bloombits" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/bloombits" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 25997053..169f4567 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -24,14 +24,14 @@ import ( "sync" "time" - ethereum "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rpc" + ethereum "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/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 19d4ef6a..21339571 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -25,17 +25,17 @@ import ( "testing" "time" - ethereum "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/common" - - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/bloombits" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rpc" + ethereum "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/common" + + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/bloombits" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 79dbe1e4..4a4688a3 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/FusionFoundation/efsn/common" - - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 82099d20..e05abad6 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -22,13 +22,13 @@ import ( "sort" "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rpc" lru "github.com/hashicorp/golang-lru" ) diff --git a/eth/handler.go b/eth/handler.go index ff0aae24..7b61f738 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -20,27 +20,27 @@ import ( "encoding/json" "errors" "fmt" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/trie" "math" "math/big" "sync" "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/eth/fetcher" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/eth/fetcher" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index 5ddbf9c0..d69dfc0b 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -17,25 +17,25 @@ package eth import ( - "github.com/FusionFoundation/efsn/eth/ethconfig" + "github.com/FusionFoundation/efsn/v4/eth/ethconfig" "math" "math/big" "math/rand" "testing" "time" - "github.com/FusionFoundation/efsn/common" - - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/params" ) // Tests that protocol versions and modes of operations are matched up properly. diff --git a/eth/helper_test.go b/eth/helper_test.go index 9ca2d506..24d7fd56 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -22,24 +22,24 @@ package eth import ( "crypto/ecdsa" "crypto/rand" - "github.com/FusionFoundation/efsn/eth/ethconfig" + "github.com/FusionFoundation/efsn/v4/eth/ethconfig" "math/big" "sort" "sync" "testing" - "github.com/FusionFoundation/efsn/common" - - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 35860377..044b01a0 100644 --- a/eth/metrics.go +++ b/eth/metrics.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/FusionFoundation/efsn/metrics" - "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/v4/metrics" + "github.com/FusionFoundation/efsn/v4/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index b3c0d2df..1f41c195 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -23,11 +23,11 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" mapset "github.com/deckarep/golang-set" ) diff --git a/eth/protocol.go b/eth/protocol.go index f64fbfdb..6ae1fb59 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -21,11 +21,11 @@ import ( "io" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index f5d95a02..09e8f0fc 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -18,17 +18,17 @@ package eth import ( "fmt" - "github.com/FusionFoundation/efsn/eth/ethconfig" + "github.com/FusionFoundation/efsn/v4/eth/ethconfig" "sync" "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/rlp" ) func init() { diff --git a/eth/state_accessor.go b/eth/state_accessor.go index 2bf319b0..10754cd6 100644 --- a/eth/state_accessor.go +++ b/eth/state_accessor.go @@ -21,13 +21,13 @@ import ( "fmt" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/trie" ) // stateAtBlock retrieves the state database associated with a certain block. diff --git a/eth/sync.go b/eth/sync.go index 6d35ac93..0713e3ab 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/discover" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index e1186c74..73b6ac41 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" ) // Tests that fast sync gets disabled as soon as a real block is successfully diff --git a/eth/tracers/api.go b/eth/tracers/api.go index f326a6f5..695cdf5b 100644 --- a/eth/tracers/api.go +++ b/eth/tracers/api.go @@ -28,20 +28,20 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/internal/ethapi" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/internal/ethapi" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/rpc" ) const ( diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index 7ea4797f..068a1021 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -25,12 +25,12 @@ import ( "time" "unsafe" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" "gopkg.in/olebedev/go-duktape.v3" ) diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go index 4611dc11..9bfa8880 100644 --- a/eth/tracers/tracer_test.go +++ b/eth/tracers/tracer_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/params" ) type account struct{} diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index ce2fc932..2e40f5da 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -21,7 +21,7 @@ import ( "strings" "unicode" - "github.com/FusionFoundation/efsn/eth/tracers/internal/tracers" + "github.com/FusionFoundation/efsn/v4/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 a465b9e5..1c2ae627 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/params" ) type account struct{} diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index ba2325b6..7c3b5c90 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -24,11 +24,11 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 307d00f8..60b49976 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -16,7 +16,7 @@ package ethclient -import "github.com/FusionFoundation/efsn" +import "github.com/FusionFoundation/efsn/v4" // Verify that Client implements the ethereum interfaces. var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index 1a98dd09..2a8994bc 100644 --- a/ethclient/signer.go +++ b/ethclient/signer.go @@ -20,8 +20,8 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 52fa7506..85bd69e2 100644 --- a/ethdb/dbtest/testsuite.go +++ b/ethdb/dbtest/testsuite.go @@ -22,7 +22,7 @@ import ( "sort" "testing" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/ethdb" ) // TestDatabaseSuite runs a suite of tests against a KeyValueStore database diff --git a/ethdb/leveldb/leveldb.go b/ethdb/leveldb/leveldb.go index f8d3749c..3cf8f6f1 100644 --- a/ethdb/leveldb/leveldb.go +++ b/ethdb/leveldb/leveldb.go @@ -14,6 +14,7 @@ // You should have received a copy of the GNU Lesser General Public License // along with the go-ethereum library. If not, see . +//go:build !js // +build !js // Package leveldb implements the key-value database layer based on LevelDB. @@ -26,10 +27,10 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/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 ab181a9b..245e1009 100644 --- a/ethdb/leveldb/leveldb_test.go +++ b/ethdb/leveldb/leveldb_test.go @@ -19,8 +19,8 @@ package leveldb import ( "testing" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/ethdb/dbtest" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/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 3e6a227b..7a5b10ff 100644 --- a/ethdb/memorydb/memorydb.go +++ b/ethdb/memorydb/memorydb.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/ethdb" ) var ( diff --git a/ethdb/memorydb/memorydb_test.go b/ethdb/memorydb/memorydb_test.go index 6d7bd5e2..76053288 100644 --- a/ethdb/memorydb/memorydb_test.go +++ b/ethdb/memorydb/memorydb_test.go @@ -19,8 +19,8 @@ package memorydb import ( "testing" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/ethdb/dbtest" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/ethdb/dbtest" ) func TestMemoryDB(t *testing.T) { diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index b1e99b0a..d5973925 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,18 +30,18 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/eth" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/les" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/eth" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/les" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 9170d2ba..633aacb7 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/v4/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index b0993985..bda08085 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/v4/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 fdc5e094..99e19bcd 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/v4/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index e6fa08ec..a9cdb337 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/v4/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 25a6aadb..28738cc1 100644 --- a/go.mod +++ b/go.mod @@ -56,3 +56,18 @@ require ( gopkg.in/urfave/cli.v1 v1.20.0 gotest.tools v2.2.0+incompatible // indirect ) + +require ( + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect + github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect + github.com/kr/pretty v0.2.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d // indirect + github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect + golang.org/x/text v0.3.6 // indirect + google.golang.org/protobuf v1.23.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect +) diff --git a/interfaces.go b/interfaces.go index 172c8b88..84fbda21 100644 --- a/interfaces.go +++ b/interfaces.go @@ -22,8 +22,8 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 b67b3565..d0271f57 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -34,7 +34,7 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 6478598f..41a4285b 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,9 +24,9 @@ import ( "os" "runtime" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" - "github.com/FusionFoundation/efsn/metrics/exp" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/metrics" + "github.com/FusionFoundation/efsn/v4/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 9e8f7a5c..4ec4865d 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -14,7 +14,8 @@ // You should have received a copy of the GNU Lesser General Public License // along with the go-ethereum library. If not, see . -//+build go1.5 +//go:build go1.5 +// +build go1.5 package debug @@ -23,7 +24,7 @@ import ( "os" "runtime/trace" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index ee4f0710..3be52a1f 100644 --- a/internal/ethapi/addrlock.go +++ b/internal/ethapi/addrlock.go @@ -19,7 +19,7 @@ package ethapi import ( "sync" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 6664e783..61c5a2dd 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -24,24 +24,24 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/accounts/abi" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/consensus/misc" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/accounts/abi" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/consensus/misc" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/rpc" "github.com/davecgh/go-spew/spew" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/internal/ethapi/api_fsn.go b/internal/ethapi/api_fsn.go index 29e6a25b..d8c810f4 100644 --- a/internal/ethapi/api_fsn.go +++ b/internal/ethapi/api_fsn.go @@ -10,16 +10,16 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/rpc" ) var lastBlockOfBuyTickets = int64(0) diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index 12660ffb..809e7cd2 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -21,18 +21,18 @@ import ( "context" "math/big" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/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 0356b8ba..42a29578 100644 --- a/internal/ethapi/transaction_args.go +++ b/internal/ethapi/transaction_args.go @@ -23,12 +23,12 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/rpc" ) // TransactionArgs represents the arguments to construct a new transaction diff --git a/internal/flags/helpers.go b/internal/flags/helpers.go index 53e4a79a..235d733a 100644 --- a/internal/flags/helpers.go +++ b/internal/flags/helpers.go @@ -20,7 +20,7 @@ import ( "os" "path/filepath" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/params" "gopkg.in/urfave/cli.v1" ) diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index 6de3d1d1..b9a424e8 100644 --- a/internal/guide/guide_test.go +++ b/internal/guide/guide_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/core/types" ) // Tests that the account management snippets work correctly. diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index 515f477d..1a61cd56 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -26,7 +26,7 @@ import ( "math/rand" "time" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" "github.com/dop251/goja" ) diff --git a/les/api_backend.go b/les/api_backend.go index d8051ded..8ca7df71 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -21,22 +21,22 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/bloombits" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/eth/gasprice" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/light" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/bloombits" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/eth/gasprice" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/light" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index 1ddac3a8..74426527 100644 --- a/les/backend.go +++ b/les/backend.go @@ -19,31 +19,31 @@ package les import ( "fmt" - "github.com/FusionFoundation/efsn/eth/ethconfig" + "github.com/FusionFoundation/efsn/v4/eth/ethconfig" "sync" "time" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/bloombits" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/eth" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/eth/filters" - "github.com/FusionFoundation/efsn/eth/gasprice" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/internal/ethapi" - "github.com/FusionFoundation/efsn/light" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discv5" - "github.com/FusionFoundation/efsn/params" - rpc "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/bloombits" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/eth" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/eth/filters" + "github.com/FusionFoundation/efsn/v4/eth/gasprice" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/internal/ethapi" + "github.com/FusionFoundation/efsn/v4/light" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discv5" + "github.com/FusionFoundation/efsn/v4/params" + rpc "github.com/FusionFoundation/efsn/v4/rpc" ) type LightEthereum struct { diff --git a/les/bloombits.go b/les/bloombits.go index 393459fa..35bdea48 100644 --- a/les/bloombits.go +++ b/les/bloombits.go @@ -19,8 +19,8 @@ package les import ( "time" - "github.com/FusionFoundation/efsn/common/bitutil" - "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/v4/common/bitutil" + "github.com/FusionFoundation/efsn/v4/light" ) const ( diff --git a/les/commons.go b/les/commons.go index 510867d3..9cdcd740 100644 --- a/les/commons.go +++ b/les/commons.go @@ -18,16 +18,16 @@ package les import ( "fmt" - "github.com/FusionFoundation/efsn/eth/ethconfig" + "github.com/FusionFoundation/efsn/v4/eth/ethconfig" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/light" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/light" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/params" ) // lesCommons contains fields needed by both server and client. diff --git a/les/fetcher.go b/les/fetcher.go index 70cddd46..10603bd1 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/light" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/light" + "github.com/FusionFoundation/efsn/v4/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index 7aa4d66d..9ed38a57 100644 --- a/les/flowcontrol/control.go +++ b/les/flowcontrol/control.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/v4/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index 8d61fb47..5aacaa67 100644 --- a/les/flowcontrol/manager.go +++ b/les/flowcontrol/manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/v4/common/mclock" ) const rcConst = 1000000 diff --git a/les/freeclient.go b/les/freeclient.go index 47c596eb..a5d3fd92 100644 --- a/les/freeclient.go +++ b/les/freeclient.go @@ -23,11 +23,11 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/common/prque" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/common/prque" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/rlp" ) // freeClientPool implements a client database that limits the connection time diff --git a/les/freeclient_test.go b/les/freeclient_test.go index 7ac8bd43..3b5981ef 100644 --- a/les/freeclient_test.go +++ b/les/freeclient_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/ethdb" ) func TestFreeClientPoolL10C100(t *testing.T) { diff --git a/les/handler.go b/les/handler.go index 9a3acfac..8bbfe42b 100644 --- a/les/handler.go +++ b/les/handler.go @@ -26,23 +26,23 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/light" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discv5" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/light" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discv5" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index a381f0af..5866885c 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,19 +23,19 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/light" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/light" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/trie" ) func expectResponse(r p2p.MsgReader, msgcode, reqID, bv uint64, data interface{}) error { diff --git a/les/helper_test.go b/les/helper_test.go index 35d8adc9..e760c07e 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -26,20 +26,20 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/eth" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/les/flowcontrol" - "github.com/FusionFoundation/efsn/light" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/eth" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/les/flowcontrol" + "github.com/FusionFoundation/efsn/v4/light" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index 8e853b54..a1fdf1d3 100644 --- a/les/metrics.go +++ b/les/metrics.go @@ -17,8 +17,8 @@ package les import ( - "github.com/FusionFoundation/efsn/metrics" - "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/v4/metrics" + "github.com/FusionFoundation/efsn/v4/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index 7f21a364..a794f3e7 100644 --- a/les/odr.go +++ b/les/odr.go @@ -19,10 +19,10 @@ package les import ( "context" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/light" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/light" + "github.com/FusionFoundation/efsn/v4/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index 785d7d54..708e2fda 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -23,15 +23,15 @@ import ( "errors" "fmt" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/light" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/light" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index f94f8bda..d95f192e 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/light" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/light" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/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 a9f94e60..3fc59ad9 100644 --- a/les/peer.go +++ b/les/peer.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/eth" - "github.com/FusionFoundation/efsn/les/flowcontrol" - "github.com/FusionFoundation/efsn/light" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/eth" + "github.com/FusionFoundation/efsn/v4/les/flowcontrol" + "github.com/FusionFoundation/efsn/v4/light" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index 079f46c0..5d735977 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -26,12 +26,12 @@ import ( "io" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/crypto/secp256k1" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/crypto/secp256k1" + "github.com/FusionFoundation/efsn/v4/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index ae091699..7021deed 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index 175656d2..4c2c735d 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -26,8 +26,8 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/light" ) var ( diff --git a/les/server.go b/les/server.go index 73614748..935f0725 100644 --- a/les/server.go +++ b/les/server.go @@ -20,23 +20,23 @@ package les import ( "crypto/ecdsa" "encoding/binary" - "github.com/FusionFoundation/efsn/eth/ethconfig" + "github.com/FusionFoundation/efsn/v4/eth/ethconfig" "math" "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/eth" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/les/flowcontrol" - "github.com/FusionFoundation/efsn/light" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discv5" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/eth" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/les/flowcontrol" + "github.com/FusionFoundation/efsn/v4/light" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discv5" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index 5ed3cd08..85ac0c16 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/discv5" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/discv5" + "github.com/FusionFoundation/efsn/v4/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index d47a6ab5..3aabbc70 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/light" ) // syncer is responsible for periodically synchronising with the network, both diff --git a/les/txrelay.go b/les/txrelay.go index 878a890f..ff6a1c13 100644 --- a/les/txrelay.go +++ b/les/txrelay.go @@ -19,8 +19,8 @@ package les import ( "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index 83ed6ff0..831ccbd3 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -24,17 +24,17 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" "github.com/hashicorp/golang-lru" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index e6f99209..e91df4a3 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,13 +21,13 @@ import ( "math/big" "testing" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index 887b7079..cd02455d 100644 --- a/light/nodeset.go +++ b/light/nodeset.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/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 8d54f45e..d4a4325e 100644 --- a/light/odr.go +++ b/light/odr.go @@ -23,11 +23,11 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/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 22c253dc..cabaea2f 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,19 +24,19 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" - - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" + + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index 64794480..b61a4ec8 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -19,11 +19,11 @@ package light import ( "bytes" "context" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index 76efa861..96f7ac70 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -24,16 +24,16 @@ import ( "math/big" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/bitutil" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/bitutil" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/trie" ) // IndexerConfig includes a set of configs for chain indexers. diff --git a/light/trie.go b/light/trie.go index e2e6e563..a99ed68c 100644 --- a/light/trie.go +++ b/light/trie.go @@ -21,12 +21,12 @@ import ( "errors" "fmt" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/trie" ) func NewState(ctx context.Context, head *types.Header, odr OdrBackend) *state.StateDB { diff --git a/light/trie_test.go b/light/trie_test.go index 59628d55..0ae8a505 100644 --- a/light/trie_test.go +++ b/light/trie_test.go @@ -24,12 +24,12 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index 89f51890..7c41c0d5 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -23,15 +23,15 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index cd6867d6..d29ae526 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" ) type testTxRelay struct { diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index 04a0c88f..392489c1 100644 --- a/metrics/exp/exp.go +++ b/metrics/exp/exp.go @@ -8,7 +8,7 @@ import ( "net/http" "sync" - "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/v4/metrics" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index b567bbd5..5d80919d 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -5,8 +5,8 @@ import ( uurl "net/url" "time" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/metrics" "github.com/influxdata/influxdb/client" ) diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index ce56b028..ac974eed 100644 --- a/metrics/librato/librato.go +++ b/metrics/librato/librato.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/v4/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index a010ff47..fd882cb4 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) // Enabled is checked by the constructor functions for all of the diff --git a/miner/miner.go b/miner/miner.go index 0deed578..dc1f29da 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -23,16 +23,16 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" ) // Backend wraps all methods required for mining. diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 94f1a16a..996b4fbf 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -20,9 +20,9 @@ import ( "container/ring" "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/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 9db380f7..9e495036 100644 --- a/miner/unconfirmed_test.go +++ b/miner/unconfirmed_test.go @@ -19,8 +19,8 @@ package miner import ( "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" ) // noopChainRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index bf531763..7147e4bb 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -23,17 +23,17 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/consensus/misc" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/trie" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/consensus/misc" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/trie" ) const ( diff --git a/miner/worker_test.go b/miner/worker_test.go index 770ca9f7..ec54596b 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -17,19 +17,19 @@ package miner import ( - "github.com/FusionFoundation/efsn/consensus/datong" + "github.com/FusionFoundation/efsn/v4/consensus/datong" "math/big" "testing" "time" - "github.com/FusionFoundation/efsn/consensus" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/consensus" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/params" ) var ( diff --git a/mobile/accounts.go b/mobile/accounts.go index a7274769..b4d0abab 100644 --- a/mobile/accounts.go +++ b/mobile/accounts.go @@ -23,10 +23,10 @@ import ( "errors" "time" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index d933fb56..d1e752a5 100644 --- a/mobile/android_test.go +++ b/mobile/android_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/internal/build" + "github.com/FusionFoundation/efsn/v4/internal/build" ) // androidTestClass is a Java class to do some lightweight tests against the Android @@ -207,7 +207,7 @@ func TestAndroid(t *testing.T) { } } // Generate the mobile bindings for Geth and add the tester class - gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/FusionFoundation/efsn/mobile") + gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/FusionFoundation/efsn/v4/mobile") if output, err := gobind.CombinedOutput(); err != nil { t.Logf("%s", output) t.Fatalf("failed to run gomobile bind: %v", err) diff --git a/mobile/big.go b/mobile/big.go index 52cfa8f3..1368c19f 100644 --- a/mobile/big.go +++ b/mobile/big.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index f19df242..83e9d010 100644 --- a/mobile/bind.go +++ b/mobile/bind.go @@ -22,10 +22,10 @@ import ( "math/big" "strings" - "github.com/FusionFoundation/efsn/accounts/abi" - "github.com/FusionFoundation/efsn/accounts/abi/bind" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/accounts/abi" + "github.com/FusionFoundation/efsn/v4/accounts/abi/bind" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" ) // Signer is an interaface defining the callback when a contract requires a diff --git a/mobile/common.go b/mobile/common.go index c381f03d..39c14ef5 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index 70e5a091..12246012 100644 --- a/mobile/discover.go +++ b/mobile/discover.go @@ -22,7 +22,7 @@ package geth import ( "errors" - "github.com/FusionFoundation/efsn/p2p/discv5" + "github.com/FusionFoundation/efsn/v4/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 54982a40..690a8e5a 100644 --- a/mobile/ethclient.go +++ b/mobile/ethclient.go @@ -21,8 +21,8 @@ package geth import ( "math/big" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/ethclient" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index dd7ad448..edc6993d 100644 --- a/mobile/ethereum.go +++ b/mobile/ethereum.go @@ -21,8 +21,8 @@ package geth import ( "errors" - ethereum "github.com/FusionFoundation/efsn" - "github.com/FusionFoundation/efsn/common" + ethereum "github.com/FusionFoundation/efsn/v4" + "github.com/FusionFoundation/efsn/v4/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index 5c66f738..432d4641 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -22,19 +22,19 @@ package geth import ( "encoding/json" "fmt" - "github.com/FusionFoundation/efsn/eth/ethconfig" + "github.com/FusionFoundation/efsn/v4/eth/ethconfig" "path/filepath" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/eth/downloader" - "github.com/FusionFoundation/efsn/ethclient" - "github.com/FusionFoundation/efsn/ethstats" - "github.com/FusionFoundation/efsn/internal/debug" - "github.com/FusionFoundation/efsn/les" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/nat" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/eth/downloader" + "github.com/FusionFoundation/efsn/v4/ethclient" + "github.com/FusionFoundation/efsn/v4/ethstats" + "github.com/FusionFoundation/efsn/v4/internal/debug" + "github.com/FusionFoundation/efsn/v4/les" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/nat" + "github.com/FusionFoundation/efsn/v4/params" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index aa0a45cc..bdceffb0 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index 4a8c7b88..966107a5 100644 --- a/mobile/interface.go +++ b/mobile/interface.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/logger.go b/mobile/logger.go index fd20dab4..b1ae0699 100644 --- a/mobile/logger.go +++ b/mobile/logger.go @@ -19,7 +19,7 @@ package geth import ( "os" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/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 cb6de0f6..0d3b74c6 100644 --- a/mobile/p2p.go +++ b/mobile/p2p.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/v4/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index 805504a9..50ccd90f 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -21,9 +21,9 @@ package geth import ( "encoding/json" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/p2p/discv5" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/p2p/discv5" + "github.com/FusionFoundation/efsn/v4/params" ) // MainnetGenesis returns the JSON spec to use for the main Ethereum network. It diff --git a/mobile/types.go b/mobile/types.go index 77c38a69..6b8c7e28 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,9 +23,9 @@ import ( "errors" "fmt" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/rlp" ) // A Nonce is a 64-bit hash which proves (combined with the mix-hash) that diff --git a/mobile/vm.go b/mobile/vm.go index b73d76bd..4201ffe9 100644 --- a/mobile/vm.go +++ b/mobile/vm.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/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 879ed235..60e4d5bf 100644 --- a/node/api.go +++ b/node/api.go @@ -21,11 +21,11 @@ import ( "fmt" "strings" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/rpc" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/node/config.go b/node/config.go index a10e7c3d..818751e4 100644 --- a/node/config.go +++ b/node/config.go @@ -25,15 +25,15 @@ import ( "runtime" "strings" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/accounts/usbwallet" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/accounts/usbwallet" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/rpc" ) const ( diff --git a/node/config_test.go b/node/config_test.go index 09fc85c7..2415c92f 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -24,8 +24,8 @@ import ( "runtime" "testing" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index 6240b8ae..7e5334a3 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,9 +22,9 @@ import ( "path/filepath" "runtime" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/nat" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/nat" + "github.com/FusionFoundation/efsn/v4/rpc" ) const ( diff --git a/node/node.go b/node/node.go index d38b7806..8a66b345 100644 --- a/node/node.go +++ b/node/node.go @@ -19,7 +19,7 @@ package node import ( "errors" "fmt" - "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/rawdb" "net" "os" "path/filepath" @@ -27,13 +27,13 @@ import ( "strings" "sync" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/internal/debug" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/internal/debug" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/rpc" "github.com/prometheus/tsdb/fileutil" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index f8aec1c7..ef426183 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,9 +20,9 @@ import ( "fmt" "log" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/rpc" ) // SampleService 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 66c3e0cc..51028f1a 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/rpc" ) var ( diff --git a/node/service.go b/node/service.go index e5d91afd..b88d7140 100644 --- a/node/service.go +++ b/node/service.go @@ -17,14 +17,14 @@ package node import ( - "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/rawdb" "reflect" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index ff4c2f8b..2ac7dbad 100644 --- a/node/utils_test.go +++ b/node/utils_test.go @@ -22,8 +22,8 @@ package node import ( "reflect" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index 22ff6f73..56c2d307 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -24,9 +24,9 @@ import ( "net" "time" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/netutil" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 9f87cae8..5305c51b 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/netutil" "github.com/davecgh/go-spew/spew" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/netutil" ) func init() { diff --git a/p2p/discover/database.go b/p2p/discover/database.go index 4c5f7583..8a43e4e5 100644 --- a/p2p/discover/database.go +++ b/p2p/discover/database.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discover/node.go b/p2p/discover/node.go index afb42596..94cc1f22 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -31,9 +31,9 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/crypto/secp256k1" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/crypto/secp256k1" ) const NodeIDBits = 512 diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go index 0c39e1c1..461b1e32 100644 --- a/p2p/discover/node_test.go +++ b/p2p/discover/node_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" ) func ExampleNewNode() { diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 451ac614..d7d38070 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,7 +25,7 @@ import ( "sort" "time" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index a7e734d6..a83eb5e9 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -32,10 +32,10 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/netutil" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index 5ef08e89..eeb7b9fa 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index ea38e85a..d4ffb2f7 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -25,11 +25,11 @@ import ( "net" "time" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/nat" - "github.com/FusionFoundation/efsn/p2p/netutil" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/nat" + "github.com/FusionFoundation/efsn/v4/p2p/netutil" + "github.com/FusionFoundation/efsn/v4/rlp" ) // Errors diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index f1cc2bd2..9822fce9 100644 --- a/p2p/discover/udp_test.go +++ b/p2p/discover/udp_test.go @@ -33,10 +33,10 @@ import ( "testing" "time" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" "github.com/davecgh/go-spew/spew" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index b99a2a64..d835e586 100644 --- a/p2p/discv5/database.go +++ b/p2p/discv5/database.go @@ -28,9 +28,9 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discv5/metrics.go b/p2p/discv5/metrics.go index c98fe281..fca4cccb 100644 --- a/p2p/discv5/metrics.go +++ b/p2p/discv5/metrics.go @@ -1,6 +1,6 @@ package discv5 -import "github.com/FusionFoundation/efsn/metrics" +import "github.com/FusionFoundation/efsn/v4/metrics" var ( ingressTrafficMeter = metrics.NewRegisteredMeter("discv5/InboundTraffic", nil) diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index 7d980a7c..da8d7523 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/netutil" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/netutil" + "github.com/FusionFoundation/efsn/v4/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index 4a4226ae..269a248d 100644 --- a/p2p/discv5/net_test.go +++ b/p2p/discv5/net_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index 259f25b5..ca2b0076 100644 --- a/p2p/discv5/node.go +++ b/p2p/discv5/node.go @@ -30,8 +30,8 @@ import ( "strconv" "strings" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index 40718b08..98fadc54 100644 --- a/p2p/discv5/node_test.go +++ b/p2p/discv5/node_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 65fd766a..afdabded 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index b085b8db..eac9095e 100644 --- a/p2p/discv5/sim_test.go +++ b/p2p/discv5/sim_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index a2ad4833..dda140c8 100644 --- a/p2p/discv5/table.go +++ b/p2p/discv5/table.go @@ -29,7 +29,7 @@ import ( "net" "sort" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index beead807..b44d41d2 100644 --- a/p2p/discv5/table_test.go +++ b/p2p/discv5/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index 3b8bd5ac..0495b93d 100644 --- a/p2p/discv5/ticket.go +++ b/p2p/discv5/ticket.go @@ -25,10 +25,10 @@ import ( "sort" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index 4594e69e..ec730066 100644 --- a/p2p/discv5/topic.go +++ b/p2p/discv5/topic.go @@ -23,8 +23,8 @@ import ( "math/rand" "time" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/log" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index 69dc6367..bdf0e691 100644 --- a/p2p/discv5/topic_test.go +++ b/p2p/discv5/topic_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index fbcde7e1..2fb0196c 100644 --- a/p2p/discv5/udp.go +++ b/p2p/discv5/udp.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/nat" - "github.com/FusionFoundation/efsn/p2p/netutil" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/nat" + "github.com/FusionFoundation/efsn/v4/p2p/netutil" + "github.com/FusionFoundation/efsn/v4/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index 17b9d7c4..af1e9200 100644 --- a/p2p/discv5/udp_test.go +++ b/p2p/discv5/udp_test.go @@ -25,10 +25,10 @@ import ( "sync" "testing" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" "github.com/davecgh/go-spew/spew" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" ) func init() { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index f9f080ca..e5320576 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -34,7 +34,7 @@ import ( "io" "sort" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/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 8e92eb21..ffb772ea 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index 9f6e9047..231e3fd8 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -22,8 +22,8 @@ import ( "io" "net" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/enr/idscheme.go b/p2p/enr/idscheme.go index 0be9b7a0..3869fc35 100644 --- a/p2p/enr/idscheme.go +++ b/p2p/enr/idscheme.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/message.go b/p2p/message.go index f681de0c..52129a02 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 4551af01..ac0c32f4 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -21,7 +21,7 @@ package p2p import ( "net" - "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/v4/metrics" ) var ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index a142270c..477291ed 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/peer.go b/p2p/peer.go index 767493e7..d655e5f1 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/rlp" ) var ( diff --git a/p2p/protocol.go b/p2p/protocol.go index 1a04b3f3..3b379752 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,7 +19,7 @@ package p2p import ( "fmt" - "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/discover" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/rlpx.go b/p2p/rlpx.go index adeaa9f7..2f519b61 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -35,11 +35,11 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/crypto/ecies" - "github.com/FusionFoundation/efsn/crypto/secp256k1" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/crypto/ecies" + "github.com/FusionFoundation/efsn/v4/crypto/secp256k1" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/rlp" "github.com/golang/snappy" "golang.org/x/crypto/sha3" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index 69a9754c..9b9f8f85 100644 --- a/p2p/rlpx_test.go +++ b/p2p/rlpx_test.go @@ -30,11 +30,11 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/crypto/ecies" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/simulations/pipes" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/crypto/ecies" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/simulations/pipes" + "github.com/FusionFoundation/efsn/v4/rlp" "github.com/davecgh/go-spew/spew" "golang.org/x/crypto/sha3" ) diff --git a/p2p/server.go b/p2p/server.go index cdbae02e..0c722ce6 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -26,14 +26,14 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/mclock" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/discv5" - "github.com/FusionFoundation/efsn/p2p/nat" - "github.com/FusionFoundation/efsn/p2p/netutil" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/mclock" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/discv5" + "github.com/FusionFoundation/efsn/v4/p2p/nat" + "github.com/FusionFoundation/efsn/v4/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index 0413080b..cce8cf3e 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/discover" "golang.org/x/crypto/sha3" ) diff --git a/p2p/simulations/adapters/docker.go b/p2p/simulations/adapters/docker.go index cbe8019f..66f411c5 100644 --- a/p2p/simulations/adapters/docker.go +++ b/p2p/simulations/adapters/docker.go @@ -27,9 +27,9 @@ import ( "runtime" "strings" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p/discover" "github.com/docker/docker/pkg/reexec" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p/discover" ) var ( diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index 8e10c391..f5f7689d 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -34,12 +34,12 @@ import ( "syscall" "time" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/rpc" "github.com/docker/docker/pkg/reexec" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index 3c2a258c..72bbd6c1 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,13 +23,13 @@ import ( "net" "sync" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/simulations/pipes" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/simulations/pipes" + "github.com/FusionFoundation/efsn/v4/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go index c853608d..563bc8cc 100644 --- a/p2p/simulations/adapters/inproc_test.go +++ b/p2p/simulations/adapters/inproc_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/p2p/simulations/pipes" + "github.com/FusionFoundation/efsn/v4/p2p/simulations/pipes" ) func TestTCPPipe(t *testing.T) { diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index 28804ebc..1daf392c 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -25,12 +25,12 @@ import ( "os" "strconv" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/rpc" "github.com/docker/docker/pkg/reexec" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/rpc" ) // Node represents a node in a simulation network which is created by a diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go index 16199b10..e2729d37 100644 --- a/p2p/simulations/examples/ping-pong.go +++ b/p2p/simulations/examples/ping-pong.go @@ -25,13 +25,13 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/simulations" - "github.com/FusionFoundation/efsn/p2p/simulations/adapters" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/simulations" + "github.com/FusionFoundation/efsn/v4/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/v4/rpc" ) 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 e94b7ae8..5d064de1 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -29,11 +29,11 @@ import ( "strings" "sync" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/simulations/adapters" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/v4/rpc" "github.com/julienschmidt/httprouter" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go index 0ea913a4..67646348 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/simulations/adapters" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/v4/rpc" ) // testService implements the node.Service interface and provides protocols diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index 470df661..ca581e32 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/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 1d272cb6..e13093c5 100644 --- a/p2p/simulations/mocker_test.go +++ b/p2p/simulations/mocker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/discover" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index cb69b6bf..e3a8228c 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/event" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/v4/event" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/simulations/adapters" ) var DialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index 154469ea..e7659187 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/simulations/adapters" ) // TestNetworkSimulation creates a multi-node simulation network with each node diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go index 13faa59c..0baa11f5 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/discover" ) // Simulation provides a framework for running actions in a simulated network diff --git a/p2p/testing/peerpool.go b/p2p/testing/peerpool.go index 71937f8c..855dceac 100644 --- a/p2p/testing/peerpool.go +++ b/p2p/testing/peerpool.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/discover" ) type TestPeer interface { diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go index ecd4a4a2..d0ee2ec4 100644 --- a/p2p/testing/protocolsession.go +++ b/p2p/testing/protocolsession.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/simulations/adapters" ) var errTimedOut = errors.New("timed out") diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go index 23c4a260..78b6413f 100644 --- a/p2p/testing/protocoltester.go +++ b/p2p/testing/protocoltester.go @@ -32,14 +32,14 @@ import ( "sync" "testing" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/node" - "github.com/FusionFoundation/efsn/p2p" - "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/FusionFoundation/efsn/p2p/simulations" - "github.com/FusionFoundation/efsn/p2p/simulations/adapters" - "github.com/FusionFoundation/efsn/rlp" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/node" + "github.com/FusionFoundation/efsn/v4/p2p" + "github.com/FusionFoundation/efsn/v4/p2p/discover" + "github.com/FusionFoundation/efsn/v4/p2p/simulations" + "github.com/FusionFoundation/efsn/v4/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/v4/rlp" + "github.com/FusionFoundation/efsn/v4/rpc" ) // ProtocolTester is the tester environment used for unit testing protocol diff --git a/params/config.go b/params/config.go index 408304f6..614bc525 100644 --- a/params/config.go +++ b/params/config.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // Genesis hashes to enforce below configs on. diff --git a/params/dao.go b/params/dao.go index 01d861ac..9584b97b 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/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 c77a5a81..9310523d 100644 --- a/rlp/decode_test.go +++ b/rlp/decode_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common/math" ) func TestStreamKind(t *testing.T) { diff --git a/rlp/encode_test.go b/rlp/encode_test.go index 3ebcb27d..37725876 100644 --- a/rlp/encode_test.go +++ b/rlp/encode_test.go @@ -27,7 +27,7 @@ import ( "sync" "testing" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common/math" ) type testEncoder struct { diff --git a/rlp/iterator_test.go b/rlp/iterator_test.go index deca8b7e..cecf0c86 100644 --- a/rlp/iterator_test.go +++ b/rlp/iterator_test.go @@ -19,7 +19,7 @@ package rlp import ( "testing" - "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/hexutil" ) // TestIterator tests some basic things about the ListIterator. A more diff --git a/rpc/client.go b/rpc/client.go index 51badfef..ca41a304 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -33,7 +33,7 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 80d54f24..8d9f3fb8 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -22,7 +22,7 @@ import ( "math/big" "time" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/rpc" ) // In this example, our client whishes to track the latest 'block number' diff --git a/rpc/client_test.go b/rpc/client_test.go index a17d95d7..18335444 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" + "github.com/FusionFoundation/efsn/v4/log" "github.com/davecgh/go-spew/spew" - "github.com/FusionFoundation/efsn/log" ) func TestClientRequest(t *testing.T) { diff --git a/rpc/endpoints.go b/rpc/endpoints.go index 3c5b99e7..a2f58fad 100644 --- a/rpc/endpoints.go +++ b/rpc/endpoints.go @@ -19,7 +19,7 @@ package rpc import ( "net" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) // StartHTTPEndpoint starts the HTTP RPC endpoint, configured with cors/vhosts/modules diff --git a/rpc/http.go b/rpc/http.go index 807401b0..b45b20f4 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -31,7 +31,7 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" "github.com/rs/cors" ) diff --git a/rpc/ipc.go b/rpc/ipc.go index d18d5d51..a0e13970 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -20,8 +20,8 @@ import ( "context" "net" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/p2p/netutil" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/p2p/netutil" ) // ServeListener accepts connections on l, serving JSON-RPC on them. diff --git a/rpc/json.go b/rpc/json.go index cf9fd672..a73c62f0 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index 9e9cdd72..348de354 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -25,7 +25,7 @@ import ( "sync" "sync/atomic" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" mapset "github.com/deckarep/golang-set" ) diff --git a/rpc/types.go b/rpc/types.go index 3aca067c..a4da9032 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -25,8 +25,8 @@ import ( "strings" "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" mapset "github.com/deckarep/golang-set" ) diff --git a/rpc/types_test.go b/rpc/types_test.go index 178d22d2..98194282 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index 759a95a3..77557ed7 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -30,8 +30,8 @@ import ( "strings" "time" + "github.com/FusionFoundation/efsn/v4/log" mapset "github.com/deckarep/golang-set" - "github.com/FusionFoundation/efsn/log" "golang.org/x/net/websocket" ) diff --git a/signer/core/abihelper.go b/signer/core/abihelper.go index 53df3f07..4de826d5 100644 --- a/signer/core/abihelper.go +++ b/signer/core/abihelper.go @@ -22,8 +22,8 @@ import ( "io/ioutil" "strings" - "github.com/FusionFoundation/efsn/accounts/abi" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/accounts/abi" + "github.com/FusionFoundation/efsn/v4/common" "bytes" "os" diff --git a/signer/core/abihelper_test.go b/signer/core/abihelper_test.go index bfe4080d..788d74dd 100644 --- a/signer/core/abihelper_test.go +++ b/signer/core/abihelper_test.go @@ -25,8 +25,8 @@ import ( "math/big" "reflect" - "github.com/FusionFoundation/efsn/accounts/abi" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/accounts/abi" + "github.com/FusionFoundation/efsn/v4/common" ) func verify(t *testing.T, jsondata, calldata string, exp []interface{}) { diff --git a/signer/core/api.go b/signer/core/api.go index b13a3621..b6376bf3 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -25,14 +25,14 @@ import ( "math/big" "reflect" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/accounts/usbwallet" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/internal/ethapi" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/accounts/usbwallet" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/internal/ethapi" + "github.com/FusionFoundation/efsn/v4/log" ) // ExternalAPI defines the external API through which signing requests are made. diff --git a/signer/core/api_test.go b/signer/core/api_test.go index a377c860..02655701 100644 --- a/signer/core/api_test.go +++ b/signer/core/api_test.go @@ -27,13 +27,13 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/accounts/keystore" - "github.com/FusionFoundation/efsn/cmd/utils" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/internal/ethapi" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/accounts/keystore" + "github.com/FusionFoundation/efsn/v4/cmd/utils" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/internal/ethapi" + "github.com/FusionFoundation/efsn/v4/rlp" ) //Used for testing diff --git a/signer/core/auditlog.go b/signer/core/auditlog.go index 09beeddb..5f82bc04 100644 --- a/signer/core/auditlog.go +++ b/signer/core/auditlog.go @@ -21,11 +21,11 @@ import ( "encoding/json" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/internal/ethapi" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/internal/ethapi" + "github.com/FusionFoundation/efsn/v4/log" ) type AuditLogger struct { diff --git a/signer/core/cliui.go b/signer/core/cliui.go index cc50c583..04906a82 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -24,10 +24,10 @@ import ( "sync" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/internal/ethapi" + "github.com/FusionFoundation/efsn/v4/log" "github.com/davecgh/go-spew/spew" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/internal/ethapi" - "github.com/FusionFoundation/efsn/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go index 27b28120..9024e04e 100644 --- a/signer/core/stdioui.go +++ b/signer/core/stdioui.go @@ -21,9 +21,9 @@ import ( "context" "sync" - "github.com/FusionFoundation/efsn/internal/ethapi" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/v4/internal/ethapi" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/rpc" ) type StdIOUI struct { diff --git a/signer/core/types.go b/signer/core/types.go index ff0754db..eddfc7f5 100644 --- a/signer/core/types.go +++ b/signer/core/types.go @@ -22,10 +22,10 @@ import ( "math/big" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core/types" ) type Accounts []Account diff --git a/signer/core/validation.go b/signer/core/validation.go index 3b288962..3581233a 100644 --- a/signer/core/validation.go +++ b/signer/core/validation.go @@ -22,7 +22,7 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // The validation package contains validation checks for transactions diff --git a/signer/core/validation_test.go b/signer/core/validation_test.go index dd83a430..adcd74e4 100644 --- a/signer/core/validation_test.go +++ b/signer/core/validation_test.go @@ -21,8 +21,8 @@ import ( "math/big" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" ) func hexAddr(a string) common.Address { return common.BytesToAddress(common.FromHex(a)) } diff --git a/signer/rules/rules.go b/signer/rules/rules.go index 966ab0d2..1ec5a778 100644 --- a/signer/rules/rules.go +++ b/signer/rules/rules.go @@ -22,12 +22,12 @@ import ( "os" "strings" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/internal/ethapi" - "github.com/FusionFoundation/efsn/internal/jsre/deps" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/signer/core" - "github.com/FusionFoundation/efsn/signer/storage" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/internal/ethapi" + "github.com/FusionFoundation/efsn/v4/internal/jsre/deps" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/signer/core" + "github.com/FusionFoundation/efsn/v4/signer/storage" "github.com/robertkrimen/otto" ) diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go index e2ffd5dc..7688d750 100644 --- a/signer/rules/rules_test.go +++ b/signer/rules/rules_test.go @@ -22,13 +22,13 @@ import ( "strings" "testing" - "github.com/FusionFoundation/efsn/accounts" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/internal/ethapi" - "github.com/FusionFoundation/efsn/signer/core" - "github.com/FusionFoundation/efsn/signer/storage" + "github.com/FusionFoundation/efsn/v4/accounts" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/internal/ethapi" + "github.com/FusionFoundation/efsn/v4/signer/core" + "github.com/FusionFoundation/efsn/v4/signer/storage" ) const JS = ` diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go index 077edf26..7fb6fc63 100644 --- a/signer/storage/aes_gcm_storage.go +++ b/signer/storage/aes_gcm_storage.go @@ -26,7 +26,7 @@ import ( "io/ioutil" "os" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/log" ) type storedCredential struct { diff --git a/signer/storage/aes_gcm_storage_test.go b/signer/storage/aes_gcm_storage_test.go index d4d07521..caaba85a 100644 --- a/signer/storage/aes_gcm_storage_test.go +++ b/signer/storage/aes_gcm_storage_test.go @@ -22,8 +22,8 @@ import ( "io/ioutil" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/log" "github.com/mattn/go-colorable" ) diff --git a/tests/block_test_util.go b/tests/block_test_util.go index fcbae25b..f34d9df1 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -22,19 +22,19 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/FusionFoundation/efsn/consensus/datong" - "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/v4/consensus/datong" + "github.com/FusionFoundation/efsn/v4/core/rawdb" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 8a3ea393..cfb8b79e 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index 6c5c5483..986e8886 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 418edd99..f396ef59 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index 9afdbd3c..07b1c674 100644 --- a/tests/gen_tttransaction.go +++ b/tests/gen_tttransaction.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" ) var _ = (*ttTransactionMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index b5281d65..7065c5f5 100644 --- a/tests/init.go +++ b/tests/init.go @@ -21,7 +21,7 @@ import ( "math/big" "sort" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/params" ) // Forks table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index cfc6ed95..e0c2e7e3 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -29,7 +29,7 @@ import ( "strings" "testing" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 1613b6f5..ff325ee4 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -24,7 +24,7 @@ import ( "math/big" "strings" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index 03353f25..57cd5105 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/v4/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index a586cc47..3050b0c7 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -20,22 +20,22 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/v4/core/rawdb" "math/big" "strconv" "strings" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/core" - "github.com/FusionFoundation/efsn/core/state" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/core/vm" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/core" + "github.com/FusionFoundation/efsn/v4/core/state" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/core/vm" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" "golang.org/x/crypto/sha3" ) diff --git a/tests/transaction_test.go b/tests/transaction_test.go index 05e56ab0..f7cbb1c7 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/v4/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index fa974672..7fdcea78 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/FusionFoundation/efsn/common/math" - "github.com/FusionFoundation/efsn/core/types" - "github.com/FusionFoundation/efsn/params" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/hexutil" + "github.com/FusionFoundation/efsn/v4/common/math" + "github.com/FusionFoundation/efsn/v4/core/types" + "github.com/FusionFoundation/efsn/v4/params" + "github.com/FusionFoundation/efsn/v4/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/trie/committer.go b/trie/committer.go index 11e31773..8587e1de 100644 --- a/trie/committer.go +++ b/trie/committer.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" "golang.org/x/crypto/sha3" ) diff --git a/trie/database.go b/trie/database.go index 7d64cb36..d8b8b648 100644 --- a/trie/database.go +++ b/trie/database.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/metrics" + "github.com/FusionFoundation/efsn/v4/rlp" "github.com/VictoriaMetrics/fastcache" ) diff --git a/trie/database_test.go b/trie/database_test.go index 7c19473f..64210662 100644 --- a/trie/database_test.go +++ b/trie/database_test.go @@ -19,8 +19,8 @@ package trie import ( "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/ethdb/memorydb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 98853468..fe95f8c5 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -19,7 +19,7 @@ package trie import ( "fmt" - "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/v4/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index 27500007..c7f5b554 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -19,8 +19,8 @@ package trie import ( "sync" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/rlp" "golang.org/x/crypto/sha3" ) diff --git a/trie/iterator.go b/trie/iterator.go index c11dff0a..034faf84 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,9 +21,9 @@ import ( "container/heap" "errors" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/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 ee3e281e..038d7c2c 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -23,10 +23,10 @@ import ( "math/rand" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/ethdb/memorydb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/ethdb/memorydb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index 919a5b0d..dbadab6c 100644 --- a/trie/node.go +++ b/trie/node.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/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 c182ad3b..227a1f87 100644 --- a/trie/node_test.go +++ b/trie/node_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/rlp" ) func newTestFullNode(v []byte) []interface{} { diff --git a/trie/proof.go b/trie/proof.go index 25d10b2c..5a356c06 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/ethdb/memorydb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/ethdb/memorydb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/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 5314a684..5a9d9843 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb/memorydb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb/memorydb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 331ee724..b11ae37a 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -19,8 +19,8 @@ package trie import ( "fmt" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/log" ) // 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 1d43fc54..7fc08f36 100644 --- a/trie/secure_trie_test.go +++ b/trie/secure_trie_test.go @@ -22,9 +22,9 @@ import ( "sync" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb/memorydb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb/memorydb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/stacktrie.go b/trie/stacktrie.go index c3920d5d..9af2b3ed 100644 --- a/trie/stacktrie.go +++ b/trie/stacktrie.go @@ -25,10 +25,10 @@ import ( "io" "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/rlp" ) var ErrCommitDisabled = errors.New("no database for committing") diff --git a/trie/stacktrie_test.go b/trie/stacktrie_test.go index 0af184a2..5ba92694 100644 --- a/trie/stacktrie_test.go +++ b/trie/stacktrie_test.go @@ -5,9 +5,9 @@ import ( "math/big" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb/memorydb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb/memorydb" ) func TestSizeBug(t *testing.T) { diff --git a/trie/sync.go b/trie/sync.go index bd5a786e..13c0e41b 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,10 +20,10 @@ import ( "errors" "fmt" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/common/prque" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/common/prque" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/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 bcb2e450..63ce6b5d 100644 --- a/trie/sync_bloom.go +++ b/trie/sync_bloom.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/core/rawdb" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/log" - "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/core/rawdb" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/log" + "github.com/FusionFoundation/efsn/v4/metrics" bloomfilter "github.com/holiman/bloomfilter/v2" ) diff --git a/trie/sync_test.go b/trie/sync_test.go index c372163f..f32b21f3 100644 --- a/trie/sync_test.go +++ b/trie/sync_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index 748060a3..77609f69 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -23,9 +23,9 @@ import ( "fmt" "sync" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/log" ) var ( diff --git a/trie/trie_test.go b/trie/trie_test.go index eda9eb0a..08c5cef8 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -29,11 +29,11 @@ import ( "testing" "testing/quick" + "github.com/FusionFoundation/efsn/v4/common" + "github.com/FusionFoundation/efsn/v4/crypto" + "github.com/FusionFoundation/efsn/v4/ethdb" + "github.com/FusionFoundation/efsn/v4/rlp" "github.com/davecgh/go-spew/spew" - "github.com/FusionFoundation/efsn/common" - "github.com/FusionFoundation/efsn/crypto" - "github.com/FusionFoundation/efsn/ethdb" - "github.com/FusionFoundation/efsn/rlp" ) func init() {