From 5f308ad70a5c632476b2c9a665477b266096fe36 Mon Sep 17 00:00:00 2001 From: suryansh Date: Tue, 20 Mar 2018 01:29:26 +0530 Subject: [PATCH] eInc protocol update --- .github/CONTRIBUTING.md | 4 +- .travis.yml | 2 +- accounts/abi/abi_test.go | 4 +- accounts/abi/bind/auth.go | 8 +-- accounts/abi/bind/backend.go | 6 +- accounts/abi/bind/backends/simulated.go | 30 +++++----- accounts/abi/bind/base.go | 12 ++-- accounts/abi/bind/bind.go | 4 +- accounts/abi/bind/bind_test.go | 2 +- accounts/abi/bind/template.go | 2 +- accounts/abi/bind/topics.go | 6 +- accounts/abi/bind/util.go | 6 +- accounts/abi/bind/util_test.go | 12 ++-- accounts/abi/event.go | 4 +- accounts/abi/event_test.go | 6 +- accounts/abi/method.go | 2 +- accounts/abi/numbers.go | 4 +- accounts/abi/pack.go | 4 +- accounts/abi/pack_test.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 | 8 +-- 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 | 2 +- accounts/manager.go | 2 +- accounts/usbwallet/hub.go | 6 +- accounts/usbwallet/ledger.go | 12 ++-- accounts/usbwallet/trezor.go | 12 ++-- accounts/usbwallet/wallet.go | 10 ++-- bmt/bmt_test.go | 2 +- build/ci.go | 6 +- build/deb.control | 4 +- build/mvn.pom | 6 +- build/nsis.install.nsh | 6 +- build/pod.podspec | 4 +- cmd/abigen/main.go | 4 +- cmd/bootnode/main.go | 14 ++--- 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 | 6 +- cmd/evm/compiler.go | 2 +- cmd/evm/disasm.go | 2 +- cmd/evm/internal/compiler/compiler.go | 2 +- cmd/evm/json_logger.go | 6 +- cmd/evm/main.go | 2 +- cmd/evm/runner.go | 20 +++---- cmd/evm/staterunner.go | 8 +-- cmd/faucet/faucet.go | 36 ++++++------ cmd/geth/accountcmd.go | 12 ++-- cmd/geth/accountcmd_test.go | 2 +- cmd/geth/bugcmd.go | 8 +-- cmd/geth/chaincmd.go | 22 ++++---- cmd/geth/config.go | 12 ++-- cmd/geth/consolecmd.go | 14 ++--- cmd/geth/consolecmd_test.go | 2 +- cmd/geth/dao_test.go | 8 +-- cmd/geth/main.go | 22 ++++---- cmd/geth/misccmd.go | 8 +-- cmd/geth/monitorcmd.go | 6 +- cmd/geth/run_test.go | 2 +- cmd/geth/usage.go | 4 +- cmd/p2psim/main.go | 12 ++-- cmd/puppeth/genesis.go | 10 ++-- cmd/puppeth/module.go | 2 +- cmd/puppeth/module_dashboard.go | 8 +-- 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/swarm/config.go | 12 ++-- cmd/swarm/config_test.go | 6 +- cmd/swarm/db.go | 6 +- cmd/swarm/hash.go | 4 +- cmd/swarm/list.go | 4 +- cmd/swarm/main.go | 34 +++++------ cmd/swarm/manifest.go | 6 +- cmd/swarm/run_test.go | 14 ++--- cmd/swarm/upload.go | 4 +- cmd/utils/cmd.go | 12 ++-- cmd/utils/customflags.go | 2 +- cmd/utils/flags.go | 56 +++++++++---------- cmd/wnode/main.go | 20 +++---- common/bitutil/compress_test.go | 2 +- common/debug.go | 2 +- common/hexutil/json_example_test.go | 2 +- common/math/big_test.go | 2 +- common/number/int.go | 2 +- common/number/uint_test.go | 2 +- common/types.go | 4 +- compression/rle/read_write.go | 2 +- consensus/clique/api.go | 8 +-- consensus/clique/clique.go | 28 +++++----- consensus/clique/snapshot.go | 8 +-- consensus/clique/snapshot_test.go | 12 ++-- consensus/consensus.go | 10 ++-- consensus/ethash/algorithm.go | 10 ++-- consensus/ethash/algorithm_test.go | 6 +- consensus/ethash/consensus.go | 14 ++--- consensus/ethash/consensus_test.go | 6 +- consensus/ethash/ethash.go | 6 +- consensus/ethash/ethash_test.go | 4 +- consensus/ethash/sealer.go | 8 +-- consensus/misc/dao.go | 6 +- consensus/misc/forks.go | 6 +- console/bridge.go | 6 +- console/console.go | 6 +- console/console_test.go | 12 ++-- containers/docker/develop-alpine/Dockerfile | 2 +- containers/docker/develop-ubuntu/Dockerfile | 2 +- containers/docker/master-alpine/Dockerfile | 2 +- containers/docker/master-ubuntu/Dockerfile | 2 +- containers/vagrant/Vagrantfile | 2 +- .../vagrant/provisioners/shell/centos.sh | 2 +- .../vagrant/provisioners/shell/debian.sh | 2 +- .../vagrant/provisioners/shell/ubuntu.sh | 2 +- contracts/chequebook/api.go | 2 +- contracts/chequebook/cheque.go | 16 +++--- contracts/chequebook/cheque_test.go | 12 ++-- contracts/chequebook/contract/chequebook.go | 12 ++-- contracts/chequebook/gencode.go | 10 ++-- contracts/ens/contract/ens.go | 12 ++-- contracts/ens/contract/fifsregistrar.go | 8 +-- contracts/ens/contract/publicresolver.go | 12 ++-- contracts/ens/ens.go | 10 ++-- contracts/ens/ens_test.go | 10 ++-- core/asm/asm.go | 2 +- core/asm/compiler.go | 4 +- core/bench_test.go | 16 +++--- core/block_validator.go | 8 +-- core/block_validator_test.go | 10 ++-- core/blockchain.go | 28 +++++----- core/blockchain_test.go | 18 +++--- 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 | 4 +- core/chain_indexer.go | 10 ++-- core/chain_indexer_test.go | 6 +- core/chain_makers.go | 16 +++--- core/chain_makers_test.go | 12 ++-- core/dao_test.go | 8 +-- core/database_util.go | 14 ++--- core/database_util_test.go | 10 ++-- core/events.go | 4 +- core/evm.go | 8 +-- core/gen_genesis.go | 8 +-- core/gen_genesis_account.go | 6 +- core/genesis.go | 18 +++--- core/genesis_test.go | 10 ++-- core/headerchain.go | 12 ++-- core/helper_test.go | 6 +- core/mkalloc.go | 4 +- core/state/database.go | 6 +- core/state/dump.go | 6 +- core/state/iterator.go | 6 +- core/state/iterator_test.go | 4 +- core/state/journal.go | 2 +- core/state/managed_state.go | 2 +- core/state/managed_state_test.go | 4 +- core/state/state_object.go | 6 +- core/state/state_test.go | 6 +- core/state/statedb.go | 12 ++-- core/state/statedb_test.go | 8 +-- core/state/sync.go | 6 +- core/state/sync_test.go | 8 +-- core/state_processor.go | 16 +++--- core/state_transition.go | 8 +-- core/tx_journal.go | 8 +-- core/tx_list.go | 6 +- core/tx_list_test.go | 4 +- core/tx_pool.go | 14 ++--- core/tx_pool_test.go | 14 ++--- core/types.go | 6 +- core/types/block.go | 8 +-- core/types/block_test.go | 4 +- core/types/bloom9.go | 4 +- core/types/bloom9_test.go | 2 +- core/types/derive_sha.go | 6 +- core/types/gen_header_json.go | 4 +- core/types/gen_log_json.go | 4 +- core/types/gen_receipt_json.go | 4 +- core/types/gen_tx_json.go | 4 +- core/types/log.go | 6 +- core/types/log_test.go | 4 +- core/types/receipt.go | 6 +- core/types/transaction.go | 8 +-- core/types/transaction_signing.go | 6 +- core/types/transaction_signing_test.go | 6 +- core/types/transaction_test.go | 6 +- core/vm/analysis.go | 2 +- core/vm/common.go | 4 +- core/vm/contract.go | 2 +- core/vm/contracts.go | 10 ++-- core/vm/contracts_test.go | 2 +- core/vm/evm.go | 6 +- core/vm/gas.go | 2 +- core/vm/gas_table.go | 6 +- core/vm/gen_structlog.go | 6 +- core/vm/instructions.go | 10 ++-- core/vm/instructions_test.go | 4 +- core/vm/interface.go | 4 +- core/vm/interpreter.go | 8 +-- core/vm/jump_table.go | 2 +- core/vm/logger.go | 8 +-- core/vm/logger_test.go | 4 +- core/vm/memory_table.go | 2 +- core/vm/noop.go | 4 +- core/vm/runtime/env.go | 6 +- 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 +- core/vm/vm_jit.go | 6 +- crypto/crypto.go | 8 +-- crypto/crypto_test.go | 2 +- crypto/ecies/ecies_test.go | 2 +- crypto/ecies/params.go | 2 +- crypto/secp256k1/curve.go | 2 +- crypto/secp256k1/secp256_test.go | 4 +- crypto/signature_cgo.go | 4 +- crypto/signature_test.go | 6 +- dashboard/cpu.go | 2 +- dashboard/dashboard.go | 8 +-- eth/api.go | 22 ++++---- eth/api_backend.go | 28 +++++----- eth/api_test.go | 6 +- eth/api_tracer.go | 24 ++++---- eth/backend.go | 46 +++++++-------- eth/bloombits.go | 14 ++--- eth/config.go | 14 ++--- eth/db_upgrade.go | 10 ++-- eth/downloader/api.go | 6 +- eth/downloader/downloader.go | 14 ++--- eth/downloader/downloader_test.go | 18 +++--- eth/downloader/fakepeer.go | 8 +-- eth/downloader/metrics.go | 2 +- eth/downloader/peer.go | 6 +- eth/downloader/queue.go | 6 +- eth/downloader/statesync.go | 12 ++-- eth/downloader/types.go | 2 +- eth/fetcher/fetcher.go | 8 +-- eth/fetcher/fetcher_test.go | 14 ++--- eth/fetcher/metrics.go | 2 +- eth/filters/api.go | 14 ++--- eth/filters/api_test.go | 4 +- eth/filters/bench_test.go | 16 +++--- eth/filters/filter.go | 14 ++--- eth/filters/filter_system.go | 12 ++-- eth/filters/filter_system_test.go | 20 +++---- eth/filters/filter_test.go | 16 +++--- eth/gasprice/gasprice.go | 10 ++-- eth/gen_config.go | 12 ++-- eth/handler.go | 28 +++++----- eth/handler_test.go | 24 ++++---- eth/helper_test.go | 24 ++++---- eth/metrics.go | 4 +- eth/peer.go | 8 +-- eth/protocol.go | 10 ++-- eth/protocol_test.go | 12 ++-- eth/sync.go | 10 ++-- eth/sync_test.go | 6 +- eth/tracers/tracer.go | 10 ++-- eth/tracers/tracer_test.go | 6 +- eth/tracers/tracers.go | 2 +- eth/tracers/tracers_test.go | 18 +++--- ethclient/ethclient.go | 12 ++-- ethclient/ethclient_test.go | 2 +- ethclient/signer.go | 4 +- ethdb/database.go | 4 +- ethdb/database_test.go | 2 +- ethdb/memory_database.go | 2 +- ethstats/ethstats.go | 22 ++++---- event/example_feed_test.go | 2 +- event/example_scope_test.go | 2 +- event/example_subscription_test.go | 2 +- event/subscription.go | 2 +- interfaces.go | 4 +- internal/debug/api.go | 2 +- internal/debug/flags.go | 4 +- internal/debug/trace.go | 2 +- internal/ethapi/addrlock.go | 2 +- internal/ethapi/api.go | 34 +++++------ internal/ethapi/backend.go | 22 ++++---- internal/guide/guide_test.go | 4 +- internal/jsre/deps/web3.js | 2 +- internal/jsre/jsre.go | 4 +- les/api_backend.go | 30 +++++----- les/backend.go | 42 +++++++------- les/bloombits.go | 4 +- les/fetcher.go | 14 ++--- les/flowcontrol/control.go | 2 +- les/flowcontrol/manager.go | 2 +- les/handler.go | 32 +++++------ les/handler_test.go | 24 ++++---- les/helper_test.go | 26 ++++----- 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 | 10 ++-- les/request_test.go | 12 ++-- les/retrieve.go | 2 +- les/server.go | 22 ++++---- les/serverpool.go | 14 ++--- les/sync.go | 6 +- les/txrelay.go | 4 +- light/lightchain.go | 20 +++---- light/lightchain_test.go | 12 ++-- light/nodeset.go | 8 +-- light/odr.go | 8 +-- light/odr_test.go | 24 ++++---- light/odr_util.go | 10 ++-- light/postprocess.go | 18 +++--- light/trie.go | 12 ++-- light/trie_test.go | 14 ++--- light/txpool.go | 18 +++--- light/txpool_test.go | 14 ++--- log/format.go | 2 +- metrics/metrics.go | 2 +- miner/agent.go | 4 +- miner/miner.go | 22 ++++---- miner/remote_agent.go | 10 ++-- miner/unconfirmed.go | 6 +- miner/unconfirmed_test.go | 4 +- miner/worker.go | 22 ++++---- 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 | 16 +++--- node/config_test.go | 4 +- node/defaults.go | 4 +- node/node.go | 14 ++--- node/node_example_test.go | 6 +- node/node_test.go | 6 +- node/service.go | 10 ++-- 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 | 6 +- p2p/discover/table_test.go | 4 +- p2p/discover/udp.go | 10 ++-- p2p/discover/udp_test.go | 6 +- p2p/discv5/database.go | 6 +- p2p/discv5/net.go | 14 ++--- 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 | 6 +- p2p/enr/enr_test.go | 4 +- p2p/enr/entries.go | 4 +- p2p/message.go | 6 +- p2p/metrics.go | 2 +- p2p/nat/nat.go | 2 +- p2p/peer.go | 10 ++-- p2p/protocol.go | 2 +- p2p/rlpx.go | 12 ++-- p2p/rlpx_test.go | 10 ++-- p2p/server.go | 16 +++--- p2p/server_test.go | 8 +-- p2p/simulations/adapters/docker.go | 6 +- p2p/simulations/adapters/exec.go | 10 ++-- p2p/simulations/adapters/inproc.go | 12 ++-- 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 | 4 +- p2p/simulations/mocker_test.go | 2 +- p2p/simulations/network.go | 10 ++-- p2p/simulations/network_test.go | 4 +- p2p/simulations/simulation.go | 2 +- params/config.go | 2 +- params/dao.go | 2 +- rpc/client.go | 2 +- rpc/client_example_test.go | 2 +- rpc/client_test.go | 2 +- rpc/ipc.go | 2 +- rpc/json.go | 2 +- rpc/server.go | 2 +- rpc/types.go | 2 +- rpc/types_test.go | 2 +- rpc/websocket.go | 2 +- swarm/api/api.go | 6 +- swarm/api/api_test.go | 6 +- swarm/api/client/client.go | 2 +- swarm/api/client/client_test.go | 4 +- swarm/api/config.go | 16 +++--- swarm/api/config_test.go | 4 +- swarm/api/filesystem.go | 6 +- swarm/api/filesystem_test.go | 4 +- swarm/api/http/error.go | 4 +- swarm/api/http/error_test.go | 2 +- swarm/api/http/roundtripper.go | 8 +-- swarm/api/http/server.go | 8 +-- swarm/api/http/server_test.go | 10 ++-- swarm/api/http/templates.go | 2 +- swarm/api/manifest.go | 6 +- swarm/api/manifest_test.go | 2 +- swarm/api/testapi.go | 2 +- swarm/dev/Makefile | 8 +-- swarm/dev/bashrc | 2 +- swarm/dev/run.sh | 2 +- swarm/fuse/fuse_file.go | 4 +- swarm/fuse/swarmfs.go | 2 +- swarm/fuse/swarmfs_test.go | 4 +- swarm/fuse/swarmfs_unix.go | 6 +- swarm/fuse/swarmfs_util.go | 2 +- swarm/network/depo.go | 4 +- swarm/network/forwarding.go | 4 +- swarm/network/hive.go | 12 ++-- swarm/network/kademlia/address.go | 2 +- swarm/network/kademlia/address_test.go | 2 +- swarm/network/kademlia/kaddb.go | 2 +- swarm/network/kademlia/kademlia.go | 2 +- swarm/network/messages.go | 10 ++-- swarm/network/protocol.go | 12 ++-- swarm/network/syncdb.go | 4 +- swarm/network/syncdb_test.go | 6 +- swarm/network/syncer.go | 4 +- swarm/services/swap/swap.go | 16 +++--- swarm/services/swap/swap/swap.go | 2 +- swarm/services/swap/swap/swap_test.go | 2 +- swarm/storage/chunker_test.go | 2 +- swarm/storage/common_test.go | 2 +- swarm/storage/database.go | 2 +- swarm/storage/dbstore.go | 4 +- swarm/storage/dbstore_test.go | 2 +- swarm/storage/dpa.go | 2 +- swarm/storage/memstore.go | 2 +- swarm/storage/netstore.go | 2 +- swarm/storage/types.go | 6 +- swarm/swarm.go | 32 +++++------ swarm/testutil/http.go | 6 +- tests/block_test_util.go | 22 ++++---- tests/difficulty_test.go | 4 +- tests/difficulty_test_util.go | 10 ++-- tests/gen_btheader.go | 8 +-- tests/gen_difficultytest.go | 4 +- tests/gen_stenv.go | 4 +- tests/gen_sttransaction.go | 4 +- tests/gen_tttransaction.go | 6 +- tests/gen_vmexec.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 ++-- tests/vm_test.go | 2 +- tests/vm_test_util.go | 18 +++--- trie/database.go | 6 +- trie/errors.go | 2 +- trie/hasher.go | 6 +- trie/iterator.go | 2 +- trie/iterator_test.go | 4 +- trie/node.go | 4 +- trie/proof.go | 10 ++-- trie/proof_test.go | 6 +- trie/secure_trie.go | 4 +- trie/secure_trie_test.go | 6 +- trie/sync.go | 4 +- trie/sync_test.go | 4 +- trie/trie.go | 6 +- trie/trie_test.go | 8 +-- vendor/vendor.json | 2 +- whisper/mailserver/mailserver.go | 12 ++-- whisper/mailserver/server_test.go | 6 +- whisper/shhclient/client.go | 8 +-- whisper/whisperv2/api.go | 6 +- whisper/whisperv2/envelope.go | 10 ++-- whisper/whisperv2/envelope_test.go | 4 +- whisper/whisperv2/filter.go | 2 +- whisper/whisperv2/main.go | 12 ++-- whisper/whisperv2/message.go | 8 +-- whisper/whisperv2/message_test.go | 2 +- whisper/whisperv2/peer.go | 8 +-- whisper/whisperv2/peer_test.go | 4 +- whisper/whisperv2/topic.go | 2 +- whisper/whisperv2/whisper.go | 14 ++--- whisper/whisperv2/whisper_test.go | 4 +- whisper/whisperv5/api.go | 12 ++-- whisper/whisperv5/benchmarks_test.go | 2 +- whisper/whisperv5/envelope.go | 10 ++-- whisper/whisperv5/filter.go | 6 +- whisper/whisperv5/filter_test.go | 4 +- whisper/whisperv5/gen_criteria_json.go | 2 +- whisper/whisperv5/gen_message_json.go | 2 +- whisper/whisperv5/gen_newmessage_json.go | 2 +- whisper/whisperv5/message.go | 8 +-- whisper/whisperv5/message_test.go | 4 +- whisper/whisperv5/peer.go | 8 +-- whisper/whisperv5/peer_test.go | 10 ++-- whisper/whisperv5/topic.go | 4 +- whisper/whisperv5/whisper.go | 10 ++-- whisper/whisperv5/whisper_test.go | 2 +- whisper/whisperv6/api.go | 12 ++-- whisper/whisperv6/benchmarks_test.go | 2 +- whisper/whisperv6/envelope.go | 10 ++-- whisper/whisperv6/envelope_test.go | 2 +- whisper/whisperv6/filter.go | 6 +- whisper/whisperv6/filter_test.go | 4 +- whisper/whisperv6/gen_criteria_json.go | 2 +- whisper/whisperv6/gen_message_json.go | 2 +- whisper/whisperv6/gen_newmessage_json.go | 2 +- whisper/whisperv6/message.go | 8 +-- whisper/whisperv6/message_test.go | 6 +- whisper/whisperv6/peer.go | 8 +-- whisper/whisperv6/peer_test.go | 12 ++-- whisper/whisperv6/topic.go | 4 +- whisper/whisperv6/whisper.go | 12 ++-- whisper/whisperv6/whisper_test.go | 2 +- 573 files changed, 2098 insertions(+), 2098 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a69cfa3a55..74f52ff2ac 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,7 +2,7 @@ Before you do a feature request please check and make sure that it isn't possible through some other means. The JavaScript enabled console is a powerful feature -in the right hands. Please check our [Wiki page](https://github.com/etherinc/go-ethereum/wiki) for more info +in the right hands. Please check our [Wiki page](https://github.com/etherinc/go-etherinc/wiki) for more info and help. ## Contributing @@ -11,6 +11,6 @@ If you'd like to contribute to go-ethereum please fork, fix, commit and send a pull request. Commits which do not comply with the coding standards are ignored (use gofmt!). -See [Developers' Guide](https://github.com/etherinc/go-ethereum/wiki/Developers'-Guide) +See [Developers' Guide](https://github.com/etherinc/go-etherinc/wiki/Developers'-Guide) for more details on configuring your environment, testing, and dependency management. diff --git a/.travis.yml b/.travis.yml index 956b078dc6..024de5380d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/etherinc/go-ethereum +go_import_path: github.com/etherinc/go-etherinc sudo: false matrix: include: diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index 95b39493f0..975dde5a17 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -27,8 +27,8 @@ import ( "reflect" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index 2833494c97..c5c26e20ac 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -22,10 +22,10 @@ import ( "io" "io/ioutil" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" ) // NewTransactor is a utility method to easily create a transaction signer from diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go index 94acfbb9d0..3870db03bd 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 993a8bc8e9..c0a9828ece 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,21 +24,21 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/bloombits" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/eth/filters" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/bloombits" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/eth/filters" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/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 c2819dd37a..d40c0c40ad 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/accounts/abi" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/accounts/abi" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/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 270f29720f..98877abfa2 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -17,7 +17,7 @@ // Package bind generates Ethereum contract Go bindings. // // Detailed usage document and tutorial available on the go-ethereum Wiki page: -// https://github.com/etherinc/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts +// https://github.com/etherinc/go-etherinc/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts package bind import ( @@ -28,7 +28,7 @@ import ( "text/template" "unicode" - "github.com/etherinc/go-ethereum/accounts/abi" + "github.com/etherinc/go-etherinc/accounts/abi" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index b90249d128..aed8444eb8 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index aac545953f..83fd603fa5 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/etherinc/go-ethereum/accounts/abi" +import "github.com/etherinc/go-etherinc/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { diff --git a/accounts/abi/bind/topics.go b/accounts/abi/bind/topics.go index 70b119d5e1..964f567762 100644 --- a/accounts/abi/bind/topics.go +++ b/accounts/abi/bind/topics.go @@ -22,9 +22,9 @@ import ( "math/big" "reflect" - "github.com/etherinc/go-ethereum/accounts/abi" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts/abi" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" ) // makeTopics converts a filter query argument list into a filter topic set. diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index e9ff0bf5dc..e233a42f10 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/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 175ed8c652..3027bd1857 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/accounts/abi/bind/backends" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/accounts/abi/bind/backends" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index e8ea4fdbb7..2a180aa6ea 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/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 71976b04ec..6409e3ba73 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -244,7 +244,7 @@ func unpackTestEventData(dest interface{}, hexData string, jsonEvent []byte, ass /* Taken from -https://github.com/etherinc/go-ethereum/pull/15568 +https://github.com/etherinc/go-etherinc/pull/15568 */ type testResult struct { diff --git a/accounts/abi/method.go b/accounts/abi/method.go index 8fbb81ae32..8be6ba036f 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/crypto" ) // Method represents a callable given a `Name` and whether the method is a constant. diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go index 93311f91e6..c58d312bb8 100644 --- a/accounts/abi/numbers.go +++ b/accounts/abi/numbers.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" ) var ( diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index 057e789f29..b660226e89 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/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 18d84240cb..f43418bde2 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) func TestPack(t *testing.T) { diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index bdc8531855..8892dd5c74 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) // typeWithoutStringer is a alias for the Type type which simply doesn't implement diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go index 658802d8ab..f3808e1d89 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,7 @@ import ( "math/big" "reflect" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) // reads the integer based on its kind diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index 5da3cd20f6..054e43b2f9 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" "github.com/stretchr/testify/require" ) diff --git a/accounts/accounts.go b/accounts/accounts.go index 20974edd8e..4fd9f2d09c 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -20,10 +20,10 @@ package accounts import ( "math/big" - ethereum "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/event" + ethereum "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/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 4c08afea50..0e40ed9be5 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" "gopkg.in/fatih/set.v0" ) diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index cbd6fbf9c1..ff9bc20ad1 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -29,8 +29,8 @@ import ( "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" ) var ( diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index 3f2694d201..f16f2a5804 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" set "gopkg.in/fatih/set.v0" ) diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index 1145156299..787ddf6892 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" "github.com/pborman/uuid" ) diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 0c854bc3e3..ea9291bba0 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/event" ) var ( diff --git a/accounts/keystore/keystore_passphrase.go b/accounts/keystore/keystore_passphrase.go index b33ce5af1f..8622115ca7 100644 --- a/accounts/keystore/keystore_passphrase.go +++ b/accounts/keystore/keystore_passphrase.go @@ -36,10 +36,10 @@ import ( "io/ioutil" "path/filepath" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/randentropy" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/randentropy" "github.com/pborman/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 8b1b55123d..3664d58f2b 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) const ( diff --git a/accounts/keystore/keystore_plain.go b/accounts/keystore/keystore_plain.go index 70d0073d74..7d3a5d0525 100644 --- a/accounts/keystore/keystore_plain.go +++ b/accounts/keystore/keystore_plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/keystore_plain_test.go b/accounts/keystore/keystore_plain_test.go index 1d868d0c8b..a45a92e9b9 100644 --- a/accounts/keystore/keystore_plain_test.go +++ b/accounts/keystore/keystore_plain_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/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 55de023e7e..10478bbe1c 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/keystore_wallet.go b/accounts/keystore/keystore_wallet.go index 7f26abfaa5..bf6cf75b2e 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/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/core/types" + ethereum "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/core/types" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 92f02145c4..f38ed5cfd1 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/crypto" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index 6ce9a735d2..59129a582d 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -21,7 +21,7 @@ package keystore import ( "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" "github.com/rjeczalik/notify" ) diff --git a/accounts/manager.go b/accounts/manager.go index 0b92fe3917..330b5febe6 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-etherinc/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 f405f5b073..3dcabab5d1 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" "github.com/karalabe/hid" ) diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index 66bce1d90f..7ce2bfb74e 100644 --- a/accounts/usbwallet/ledger.go +++ b/accounts/usbwallet/ledger.go @@ -28,12 +28,12 @@ import ( "io" "math/big" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index 7230cd913e..6ddf18ae65 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -27,12 +27,12 @@ import ( "io" "math/big" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/accounts/usbwallet/internal/trezor" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/accounts/usbwallet/internal/trezor" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/log" "github.com/golang/protobuf/proto" ) diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index ab4052a4e7..94ac8fc467 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -25,11 +25,11 @@ import ( "sync" "time" - ethereum "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/log" + ethereum "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/log" "github.com/karalabe/hid" ) diff --git a/bmt/bmt_test.go b/bmt/bmt_test.go index 21017b5da3..70fcdc3a1e 100644 --- a/bmt/bmt_test.go +++ b/bmt/bmt_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-etherinc/crypto/sha3" ) const ( diff --git a/build/ci.go b/build/ci.go index 0e2734c4b1..c15f9a1afb 100644 --- a/build/ci.go +++ b/build/ci.go @@ -58,7 +58,7 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/internal/build" + "github.com/etherinc/go-etherinc/internal/build" ) var ( @@ -737,7 +737,7 @@ func doAndroidArchive(cmdline []string) { // Build the Android archive and Maven resources build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(gomobileTool("init", "--ndk", os.Getenv("ANDROID_NDK"))) - build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/etherinc/go-ethereum/mobile")) + build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/etherinc/go-etherinc/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven @@ -857,7 +857,7 @@ func doXCodeFramework(cmdline []string) { // Build the iOS XCode framework build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(gomobileTool("init")) - bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/etherinc/go-ethereum/mobile") + bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/etherinc/go-etherinc/mobile") if *local { // If we're building locally, use the build folder and stop afterwards diff --git a/build/deb.control b/build/deb.control index b20de3faca..b6bc9aa765 100644 --- a/build/deb.control +++ b/build/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.9 Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: git://github.com/etherinc/go-ethereum.git -Vcs-Browser: https://github.com/etherinc/go-ethereum +Vcs-Git: git://github.com/etherinc/go-etherinc.git +Vcs-Browser: https://github.com/etherinc/go-etherinc Package: {{.Name}} Architecture: any diff --git a/build/mvn.pom b/build/mvn.pom index 1d0c4d8c7a..bf2bcdf536 100644 --- a/build/mvn.pom +++ b/build/mvn.pom @@ -11,7 +11,7 @@ Android Ethereum Client Android port of the go-ethereum libraries and node - https://github.com/etherinc/go-ethereum + https://github.com/etherinc/go-etherinc 2015 @@ -48,10 +48,10 @@ GitHub Issues - https://github.com/etherinc/go-ethereum/issues/ + https://github.com/etherinc/go-etherinc/issues/ - https://github.com/etherinc/go-ethereum + https://github.com/etherinc/go-etherinc diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index 340eadcdff..9037adaa18 100644 --- a/build/nsis.install.nsh +++ b/build/nsis.install.nsh @@ -3,9 +3,9 @@ InstallDir "$InstDir" OutFile "${OUTPUTFILE}" # set through command line arguments # Links for "Add/Remove Programs" -!define HELPURL "https://github.com/etherinc/go-ethereum/issues" -!define UPDATEURL "https://github.com/etherinc/go-ethereum/releases" -!define ABOUTURL "https://github.com/etherinc/go-ethereum#ethereum-go" +!define HELPURL "https://github.com/etherinc/go-etherinc/issues" +!define UPDATEURL "https://github.com/etherinc/go-etherinc/releases" +!define ABOUTURL "https://github.com/etherinc/go-etherinc#ethereum-go" !define /date NOW "%Y%m%d" PageEx license diff --git a/build/pod.podspec b/build/pod.podspec index f8e886c4c9..a4eb7a45d1 100644 --- a/build/pod.podspec +++ b/build/pod.podspec @@ -2,12 +2,12 @@ Pod::Spec.new do |spec| spec.name = 'Geth' spec.version = '{{.Version}}' spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' } - spec.homepage = 'https://github.com/etherinc/go-ethereum' + spec.homepage = 'https://github.com/etherinc/go-etherinc' spec.authors = { {{range .Contributors}} '{{.Name}}' => '{{.Email}}',{{end}} } spec.summary = 'iOS Ethereum Client' - spec.source = { :git => 'https://github.com/etherinc/go-ethereum.git', :commit => '{{.Commit}}' } + spec.source = { :git => 'https://github.com/etherinc/go-etherinc.git', :commit => '{{.Commit}}' } spec.platform = :ios spec.ios.deployment_target = '9.0' diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index 54b0dc3989..c6eca5a792 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/common/compiler" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 880746a9bb..4fe84f9ebe 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,13 +24,13 @@ import ( "net" "os" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/discv5" - "github.com/etherinc/go-ethereum/p2p/nat" - "github.com/etherinc/go-ethereum/p2p/netutil" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/discv5" + "github.com/etherinc/go-etherinc/p2p/nat" + "github.com/etherinc/go-etherinc/p2p/netutil" ) func main() { diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index 67c8b7c78f..221c5816c4 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -23,9 +23,9 @@ import ( "os" "path/filepath" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/crypto" "github.com/pborman/uuid" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index fe48cd2150..9302ac1a80 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -5,9 +5,9 @@ import ( "fmt" "io/ioutil" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index 513096aefb..58e6b448af 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-etherinc/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index 1bf7bcf47e..d66c6f2216 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,10 +21,10 @@ import ( "fmt" "io/ioutil" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index e9ac69a584..e3c97fce9c 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/etherinc/go-ethereum/internal/cmdtest" + "github.com/etherinc/go-etherinc/internal/cmdtest" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 77166fa009..fac3f999c5 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,9 +22,9 @@ import ( "io/ioutil" "strings" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/console" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/console" + "github.com/etherinc/go-etherinc/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index e744d2bb5c..ad8776b2ee 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "io/ioutil" - "github.com/etherinc/go-ethereum/cmd/evm/internal/compiler" + "github.com/etherinc/go-etherinc/cmd/evm/internal/compiler" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 8995231d9b..636d378e2a 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/etherinc/go-ethereum/core/asm" + "github.com/etherinc/go-etherinc/core/asm" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go index a699a6112b..c5e230aa3b 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/etherinc/go-ethereum/core/asm" + "github.com/etherinc/go-etherinc/core/asm" ) func Compile(fn string, src []byte, debug bool) (string, error) { diff --git a/cmd/evm/json_logger.go b/cmd/evm/json_logger.go index 5ba1803cc4..296da3bcae 100644 --- a/cmd/evm/json_logger.go +++ b/cmd/evm/json_logger.go @@ -22,9 +22,9 @@ import ( "math/big" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core/vm" ) type JSONLogger struct { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 9f21c96091..679bf82fa8 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,7 +22,7 @@ import ( "math/big" "os" - "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-etherinc/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index e0b3a271b1..e354a43016 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -27,16 +27,16 @@ import ( goruntime "runtime" - "github.com/etherinc/go-ethereum/cmd/evm/internal/compiler" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/core/vm/runtime" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/cmd/evm/internal/compiler" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/core/vm/runtime" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/params" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index 736bf9c7a9..662c05b33e 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -23,10 +23,10 @@ import ( "io/ioutil" "os" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/tests" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/tests" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 17fb85fe61..a1ec6f95bc 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -41,23 +41,23 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/ethclient" - "github.com/etherinc/go-ethereum/ethstats" - "github.com/etherinc/go-ethereum/les" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/discv5" - "github.com/etherinc/go-ethereum/p2p/nat" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/ethclient" + "github.com/etherinc/go-etherinc/ethstats" + "github.com/etherinc/go-etherinc/les" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/discv5" + "github.com/etherinc/go-etherinc/p2p/nat" + "github.com/etherinc/go-etherinc/params" "golang.org/x/net/websocket" ) @@ -450,7 +450,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) { case *noauthFlag: username, avatar, address, err = authNoAuth(msg.URL) default: - err = errors.New("Something funky happened, please open an issue at https://github.com/etherinc/go-ethereum/issues") + err = errors.New("Something funky happened, please open an issue at https://github.com/etherinc/go-etherinc/issues") } if err != nil { if err = sendError(conn, err); err != nil { diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index 7201679dbc..89aa993cd3 100644 --- a/cmd/geth/accountcmd.go +++ b/cmd/geth/accountcmd.go @@ -20,12 +20,12 @@ import ( "fmt" "io/ioutil" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/console" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/console" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go index efa0562480..dbe40d90c7 100644 --- a/cmd/geth/accountcmd_test.go +++ b/cmd/geth/accountcmd_test.go @@ -173,7 +173,7 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could `) } -// https://github.com/etherinc/go-ethereum/issues/1785 +// https://github.com/etherinc/go-etherinc/issues/1785 func TestUnlockFlagMultiIndex(t *testing.T) { datadir := tmpDatadirWithKeystore(t) geth := runGeth(t, diff --git a/cmd/geth/bugcmd.go b/cmd/geth/bugcmd.go index 54a94b6b10..35ea038665 100644 --- a/cmd/geth/bugcmd.go +++ b/cmd/geth/bugcmd.go @@ -26,10 +26,10 @@ import ( "runtime" "strings" - "github.com/etherinc/go-ethereum/cmd/internal/browser" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/cmd/internal/browser" + "github.com/etherinc/go-etherinc/params" - "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-etherinc/cmd/utils" cli "gopkg.in/urfave/cli.v1" ) @@ -41,7 +41,7 @@ var bugCommand = cli.Command{ Category: "MISCELLANEOUS COMMANDS", } -const issueUrl = "https://github.com/etherinc/go-ethereum/issues/new" +const issueUrl = "https://github.com/etherinc/go-etherinc/issues/new" // reportBug reports a bug by opening a new URL to the go-ethereum GH issue // tracker and setting default values as the issue body. diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 2442ad41df..086789398e 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -25,17 +25,17 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/console" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/console" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/trie" "github.com/syndtr/goleveldb/leveldb/util" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index c5da3e0611..81d2f396dc 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -27,12 +27,12 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/dashboard" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/params" - whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/dashboard" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/params" + whisper "github.com/etherinc/go-etherinc/whisper/whisperv5" "github.com/naoina/toml" ) diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index b8718cf4e0..dc2b70e3fe 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -23,10 +23,10 @@ import ( "path/filepath" "strings" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/console" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/console" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/rpc" "gopkg.in/urfave/cli.v1" ) @@ -42,7 +42,7 @@ var ( Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/etherinc/go-ethereum/wiki/Javascipt-Console.`, +See https://github.com/etherinc/go-etherinc/wiki/Javascipt-Console.`, } attachCommand = cli.Command{ @@ -55,7 +55,7 @@ See https://github.com/etherinc/go-ethereum/wiki/Javascipt-Console.`, Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/etherinc/go-ethereum/wiki/Javascipt-Console. +See https://github.com/etherinc/go-etherinc/wiki/Javascipt-Console. This command allows to open a console on a running geth node.`, } @@ -68,7 +68,7 @@ This command allows to open a console on a running geth node.`, Category: "CONSOLE COMMANDS", Description: ` The JavaScript VM exposes a node admin interface as well as the Ðapp -JavaScript API. See https://github.com/etherinc/go-ethereum/wiki/Javascipt-Console`, +JavaScript API. See https://github.com/etherinc/go-etherinc/wiki/Javascipt-Console`, } ) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index ae8e9fdda7..533875b7a5 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/params" ) const ( diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index 1e6887d92e..3df469f7df 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -23,10 +23,10 @@ import ( "path/filepath" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index d8e95c96bd..4fa60320ab 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -25,17 +25,17 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/console" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/ethclient" - "github.com/etherinc/go-ethereum/internal/debug" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/metrics" - "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/console" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/ethclient" + "github.com/etherinc/go-etherinc/internal/debug" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/metrics" + "github.com/etherinc/go-etherinc/node" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index 7495fb65d9..572d6777dd 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go index 7ed5e427fc..0685751881 100644 --- a/cmd/geth/monitorcmd.go +++ b/cmd/geth/monitorcmd.go @@ -25,9 +25,9 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/rpc" "github.com/gizak/termui" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go index 3bdd85d7f0..a752f8250b 100644 --- a/cmd/geth/run_test.go +++ b/cmd/geth/run_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/etherinc/go-ethereum/internal/cmdtest" + "github.com/etherinc/go-etherinc/internal/cmdtest" ) func tmpdir(t *testing.T) string { diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index f17955dbf6..8552813257 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -24,8 +24,8 @@ import ( "strings" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/internal/debug" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/internal/debug" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index 70afae6463..4cae32bfa3 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -29,12 +29,12 @@ import ( "strings" "text/tabwriter" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/simulations" - "github.com/etherinc/go-ethereum/p2p/simulations/adapters" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/simulations" + "github.com/etherinc/go-etherinc/p2p/simulations/adapters" + "github.com/etherinc/go-etherinc/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go index a3f9ff05cf..c8aced5af0 100644 --- a/cmd/puppeth/genesis.go +++ b/cmd/puppeth/genesis.go @@ -21,11 +21,11 @@ import ( "errors" "math" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/params" ) // cppEthereumGenesisSpec represents the genesis specification format used by the diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index 30601eb22f..76535f8c3b 100644 --- a/cmd/puppeth/module.go +++ b/cmd/puppeth/module.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 29a13f86ec..acd110b47d 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) // dashboardContent is the actual dashboard HTML content to serve up when users @@ -256,7 +256,7 @@ var dashboardContent = `

Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for Java based Android projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from Android too.

Under the hood the Android library is backed by a go-ethereum light node, meaning that given a not-too-old Android device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.


-

The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive. +

The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive.

Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your Android project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.

Inside your Java code you can now import the geth archive and connect to Ethereum: 

import org.ethereum.geth.*;
@@ -287,7 +287,7 @@ node.start();

Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for ObjC/Swift based iOS projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from iOS too.

Under the hood the iOS library is backed by a go-ethereum light node, meaning that given a not-too-old Apple device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.


-

Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework. +

Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework.

Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your iOS project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.

Inside your Swift code you can now import the geth framework and connect to Ethereum (ObjC should be analogous): 

import Geth
@@ -419,7 +419,7 @@ try! node?.start();

Puppeth is a tool to aid you in creating a new Ethereum network down to the genesis block, bootnodes, signers, ethstats server, crypto faucet, wallet browsers, block explorer, dashboard and more; without the hassle that it would normally entail to manually configure all these services one by one.

Puppeth uses ssh to dial in to remote servers, and builds its network components out of docker containers using docker-compose. The user is guided through the process via a command line wizard that does the heavy lifting and topology configuration automatically behind the scenes.


-

Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:

go get github.com/etherinc/go-ethereum/cmd/puppeth

+

Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:

go get github.com/etherinc/go-etherinc/cmd/puppeth


Copyright 2017. The go-ethereum Authors.

diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index b792b2f519..577f9c56d0 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/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 6befd3a956..50428fbc55 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/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 4def058c80..5980bf207d 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" ) // faucetDockerfile is the Dockerfile required to build an faucet container to diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index fc8e8e1ae3..1310d055f8 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/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 052de20636..6bade51dab 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -26,8 +26,8 @@ import ( "strings" "text/template" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/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 e801ae5177..7c93ef6384 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index f3d5007075..66d2a921cb 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index 5d981bf358..f073a7f983 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/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 ba5ec46faa..52267e2404 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -30,9 +30,9 @@ import ( "strings" "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index b8bf52b5d5..3bd387e38e 100644 --- a/cmd/puppeth/wizard_dashboard.go +++ b/cmd/puppeth/wizard_dashboard.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/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 6517f7681d..b2679852af 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/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 7cddd5fab1..2d313ff357 100644 --- a/cmd/puppeth/wizard_explorer.go +++ b/cmd/puppeth/wizard_explorer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/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 4b3ca22ee7..6336767d55 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/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 aa0087f82e..5f8dc559bc 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -25,10 +25,10 @@ import ( "math/rand" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/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 02e99903b3..e4ba4aa59e 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index af6ba91027..bae4041c4f 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/log" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index e310250efb..318314e499 100644 --- a/cmd/puppeth/wizard_network.go +++ b/cmd/puppeth/wizard_network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/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 e53ec8e7d9..78cd9febb5 100644 --- a/cmd/puppeth/wizard_nginx.go +++ b/cmd/puppeth/wizard_nginx.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/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 cb9a4470b5..ab7618900c 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/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 a062d05f66..ccb4598920 100644 --- a/cmd/puppeth/wizard_wallet.go +++ b/cmd/puppeth/wizard_wallet.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/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 4d91f87f21..c7201f866f 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/rlp" ) var ( diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index 2cfdf8dfa7..9c9fd09ca5 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -27,13 +27,13 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/node" "github.com/naoina/toml" - bzzapi "github.com/etherinc/go-ethereum/swarm/api" + bzzapi "github.com/etherinc/go-etherinc/swarm/api" ) var ( @@ -83,7 +83,7 @@ var tomlSettings = toml.Config{ MissingField: func(rt reflect.Type, field string) error { link := "" if unicode.IsUpper(rune(rt.Name()[0])) && rt.PkgPath() != "main" { - link = fmt.Sprintf(", check github.com/etherinc/go-ethereum/swarm/api/config.go for available fields") + link = fmt.Sprintf(", check github.com/etherinc/go-etherinc/swarm/api/config.go for available fields") } return fmt.Errorf("field '%s' is not defined in %s%s", field, rt.String(), link) }, diff --git a/cmd/swarm/config_test.go b/cmd/swarm/config_test.go index d33b20af09..192253da7e 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/rpc" - "github.com/etherinc/go-ethereum/swarm" - "github.com/etherinc/go-ethereum/swarm/api" + "github.com/etherinc/go-etherinc/rpc" + "github.com/etherinc/go-etherinc/swarm" + "github.com/etherinc/go-etherinc/swarm/api" "github.com/docker/docker/pkg/reexec" ) diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index 214aff96db..608d6334fb 100644 --- a/cmd/swarm/db.go +++ b/cmd/swarm/db.go @@ -22,9 +22,9 @@ import ( "os" "path/filepath" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index b52b2be09f..81dcae4c88 100644 --- a/cmd/swarm/hash.go +++ b/cmd/swarm/hash.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index a7eea1808d..d6e38aec77 100644 --- a/cmd/swarm/list.go +++ b/cmd/swarm/list.go @@ -22,8 +22,8 @@ import ( "strings" "text/tabwriter" - "github.com/etherinc/go-ethereum/cmd/utils" - swarm "github.com/etherinc/go-ethereum/swarm/api/client" + "github.com/etherinc/go-etherinc/cmd/utils" + swarm "github.com/etherinc/go-etherinc/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index dea0481d81..2ae5c87cc1 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -31,23 +31,23 @@ import ( "syscall" "time" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/console" - "github.com/etherinc/go-ethereum/contracts/ens" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethclient" - "github.com/etherinc/go-ethereum/internal/debug" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rpc" - "github.com/etherinc/go-ethereum/swarm" - bzzapi "github.com/etherinc/go-ethereum/swarm/api" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/console" + "github.com/etherinc/go-etherinc/contracts/ens" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethclient" + "github.com/etherinc/go-etherinc/internal/debug" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rpc" + "github.com/etherinc/go-etherinc/swarm" + bzzapi "github.com/etherinc/go-etherinc/swarm/api" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index 1717321055..8dba73df03 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -24,9 +24,9 @@ import ( "path/filepath" "strings" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/swarm/api" - swarm "github.com/etherinc/go-ethereum/swarm/api/client" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/swarm/api" + swarm "github.com/etherinc/go-etherinc/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index 6fc04cb292..94f197e5c5 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -27,13 +27,13 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/internal/cmdtest" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rpc" - "github.com/etherinc/go-ethereum/swarm" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/internal/cmdtest" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rpc" + "github.com/etherinc/go-etherinc/swarm" ) func init() { diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 6c99727ae1..8e0e8f6a25 100644 --- a/cmd/swarm/upload.go +++ b/cmd/swarm/upload.go @@ -30,8 +30,8 @@ import ( "path/filepath" "strings" - "github.com/etherinc/go-ethereum/cmd/utils" - swarm "github.com/etherinc/go-ethereum/swarm/api/client" + "github.com/etherinc/go-etherinc/cmd/utils" + swarm "github.com/etherinc/go-etherinc/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 30a304da4c..345d448bed 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -26,12 +26,12 @@ import ( "runtime" "strings" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/internal/debug" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/internal/debug" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index 3a6871b5c1..f3087f5e54 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 3d70c4695d..e1b941b0d8 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,34 +28,34 @@ import ( "strconv" "strings" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/fdlimit" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/consensus/clique" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/dashboard" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/eth/gasprice" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/ethstats" - "github.com/etherinc/go-ethereum/les" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/metrics" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/discv5" - "github.com/etherinc/go-ethereum/p2p/nat" - "github.com/etherinc/go-ethereum/p2p/netutil" - "github.com/etherinc/go-ethereum/params" - whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/fdlimit" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/consensus/clique" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/dashboard" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/eth/gasprice" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/ethstats" + "github.com/etherinc/go-etherinc/les" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/metrics" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/discv5" + "github.com/etherinc/go-etherinc/p2p/nat" + "github.com/etherinc/go-etherinc/p2p/netutil" + "github.com/etherinc/go-etherinc/params" + whisper "github.com/etherinc/go-etherinc/whisper/whisperv5" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 4499d824bb..a269fc0103 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -34,16 +34,16 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/console" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/nat" - "github.com/etherinc/go-ethereum/whisper/mailserver" - whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/console" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/nat" + "github.com/etherinc/go-etherinc/whisper/mailserver" + whisper "github.com/etherinc/go-etherinc/whisper/whisperv5" "golang.org/x/crypto/pbkdf2" ) diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index 99be7245fd..c452a1b213 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/debug.go b/common/debug.go index 8f6ca8e735..f50507c64f 100644 --- a/common/debug.go +++ b/common/debug.go @@ -26,7 +26,7 @@ import ( // Report gives off a warning requesting the user to submit an issue to the github tracker. func Report(extra ...interface{}) { - fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/etherinc/go-ethereum/issues") + fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/etherinc/go-etherinc/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index 4e08c5da02..63287ceac6 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/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index 4c25d588e4..02bd53d9d5 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/number/int.go b/common/number/int.go index a9453073ef..99af2bed10 100644 --- a/common/number/int.go +++ b/common/number/int.go @@ -19,7 +19,7 @@ package number import ( "math/big" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) var tt256 = new(big.Int).Lsh(big.NewInt(1), 256) diff --git a/common/number/uint_test.go b/common/number/uint_test.go index 8ca1f20e9f..a3fe74255f 100644 --- a/common/number/uint_test.go +++ b/common/number/uint_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) func TestSet(t *testing.T) { diff --git a/common/types.go b/common/types.go index da9cfef9e8..cd850560a1 100644 --- a/common/types.go +++ b/common/types.go @@ -23,8 +23,8 @@ import ( "math/rand" "reflect" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/crypto/sha3" ) const ( diff --git a/compression/rle/read_write.go b/compression/rle/read_write.go index 136b2f4d46..e23801e478 100644 --- a/compression/rle/read_write.go +++ b/compression/rle/read_write.go @@ -21,7 +21,7 @@ import ( "bytes" "errors" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/crypto" ) const ( diff --git a/consensus/clique/api.go b/consensus/clique/api.go index d723a52204..345c4cf29d 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -17,10 +17,10 @@ package clique import ( - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/rpc" ) // API is a user facing RPC API to allow controlling the signer and voting diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index 698d1c214d..a82a09612b 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -25,20 +25,20 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/consensus/misc" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/consensus/misc" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/rpc" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 47082d38d9..4e497ea44a 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -20,10 +20,10 @@ import ( "bytes" "encoding/json" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index a4335c339e..36a46756a8 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -22,12 +22,12 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) type testerVote struct { diff --git a/consensus/consensus.go b/consensus/consensus.go index 69edea599d..18bc048842 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -18,11 +18,11 @@ package consensus import ( - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rpc" "math/big" ) diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index b9aa1ce492..cc2e6a3842 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -26,11 +26,11 @@ import ( "time" "unsafe" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/bitutil" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/bitutil" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/log" ) const ( diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index 2d57e8049b..b91c624958 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -25,9 +25,9 @@ import ( "sync" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/core/types" ) // Tests that verification caches can be correctly generated. diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index d7514c5867..f771285522 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -25,13 +25,13 @@ import ( "runtime" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/consensus/misc" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/consensus/misc" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/params" set "gopkg.in/fatih/set.v0" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 1a3953ccdb..ed7e555456 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index 19f292c9b5..82fda9e733 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -33,9 +33,9 @@ import ( "unsafe" mmap "github.com/edsrzf/mmap-go" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/rpc" "github.com/hashicorp/golang-lru/simplelru" metrics "github.com/rcrowley/go-metrics" ) diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index a4d4b686cc..6669606a30 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/core/types" ) // Tests that ethash works correctly in test mode. @@ -44,7 +44,7 @@ func TestTestMode(t *testing.T) { } // This test checks that cache lru logic doesn't crash under load. -// It reproduces https://github.com/etherinc/go-ethereum/issues/14943 +// It reproduces https://github.com/etherinc/go-etherinc/issues/14943 func TestCacheFileEvict(t *testing.T) { tmpdir, err := ioutil.TempDir("", "ethash-test") if err != nil { diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index d8dfb9e2a0..705be4dd25 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -24,10 +24,10 @@ import ( "runtime" "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/log" ) // Seal implements consensus.Engine, attempting to find a nonce that satisfies diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 1ac6086ce7..c7d924ce5f 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index e4f8c24fe1..9af99e6d04 100644 --- a/consensus/misc/forks.go +++ b/consensus/misc/forks.go @@ -19,9 +19,9 @@ package misc import ( "fmt" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index 29a3dab4a1..c9c9d2ed01 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/accounts/usbwallet" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/accounts/usbwallet" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/rpc" "github.com/robertkrimen/otto" ) diff --git a/console/console.go b/console/console.go index ab7d871db6..44c11e27ea 100644 --- a/console/console.go +++ b/console/console.go @@ -27,9 +27,9 @@ import ( "sort" "strings" - "github.com/etherinc/go-ethereum/internal/jsre" - "github.com/etherinc/go-ethereum/internal/web3ext" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/internal/jsre" + "github.com/etherinc/go-etherinc/internal/web3ext" + "github.com/etherinc/go-etherinc/rpc" "github.com/mattn/go-colorable" "github.com/peterh/liner" "github.com/robertkrimen/otto" diff --git a/console/console_test.go b/console/console_test.go index bd6113f880..d1da03b93c 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/internal/jsre" - "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/internal/jsre" + "github.com/etherinc/go-etherinc/node" ) const ( diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index 7d232ff9e8..734b8ec8c4 100644 --- a/containers/docker/develop-alpine/Dockerfile +++ b/containers/docker/develop-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 https://github.com/etherinc/go-ethereum && \ + git clone --depth 1 https://github.com/etherinc/go-etherinc && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apk del go git make gcc musl-dev linux-headers && \ diff --git a/containers/docker/develop-ubuntu/Dockerfile b/containers/docker/develop-ubuntu/Dockerfile index 04b0f99685..95551645c6 100644 --- a/containers/docker/develop-ubuntu/Dockerfile +++ b/containers/docker/develop-ubuntu/Dockerfile @@ -5,7 +5,7 @@ ENV PATH=/usr/lib/go-1.9/bin:$PATH RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \ - git clone --depth 1 https://github.com/etherinc/go-ethereum && \ + git clone --depth 1 https://github.com/etherinc/go-etherinc && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \ diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile index 08e6e4314c..0940021c38 100644 --- a/containers/docker/master-alpine/Dockerfile +++ b/containers/docker/master-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 --branch release/1.7 https://github.com/etherinc/go-ethereum && \ + git clone --depth 1 --branch release/1.7 https://github.com/etherinc/go-etherinc && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apk del go git make gcc musl-dev linux-headers && \ diff --git a/containers/docker/master-ubuntu/Dockerfile b/containers/docker/master-ubuntu/Dockerfile index 2c820561f8..6b020da1e8 100644 --- a/containers/docker/master-ubuntu/Dockerfile +++ b/containers/docker/master-ubuntu/Dockerfile @@ -5,7 +5,7 @@ ENV PATH=/usr/lib/go-1.9/bin:$PATH RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \ - git clone --depth 1 --branch release/1.7 https://github.com/etherinc/go-ethereum && \ + git clone --depth 1 --branch release/1.7 https://github.com/etherinc/go-etherinc && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \ diff --git a/containers/vagrant/Vagrantfile b/containers/vagrant/Vagrantfile index 92da08fd7d..f5868e19af 100644 --- a/containers/vagrant/Vagrantfile +++ b/containers/vagrant/Vagrantfile @@ -34,5 +34,5 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end config.vm.synced_folder ".", "/vagrant", :disabled => true - config.vm.synced_folder "../../", "/home/vagrant/go/src/github.com/etherinc/go-ethereum" + config.vm.synced_folder "../../", "/home/vagrant/go/src/github.com/etherinc/go-etherinc" end diff --git a/containers/vagrant/provisioners/shell/centos.sh b/containers/vagrant/provisioners/shell/centos.sh index 1479b88d66..2226669a2a 100755 --- a/containers/vagrant/provisioners/shell/centos.sh +++ b/containers/vagrant/provisioners/shell/centos.sh @@ -6,6 +6,6 @@ sudo yum update -y wget --continue https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz -GETH_PATH="~vagrant/go/src/github.com/etherinc/go-ethereum/build/bin/" +GETH_PATH="~vagrant/go/src/github.com/etherinc/go-etherinc/build/bin/" echo "export PATH=$PATH:/usr/local/go/bin:$GETH_PATH" >> ~vagrant/.bashrc diff --git a/containers/vagrant/provisioners/shell/debian.sh b/containers/vagrant/provisioners/shell/debian.sh index 9af5e4b76b..8d42f8b1ff 100755 --- a/containers/vagrant/provisioners/shell/debian.sh +++ b/containers/vagrant/provisioners/shell/debian.sh @@ -6,6 +6,6 @@ sudo apt-get update wget --continue https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz -GETH_PATH="~vagrant/go/src/github.com/etherinc/go-ethereum/build/bin/" +GETH_PATH="~vagrant/go/src/github.com/etherinc/go-etherinc/build/bin/" echo "export PATH=$PATH:/usr/local/go/bin:$GETH_PATH" >> ~vagrant/.bashrc diff --git a/containers/vagrant/provisioners/shell/ubuntu.sh b/containers/vagrant/provisioners/shell/ubuntu.sh index 9af5e4b76b..8d42f8b1ff 100755 --- a/containers/vagrant/provisioners/shell/ubuntu.sh +++ b/containers/vagrant/provisioners/shell/ubuntu.sh @@ -6,6 +6,6 @@ sudo apt-get update wget --continue https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz -GETH_PATH="~vagrant/go/src/github.com/etherinc/go-ethereum/build/bin/" +GETH_PATH="~vagrant/go/src/github.com/etherinc/go-etherinc/build/bin/" echo "export PATH=$PATH:/usr/local/go/bin:$GETH_PATH" >> ~vagrant/.bashrc diff --git a/contracts/chequebook/api.go b/contracts/chequebook/api.go index e1ea2271dd..1ca15b6dfc 100644 --- a/contracts/chequebook/api.go +++ b/contracts/chequebook/api.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index f8a5eaae8c..fa0fa6d9d0 100644 --- a/contracts/chequebook/cheque.go +++ b/contracts/chequebook/cheque.go @@ -36,14 +36,14 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/contracts/chequebook/contract" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/services/swap/swap" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/contracts/chequebook/contract" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/services/swap/swap" ) // TODO(zelig): watch peer solvency and notify of bouncing cheques diff --git a/contracts/chequebook/cheque_test.go b/contracts/chequebook/cheque_test.go index b5ab0fe687..d73cbdeff9 100644 --- a/contracts/chequebook/cheque_test.go +++ b/contracts/chequebook/cheque_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/accounts/abi/bind/backends" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/contracts/chequebook/contract" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/accounts/abi/bind/backends" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/contracts/chequebook/contract" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index 9f4faba6bd..cfb763e0cb 100644 --- a/contracts/chequebook/contract/chequebook.go +++ b/contracts/chequebook/contract/chequebook.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/accounts/abi" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/event" + ethereum "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/accounts/abi" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/event" ) // ChequebookABI is the input ABI used to generate the binding from. diff --git a/contracts/chequebook/gencode.go b/contracts/chequebook/gencode.go index 67357502f9..231eb47587 100644 --- a/contracts/chequebook/gencode.go +++ b/contracts/chequebook/gencode.go @@ -25,11 +25,11 @@ import ( "io/ioutil" "math/big" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/accounts/abi/bind/backends" - "github.com/etherinc/go-ethereum/contracts/chequebook/contract" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/accounts/abi/bind/backends" + "github.com/etherinc/go-etherinc/contracts/chequebook/contract" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/crypto" ) var ( diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index d760716efa..1c6138b6b4 100644 --- a/contracts/ens/contract/ens.go +++ b/contracts/ens/contract/ens.go @@ -6,12 +6,12 @@ package contract import ( "strings" - ethereum "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/accounts/abi" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/event" + ethereum "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/accounts/abi" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/event" ) // ENSABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/fifsregistrar.go b/contracts/ens/contract/fifsregistrar.go index a35a455ef4..77b8199fa8 100644 --- a/contracts/ens/contract/fifsregistrar.go +++ b/contracts/ens/contract/fifsregistrar.go @@ -6,10 +6,10 @@ package contract import ( "strings" - "github.com/etherinc/go-ethereum/accounts/abi" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/accounts/abi" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" ) // FIFSRegistrarABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/publicresolver.go b/contracts/ens/contract/publicresolver.go index 53c5415007..1ab2cbba52 100644 --- a/contracts/ens/contract/publicresolver.go +++ b/contracts/ens/contract/publicresolver.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/accounts/abi" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/event" + ethereum "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/accounts/abi" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/event" ) // PublicResolverABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/ens.go b/contracts/ens/ens.go index a12e539f95..8d19b6ed4b 100644 --- a/contracts/ens/ens.go +++ b/contracts/ens/ens.go @@ -23,11 +23,11 @@ package ens import ( "strings" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/contracts/ens/contract" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/contracts/ens/contract" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" ) var ( diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index 3d634da55d..9c0799fb69 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -20,11 +20,11 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/accounts/abi/bind/backends" - "github.com/etherinc/go-ethereum/contracts/ens/contract" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/accounts/abi/bind/backends" + "github.com/etherinc/go-etherinc/contracts/ens/contract" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/crypto" ) var ( diff --git a/core/asm/asm.go b/core/asm/asm.go index 136b4149fc..3aff8a279f 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-etherinc/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index 300cc841d8..47c705cf6c 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -23,8 +23,8 @@ import ( "os" "strings" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index 8ce85e4d46..267464e410 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,14 +23,14 @@ import ( "os" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index 27fceaf52a..d4ff3cfed6 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -19,10 +19,10 @@ package core import ( "fmt" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/params" ) // BlockValidator is responsible for validating block headers, uncles and diff --git a/core/block_validator_test.go b/core/block_validator_test.go index 59aa4c00f2..88d1c2950e 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index fbbf926107..cef91fe2ef 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -27,20 +27,20 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/mclock" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/metrics" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/mclock" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/metrics" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/trie" "github.com/hashicorp/golang-lru" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index be0cff00bf..aa70c43eda 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) // newTestBlockChain creates a blockchain without validation. @@ -1202,7 +1202,7 @@ func TestEIP161AccountRemoval(t *testing.T) { // tests that under weird reorg conditions the blockchain and its internal header- // chain return the same latest block/header. // -// https://github.com/etherinc/go-ethereum/pull/15941 +// https://github.com/etherinc/go-etherinc/pull/15941 func TestBlockchainHeaderchainReorgConsistency(t *testing.T) { // Generate a canonical chain to act as the main dataset engine := ethash.NewFaker() diff --git a/core/blocks.go b/core/blocks.go index bf06dbcf57..33cffa6a25 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -16,7 +16,7 @@ package core -import "github.com/etherinc/go-ethereum/common" +import "github.com/etherinc/go-etherinc/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 405272267a..393b93cb8c 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -19,7 +19,7 @@ package bloombits import ( "errors" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/core/types" ) // errSectionOutOfBounds is returned if the user tried to add more bloom filters diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index 3e9a59b6d0..ffdbb56c8c 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/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 f7ad57f0a9..4ab3bbf530 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/common/bitutil" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common/bitutil" + "github.com/etherinc/go-etherinc/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 75ca4beecd..8dab96284f 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) const testSectionSize = 4096 @@ -82,7 +82,7 @@ func TestMatcherRandom(t *testing.T) { // Tests that the matcher can properly find matches if the starting block is // shifter from a multiple of 8. This is needed to cover an optimisation with -// bitset matching https://github.com/etherinc/go-ethereum/issues/15309. +// bitset matching https://github.com/etherinc/go-etherinc/issues/15309. func TestMatcherShifted(t *testing.T) { // Block 0 always matches in the tests, skip ahead of first 8 blocks with the // start to get a potential zero byte in the matcher bitset. diff --git a/core/chain_indexer.go b/core/chain_indexer.go index ce257d6dde..79511ddcfc 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/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 bcc460141e..23676b1e48 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index b4aac3d927..b837ce80ce 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/consensus/misc" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/consensus/misc" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) // So we can deterministically seed different blockchains diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 1d40b1ea09..a4c3c522aa 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -20,12 +20,12 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index 78bf0a97f4..fba1e7549f 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/database_util.go b/core/database_util.go index 0010cc4079..0d1c2a2399 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -24,13 +24,13 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/metrics" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/metrics" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" ) // DatabaseReader wraps the Get method of a backing data store. diff --git a/core/database_util_test.go b/core/database_util_test.go index 6e9bf9b379..ba744b5b1a 100644 --- a/core/database_util_test.go +++ b/core/database_util_test.go @@ -21,11 +21,11 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/rlp" ) // Tests block header storage and retrieval operations. diff --git a/core/events.go b/core/events.go index ac8645d49a..e46989a552 100644 --- a/core/events.go +++ b/core/events.go @@ -17,8 +17,8 @@ package core import ( - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" ) // TxPreEvent is posted when a transaction enters the transaction pool. diff --git a/core/evm.go b/core/evm.go index 9e61383a10..dc3c73716d 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,10 +19,10 @@ package core import ( "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index 780980dc57..ec1dbb0ebc 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index 02021bb914..bcdaf3a834 100644 --- a/core/gen_genesis_account.go +++ b/core/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index f649230758..13a67cb8ef 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -25,15 +25,15 @@ import ( "math/big" "strings" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" ) //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 5cbf1e6e76..c29cc75e70 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -22,11 +22,11 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index d63aac1ac5..5bcc858b8d 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -25,12 +25,12 @@ import ( mrand "math/rand" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/params" "github.com/hashicorp/golang-lru" ) diff --git a/core/helper_test.go b/core/helper_test.go index 210a82441a..1163f0f607 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -20,9 +20,9 @@ import ( "container/list" "fmt" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index f510f245f0..4ed27cd6fb 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -34,8 +34,8 @@ import ( "sort" "strconv" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/state/database.go b/core/state/database.go index 3edaa5a92e..4640af9443 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -20,9 +20,9 @@ import ( "fmt" "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/dump.go b/core/state/dump.go index a0061e3e53..07c3db0deb 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/trie" ) type DumpAccount struct { diff --git a/core/state/iterator.go b/core/state/iterator.go index 60a7d8340c..9da87fd054 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -20,9 +20,9 @@ import ( "bytes" "fmt" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/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 10c1e86e98..68ea76a8d4 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/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 06a982bb64..d450770edf 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -19,7 +19,7 @@ package state import ( "math/big" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) type journalEntry interface { diff --git a/core/state/managed_state.go b/core/state/managed_state.go index 5799aa3236..1db36e005b 100644 --- a/core/state/managed_state.go +++ b/core/state/managed_state.go @@ -19,7 +19,7 @@ package state import ( "sync" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index e94ba1d19b..45f4331802 100644 --- a/core/state/managed_state_test.go +++ b/core/state/managed_state_test.go @@ -19,8 +19,8 @@ package state import ( "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index 4d03c14682..0461bee626 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index f6b0496d5b..9a30ac700b 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index ef37b21881..53c292e5cd 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -23,12 +23,12 @@ import ( "sort" "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/trie" ) type revision struct { diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index 84062ef48d..e31b5ae2a1 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/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" ) // Tests that updating a state trie does not leak any database writes prior to @@ -119,7 +119,7 @@ func TestIntermediateLeaks(t *testing.T) { // TestCopy tests that copying a statedb object indeed makes the original and // the copy independent of each other. This test is a regression test against -// https://github.com/etherinc/go-ethereum/pull/15549. +// https://github.com/etherinc/go-etherinc/pull/15549. func TestCopy(t *testing.T) { // Create a random state test to copy and modify "independently" db, _ := ethdb.NewMemDatabase() diff --git a/core/state/sync.go b/core/state/sync.go index d823e7bd96..6bf96e874e 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -19,9 +19,9 @@ package state import ( "bytes" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 9d985a97a2..a6651348b0 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/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 0dcb6b9d17..3a99d63d97 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -17,14 +17,14 @@ package core import ( - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/consensus/misc" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/consensus/misc" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index 77a8cfdbd1..87b1f5df2b 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -21,10 +21,10 @@ import ( "math" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/params" ) var ( diff --git a/core/tx_journal.go b/core/tx_journal.go index 759cb8b9cb..7d2b140403 100644 --- a/core/tx_journal.go +++ b/core/tx_journal.go @@ -21,10 +21,10 @@ import ( "io" "os" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/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 838ff2ccd5..02b870212d 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -22,9 +22,9 @@ import ( "math/big" "sort" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/log" ) // 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 136b1d8cc0..14c28c27fd 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -20,8 +20,8 @@ import ( "math/rand" "testing" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" ) // Tests that transactions can be added to strict lists and list contents and diff --git a/core/tx_pool.go b/core/tx_pool.go index 08be2f9be4..645a7d0fdc 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/metrics" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/metrics" + "github.com/etherinc/go-etherinc/params" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 78f31290b9..bfcf7bd057 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index 540fb06a5c..af1e4e6b27 100644 --- a/core/types.go +++ b/core/types.go @@ -17,9 +17,9 @@ package core import ( - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" ) // Validator is an interface which defines the standard for block validation. It diff --git a/core/types/block.go b/core/types/block.go index ec8b47986a..329a4ed163 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -27,10 +27,10 @@ import ( "time" "unsafe" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/rlp" ) var ( diff --git a/core/types/block_test.go b/core/types/block_test.go index 6e8256e05a..22af27dca5 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -23,8 +23,8 @@ import ( "reflect" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index d501958986..d0b82d4d66 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index c6a78fc4cf..524fc04fc6 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/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-etherinc/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index ec0f83f68b..15ba1f1f8b 100644 --- a/core/types/derive_sha.go +++ b/core/types/derive_sha.go @@ -19,9 +19,9 @@ package types import ( "bytes" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 627cb3823e..d0453aa20d 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/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 4f4769cba4..a242a405f5 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/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 83e529ae98..e15ae18d63 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index bba0804abd..01c69c57a0 100644 --- a/core/types/gen_tx_json.go +++ b/core/types/gen_tx_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" ) var _ = (*txdataMarshaling)(nil) diff --git a/core/types/log.go b/core/types/log.go index f024346127..51434406f7 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -20,9 +20,9 @@ import ( "fmt" "io" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/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 7794e78905..20b16cf9a7 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index e5162cc731..45d49ab5d7 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -22,9 +22,9 @@ import ( "io" "unsafe" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/rlp" ) //go:generate gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go diff --git a/core/types/transaction.go b/core/types/transaction.go index 1fda9ed6e4..9600c80939 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -24,10 +24,10 @@ import ( "math/big" "sync/atomic" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/rlp" ) //go:generate gencodec -type txdata -field-override txdataMarshaling -out gen_tx_json.go diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index e3b31e8928..f41c5b8bc8 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -22,9 +22,9 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 472c53bca7..61680183f5 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/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index 363a222cd7..bc18ba5bdc 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis.go b/core/vm/analysis.go index dc0b339878..5bb85822f0 100644 --- a/core/vm/analysis.go +++ b/core/vm/analysis.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) // destinations stores one map per contract (keyed by hash of code). diff --git a/core/vm/common.go b/core/vm/common.go index cdf6c263c9..05a3334e61 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" ) // calculates the memory size required for a step diff --git a/core/vm/contract.go b/core/vm/contract.go index 6d2b8ea09a..fe1aa35f80 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 46c23d51c4..9c8646c443 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -21,11 +21,11 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/bn256" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/bn256" + "github.com/etherinc/go-etherinc/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 75b66e3ce0..01d99b623f 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -5,7 +5,7 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index ecd398c6e6..a0144e4dbc 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/params" ) // emptyCodeHash is used by create to ensure deployment is disallowed to already diff --git a/core/vm/gas.go b/core/vm/gas.go index 84f4b99172..51aa65b654 100644 --- a/core/vm/gas.go +++ b/core/vm/gas.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/params" ) const ( diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 23b322e297..ad54fbdbb4 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -17,9 +17,9 @@ package vm import ( - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/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 5a2b4c7f0c..4d05b62238 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -6,9 +6,9 @@ import ( "encoding/json" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" ) var _ = (*structLogMarshaling)(nil) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 0c6a7d9ec0..a36a5c9846 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/params" ) var ( diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index d216acadc5..c8439939e6 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -4,8 +4,8 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/params" ) func TestByteOp(t *testing.T) { diff --git a/core/vm/interface.go b/core/vm/interface.go index 42fd928811..cb98b8be5a 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index cb808d520e..f54fa3a650 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -20,10 +20,10 @@ import ( "fmt" "sync/atomic" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index a1191b5059..d64154b7fc 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index fd637e0d1a..7753951174 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -23,10 +23,10 @@ import ( "math/big" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core/types" ) type Storage map[common.Hash]common.Hash diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index c284659b59..b2a0c49672 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/params" ) type dummyContractRef struct { diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index 56851a3741..11a931d15c 100644 --- a/core/vm/memory_table.go +++ b/core/vm/memory_table.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common/math" ) func memorySha3(stack *Stack) *big.Int { diff --git a/core/vm/noop.go b/core/vm/noop.go index eddda01db6..e437934f8f 100644 --- a/core/vm/noop.go +++ b/core/vm/noop.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" ) func NoopCanTransfer(db StateDB, from common.Address, balance *big.Int) bool { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index 24e1c8adfe..2651b21ec8 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -17,9 +17,9 @@ package runtime import ( - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 8a56027700..11620c0d39 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -21,12 +21,12 @@ import ( "math/big" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/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 4a6bb43697..30792a284a 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/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/vm/runtime" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index cf4acd6970..9b9ae0560e 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -21,11 +21,11 @@ import ( "strings" "testing" - "github.com/etherinc/go-ethereum/accounts/abi" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/accounts/abi" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/ethdb" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index 3048e743c6..01294c190a 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -19,7 +19,7 @@ package vm import ( "fmt" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/params" ) func makeStackFunc(pop, push int) stackValidationFunc { diff --git a/core/vm/vm_jit.go b/core/vm/vm_jit.go index 79d40abb9a..c3c811a1c4 100644 --- a/core/vm/vm_jit.go +++ b/core/vm/vm_jit.go @@ -38,9 +38,9 @@ import ( "math/big" "unsafe" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/params" ) type JitVm struct { diff --git a/crypto/crypto.go b/crypto/crypto.go index f45a3f892c..6752eccc53 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -28,10 +28,10 @@ import ( "math/big" "os" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/rlp" ) var ( diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 1353a3d761..67e559097a 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -25,7 +25,7 @@ import ( "os" "testing" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index 76f6db63f3..2ccae119f1 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -40,7 +40,7 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index a937d6279d..db3976fb55 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/etherinc/go-ethereum/crypto" + ethcrypto "github.com/etherinc/go-etherinc/crypto" ) var ( diff --git a/crypto/secp256k1/curve.go b/crypto/secp256k1/curve.go index 75962b1ee0..dc34e6c122 100644 --- a/crypto/secp256k1/curve.go +++ b/crypto/secp256k1/curve.go @@ -36,7 +36,7 @@ import ( "math/big" "unsafe" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common/math" ) /* diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go index 90c2627da4..f1c30924d8 100644 --- a/crypto/secp256k1/secp256_test.go +++ b/crypto/secp256k1/secp256_test.go @@ -24,8 +24,8 @@ import ( "encoding/hex" "testing" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/crypto/randentropy" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/crypto/randentropy" ) const TestCount = 1000 diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 15178663b7..b8e8cd8b87 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -23,8 +23,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/crypto/secp256k1" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/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 e3821173c9..3d7aacb18c 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" ) var ( diff --git a/dashboard/cpu.go b/dashboard/cpu.go index 00177a55d9..b0de5af4a9 100644 --- a/dashboard/cpu.go +++ b/dashboard/cpu.go @@ -21,7 +21,7 @@ package dashboard import ( "syscall" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index 3b358d7534..0f521d7a05 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -35,10 +35,10 @@ import ( "time" "github.com/elastic/gosigar" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rpc" "github.com/rcrowley/go-metrics" "golang.org/x/net/websocket" ) diff --git a/eth/api.go b/eth/api.go index 0e0c329639..7ddbaec10c 100644 --- a/eth/api.go +++ b/eth/api.go @@ -25,17 +25,17 @@ import ( "os" "strings" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/miner" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/rpc" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/miner" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/rpc" + "github.com/etherinc/go-etherinc/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index fbe04d17fb..92b8ba4a0e 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -20,20 +20,20 @@ import ( "context" "math/big" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/bloombits" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/eth/gasprice" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/bloombits" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/eth/gasprice" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rpc" ) // EthApiBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index ee7f78ba95..547f4d1314 100644 --- a/eth/api_test.go +++ b/eth/api_test.go @@ -21,9 +21,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/api_tracer.go b/eth/api_tracer.go index 6dfdbfb57b..027de7e1db 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -26,18 +26,18 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/eth/tracers" - "github.com/etherinc/go-ethereum/internal/ethapi" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/rpc" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/eth/tracers" + "github.com/etherinc/go-etherinc/internal/ethapi" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/rpc" + "github.com/etherinc/go-etherinc/trie" ) const ( diff --git a/eth/backend.go b/eth/backend.go index 5e50cd1ba7..bf4bffce5d 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -25,29 +25,29 @@ import ( "sync" "sync/atomic" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/consensus/clique" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/bloombits" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/eth/filters" - "github.com/etherinc/go-ethereum/eth/gasprice" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/internal/ethapi" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/miner" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/consensus/clique" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/bloombits" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/eth/filters" + "github.com/etherinc/go-etherinc/eth/gasprice" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/internal/ethapi" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/miner" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/rpc" ) type LesServer interface { diff --git a/eth/bloombits.go b/eth/bloombits.go index f744085f4c..399ef9808a 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -19,13 +19,13 @@ package eth import ( "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/bitutil" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/bloombits" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/bitutil" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/bloombits" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) const ( diff --git a/eth/config.go b/eth/config.go index b881a7fdf7..4421abab03 100644 --- a/eth/config.go +++ b/eth/config.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/eth/gasprice" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/eth/gasprice" + "github.com/etherinc/go-etherinc/params" ) // DefaultConfig contains default settings for use on the Ethereum main net. diff --git a/eth/db_upgrade.go b/eth/db_upgrade.go index abb5dd1d53..c47338db2f 100644 --- a/eth/db_upgrade.go +++ b/eth/db_upgrade.go @@ -21,11 +21,11 @@ import ( "bytes" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/rlp" ) var deduplicateData = []byte("dbUpgrade_20170714deduplicateData") diff --git a/eth/downloader/api.go b/eth/downloader/api.go index 8f05f66902..0cd889ed7b 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -20,9 +20,9 @@ import ( "context" "sync" - ethereum "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/rpc" + ethereum "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/rpc" ) // PublicDownloaderAPI provides an API which gives information about the current synchronisation status. diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 37080cb37a..21c25a32bf 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,13 +25,13 @@ import ( "sync/atomic" "time" - ethereum "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/params" + ethereum "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/params" "github.com/rcrowley/go-metrics" ) diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index aeddaf6bf5..16bd7c84dd 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/trie" ) var ( diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go index 79ea211e41..e14c79f56b 100644 --- a/eth/downloader/fakepeer.go +++ b/eth/downloader/fakepeer.go @@ -19,10 +19,10 @@ package downloader import ( "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" ) // FakePeer is a mock downloader peer that operates on a local database instance diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index b9eaaeefb2..d2485860fe 100644 --- a/eth/downloader/metrics.go +++ b/eth/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/etherinc/go-ethereum/metrics" + "github.com/etherinc/go-etherinc/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index a4ba271a9d..1b8eb5e9ee 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 7154c37da5..8517b47fb4 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -25,9 +25,9 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/log" "github.com/rcrowley/go-metrics" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index 579f3059c1..85b5a9a5dd 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -22,12 +22,12 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/trie" ) // stateReq represents a batch of state fetch requests groupped together into diff --git a/eth/downloader/types.go b/eth/downloader/types.go index ae394599c2..3d8670b86f 100644 --- a/eth/downloader/types.go +++ b/eth/downloader/types.go @@ -19,7 +19,7 @@ package downloader import ( "fmt" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/core/types" ) // peerDropFn is a callback type for dropping a peer detected as malicious. diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go index e8975d071e..e93d4f1a71 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,10 +22,10 @@ import ( "math/rand" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/log" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 94d2fe6f06..eeb3451a49 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index 0e7ceac738..3ab6bd825f 100644 --- a/eth/fetcher/metrics.go +++ b/eth/fetcher/metrics.go @@ -19,7 +19,7 @@ package fetcher import ( - "github.com/etherinc/go-ethereum/metrics" + "github.com/etherinc/go-etherinc/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index f310b03e50..bc6ed66706 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,13 +25,13 @@ import ( "sync" "time" - ethereum "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/rpc" + ethereum "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 89ae708937..45b56f3375 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index 8c0f063637..97810e8c43 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/bitutil" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/bloombits" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/bitutil" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/bloombits" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 41d2fee5d1..c79924581c 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -20,13 +20,13 @@ import ( "context" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/bloombits" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/bloombits" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 359242ba97..da5eda3366 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,12 +25,12 @@ import ( "sync" "time" - ethereum "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/rpc" + ethereum "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/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 50c192dcd1..3c9acc1fa0 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -25,16 +25,16 @@ import ( "testing" "time" - ethereum "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/bloombits" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rpc" + ethereum "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/bloombits" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index e1ad089035..ae754351bc 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,14 +23,14 @@ import ( "os" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 962c9bc2d7..32974a26f5 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -22,11 +22,11 @@ import ( "sort" "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/internal/ethapi" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/internal/ethapi" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rpc" ) var maxPrice = big.NewInt(500 * params.Shannon) diff --git a/eth/gen_config.go b/eth/gen_config.go index 9aef09611d..e2abc29fb4 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -5,12 +5,12 @@ package eth import ( "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/eth/gasprice" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/eth/gasprice" ) var _ = (*configMarshaling)(nil) diff --git a/eth/handler.go b/eth/handler.go index 534e82f610..e376d410ef 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -26,20 +26,20 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/consensus/misc" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/eth/fetcher" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/consensus/misc" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/eth/fetcher" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index 1d42836dd3..7a151bb2ee 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/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 b2ca912a56..e040569666 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -27,18 +27,18 @@ import ( "sync" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index a90c27dbe5..8ed0902100 100644 --- a/eth/metrics.go +++ b/eth/metrics.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/etherinc/go-ethereum/metrics" - "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-etherinc/metrics" + "github.com/etherinc/go-etherinc/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index c8ba6f2cef..eafc18979a 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/eth/protocol.go b/eth/protocol.go index 2a70c0744a..05651a5627 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -21,11 +21,11 @@ import ( "io" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index afea4a5b30..915bbd6740 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rlp" ) func init() { diff --git a/eth/sync.go b/eth/sync.go index f2547778a5..383b7e8e7d 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/discover" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index 8a999a06a3..d53072e97b 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" ) // Tests that fast sync gets disabled as soon as a real block is successfully diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index 45f09574b7..dcf6fec981 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -25,11 +25,11 @@ import ( "time" "unsafe" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" duktape "gopkg.in/olebedev/go-duktape.v3" ) diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go index 2e5eda46ca..a6d311b78b 100644 --- a/eth/tracers/tracer_test.go +++ b/eth/tracers/tracer_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/params" ) type account struct{} diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index a96dc3c918..a1243b528d 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -21,7 +21,7 @@ import ( "strings" "unicode" - "github.com/etherinc/go-ethereum/eth/tracers/internal/tracers" + "github.com/etherinc/go-etherinc/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 a3821dfc84..44dfb6b9c5 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -25,15 +25,15 @@ import ( "strings" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/tests" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/tests" ) // To generate a new callTracer test, copy paste the makeTest method below into diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index c54ba25025..36725b43c8 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -24,12 +24,12 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index afcfc7ab10..3950d3ce00 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -16,7 +16,7 @@ package ethclient -import "github.com/etherinc/go-ethereum" +import "github.com/etherinc/go-etherinc" // Verify that Client implements the ethereum interfaces. var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index abb8715abd..25caecac9f 100644 --- a/ethclient/signer.go +++ b/ethclient/signer.go @@ -20,8 +20,8 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" ) // senderFromServer is a types.Signer that remembers the sender address returned by the RPC diff --git a/ethdb/database.go b/ethdb/database.go index b10371d4ce..fb1fef0b8f 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/metrics" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" diff --git a/ethdb/database_test.go b/ethdb/database_test.go index a969cdd7ac..919c140bd6 100644 --- a/ethdb/database_test.go +++ b/ethdb/database_test.go @@ -25,7 +25,7 @@ import ( "sync" "testing" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/ethdb" ) func newTestLDB() (*ethdb.LDBDatabase, func()) { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index b947d96467..76714ad32e 100644 --- a/ethdb/memory_database.go +++ b/ethdb/memory_database.go @@ -20,7 +20,7 @@ import ( "errors" "sync" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) /* diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index 6b9064e2f0..79f07707c8 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,17 +30,17 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/mclock" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/les" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/mclock" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/les" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 08776fc104..3efc5eb3ce 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-etherinc/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 82370d8501..5f31f73b88 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-etherinc/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 44d5a4f7fc..ab3bf26db0 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-etherinc/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index 31188a7289..51f6bcffca 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-etherinc/common/mclock" ) // Subscription represents a stream of events. The carrier of the events is typically a diff --git a/interfaces.go b/interfaces.go index 858dd52e2b..2ba86b5d22 100644 --- a/interfaces.go +++ b/interfaces.go @@ -22,8 +22,8 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/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 4cfdde388d..f9fbe3e96e 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -33,7 +33,7 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 2dc5f75c4d..dc3e35fa80 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,8 +24,8 @@ import ( "os" "runtime" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/log/term" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/log/term" colorable "github.com/mattn/go-colorable" "gopkg.in/urfave/cli.v1" ) diff --git a/internal/debug/trace.go b/internal/debug/trace.go index b7d212d9fc..81f352482b 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -23,7 +23,7 @@ import ( "os" "runtime/trace" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 4a61cef556..95c0eb2f1f 100644 --- a/internal/ethapi/addrlock.go +++ b/internal/ethapi/addrlock.go @@ -19,7 +19,7 @@ package ethapi import ( "sync" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 339dbcd1a5..fb5e219a64 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -25,21 +25,21 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/rpc" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) @@ -421,7 +421,7 @@ func signHash(data []byte) []byte { // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/etherinc/go-ethereum/wiki/Management-APIs#personal_sign +// https://github.com/etherinc/go-etherinc/wiki/Management-APIs#personal_sign func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr common.Address, passwd string) (hexutil.Bytes, error) { // Look up the wallet containing the requested signer account := accounts.Account{Address: addr} @@ -448,7 +448,7 @@ func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr c // Note, the signature must conform to the secp256k1 curve R, S and V values, where // the V value must be be 27 or 28 for legacy reasons. // -// https://github.com/etherinc/go-ethereum/wiki/Management-APIs#personal_ecRecover +// https://github.com/etherinc/go-etherinc/wiki/Management-APIs#personal_ecRecover func (s *PrivateAccountAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) { if len(sig) != 65 { return common.Address{}, fmt.Errorf("signature must be 65 bytes long") diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index bac95326be..2065babfe8 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -21,17 +21,17 @@ import ( "context" "math/big" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rpc" ) // Backend interface provides the common API services (that are provided by diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index 96268c60e6..be7d1322b1 100644 --- a/internal/guide/guide_test.go +++ b/internal/guide/guide_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/core/types" ) // Tests that the account management snippets work correctly. diff --git a/internal/jsre/deps/web3.js b/internal/jsre/deps/web3.js index 1355056264..a4d756ae9f 100644 --- a/internal/jsre/deps/web3.js +++ b/internal/jsre/deps/web3.js @@ -5862,7 +5862,7 @@ module.exports = Shh; * @author Alex Beregszaszi * @date 2016 * - * Reference: https://github.com/etherinc/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33 + * Reference: https://github.com/etherinc/go-etherinc/blob/swarm/internal/web3ext/web3ext.go#L33 */ "use strict"; diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index 4be1f61cf8..c45a425055 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -26,8 +26,8 @@ import ( "math/rand" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/internal/jsre/deps" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/internal/jsre/deps" "github.com/robertkrimen/otto" ) diff --git a/les/api_backend.go b/les/api_backend.go index 4d51c57807..a06c1f543c 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -20,21 +20,21 @@ import ( "context" "math/big" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/bloombits" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/eth/gasprice" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/light" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/bloombits" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/eth/gasprice" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/light" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index 4d1c4871f1..c27b1744c8 100644 --- a/les/backend.go +++ b/les/backend.go @@ -22,27 +22,27 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/bloombits" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/eth/filters" - "github.com/etherinc/go-ethereum/eth/gasprice" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/internal/ethapi" - "github.com/etherinc/go-ethereum/light" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discv5" - "github.com/etherinc/go-ethereum/params" - rpc "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/bloombits" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/eth/filters" + "github.com/etherinc/go-etherinc/eth/gasprice" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/internal/ethapi" + "github.com/etherinc/go-etherinc/light" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discv5" + "github.com/etherinc/go-etherinc/params" + rpc "github.com/etherinc/go-etherinc/rpc" ) type LightEthereum struct { diff --git a/les/bloombits.go b/les/bloombits.go index 45244bc48d..fe10ad1ab4 100644 --- a/les/bloombits.go +++ b/les/bloombits.go @@ -19,8 +19,8 @@ package les import ( "time" - "github.com/etherinc/go-ethereum/common/bitutil" - "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-etherinc/common/bitutil" + "github.com/etherinc/go-etherinc/light" ) const ( diff --git a/les/fetcher.go b/les/fetcher.go index f36a8f71a7..5c0e6a1912 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/mclock" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/light" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/mclock" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/light" + "github.com/etherinc/go-etherinc/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index e57037cea9..2fcfd19c6f 100644 --- a/les/flowcontrol/control.go +++ b/les/flowcontrol/control.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-etherinc/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index aaa144db8a..0a3ac782e7 100644 --- a/les/flowcontrol/manager.go +++ b/les/flowcontrol/manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-etherinc/common/mclock" ) const rcConst = 1000000 diff --git a/les/handler.go b/les/handler.go index 9899dd399a..dd6245f8be 100644 --- a/les/handler.go +++ b/les/handler.go @@ -26,22 +26,22 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/light" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/discv5" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/light" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/discv5" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index 05cc8178a3..5af090a4a3 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/light" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/light" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/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 3e228e84e3..c3e4f615a6 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -25,19 +25,19 @@ import ( "sync" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/les/flowcontrol" - "github.com/etherinc/go-ethereum/light" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/les/flowcontrol" + "github.com/etherinc/go-etherinc/light" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index c3eafc4306..8a5b1875f3 100644 --- a/les/metrics.go +++ b/les/metrics.go @@ -17,8 +17,8 @@ package les import ( - "github.com/etherinc/go-ethereum/metrics" - "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-etherinc/metrics" + "github.com/etherinc/go-etherinc/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index 97ac2b24d2..87cf285f03 100644 --- a/les/odr.go +++ b/les/odr.go @@ -19,10 +19,10 @@ package les import ( "context" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/light" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/light" + "github.com/etherinc/go-etherinc/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index 832d7d934e..4cacb50480 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -23,15 +23,15 @@ import ( "errors" "fmt" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/light" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/light" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index 895a4e2e04..288c13c051 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/light" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/light" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/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 8165c46589..ebbcd65767 100644 --- a/les/peer.go +++ b/les/peer.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/les/flowcontrol" - "github.com/etherinc/go-ethereum/light" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/les/flowcontrol" + "github.com/etherinc/go-etherinc/light" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index ff44ed787f..77769e97ec 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -26,11 +26,11 @@ import ( "io" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/secp256k1" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/secp256k1" + "github.com/etherinc/go-etherinc/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index 575e86a535..a07662dcd5 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index 04b4440b92..fdd8348498 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-etherinc/common/mclock" ) var ( diff --git a/les/server.go b/les/server.go index 5d0f1ddb94..d4b9435a23 100644 --- a/les/server.go +++ b/les/server.go @@ -24,17 +24,17 @@ import ( "math" "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/les/flowcontrol" - "github.com/etherinc/go-ethereum/light" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discv5" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/les/flowcontrol" + "github.com/etherinc/go-etherinc/light" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discv5" + "github.com/etherinc/go-etherinc/rlp" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index ade24670cc..7cf690fbf3 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common/mclock" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/discv5" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common/mclock" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/discv5" + "github.com/etherinc/go-etherinc/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index 6226bcf6e8..98b93b9d91 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/light" ) const ( diff --git a/les/txrelay.go b/les/txrelay.go index 6ffe4246d6..ea8189bc9c 100644 --- a/les/txrelay.go +++ b/les/txrelay.go @@ -19,8 +19,8 @@ package les import ( "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index 0ad99a0976..39e57580b1 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -24,16 +24,16 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" "github.com/hashicorp/golang-lru" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index 96ef21b7ec..82aea2c06d 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index f4875b2c1c..81177cdc8d 100644 --- a/light/nodeset.go +++ b/light/nodeset.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/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 673e7c7aee..6cbf85fab8 100644 --- a/light/odr.go +++ b/light/odr.go @@ -22,10 +22,10 @@ import ( "context" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/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 3c384a3188..6125fa599a 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,18 +24,18 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index 30773818aa..dfa53137db 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -20,11 +20,11 @@ import ( "bytes" "context" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index 7a8307bfe3..785577aa1b 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -23,15 +23,15 @@ import ( "math/big" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/bitutil" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/bitutil" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/trie" ) const ( diff --git a/light/trie.go b/light/trie.go index 8bb1e075cc..f255a9bf66 100644 --- a/light/trie.go +++ b/light/trie.go @@ -21,12 +21,12 @@ import ( "errors" "fmt" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/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 6c9b1ec377..093de310e7 100644 --- a/light/trie_test.go +++ b/light/trie_test.go @@ -23,13 +23,13 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/trie" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index 24991bf955..690105a577 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,15 +22,15 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index f5916d05d1..96708eac74 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) type testTxRelay struct { diff --git a/log/format.go b/log/format.go index 89a0757937..f475ebbbd9 100644 --- a/log/format.go +++ b/log/format.go @@ -22,7 +22,7 @@ const ( // locationTrims are trimmed for display to avoid unwieldy log lines. var locationTrims = []string{ - "github.com/etherinc/go-ethereum/", + "github.com/etherinc/go-etherinc/", } // PrintOrigins sets or unsets log location (file:line) printing for terminal diff --git a/metrics/metrics.go b/metrics/metrics.go index 02f0768bcf..02e43443d5 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" "github.com/rcrowley/go-metrics" "github.com/rcrowley/go-metrics/exp" ) diff --git a/miner/agent.go b/miner/agent.go index 507ebe8382..43f417183d 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -21,8 +21,8 @@ import ( "sync/atomic" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/log" ) type CpuAgent struct { diff --git a/miner/miner.go b/miner/miner.go index 9de9e94546..e066f0b524 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -21,17 +21,17 @@ import ( "fmt" "sync/atomic" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/params" ) // Backend wraps all methods required for mining. diff --git a/miner/remote_agent.go b/miner/remote_agent.go index 11ef98e732..42e7409df2 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/log" ) type hashrate struct { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 67e033b8e7..7f03b22a0c 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -20,9 +20,9 @@ import ( "container/ring" "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/log" ) // headerRetriever 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 d753771777..bc7aebc37e 100644 --- a/miner/unconfirmed_test.go +++ b/miner/unconfirmed_test.go @@ -19,8 +19,8 @@ package miner import ( "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" ) // noopHeaderRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index 724d7e993f..025c967ecd 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -24,17 +24,17 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/consensus" - "github.com/etherinc/go-ethereum/consensus/misc" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/consensus" + "github.com/etherinc/go-etherinc/consensus/misc" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/params" "gopkg.in/fatih/set.v0" ) diff --git a/mobile/accounts.go b/mobile/accounts.go index 867c78af88..a1aa086383 100644 --- a/mobile/accounts.go +++ b/mobile/accounts.go @@ -23,10 +23,10 @@ import ( "errors" "time" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index a22eec5701..b7cd0be719 100644 --- a/mobile/android_test.go +++ b/mobile/android_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/internal/build" + "github.com/etherinc/go-etherinc/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/etherinc/go-ethereum/mobile") + gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/etherinc/go-etherinc/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 9a50210d29..b9ab6768bb 100644 --- a/mobile/big.go +++ b/mobile/big.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index 9dd14c2152..477c6913bc 100644 --- a/mobile/bind.go +++ b/mobile/bind.go @@ -22,10 +22,10 @@ import ( "math/big" "strings" - "github.com/etherinc/go-ethereum/accounts/abi" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/accounts/abi" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/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 180ea190da..b34515f529 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index c083471ab7..4ad24ab366 100644 --- a/mobile/discover.go +++ b/mobile/discover.go @@ -22,7 +22,7 @@ package geth import ( "errors" - "github.com/etherinc/go-ethereum/p2p/discv5" + "github.com/etherinc/go-etherinc/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index d905a6e539..90739beb5d 100644 --- a/mobile/ethclient.go +++ b/mobile/ethclient.go @@ -21,8 +21,8 @@ package geth import ( "math/big" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/ethclient" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index 28753574d0..832ec2f69c 100644 --- a/mobile/ethereum.go +++ b/mobile/ethereum.go @@ -21,8 +21,8 @@ package geth import ( "errors" - ethereum "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/common" + ethereum "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index b129b0fa65..abf1916dd2 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,17 +24,17 @@ import ( "fmt" "path/filepath" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/eth" - "github.com/etherinc/go-ethereum/eth/downloader" - "github.com/etherinc/go-ethereum/ethclient" - "github.com/etherinc/go-ethereum/ethstats" - "github.com/etherinc/go-ethereum/les" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/nat" - "github.com/etherinc/go-ethereum/params" - whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/eth" + "github.com/etherinc/go-etherinc/eth/downloader" + "github.com/etherinc/go-etherinc/ethclient" + "github.com/etherinc/go-etherinc/ethstats" + "github.com/etherinc/go-etherinc/les" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/nat" + "github.com/etherinc/go-etherinc/params" + whisper "github.com/etherinc/go-etherinc/whisper/whisperv5" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index 2973fcb081..92094ddff9 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index 3e848885d5..41d394d150 100644 --- a/mobile/interface.go +++ b/mobile/interface.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/logger.go b/mobile/logger.go index e3eae78244..fe8bea53f3 100644 --- a/mobile/logger.go +++ b/mobile/logger.go @@ -19,7 +19,7 @@ package geth import ( "os" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/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 06ab9a269f..dfe061c89f 100644 --- a/mobile/p2p.go +++ b/mobile/p2p.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-etherinc/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index 15b4e7e664..e8528f58b6 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -21,9 +21,9 @@ package geth import ( "encoding/json" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/p2p/discv5" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/p2p/discv5" + "github.com/etherinc/go-etherinc/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 9338b46c05..adec615d5b 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,9 +23,9 @@ import ( "errors" "fmt" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/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 55e581c821..8cc510195c 100644 --- a/mobile/vm.go +++ b/mobile/vm.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/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 4fec16313d..5345407042 100644 --- a/node/api.go +++ b/node/api.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/rpc" "github.com/rcrowley/go-metrics" ) diff --git a/node/config.go b/node/config.go index 047d1f33dd..0519954bf7 100644 --- a/node/config.go +++ b/node/config.go @@ -25,14 +25,14 @@ import ( "runtime" "strings" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/accounts/keystore" - "github.com/etherinc/go-ethereum/accounts/usbwallet" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/accounts/keystore" + "github.com/etherinc/go-etherinc/accounts/usbwallet" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" ) const ( diff --git a/node/config_test.go b/node/config_test.go index ad8618a31c..d775482771 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -24,8 +24,8 @@ import ( "runtime" "testing" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index fee99f0d42..eb21a7a1a7 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,8 +22,8 @@ import ( "path/filepath" "runtime" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/nat" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/nat" ) const ( diff --git a/node/node.go b/node/node.go index 20eb992b47..a92cf860ef 100644 --- a/node/node.go +++ b/node/node.go @@ -26,13 +26,13 @@ import ( "strings" "sync" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/internal/debug" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/internal/debug" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rpc" "github.com/prometheus/prometheus/util/flock" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index 6558c31c2a..71593e934d 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,9 +20,9 @@ import ( "fmt" "log" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/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 3d4698497a..392227146f 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 101d069f87..1e5e468c81 100644 --- a/node/service.go +++ b/node/service.go @@ -19,11 +19,11 @@ package node import ( "reflect" - "github.com/etherinc/go-ethereum/accounts" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/accounts" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index ac7d484d45..fbf980f6c8 100644 --- a/node/utils_test.go +++ b/node/utils_test.go @@ -22,8 +22,8 @@ package node import ( "reflect" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index 9e0cf4c834..b91a3fdabf 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -24,9 +24,9 @@ import ( "net" "time" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/netutil" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 2c66d762c7..fa0a0df942 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -24,8 +24,8 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/netutil" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/netutil" ) func init() { diff --git a/p2p/discover/database.go b/p2p/discover/database.go index 4b6bada0bf..3ff557cd78 100644 --- a/p2p/discover/database.go +++ b/p2p/discover/database.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/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 1f338446e8..db66a6fe3f 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -30,9 +30,9 @@ import ( "strconv" "strings" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/secp256k1" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/secp256k1" ) const NodeIDBits = 512 diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go index 8b51bfd265..f8bfb45bb4 100644 --- a/p2p/discover/node_test.go +++ b/p2p/discover/node_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" ) func ExampleNewNode() { diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 59f8a73c7b..0c7db7995b 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,7 +25,7 @@ import ( "sort" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index fdcfce44f8..9c188a7336 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -32,9 +32,9 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index e79d02bba0..b466a3c489 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index c082f26b46..e77653b486 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -25,11 +25,11 @@ import ( "net" "time" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/nat" - "github.com/etherinc/go-ethereum/p2p/netutil" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/nat" + "github.com/etherinc/go-etherinc/p2p/netutil" + "github.com/etherinc/go-etherinc/rlp" ) const Version = 4 diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index 1b22e92745..73dc6389de 100644 --- a/p2p/discover/udp_test.go +++ b/p2p/discover/udp_test.go @@ -34,9 +34,9 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 5837201352..3e50b71edc 100644 --- a/p2p/discv5/database.go +++ b/p2p/discv5/database.go @@ -28,9 +28,9 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index c3ef0ea0b7..b3c9b99c6f 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,13 +24,13 @@ import ( "net" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/mclock" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/netutil" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/mclock" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/netutil" + "github.com/etherinc/go-etherinc/rlp" ) var ( diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index 32ef0653b6..9b5bdee277 100644 --- a/p2p/discv5/net_test.go +++ b/p2p/discv5/net_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index 8cdd9609a1..67b8270579 100644 --- a/p2p/discv5/node.go +++ b/p2p/discv5/node.go @@ -30,8 +30,8 @@ import ( "strconv" "strings" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index 935b75e998..7a342529cd 100644 --- a/p2p/discv5/node_test.go +++ b/p2p/discv5/node_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 048f54b01d..11ffe0c164 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index 449aec91a7..43832afdb1 100644 --- a/p2p/discv5/sim_test.go +++ b/p2p/discv5/sim_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index 61e3329314..832ca909c2 100644 --- a/p2p/discv5/table.go +++ b/p2p/discv5/table.go @@ -29,7 +29,7 @@ import ( "net" "sort" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index 7e954cecd2..4fee90cc4f 100644 --- a/p2p/discv5/table_test.go +++ b/p2p/discv5/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index 427dca77d8..32526789cf 100644 --- a/p2p/discv5/ticket.go +++ b/p2p/discv5/ticket.go @@ -25,10 +25,10 @@ import ( "sort" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/mclock" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/mclock" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index 00b177f92b..774e381cf2 100644 --- a/p2p/discv5/topic.go +++ b/p2p/discv5/topic.go @@ -23,8 +23,8 @@ import ( "math/rand" "time" - "github.com/etherinc/go-ethereum/common/mclock" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common/mclock" + "github.com/etherinc/go-etherinc/log" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index 2a696995c0..2e1ae22c24 100644 --- a/p2p/discv5/topic_test.go +++ b/p2p/discv5/topic_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index d2166ca23e..0ff899d987 100644 --- a/p2p/discv5/udp.go +++ b/p2p/discv5/udp.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/nat" - "github.com/etherinc/go-ethereum/p2p/netutil" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/nat" + "github.com/etherinc/go-etherinc/p2p/netutil" + "github.com/etherinc/go-etherinc/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index cc3b48ce84..8da20d31fc 100644 --- a/p2p/discv5/udp_test.go +++ b/p2p/discv5/udp_test.go @@ -27,9 +27,9 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/rlp" ) func init() { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index e1b64139c3..d9525c5ea1 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -35,9 +35,9 @@ import ( "io" "sort" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/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 a4a730a5ac..7efd70023f 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index 0d21c19dbe..ba3f85bfd4 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -22,8 +22,8 @@ import ( "io" "net" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index 2a5ad06d7f..e007e595d4 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -27,9 +27,9 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index e4605d120a..e8d82cba44 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -21,7 +21,7 @@ package p2p import ( "net" - "github.com/etherinc/go-ethereum/metrics" + "github.com/etherinc/go-etherinc/metrics" ) var ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 6ee2fbaaf3..0a4be99a23 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/peer.go b/p2p/peer.go index 66497fd43d..341888a631 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common/mclock" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common/mclock" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/rlp" ) const ( diff --git a/p2p/protocol.go b/p2p/protocol.go index 420e894fe9..96359d121c 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,7 +19,7 @@ package p2p import ( "fmt" - "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/discover" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 4f34a9fc78..a40303907f 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -35,12 +35,12 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/ecies" - "github.com/etherinc/go-ethereum/crypto/secp256k1" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/ecies" + "github.com/etherinc/go-etherinc/crypto/secp256k1" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/rlp" "github.com/golang/snappy" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index a3e108071e..50df079abb 100644 --- a/p2p/rlpx_test.go +++ b/p2p/rlpx_test.go @@ -31,11 +31,11 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/ecies" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/ecies" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/rlp" ) func TestSharedSecret(t *testing.T) { diff --git a/p2p/server.go b/p2p/server.go index 191791d955..6a1b3141fa 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/mclock" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/discv5" - "github.com/etherinc/go-ethereum/p2p/nat" - "github.com/etherinc/go-ethereum/p2p/netutil" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/mclock" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/discv5" + "github.com/etherinc/go-etherinc/p2p/nat" + "github.com/etherinc/go-etherinc/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index ecf5533686..5107a0a2d6 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/discover" ) func init() { diff --git a/p2p/simulations/adapters/docker.go b/p2p/simulations/adapters/docker.go index ed840bf9a5..e8ce5942cd 100644 --- a/p2p/simulations/adapters/docker.go +++ b/p2p/simulations/adapters/docker.go @@ -28,9 +28,9 @@ import ( "strings" "github.com/docker/docker/pkg/reexec" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p/discover" ) // DockerAdapter is a NodeAdapter which runs simulation nodes inside Docker diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index f3515fe404..63186dd617 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -36,11 +36,11 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index 3c7ae8825c..6fd6a457f9 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,12 +23,12 @@ import ( "net" "sync" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index eadf43735d..94bfc8de11 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -25,11 +25,11 @@ import ( "os" "github.com/docker/docker/pkg/reexec" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/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 07ccd75474..476c0274fd 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/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/simulations" - "github.com/etherinc/go-ethereum/p2p/simulations/adapters" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/simulations" + "github.com/etherinc/go-etherinc/p2p/simulations/adapters" + "github.com/etherinc/go-etherinc/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 88ae58183d..e2b54d15ce 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -29,11 +29,11 @@ import ( "strings" "sync" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/simulations/adapters" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/simulations/adapters" + "github.com/etherinc/go-etherinc/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 6176820c59..e33b943d08 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/simulations/adapters" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/simulations/adapters" + "github.com/etherinc/go-etherinc/rpc" ) // testService implements the node.Service interface and provides protocols diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index 42c2c5d29c..44e5a2b175 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/discover" ) //a map of mocker names to its function diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go index 74dfdd01a3..7321e8ed4e 100644 --- a/p2p/simulations/mocker_test.go +++ b/p2p/simulations/mocker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/discover" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index d5de2f8d3a..fe45ea3e9e 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/event" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/simulations/adapters" + "github.com/etherinc/go-etherinc/event" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/simulations/adapters" ) var dialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index d2ef4dbbfc..6eda574bb0 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/simulations/adapters" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/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 5401476c68..6445501b0f 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/discover" ) // Simulation provides a framework for running actions in a simulated network diff --git a/params/config.go b/params/config.go index d72cee7588..af6ea82a35 100644 --- a/params/config.go +++ b/params/config.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) var ( diff --git a/params/dao.go b/params/dao.go index 93d0fb01cf..e9bc91e611 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/rpc/client.go b/rpc/client.go index 2b541f9d39..9c25188cbe 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -32,7 +32,7 @@ import ( "sync/atomic" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 923d95336a..c01438768b 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -22,7 +22,7 @@ import ( "math/big" "time" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/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 eba91c44f8..4bc7bd541e 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -31,7 +31,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) func TestClientRequest(t *testing.T) { diff --git a/rpc/ipc.go b/rpc/ipc.go index 1e8e22d354..d7a0783080 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -21,7 +21,7 @@ import ( "fmt" "net" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) // CreateIPCListener creates an listener, on Unix platforms this is a unix socket, on diff --git a/rpc/json.go b/rpc/json.go index 74f8082de6..5efc958dbf 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index d18932d5e0..c17f4b35bb 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -25,7 +25,7 @@ import ( "sync" "sync/atomic" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types.go b/rpc/types.go index 35fc98f54c..e95050a250 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common/hexutil" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types_test.go b/rpc/types_test.go index a7e76aa1b9..b502ee1405 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index 207044e154..df5e47fe01 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" "golang.org/x/net/websocket" "gopkg.in/fatih/set.v0" ) diff --git a/swarm/api/api.go b/swarm/api/api.go index 9ab14eca9e..d1f9c6ce5f 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -29,9 +29,9 @@ import ( "path/filepath" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/storage" ) var hashMatcher = regexp.MustCompile("^[0-9A-Fa-f]{64}") diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go index e686fcb74a..76bfc78194 100644 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -24,9 +24,9 @@ import ( "os" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/storage" ) func testApi(t *testing.T, f func(*Api)) { diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go index a3a12aa41d..e6f1a49056 100644 --- a/swarm/api/client/client.go +++ b/swarm/api/client/client.go @@ -33,7 +33,7 @@ import ( "strconv" "strings" - "github.com/etherinc/go-ethereum/swarm/api" + "github.com/etherinc/go-etherinc/swarm/api" ) var ( diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go index f73640e01e..3645949d2c 100644 --- a/swarm/api/client/client_test.go +++ b/swarm/api/client/client_test.go @@ -25,8 +25,8 @@ import ( "sort" "testing" - "github.com/etherinc/go-ethereum/swarm/api" - "github.com/etherinc/go-ethereum/swarm/testutil" + "github.com/etherinc/go-etherinc/swarm/api" + "github.com/etherinc/go-etherinc/swarm/testutil" ) // TestClientUploadDownloadRaw test uploading and downloading raw data to swarm diff --git a/swarm/api/config.go b/swarm/api/config.go index 7d48d49612..6a7c891fa1 100644 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -22,14 +22,14 @@ import ( "os" "path/filepath" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/contracts/ens" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/swarm/network" - "github.com/etherinc/go-ethereum/swarm/services/swap" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/contracts/ens" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/swarm/network" + "github.com/etherinc/go-etherinc/swarm/services/swap" + "github.com/etherinc/go-etherinc/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index 2044a0e00a..3d7f2d06a2 100644 --- a/swarm/api/config_test.go +++ b/swarm/api/config_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" ) func TestConfig(t *testing.T) { diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index 518b0bb108..c6a5e711f6 100644 --- a/swarm/api/filesystem.go +++ b/swarm/api/filesystem.go @@ -26,9 +26,9 @@ import ( "path/filepath" "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go index 1f302b9fc6..aab63f009f 100644 --- a/swarm/api/filesystem_test.go +++ b/swarm/api/filesystem_test.go @@ -24,8 +24,8 @@ import ( "sync" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/swarm/storage" ) var testDownloadDir, _ = ioutil.TempDir(os.TempDir(), "bzz-test") diff --git a/swarm/api/http/error.go b/swarm/api/http/error.go index 7faf74ed34..b375e75a0f 100644 --- a/swarm/api/http/error.go +++ b/swarm/api/http/error.go @@ -28,8 +28,8 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/api" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/api" ) //templateMap holds a mapping of an HTTP error code to a template diff --git a/swarm/api/http/error_test.go b/swarm/api/http/error_test.go index 167f01ada2..49f1940068 100644 --- a/swarm/api/http/error_test.go +++ b/swarm/api/http/error_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/etherinc/go-ethereum/swarm/testutil" + "github.com/etherinc/go-etherinc/swarm/testutil" ) func TestError(t *testing.T) { diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index 7f5df64c62..7d31c95f27 100644 --- a/swarm/api/http/roundtripper.go +++ b/swarm/api/http/roundtripper.go @@ -20,17 +20,17 @@ import ( "fmt" "net/http" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) /* http roundtripper to register for bzz url scheme -see https://github.com/etherinc/go-ethereum/issues/2040 +see https://github.com/etherinc/go-etherinc/issues/2040 Usage: import ( - "github.com/etherinc/go-ethereum/common/httpclient" - "github.com/etherinc/go-ethereum/swarm/api/http" + "github.com/etherinc/go-etherinc/common/httpclient" + "github.com/etherinc/go-etherinc/swarm/api/http" ) client := httpclient.New() // for (private) swarm proxy running locally diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index 0eda6a7921..765fd5f158 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -35,10 +35,10 @@ import ( "strings" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/api" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/api" + "github.com/etherinc/go-etherinc/swarm/storage" "github.com/rs/cors" ) diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index 02d6ecc3ff..c067f62acf 100644 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -26,11 +26,11 @@ import ( "sync" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/swarm/api" - swarm "github.com/etherinc/go-ethereum/swarm/api/client" - "github.com/etherinc/go-ethereum/swarm/storage" - "github.com/etherinc/go-ethereum/swarm/testutil" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/swarm/api" + swarm "github.com/etherinc/go-etherinc/swarm/api/client" + "github.com/etherinc/go-etherinc/swarm/storage" + "github.com/etherinc/go-etherinc/swarm/testutil" ) func TestBzzGetPath(t *testing.T) { diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go index 0e13b338e7..a61d406671 100644 --- a/swarm/api/http/templates.go +++ b/swarm/api/http/templates.go @@ -20,7 +20,7 @@ import ( "html/template" "path" - "github.com/etherinc/go-ethereum/swarm/api" + "github.com/etherinc/go-etherinc/swarm/api" ) type htmlListData struct { diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index 87b3400728..b1d697c26f 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index 92ac050c4f..f43547ecaf 100644 --- a/swarm/api/manifest_test.go +++ b/swarm/api/manifest_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/testapi.go b/swarm/api/testapi.go index 5de8af9b8b..c184282800 100644 --- a/swarm/api/testapi.go +++ b/swarm/api/testapi.go @@ -17,7 +17,7 @@ package api import ( - "github.com/etherinc/go-ethereum/swarm/network" + "github.com/etherinc/go-etherinc/swarm/network" ) type Control struct { diff --git a/swarm/dev/Makefile b/swarm/dev/Makefile index 1a6ff1873a..2c929dc1d0 100644 --- a/swarm/dev/Makefile +++ b/swarm/dev/Makefile @@ -3,12 +3,12 @@ default: build build: - go build -o bin/swarm github.com/etherinc/go-ethereum/cmd/swarm - go build -o bin/geth github.com/etherinc/go-ethereum/cmd/geth - go build -o bin/bootnode github.com/etherinc/go-ethereum/cmd/bootnode + go build -o bin/swarm github.com/etherinc/go-etherinc/cmd/swarm + go build -o bin/geth github.com/etherinc/go-etherinc/cmd/geth + go build -o bin/bootnode github.com/etherinc/go-etherinc/cmd/bootnode cluster: build scripts/boot-cluster.sh test: - go test -v github.com/etherinc/go-ethereum/swarm/... + go test -v github.com/etherinc/go-etherinc/swarm/... diff --git a/swarm/dev/bashrc b/swarm/dev/bashrc index f765236fb9..258dd178c9 100644 --- a/swarm/dev/bashrc +++ b/swarm/dev/bashrc @@ -1,4 +1,4 @@ -export ROOT="${GOPATH}/src/github.com/etherinc/go-ethereum" +export ROOT="${GOPATH}/src/github.com/etherinc/go-etherinc" export PATH="${ROOT}/swarm/dev/bin:${PATH}" cd "${ROOT}/swarm/dev" diff --git a/swarm/dev/run.sh b/swarm/dev/run.sh index 9f9b50097c..6852cfa3b6 100755 --- a/swarm/dev/run.sh +++ b/swarm/dev/run.sh @@ -80,7 +80,7 @@ run_image() { --rm \ --hostname "${name}" \ --name "${name}" \ - --volume "${ROOT}:/go/src/github.com/etherinc/go-ethereum" \ + --volume "${ROOT}:/go/src/github.com/etherinc/go-etherinc" \ --volume "/var/run/docker.sock:/var/run/docker.sock" \ ${docker_args} \ "${name}" \ diff --git a/swarm/fuse/fuse_file.go b/swarm/fuse/fuse_file.go index fb7d861680..2ab8e04cec 100644 --- a/swarm/fuse/fuse_file.go +++ b/swarm/fuse/fuse_file.go @@ -26,8 +26,8 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/storage" "golang.org/x/net/context" ) diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go index b9cd5a3e6c..9a7f0f3d23 100644 --- a/swarm/fuse/swarmfs.go +++ b/swarm/fuse/swarmfs.go @@ -17,7 +17,7 @@ package fuse import ( - "github.com/etherinc/go-ethereum/swarm/api" + "github.com/etherinc/go-etherinc/swarm/api" "sync" "time" ) diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index 297c61c2aa..5a0172fef8 100644 --- a/swarm/fuse/swarmfs_test.go +++ b/swarm/fuse/swarmfs_test.go @@ -27,8 +27,8 @@ import ( "path/filepath" "testing" - "github.com/etherinc/go-ethereum/swarm/api" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/swarm/api" + "github.com/etherinc/go-etherinc/swarm/storage" ) type fileInfo struct { diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index a09fb1706c..3a6250fedb 100644 --- a/swarm/fuse/swarmfs_unix.go +++ b/swarm/fuse/swarmfs_unix.go @@ -29,9 +29,9 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/api" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/api" ) var ( diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go index dd2ccfb8f5..29f7cb466a 100644 --- a/swarm/fuse/swarmfs_util.go +++ b/swarm/fuse/swarmfs_util.go @@ -24,7 +24,7 @@ import ( "os/exec" "runtime" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) func externalUnmount(mountPoint string) error { diff --git a/swarm/network/depo.go b/swarm/network/depo.go index 1fc9966b6e..da566db223 100644 --- a/swarm/network/depo.go +++ b/swarm/network/depo.go @@ -22,8 +22,8 @@ import ( "fmt" "time" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/storage" ) // Handler for storage/retrieval related protocol requests diff --git a/swarm/network/forwarding.go b/swarm/network/forwarding.go index 1885ab6bee..a2883b0d24 100644 --- a/swarm/network/forwarding.go +++ b/swarm/network/forwarding.go @@ -21,8 +21,8 @@ import ( "math/rand" "time" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/storage" ) const requesterCount = 3 diff --git a/swarm/network/hive.go b/swarm/network/hive.go index e97849ea16..cc5845e407 100644 --- a/swarm/network/hive.go +++ b/swarm/network/hive.go @@ -22,12 +22,12 @@ import ( "path/filepath" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/netutil" - "github.com/etherinc/go-ethereum/swarm/network/kademlia" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/netutil" + "github.com/etherinc/go-etherinc/swarm/network/kademlia" + "github.com/etherinc/go-etherinc/swarm/storage" ) // Hive is the logistic manager of the swarm diff --git a/swarm/network/kademlia/address.go b/swarm/network/kademlia/address.go index 93e6aa362d..067225b5dc 100644 --- a/swarm/network/kademlia/address.go +++ b/swarm/network/kademlia/address.go @@ -21,7 +21,7 @@ import ( "math/rand" "strings" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) type Address common.Hash diff --git a/swarm/network/kademlia/address_test.go b/swarm/network/kademlia/address_test.go index 47cc2836ac..e0129952e2 100644 --- a/swarm/network/kademlia/address_test.go +++ b/swarm/network/kademlia/address_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) func (Address) Generate(rand *rand.Rand, size int) reflect.Value { diff --git a/swarm/network/kademlia/kaddb.go b/swarm/network/kademlia/kaddb.go index ee6c3d71c9..62c707ff85 100644 --- a/swarm/network/kademlia/kaddb.go +++ b/swarm/network/kademlia/kaddb.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) type NodeData interface { diff --git a/swarm/network/kademlia/kademlia.go b/swarm/network/kademlia/kademlia.go index bffb9083d0..0f8c3b1e21 100644 --- a/swarm/network/kademlia/kademlia.go +++ b/swarm/network/kademlia/kademlia.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) const ( diff --git a/swarm/network/messages.go b/swarm/network/messages.go index ac9c5c559c..0b39b1538e 100644 --- a/swarm/network/messages.go +++ b/swarm/network/messages.go @@ -21,11 +21,11 @@ import ( "net" "time" - "github.com/etherinc/go-ethereum/contracts/chequebook" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/swarm/network/kademlia" - "github.com/etherinc/go-ethereum/swarm/services/swap" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/contracts/chequebook" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/swarm/network/kademlia" + "github.com/etherinc/go-etherinc/swarm/services/swap" + "github.com/etherinc/go-etherinc/swarm/storage" ) /* diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index 9dad0da68c..359a61af56 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -37,12 +37,12 @@ import ( "strconv" "time" - "github.com/etherinc/go-ethereum/contracts/chequebook" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - bzzswap "github.com/etherinc/go-ethereum/swarm/services/swap" - "github.com/etherinc/go-ethereum/swarm/services/swap/swap" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/contracts/chequebook" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + bzzswap "github.com/etherinc/go-etherinc/swarm/services/swap" + "github.com/etherinc/go-etherinc/swarm/services/swap/swap" + "github.com/etherinc/go-etherinc/swarm/storage" ) const ( diff --git a/swarm/network/syncdb.go b/swarm/network/syncdb.go index 82455f0c09..9b49d2344c 100644 --- a/swarm/network/syncdb.go +++ b/swarm/network/syncdb.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "fmt" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/storage" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" ) diff --git a/swarm/network/syncdb_test.go b/swarm/network/syncdb_test.go index 10e4c8bcf2..9e1fdd313b 100644 --- a/swarm/network/syncdb_test.go +++ b/swarm/network/syncdb_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/storage" ) func init() { diff --git a/swarm/network/syncer.go b/swarm/network/syncer.go index 4cd923489f..e494ac36e4 100644 --- a/swarm/network/syncer.go +++ b/swarm/network/syncer.go @@ -22,8 +22,8 @@ import ( "fmt" "path/filepath" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/storage" ) // syncer parameters (global, not peer specific) default values diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go index 2fd90af1ea..7c93b5d24d 100644 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -26,14 +26,14 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/contracts/chequebook" - "github.com/etherinc/go-ethereum/contracts/chequebook/contract" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/swarm/services/swap/swap" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/contracts/chequebook" + "github.com/etherinc/go-etherinc/contracts/chequebook/contract" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/swarm/services/swap/swap" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap.go b/swarm/services/swap/swap/swap.go index cd59578d1f..f03c9764e3 100644 --- a/swarm/services/swap/swap/swap.go +++ b/swarm/services/swap/swap/swap.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap_test.go b/swarm/services/swap/swap/swap_test.go index ab30b59956..51fec0e96c 100644 --- a/swarm/services/swap/swap/swap_test.go +++ b/swarm/services/swap/swap/swap_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) type testInPayment struct { diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go index 803a130772..3e98c69478 100644 --- a/swarm/storage/chunker_test.go +++ b/swarm/storage/chunker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-etherinc/crypto/sha3" ) /* diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index b008ea3718..db2b3f2e0d 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) type brokenLimitedReader struct { diff --git a/swarm/storage/database.go b/swarm/storage/database.go index 74b5d27cef..8637638722 100644 --- a/swarm/storage/database.go +++ b/swarm/storage/database.go @@ -22,7 +22,7 @@ package storage import ( "fmt" - "github.com/etherinc/go-ethereum/compression/rle" + "github.com/etherinc/go-etherinc/compression/rle" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" diff --git a/swarm/storage/dbstore.go b/swarm/storage/dbstore.go index 0cee8fcc7f..57ece9bc26 100644 --- a/swarm/storage/dbstore.go +++ b/swarm/storage/dbstore.go @@ -32,8 +32,8 @@ import ( "io/ioutil" "sync" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" ) diff --git a/swarm/storage/dbstore_test.go b/swarm/storage/dbstore_test.go index 279f7a50d6..33bc419a8c 100644 --- a/swarm/storage/dbstore_test.go +++ b/swarm/storage/dbstore_test.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "testing" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) func initDbStore(t *testing.T) *DbStore { diff --git a/swarm/storage/dpa.go b/swarm/storage/dpa.go index 5463dbf219..4341f58b01 100644 --- a/swarm/storage/dpa.go +++ b/swarm/storage/dpa.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) /* diff --git a/swarm/storage/memstore.go b/swarm/storage/memstore.go index d37548188d..ca85cf7bff 100644 --- a/swarm/storage/memstore.go +++ b/swarm/storage/memstore.go @@ -22,7 +22,7 @@ import ( "fmt" "sync" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) const ( diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index 6503f0a073..5340b648d5 100644 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -21,7 +21,7 @@ import ( "path/filepath" "time" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/log" ) /* diff --git a/swarm/storage/types.go b/swarm/storage/types.go index 70ccc7a090..addbc224f9 100644 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -24,9 +24,9 @@ import ( "io" "sync" - "github.com/etherinc/go-ethereum/bmt" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-etherinc/bmt" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto/sha3" ) type Hasher func() hash.Hash diff --git a/swarm/swarm.go b/swarm/swarm.go index 44c2022546..b3d56ac4b5 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -23,22 +23,22 @@ import ( "fmt" "net" - "github.com/etherinc/go-ethereum/accounts/abi/bind" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/contracts/chequebook" - "github.com/etherinc/go-ethereum/contracts/ens" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethclient" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/node" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/rpc" - "github.com/etherinc/go-ethereum/swarm/api" - httpapi "github.com/etherinc/go-ethereum/swarm/api/http" - "github.com/etherinc/go-ethereum/swarm/fuse" - "github.com/etherinc/go-ethereum/swarm/network" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/accounts/abi/bind" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/contracts/chequebook" + "github.com/etherinc/go-etherinc/contracts/ens" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethclient" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/node" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/rpc" + "github.com/etherinc/go-etherinc/swarm/api" + httpapi "github.com/etherinc/go-etherinc/swarm/api/http" + "github.com/etherinc/go-etherinc/swarm/fuse" + "github.com/etherinc/go-etherinc/swarm/network" + "github.com/etherinc/go-etherinc/swarm/storage" ) // the swarm stack diff --git a/swarm/testutil/http.go b/swarm/testutil/http.go index daabca46c1..92660a2d2f 100644 --- a/swarm/testutil/http.go +++ b/swarm/testutil/http.go @@ -22,9 +22,9 @@ import ( "os" "testing" - "github.com/etherinc/go-ethereum/swarm/api" - httpapi "github.com/etherinc/go-ethereum/swarm/api/http" - "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-etherinc/swarm/api" + httpapi "github.com/etherinc/go-etherinc/swarm/api/http" + "github.com/etherinc/go-etherinc/swarm/storage" ) func NewTestSwarmServer(t *testing.T) *TestSwarmServer { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 4f815d5b80..5547e46491 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -24,17 +24,17 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index 09264758ab..d3bccb5ced 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -22,8 +22,8 @@ import ( "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 80a8f19a79..4d63d14e21 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/consensus/ethash" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/consensus/ethash" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/params" ) //go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index ee54601259..835d42e56f 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index 3ba63eb0e5..0f98afa5f8 100644 --- a/tests/gen_difficultytest.go +++ b/tests/gen_difficultytest.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index cfeb8374f2..fdeaa4d90c 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 51314f4c80..105ba4f64c 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index 49fe4f3f37..03ac11e4bf 100644 --- a/tests/gen_tttransaction.go +++ b/tests/gen_tttransaction.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" ) var _ = (*ttTransactionMarshaling)(nil) diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index f89f2ad27d..5b7b3f28c1 100644 --- a/tests/gen_vmexec.go +++ b/tests/gen_vmexec.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" ) var _ = (*vmExecMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index c553421e56..f34ea16997 100644 --- a/tests/init.go +++ b/tests/init.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/params" ) // This table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index 59df951209..b7ae51f84c 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -29,7 +29,7 @@ import ( "strings" "testing" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 17be4211b4..3ae7a5f708 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -24,7 +24,7 @@ import ( "math/big" "strings" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index dcd26b08fd..03474aad3c 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-etherinc/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index facf0c8a75..89d839c387 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -23,18 +23,18 @@ import ( "math/big" "strings" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" ) // StateTest checks transaction processing without block context. diff --git a/tests/transaction_test.go b/tests/transaction_test.go index 73dcb7a685..1cf2231f19 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index ee7a167f25..76a766fca2 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core/types" - "github.com/etherinc/go-ethereum/params" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core/types" + "github.com/etherinc/go-etherinc/params" + "github.com/etherinc/go-etherinc/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/tests/vm_test.go b/tests/vm_test.go index f76d9ca1e7..272a0f2ac6 100644 --- a/tests/vm_test.go +++ b/tests/vm_test.go @@ -19,7 +19,7 @@ package tests import ( "testing" - "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-etherinc/core/vm" ) func TestVM(t *testing.T) { diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index 680ef576ad..3389d7eed0 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -22,15 +22,15 @@ import ( "fmt" "math/big" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/core" - "github.com/etherinc/go-ethereum/core/state" - "github.com/etherinc/go-ethereum/core/vm" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/core" + "github.com/etherinc/go-etherinc/core/state" + "github.com/etherinc/go-etherinc/core/vm" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/params" ) // VMTest checks EVM execution without block or transaction context. diff --git a/trie/database.go b/trie/database.go index ab24ef59cd..685a18d825 100644 --- a/trie/database.go +++ b/trie/database.go @@ -20,9 +20,9 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/log" ) // secureKeyPrefix is the database key prefix used to store trie node preimages. diff --git a/trie/errors.go b/trie/errors.go index 5793e76b95..e040ca0a81 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -19,7 +19,7 @@ package trie import ( "fmt" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index d84e87412e..c21d32c1eb 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -21,9 +21,9 @@ import ( "hash" "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto/sha3" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto/sha3" + "github.com/etherinc/go-etherinc/rlp" ) type hasher struct { diff --git a/trie/iterator.go b/trie/iterator.go index ac65a95e6a..b06f33c1af 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,7 +21,7 @@ import ( "container/heap" "errors" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/iterator_test.go b/trie/iterator_test.go index e630b025f6..177593130c 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -22,8 +22,8 @@ import ( "math/rand" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/ethdb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index 402087648d..3a0eae447c 100644 --- a/trie/node.go +++ b/trie/node.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/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/proof.go b/trie/proof.go index 445c33d06f..7ecda8fffb 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -20,11 +20,11 @@ import ( "bytes" "fmt" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/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 94e02c2b4b..c67eb56601 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index fa1095d643..3dbd5bb7d0 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -19,8 +19,8 @@ package trie import ( "fmt" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/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 931a9c6d04..19014be2e5 100644 --- a/trie/secure_trie_test.go +++ b/trie/secure_trie_test.go @@ -22,9 +22,9 @@ import ( "sync" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index 7dbbe6191c..485e2480d0 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,8 +20,8 @@ import ( "errors" "fmt" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/ethdb" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/trie/sync_test.go b/trie/sync_test.go index 58079488fb..8be1b19c5d 100644 --- a/trie/sync_test.go +++ b/trie/sync_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index 94901d64b4..d44e89b1ce 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -21,9 +21,9 @@ import ( "bytes" "fmt" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" "github.com/rcrowley/go-metrics" ) diff --git a/trie/trie_test.go b/trie/trie_test.go index 64770b7df4..d8e3f0255b 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -30,10 +30,10 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/ethdb" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/ethdb" + "github.com/etherinc/go-etherinc/rlp" ) func init() { diff --git a/vendor/vendor.json b/vendor/vendor.json index 29f3b8a414..b8e43fa82d 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -754,5 +754,5 @@ "revisionTime": "2017-08-11T01:42:03Z" } ], - "rootPath": "github.com/etherinc/go-ethereum" + "rootPath": "github.com/etherinc/go-etherinc" } diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index 1aea3d8ec0..d0ba18ea29 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -21,12 +21,12 @@ import ( "encoding/binary" "fmt" - "github.com/etherinc/go-ethereum/cmd/utils" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/rlp" - whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-etherinc/cmd/utils" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/rlp" + whisper "github.com/etherinc/go-etherinc/whisper/whisperv5" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/whisper/mailserver/server_test.go b/whisper/mailserver/server_test.go index f48d5f73d6..4daa87e24b 100644 --- a/whisper/mailserver/server_test.go +++ b/whisper/mailserver/server_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + whisper "github.com/etherinc/go-etherinc/whisper/whisperv5" ) const powRequirement = 0.00001 diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go index 887d12cba8..7173fc0cfe 100644 --- a/whisper/shhclient/client.go +++ b/whisper/shhclient/client.go @@ -19,10 +19,10 @@ package shhclient import ( "context" - "github.com/etherinc/go-ethereum" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/rpc" - whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-etherinc" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/rpc" + whisper "github.com/etherinc/go-etherinc/whisper/whisperv5" ) // Client defines typed wrappers for the Whisper v5 RPC API. diff --git a/whisper/whisperv2/api.go b/whisper/whisperv2/api.go index 680a9dc39d..025cacedbb 100644 --- a/whisper/whisperv2/api.go +++ b/whisper/whisperv2/api.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/crypto" ) // PublicWhisperAPI provides the whisper RPC service. diff --git a/whisper/whisperv2/envelope.go b/whisper/whisperv2/envelope.go index 01c0c4cb8a..830f3bf12e 100644 --- a/whisper/whisperv2/envelope.go +++ b/whisper/whisperv2/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/ecies" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/ecies" + "github.com/etherinc/go-etherinc/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv2/envelope_test.go b/whisper/whisperv2/envelope_test.go index db9fd2fffc..1a1a5aeafe 100644 --- a/whisper/whisperv2/envelope_test.go +++ b/whisper/whisperv2/envelope_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/ecies" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/ecies" ) func TestEnvelopeOpen(t *testing.T) { diff --git a/whisper/whisperv2/filter.go b/whisper/whisperv2/filter.go index ee1f860260..0b23e03e15 100644 --- a/whisper/whisperv2/filter.go +++ b/whisper/whisperv2/filter.go @@ -21,7 +21,7 @@ package whisperv2 import ( "crypto/ecdsa" - "github.com/etherinc/go-ethereum/event/filter" + "github.com/etherinc/go-etherinc/event/filter" ) // Filter is used to subscribe to specific types of whisper messages. diff --git a/whisper/whisperv2/main.go b/whisper/whisperv2/main.go index 872607a229..de46921537 100644 --- a/whisper/whisperv2/main.go +++ b/whisper/whisperv2/main.go @@ -27,12 +27,12 @@ import ( "os" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/logger" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/nat" - "github.com/etherinc/go-ethereum/whisper" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/logger" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/nat" + "github.com/etherinc/go-etherinc/whisper" ) func main() { diff --git a/whisper/whisperv2/message.go b/whisper/whisperv2/message.go index 009241a6bd..19ea4bd560 100644 --- a/whisper/whisperv2/message.go +++ b/whisper/whisperv2/message.go @@ -26,10 +26,10 @@ import ( "math/rand" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/ecies" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/ecies" + "github.com/etherinc/go-etherinc/log" ) // Message represents an end-user data packet to transmit through the Whisper diff --git a/whisper/whisperv2/message_test.go b/whisper/whisperv2/message_test.go index febfda4597..3194e808ff 100644 --- a/whisper/whisperv2/message_test.go +++ b/whisper/whisperv2/message_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/crypto" ) // Tests whether a message can be wrapped without any identity or encryption. diff --git a/whisper/whisperv2/peer.go b/whisper/whisperv2/peer.go index ea88705aa3..a35d43e16d 100644 --- a/whisper/whisperv2/peer.go +++ b/whisper/whisperv2/peer.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv2/peer_test.go b/whisper/whisperv2/peer_test.go index 252f6dc3e7..646abdc286 100644 --- a/whisper/whisperv2/peer_test.go +++ b/whisper/whisperv2/peer_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" ) type testPeer struct { diff --git a/whisper/whisperv2/topic.go b/whisper/whisperv2/topic.go index 87b9e0c845..ed5c293d73 100644 --- a/whisper/whisperv2/topic.go +++ b/whisper/whisperv2/topic.go @@ -19,7 +19,7 @@ package whisperv2 -import "github.com/etherinc/go-ethereum/crypto" +import "github.com/etherinc/go-etherinc/crypto" // Topic represents a cryptographically secure, probabilistic partial // classifications of a message, determined as the first (left) 4 bytes of the diff --git a/whisper/whisperv2/whisper.go b/whisper/whisperv2/whisper.go index bc7efa89fb..a55e0a72dd 100644 --- a/whisper/whisperv2/whisper.go +++ b/whisper/whisperv2/whisper.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/ecies" - "github.com/etherinc/go-ethereum/event/filter" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/ecies" + "github.com/etherinc/go-etherinc/event/filter" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rpc" "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv2/whisper_test.go b/whisper/whisperv2/whisper_test.go index 1699c34b49..7cdfa7a96d 100644 --- a/whisper/whisperv2/whisper_test.go +++ b/whisper/whisperv2/whisper_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" ) func startTestCluster(n int) []*Whisper { diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go index 71a3c211e6..f2635e5f43 100644 --- a/whisper/whisperv5/api.go +++ b/whisper/whisperv5/api.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/rpc" ) const ( diff --git a/whisper/whisperv5/benchmarks_test.go b/whisper/whisperv5/benchmarks_test.go index 1f0e4e1671..91002e8746 100644 --- a/whisper/whisperv5/benchmarks_test.go +++ b/whisper/whisperv5/benchmarks_test.go @@ -19,7 +19,7 @@ package whisperv5 import ( "testing" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/crypto" ) func BenchmarkDeriveKeyMaterial(b *testing.B) { diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go index 64a759df3f..c26b0e3f0e 100644 --- a/whisper/whisperv5/envelope.go +++ b/whisper/whisperv5/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/ecies" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/ecies" + "github.com/etherinc/go-etherinc/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv5/filter.go b/whisper/whisperv5/filter.go index 40bb191dfc..c9e89f531d 100644 --- a/whisper/whisperv5/filter.go +++ b/whisper/whisperv5/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" ) type Filter struct { diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go index e0eed0ba35..05dc8ec5e5 100644 --- a/whisper/whisperv5/filter_test.go +++ b/whisper/whisperv5/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" ) var seed int64 diff --git a/whisper/whisperv5/gen_criteria_json.go b/whisper/whisperv5/gen_criteria_json.go index 1d20b0ee44..e8c3b732f1 100644 --- a/whisper/whisperv5/gen_criteria_json.go +++ b/whisper/whisperv5/gen_criteria_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv5/gen_message_json.go b/whisper/whisperv5/gen_message_json.go index 592d99ff07..948909e6cf 100644 --- a/whisper/whisperv5/gen_message_json.go +++ b/whisper/whisperv5/gen_message_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv5/gen_newmessage_json.go b/whisper/whisperv5/gen_newmessage_json.go index 71cb106749..c63acb36fc 100644 --- a/whisper/whisperv5/gen_newmessage_json.go +++ b/whisper/whisperv5/gen_newmessage_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go index 3d60490d8a..ab73448283 100644 --- a/whisper/whisperv5/message.go +++ b/whisper/whisperv5/message.go @@ -27,10 +27,10 @@ import ( "errors" "strconv" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/ecies" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/ecies" + "github.com/etherinc/go-etherinc/log" ) // Options specifies the exact way a message should be wrapped into an Envelope. diff --git a/whisper/whisperv5/message_test.go b/whisper/whisperv5/message_test.go index 4afbbce124..757c964a9b 100644 --- a/whisper/whisperv5/message_test.go +++ b/whisper/whisperv5/message_test.go @@ -21,8 +21,8 @@ import ( mrand "math/rand" "testing" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go index 9971f9b54d..af6aa86a59 100644 --- a/whisper/whisperv5/peer.go +++ b/whisper/whisperv5/peer.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rlp" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go index e0d5305449..ca29ff4e5c 100644 --- a/whisper/whisperv5/peer_test.go +++ b/whisper/whisperv5/peer_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/nat" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/nat" ) var keys []string = []string{ diff --git a/whisper/whisperv5/topic.go b/whisper/whisperv5/topic.go index fb030f0a4e..741fc512e8 100644 --- a/whisper/whisperv5/topic.go +++ b/whisper/whisperv5/topic.go @@ -19,8 +19,8 @@ package whisperv5 import ( - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" ) // Topic represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go index 150578ade7..7b4f99abf9 100644 --- a/whisper/whisperv5/whisper.go +++ b/whisper/whisperv5/whisper.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rpc" "github.com/syndtr/goleveldb/leveldb/errors" "golang.org/x/crypto/pbkdf2" "golang.org/x/sync/syncmap" diff --git a/whisper/whisperv5/whisper_test.go b/whisper/whisperv5/whisper_test.go index 3d86fac19e..73898f580b 100644 --- a/whisper/whisperv5/whisper_test.go +++ b/whisper/whisperv5/whisper_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" ) func TestWhisperBasic(t *testing.T) { diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go index f0379204fd..29b9144f43 100644 --- a/whisper/whisperv6/api.go +++ b/whisper/whisperv6/api.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/rpc" ) const ( diff --git a/whisper/whisperv6/benchmarks_test.go b/whisper/whisperv6/benchmarks_test.go index bfe06f7257..a82916b201 100644 --- a/whisper/whisperv6/benchmarks_test.go +++ b/whisper/whisperv6/benchmarks_test.go @@ -20,7 +20,7 @@ import ( "crypto/sha256" "testing" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go index b75b0b9fb6..41c2ac5bcb 100644 --- a/whisper/whisperv6/envelope.go +++ b/whisper/whisperv6/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/math" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/ecies" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/math" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/ecies" + "github.com/etherinc/go-etherinc/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv6/envelope_test.go b/whisper/whisperv6/envelope_test.go index dcf8ab04ea..602a8d36e5 100644 --- a/whisper/whisperv6/envelope_test.go +++ b/whisper/whisperv6/envelope_test.go @@ -22,7 +22,7 @@ import ( mrand "math/rand" "testing" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/crypto" ) func TestEnvelopeOpenAcceptsOnlyOneKeyTypeInFilter(t *testing.T) { diff --git a/whisper/whisperv6/filter.go b/whisper/whisperv6/filter.go index d4a61dda73..fdfbd21cd0 100644 --- a/whisper/whisperv6/filter.go +++ b/whisper/whisperv6/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" ) // Filter represents a Whisper message filter diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go index d0cac123d9..2f6da9bffd 100644 --- a/whisper/whisperv6/filter_test.go +++ b/whisper/whisperv6/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" ) var seed int64 diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go index 0cfbfaba54..85fece940f 100644 --- a/whisper/whisperv6/gen_criteria_json.go +++ b/whisper/whisperv6/gen_criteria_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv6/gen_message_json.go b/whisper/whisperv6/gen_message_json.go index 74887058bc..e896eea1ce 100644 --- a/whisper/whisperv6/gen_message_json.go +++ b/whisper/whisperv6/gen_message_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv6/gen_newmessage_json.go b/whisper/whisperv6/gen_newmessage_json.go index 566227d97c..b10b87d988 100644 --- a/whisper/whisperv6/gen_newmessage_json.go +++ b/whisper/whisperv6/gen_newmessage_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv6/message.go b/whisper/whisperv6/message.go index 72565f096d..d1a38edb88 100644 --- a/whisper/whisperv6/message.go +++ b/whisper/whisperv6/message.go @@ -28,10 +28,10 @@ import ( mrand "math/rand" "strconv" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/crypto/ecies" - "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/crypto/ecies" + "github.com/etherinc/go-etherinc/log" ) // MessageParams specifies the exact way a message should be wrapped diff --git a/whisper/whisperv6/message_test.go b/whisper/whisperv6/message_test.go index 5f0f41e807..7a34c0cb88 100644 --- a/whisper/whisperv6/message_test.go +++ b/whisper/whisperv6/message_test.go @@ -23,9 +23,9 @@ import ( mrand "math/rand" "testing" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go index 2b6835cf58..1b906dd69b 100644 --- a/whisper/whisperv6/peer.go +++ b/whisper/whisperv6/peer.go @@ -21,10 +21,10 @@ import ( "math" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rlp" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv6/peer_test.go b/whisper/whisperv6/peer_test.go index ff30d52b9b..5758cc77f3 100644 --- a/whisper/whisperv6/peer_test.go +++ b/whisper/whisperv6/peer_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/p2p/discover" - "github.com/etherinc/go-ethereum/p2p/nat" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/p2p/discover" + "github.com/etherinc/go-etherinc/p2p/nat" ) var keys = []string{ diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go index fe74b4b719..78cb2a5013 100644 --- a/whisper/whisperv6/topic.go +++ b/whisper/whisperv6/topic.go @@ -19,8 +19,8 @@ package whisperv6 import ( - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go index a511dfa91d..1ec31681ab 100644 --- a/whisper/whisperv6/whisper.go +++ b/whisper/whisperv6/whisper.go @@ -26,12 +26,12 @@ import ( "sync" "time" - "github.com/etherinc/go-ethereum/common" - "github.com/etherinc/go-ethereum/crypto" - "github.com/etherinc/go-ethereum/log" - "github.com/etherinc/go-ethereum/p2p" - "github.com/etherinc/go-ethereum/rlp" - "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-etherinc/common" + "github.com/etherinc/go-etherinc/crypto" + "github.com/etherinc/go-etherinc/log" + "github.com/etherinc/go-etherinc/p2p" + "github.com/etherinc/go-etherinc/rlp" + "github.com/etherinc/go-etherinc/rpc" "github.com/syndtr/goleveldb/leveldb/errors" "golang.org/x/crypto/pbkdf2" "golang.org/x/sync/syncmap" diff --git a/whisper/whisperv6/whisper_test.go b/whisper/whisperv6/whisper_test.go index 988b71c469..afa0d37658 100644 --- a/whisper/whisperv6/whisper_test.go +++ b/whisper/whisperv6/whisper_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-etherinc/common" "golang.org/x/crypto/pbkdf2" )