From 3bfb4c17ded661872861149f8beb514ee319cc88 Mon Sep 17 00:00:00 2001 From: David Krett Date: Tue, 17 Jul 2018 16:25:51 -0400 Subject: [PATCH] Linked to github.com/empyrean/go_ethereum - Shyft Fork --- .github/CONTRIBUTING.md | 4 +- README.md | 20 +- 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 | 32 +- 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 | 8 +- 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 | 30 +- 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 | 20 +- 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 | 4 +- 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/bn256/bn256_amd64.go | 2 +- crypto/bn256/bn256_other.go | 2 +- 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/assets.go | 2 +- dashboard/assets/components/Footer.jsx | 2 +- dashboard/cpu.go | 2 +- dashboard/dashboard.go | 10 +- 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 | 18 +- 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 | 8 +- eth/downloader/statesync.go | 14 +- 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 | 8 +- 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 | 28 +- les/metrics.go | 4 +- les/odr.go | 8 +- les/odr_requests.go | 18 +- les/odr_test.go | 22 +- les/peer.go | 14 +- les/protocol.go | 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/exp/exp.go | 2 +- metrics/influxdb/influxdb.go | 2 +- metrics/librato/librato.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 | 12 +- 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 | 8 +- p2p/discover/table_test.go | 4 +- p2p/discover/udp.go | 10 +- p2p/discover/udp_test.go | 6 +- p2p/discv5/database.go | 6 +- p2p/discv5/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/protocols/protocol.go | 2 +- p2p/protocols/protocol_test.go | 8 +- 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 +- p2p/testing/peerpool.go | 4 +- p2p/testing/protocolsession.go | 8 +- p2p/testing/protocoltester.go | 16 +- 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 +- shyftBlockExplorerApi/handler.go | 2 +- shyftDb/db.go | 12 +- shyftDb/postgres_test.go | 6 +- shyftDb/shyft_database_util.go | 334 +++++++++--------- shyftDb/shyft_database_util_test.go | 102 +++--- swarm/api/api.go | 8 +- 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 | 6 +- swarm/api/http/error_test.go | 2 +- swarm/api/http/roundtripper.go | 8 +- swarm/api/http/server.go | 10 +- 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/metrics/flags.go | 8 +- swarm/network/depo.go | 6 +- swarm/network/forwarding.go | 4 +- swarm/network/hive.go | 14 +- swarm/network/kademlia/address.go | 2 +- swarm/network/kademlia/address_test.go | 2 +- swarm/network/kademlia/kaddb.go | 2 +- swarm/network/kademlia/kademlia.go | 4 +- swarm/network/messages.go | 10 +- swarm/network/protocol.go | 14 +- 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.go | 2 +- swarm/storage/chunker_test.go | 2 +- swarm/storage/common_test.go | 2 +- swarm/storage/database.go | 2 +- swarm/storage/dbstore.go | 6 +- swarm/storage/dbstore_test.go | 2 +- swarm/storage/dpa.go | 2 +- swarm/storage/localstore.go | 2 +- swarm/storage/memstore.go | 4 +- swarm/storage/netstore.go | 2 +- swarm/storage/types.go | 6 +- swarm/swarm.go | 36 +- swarm/swarm_test.go | 2 +- 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 | 8 +- 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/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 +- 582 files changed, 2350 insertions(+), 2354 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 9f2dbfcb80..a9f7b210e7 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/ethereum/go-ethereum/wiki) for more info +in the right hands. Please check our [Wiki page](https://github.com/empyrean/go-ethereum/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/ethereum/go-ethereum/wiki/Developers'-Guide) +See [Developers' Guide](https://github.com/empyrean/go-ethereum/wiki/Developers'-Guide) for more details on configuring your environment, testing, and dependency management. diff --git a/README.md b/README.md index f7d50d21a6..41de98eead 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ Official golang implementation of the Ethereum protocol. [![API Reference]( https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667 -)](https://godoc.org/github.com/ethereum/go-ethereum) -[![Go Report Card](https://goreportcard.com/badge/github.com/ethereum/go-ethereum)](https://goreportcard.com/report/github.com/ethereum/go-ethereum) +)](https://godoc.org/github.com/empyrean/go-ethereum) +[![Go Report Card](https://goreportcard.com/badge/github.com/empyrean/go-ethereum)](https://goreportcard.com/report/github.com/empyrean/go-ethereum) [![Build Status](https://travis-ci.org/ShyftNetwork/shyft_go-ethereum.svg?branch=master)](https://travis-ci.org/ShyftNetwork/shyft_go-ethereum) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/go-ethereum?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) @@ -15,7 +15,7 @@ Binary archives are published at https://geth.ethereum.org/downloads/. ## Building the source For prerequisites and detailed build instructions please read the -[Installation Instructions](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum) +[Installation Instructions](https://github.com/empyrean/go-ethereum/wiki/Building-Ethereum) on the wiki. Building geth requires both a Go (version 1.7 or later) and a C compiler. @@ -34,8 +34,8 @@ The go-ethereum project comes with several wrappers/executables found in the `cm | Command | Description | |:----------:|-------------| -| **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default) archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI Wiki page](https://github.com/ethereum/go-ethereum/wiki/Command-Line-Options) for command line options. | -| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. | +| **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default) archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI Wiki page](https://github.com/empyrean/go-ethereum/wiki/Command-Line-Options) for command line options. | +| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/empyrean/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. | | `bootnode` | Stripped down version of our Ethereum client implementation that only takes part in the network node discovery protocol, but does not run any of the higher level application protocols. It can be used as a lightweight bootstrap node to aid in finding peers in private networks. | | `evm` | Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode. Its purpose is to allow isolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug`). | | `gethrpctest` | Developer utility tool to support our [ethereum/rpc-test](https://github.com/ethereum/rpc-tests) test suite which validates baseline conformity to the [Ethereum JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) specs. Please see the [test suite's readme](https://github.com/ethereum/rpc-tests/blob/master/README.md) for details. | @@ -46,7 +46,7 @@ The go-ethereum project comes with several wrappers/executables found in the `cm ## Running geth Going through all the possible command line flags is out of scope here (please consult our -[CLI Wiki page](https://github.com/ethereum/go-ethereum/wiki/Command-Line-Options)), but we've +[CLI Wiki page](https://github.com/empyrean/go-ethereum/wiki/Command-Line-Options)), but we've enumerated a few common parameter combos to get you up to speed quickly on how you can run your own Geth instance. @@ -66,9 +66,9 @@ This command will: * Start geth in fast sync mode (default, can be changed with the `--syncmode` flag), causing it to download more data in exchange for avoiding processing the entire history of the Ethereum network, which is very CPU intensive. - * Start up Geth's built-in interactive [JavaScript console](https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console), + * Start up Geth's built-in interactive [JavaScript console](https://github.com/empyrean/go-ethereum/wiki/JavaScript-Console), (via the trailing `console` subcommand) through which you can invoke all official [`web3` methods](https://github.com/ethereum/wiki/wiki/JavaScript-API) - as well as Geth's own [management APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs). + as well as Geth's own [management APIs](https://github.com/empyrean/go-ethereum/wiki/Management-APIs). This too is optional and if you leave it out you can always attach to an already running Geth instance with `geth attach`. @@ -144,7 +144,7 @@ Do not forget `--rpcaddr 0.0.0.0`, if you want to access RPC from other containe As a developer, sooner rather than later you'll want to start interacting with Geth and the Ethereum network via your own programs and not manually through the console. To aid this, Geth has built in support for a JSON-RPC based APIs ([standard APIs](https://github.com/ethereum/wiki/wiki/JSON-RPC) and -[Geth specific APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs)). These can be +[Geth specific APIs](https://github.com/empyrean/go-ethereum/wiki/Management-APIs)). These can be exposed via HTTP, WebSockets and IPC (unix sockets on unix based platforms, and named pipes on Windows). The IPC interface is enabled by default and exposes all the APIs supported by Geth, whereas the HTTP @@ -307,7 +307,7 @@ Please make sure your contributions adhere to our coding guidelines: * Commit messages should be prefixed with the package(s) they modify. * E.g. "eth, rpc: make trace configs optional" -Please see the [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide) +Please see the [Developers' Guide](https://github.com/empyrean/go-ethereum/wiki/Developers'-Guide) for more details on configuring your environment, managing project dependencies and testing procedures. ## License diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index 35e0094ddd..57afe4a9a1 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -27,8 +27,8 @@ import ( "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index e6bb0c3b52..0db5678b69 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -22,10 +22,10 @@ import ( "io" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 ca60cc1b43..6dec891e29 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index fe7dea4da1..a2deeadd2b 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,21 +24,21 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/bloombits" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/eth/filters" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/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 83ad1c8ae7..08ddadab18 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/accounts/abi" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/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 411177057b..6887edc5f3 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -17,7 +17,7 @@ // Package bind generates Ethereum contract Go bindings. // // Detailed usage document and tutorial available on the go-ethereum Wiki page: -// https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts +// https://github.com/empyrean/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts package bind import ( @@ -28,7 +28,7 @@ import ( "text/template" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/empyrean/go-ethereum/accounts/abi" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index 2a5a886487..31e1270199 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 7202ee67a1..f072c48b62 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/ethereum/go-ethereum/accounts/abi" +import "github.com/empyrean/go-ethereum/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 600dfcda97..ee5ffc732b 100644 --- a/accounts/abi/bind/topics.go +++ b/accounts/abi/bind/topics.go @@ -22,9 +22,9 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts/abi" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 d129993ca1..aa546546d4 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 49e6dc813a..ac1e9984e4 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/accounts/abi/bind/backends" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index 595f169f3a..519bc85512 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 cca61e433d..75156852e6 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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/ethereum/go-ethereum/pull/15568 +https://github.com/empyrean/go-ethereum/pull/15568 */ type testResult struct { diff --git a/accounts/abi/method.go b/accounts/abi/method.go index f434ffdbef..4a96adecba 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/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 9ad99f90d2..95e087d2b4 100644 --- a/accounts/abi/numbers.go +++ b/accounts/abi/numbers.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" ) var ( diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index 36c58265bd..1d2d7cd542 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 58a5b7a581..05d56ea263 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) func TestPack(t *testing.T) { diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index e55af12939..3f1d4efc55 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 793d515adf..60c165d19f 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,7 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) // reads the integer based on its kind diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index ee62567094..2aab49060d 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" "github.com/stretchr/testify/require" ) diff --git a/accounts/accounts.go b/accounts/accounts.go index 76951e1a42..fc4256e543 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -20,10 +20,10 @@ package accounts import ( "math/big" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 71f698ece7..b9fb2ba4b8 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/log" "gopkg.in/fatih/set.v0" ) diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index fe9233c046..fae3db22b1 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -29,8 +29,8 @@ import ( "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" ) var ( diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index c91b7b7b61..c15f1ede99 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" set "gopkg.in/fatih/set.v0" ) diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index 211fa863d7..73317f4667 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" "github.com/pborman/uuid" ) diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 80ccd37419..a367b5ad1c 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/event" ) var ( diff --git a/accounts/keystore/keystore_passphrase.go b/accounts/keystore/keystore_passphrase.go index eaec39f7df..65772a1972 100644 --- a/accounts/keystore/keystore_passphrase.go +++ b/accounts/keystore/keystore_passphrase.go @@ -36,10 +36,10 @@ import ( "io/ioutil" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/randentropy" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/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 630682cebd..6a92727c64 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/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) const ( diff --git a/accounts/keystore/keystore_plain.go b/accounts/keystore/keystore_plain.go index b490ca72b8..2db960a5a9 100644 --- a/accounts/keystore/keystore_plain.go +++ b/accounts/keystore/keystore_plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/keystore_plain_test.go b/accounts/keystore/keystore_plain_test.go index a1c3bc4b6c..e923d9b3c7 100644 --- a/accounts/keystore/keystore_plain_test.go +++ b/accounts/keystore/keystore_plain_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 6fb0a78088..f0af0161ff 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/keystore_wallet.go b/accounts/keystore/keystore_wallet.go index 758fdfe364..a719b0a488 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/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/core/types" + ethereum "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/core/types" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 1554294e14..4d131b3ae7 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/crypto" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index bbcfb99257..a52936ce3b 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -21,7 +21,7 @@ package keystore import ( "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" "github.com/rjeczalik/notify" ) diff --git a/accounts/manager.go b/accounts/manager.go index 96ca298fc5..e795f4973b 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/event" + "github.com/empyrean/go-ethereum/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 61fc98ccc8..7d3d343510 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" "github.com/karalabe/hid" ) diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index f5def61d23..00df8351c4 100644 --- a/accounts/usbwallet/ledger.go +++ b/accounts/usbwallet/ledger.go @@ -28,12 +28,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index b84a955992..6a9d90b871 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -27,12 +27,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/usbwallet/internal/trezor" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/accounts/usbwallet/internal/trezor" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/log" "github.com/golang/protobuf/proto" ) diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index 8b3b5a5224..7057eee2d7 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -25,11 +25,11 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + ethereum "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/log" "github.com/karalabe/hid" ) diff --git a/bmt/bmt_test.go b/bmt/bmt_test.go index 57df83060a..40620247e9 100644 --- a/bmt/bmt_test.go +++ b/bmt/bmt_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/crypto/sha3" ) const ( diff --git a/build/ci.go b/build/ci.go index 24b58c1ae4..8cebb6883e 100644 --- a/build/ci.go +++ b/build/ci.go @@ -58,7 +58,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/internal/build" + "github.com/empyrean/go-ethereum/internal/build" ) var ( @@ -738,7 +738,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/ethereum/go-ethereum/mobile")) + build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/empyrean/go-ethereum/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven @@ -858,7 +858,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/ethereum/go-ethereum/mobile") + bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/empyrean/go-ethereum/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 33c1a779f4..fdb6795681 100644 --- a/build/deb.control +++ b/build/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.10 Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: git://github.com/ethereum/go-ethereum.git -Vcs-Browser: https://github.com/ethereum/go-ethereum +Vcs-Git: git://github.com/empyrean/go-ethereum.git +Vcs-Browser: https://github.com/empyrean/go-ethereum Package: {{.Name}} Architecture: any diff --git a/build/mvn.pom b/build/mvn.pom index 7670246ba9..119b7c3c0a 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/ethereum/go-ethereum + https://github.com/empyrean/go-ethereum 2015 @@ -48,10 +48,10 @@ GitHub Issues - https://github.com/ethereum/go-ethereum/issues/ + https://github.com/empyrean/go-ethereum/issues/ - https://github.com/ethereum/go-ethereum + https://github.com/empyrean/go-ethereum diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index 57ef5a37c6..ed44b12ad2 100644 --- a/build/nsis.install.nsh +++ b/build/nsis.install.nsh @@ -3,9 +3,9 @@ InstallDir "$InstDir" OutFile "${OUTPUTFILE}" # set through command line arguments # Links for "Add/Remove Programs" -!define HELPURL "https://github.com/ethereum/go-ethereum/issues" -!define UPDATEURL "https://github.com/ethereum/go-ethereum/releases" -!define ABOUTURL "https://github.com/ethereum/go-ethereum#ethereum-go" +!define HELPURL "https://github.com/empyrean/go-ethereum/issues" +!define UPDATEURL "https://github.com/empyrean/go-ethereum/releases" +!define ABOUTURL "https://github.com/empyrean/go-ethereum#ethereum-go" !define /date NOW "%Y%m%d" PageEx license diff --git a/build/pod.podspec b/build/pod.podspec index 2c14c280c7..13909c16bf 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/ethereum/go-ethereum' + spec.homepage = 'https://github.com/empyrean/go-ethereum' spec.authors = { {{range .Contributors}} '{{.Name}}' => '{{.Email}}',{{end}} } spec.summary = 'iOS Ethereum Client' - spec.source = { :git => 'https://github.com/ethereum/go-ethereum.git', :commit => '{{.Commit}}' } + spec.source = { :git => 'https://github.com/empyrean/go-ethereum.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 3a1ae6f4c3..d272aa1689 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common/compiler" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 2e93cc04d2..4023d403f7 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,13 +24,13 @@ import ( "net" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/discv5" + "github.com/empyrean/go-ethereum/p2p/nat" + "github.com/empyrean/go-ethereum/p2p/netutil" ) func main() { diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index 6d57d17fb4..91bdf80bc2 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -23,9 +23,9 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/crypto" "github.com/pborman/uuid" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index dbf5afc0ce..265ec8e0a0 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -21,9 +21,9 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index 2a9e5ee483..98f73994ba 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index 531a931c82..e0fa95e32e 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,10 +21,10 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index 6006f6b5bb..226d9c2768 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "github.com/empyrean/go-ethereum/internal/cmdtest" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 0e563bf922..e574a9bf4f 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,9 +22,9 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/console" + "github.com/empyrean/go-ethereum/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index c019a2fe70..0cbff2c22a 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" + "github.com/empyrean/go-ethereum/cmd/evm/internal/compiler" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 4a442cf784..4b25dddb6b 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/empyrean/go-ethereum/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 753ca62264..06bf700a52 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/empyrean/go-ethereum/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 0e7a911896..fda5e64038 100644 --- a/cmd/evm/json_logger.go +++ b/cmd/evm/json_logger.go @@ -22,9 +22,9 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core/vm" ) type JSONLogger struct { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index a59cb1fb84..65458b1a86 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,7 +22,7 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index bc2fabc48f..4b3bf248a2 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -27,16 +27,16 @@ import ( goruntime "runtime" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/core/vm/runtime" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/cmd/evm/internal/compiler" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/core/vm/runtime" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index 071ea94ad0..47a8e08d67 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -23,10 +23,10 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/tests" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/tests" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 5bad09bbd5..a11f183385 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -41,23 +41,23 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/ethclient" + "github.com/empyrean/go-ethereum/ethstats" + "github.com/empyrean/go-ethereum/les" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/discv5" + "github.com/empyrean/go-ethereum/p2p/nat" + "github.com/empyrean/go-ethereum/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/ethereum/go-ethereum/issues") + err = errors.New("Something funky happened, please open an issue at https://github.com/empyrean/go-ethereum/issues") } if err != nil { if err = sendError(conn, err); err != nil { diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index 0db5c4ce0f..cdf11a204f 100644 --- a/cmd/geth/accountcmd.go +++ b/cmd/geth/accountcmd.go @@ -20,12 +20,12 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/console" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go index 3ea22ccfab..50b456008b 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/ethereum/go-ethereum/issues/1785 +// https://github.com/empyrean/go-ethereum/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 ce9dbe6c0a..85f57acbcb 100644 --- a/cmd/geth/bugcmd.go +++ b/cmd/geth/bugcmd.go @@ -26,10 +26,10 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/cmd/internal/browser" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/cmd/internal/browser" + "github.com/empyrean/go-ethereum/params" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/cmd/utils" cli "gopkg.in/urfave/cli.v1" ) @@ -41,7 +41,7 @@ var bugCommand = cli.Command{ Category: "MISCELLANEOUS COMMANDS", } -const issueUrl = "https://github.com/ethereum/go-ethereum/issues/new" +const issueUrl = "https://github.com/empyrean/go-ethereum/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 c9ab72b6df..ac5ce26211 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -25,17 +25,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/console" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 fd86949f7c..bbf2b6aa4a 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -27,12 +27,12 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/dashboard" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/params" + whisper "github.com/empyrean/go-ethereum/whisper/whisperv5" "github.com/naoina/toml" ) diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 2500a969cf..5194052de5 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -24,10 +24,10 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/console" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/rpc" "gopkg.in/urfave/cli.v1" ) @@ -43,7 +43,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/ethereum/go-ethereum/wiki/JavaScript-Console.`, +See https://github.com/empyrean/go-ethereum/wiki/JavaScript-Console.`, } attachCommand = cli.Command{ @@ -56,7 +56,7 @@ See https://github.com/ethereum/go-ethereum/wiki/JavaScript-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/ethereum/go-ethereum/wiki/JavaScript-Console. +See https://github.com/empyrean/go-ethereum/wiki/JavaScript-Console. This command allows to open a console on a running geth node.`, } @@ -69,7 +69,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/ethereum/go-ethereum/wiki/JavaScript-Console`, +JavaScript API. See https://github.com/empyrean/go-ethereum/wiki/JavaScript-Console`, } ) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 258b9e6dd9..c7b382692f 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/params" ) const ( diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index a8dbc51630..a354af1fe1 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -23,10 +23,10 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/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 f5a3fa941a..3cd8b4fa8c 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -25,17 +25,17 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/console" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/ethclient" + "github.com/empyrean/go-ethereum/internal/debug" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/node" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index aa9b1ee568..c5ee12dc9f 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go index cd19caa276..48728364a3 100644 --- a/cmd/geth/monitorcmd.go +++ b/cmd/geth/monitorcmd.go @@ -25,9 +25,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/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 da82facac3..f0518d3e35 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/ethereum/go-ethereum/internal/cmdtest" + "github.com/empyrean/go-ethereum/internal/cmdtest" ) func tmpdir(t *testing.T) string { diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index a1558c2330..b0bbd4c842 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -24,8 +24,8 @@ import ( "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/internal/debug" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/internal/debug" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index 0c8ed038d5..48b067df10 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -45,12 +45,12 @@ import ( "strings" "text/tabwriter" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/simulations" + "github.com/empyrean/go-ethereum/p2p/simulations/adapters" + "github.com/empyrean/go-ethereum/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go index 1974a94aa2..9fb0979a75 100644 --- a/cmd/puppeth/genesis.go +++ b/cmd/puppeth/genesis.go @@ -21,11 +21,11 @@ import ( "errors" "math" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/params" ) // cppEthereumGenesisSpec represents the genesis specification format used by the diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index b6a029a01a..c9e50deb42 100644 --- a/cmd/puppeth/module.go +++ b/cmd/puppeth/module.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 3832b247f8..3a1c3fad02 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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/ethereum/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/empyrean/go-ethereum/cmd/puppeth


Copyright 2017. The go-ethereum Authors.

diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index 20b7afe236..11421bea80 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 427134153b..cf5d5f49fb 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 976bf04d00..052a370620 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 35c0efc8ad..0eccaad92f 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 2609fd976e..b0c089d3cc 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -26,8 +26,8 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 5e5032bedf..0a9f694c88 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index 26382dac13..81dae671a0 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index 158261ce05..1adbfc6675 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 b88a61de7d..c878709b04 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -30,9 +30,9 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index 5f781c4152..513d37cff6 100644 --- a/cmd/puppeth/wizard_dashboard.go +++ b/cmd/puppeth/wizard_dashboard.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 fb2529c267..6a4452d119 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 413511c1c3..68d004d822 100644 --- a/cmd/puppeth/wizard_explorer.go +++ b/cmd/puppeth/wizard_explorer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 9a429bc96d..7bced55474 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/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 f255ef6e65..f6e075043f 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -25,10 +25,10 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 60aa0f7ffb..a2885c48bc 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index 90bf7ae3c8..8a740715bc 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/log" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index d780c550b1..85b950a2e1 100644 --- a/cmd/puppeth/wizard_network.go +++ b/cmd/puppeth/wizard_network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 4eeae93a0b..2006604ee3 100644 --- a/cmd/puppeth/wizard_nginx.go +++ b/cmd/puppeth/wizard_nginx.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 a60948bc67..5cfadf02d8 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 933cd9ae59..a70d80b6c8 100644 --- a/cmd/puppeth/wizard_wallet.go +++ b/cmd/puppeth/wizard_wallet.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 d0f993c5b8..24b7046b15 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/rlp" ) var ( diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index adac772bab..d306019be8 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -28,13 +28,13 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/node" "github.com/naoina/toml" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" + bzzapi "github.com/empyrean/go-ethereum/swarm/api" ) var ( @@ -84,7 +84,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/ethereum/go-ethereum/swarm/api/config.go for available fields") + link = fmt.Sprintf(", check github.com/empyrean/go-ethereum/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 9bf584f50c..40b1f12f9b 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/empyrean/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/swarm" + "github.com/empyrean/go-ethereum/swarm/api" "github.com/docker/docker/pkg/reexec" ) diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index dfd2d069b9..e7a85b641c 100644 --- a/cmd/swarm/db.go +++ b/cmd/swarm/db.go @@ -22,9 +22,9 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index 792e8d0d7a..7641403ffe 100644 --- a/cmd/swarm/hash.go +++ b/cmd/swarm/hash.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 57b5517c6e..8d5a8c6f81 100644 --- a/cmd/swarm/list.go +++ b/cmd/swarm/list.go @@ -22,8 +22,8 @@ import ( "strings" "text/tabwriter" - "github.com/ethereum/go-ethereum/cmd/utils" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/empyrean/go-ethereum/cmd/utils" + swarm "github.com/empyrean/go-ethereum/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 360020b77b..382179b765 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -28,22 +28,22 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/swarm" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" - swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/console" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethclient" + "github.com/empyrean/go-ethereum/internal/debug" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/swarm" + bzzapi "github.com/empyrean/go-ethereum/swarm/api" + swarmmetrics "github.com/empyrean/go-ethereum/swarm/metrics" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index 41a69a5d05..b88ce0a70b 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -24,9 +24,9 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/swarm/api" + swarm "github.com/empyrean/go-ethereum/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index 594cfa55cb..fc6c0080ec 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/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/internal/cmdtest" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/swarm" ) func init() { diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 9f4c525bb9..ed42bab18c 100644 --- a/cmd/swarm/upload.go +++ b/cmd/swarm/upload.go @@ -30,8 +30,8 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/empyrean/go-ethereum/cmd/utils" + swarm "github.com/empyrean/go-ethereum/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 186d18d8f5..6175f5901c 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -27,12 +27,12 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/internal/debug" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index e5bf8724c1..795445b3f5 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index fa481522d4..b32d642c0c 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,34 +28,34 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/fdlimit" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/consensus/clique" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/dashboard" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/eth/gasprice" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/ethstats" + "github.com/empyrean/go-ethereum/les" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/discv5" + "github.com/empyrean/go-ethereum/p2p/nat" + "github.com/empyrean/go-ethereum/p2p/netutil" + "github.com/empyrean/go-ethereum/params" + whisper "github.com/empyrean/go-ethereum/whisper/whisperv5" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 988c50ce3d..fcf2b0be52 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -35,16 +35,16 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/whisper/mailserver" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/console" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/nat" + "github.com/empyrean/go-ethereum/whisper/mailserver" + whisper "github.com/empyrean/go-ethereum/whisper/whisperv6" "golang.org/x/crypto/pbkdf2" ) diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index 9bd1de103a..dc87c726d0 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/debug.go b/common/debug.go index 61acd8ce70..7680e17463 100644 --- a/common/debug.go +++ b/common/debug.go @@ -26,7 +26,7 @@ import ( // Report gives off a warning requesting the user to submit an issue to the github tracker. func Report(extra ...interface{}) { - fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/ethereum/go-ethereum/issues") + fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/empyrean/go-ethereum/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index 80180d9186..dc2c9f3447 100644 --- a/common/hexutil/json_example_test.go +++ b/common/hexutil/json_example_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index be9810dc8c..1e6074d1ba 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/number/int.go b/common/number/int.go index 6dab2436de..ddfce3bd9d 100644 --- a/common/number/int.go +++ b/common/number/int.go @@ -19,7 +19,7 @@ package number import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 3ab9e4c344..0730f106c1 100644 --- a/common/number/uint_test.go +++ b/common/number/uint_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) func TestSet(t *testing.T) { diff --git a/common/types.go b/common/types.go index fdc67480c2..72107bd9b0 100644 --- a/common/types.go +++ b/common/types.go @@ -23,8 +23,8 @@ import ( "math/rand" "reflect" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/crypto/sha3" ) const ( diff --git a/compression/rle/read_write.go b/compression/rle/read_write.go index 0e7ad90aec..a1123057a1 100644 --- a/compression/rle/read_write.go +++ b/compression/rle/read_write.go @@ -21,7 +21,7 @@ import ( "bytes" "errors" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto" ) const ( diff --git a/consensus/clique/api.go b/consensus/clique/api.go index b875eef012..5c711456db 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -17,10 +17,10 @@ package clique import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 2bdad9092a..42a880bfb2 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -25,20 +25,20 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/consensus/misc" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/rpc" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 9ebdb8df15..9a499aa0c5 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -20,10 +20,10 @@ import ( "bytes" "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index 8b51e6e094..c2e6939388 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -22,12 +22,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) type testerVote struct { diff --git a/consensus/consensus.go b/consensus/consensus.go index be5e661c12..3d831921e4 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -18,11 +18,11 @@ package consensus import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rpc" "math/big" ) diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index 905a7b1ea7..a6a18ce256 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -27,11 +27,11 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/bitutil" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/log" ) const ( diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index 841e39233f..a031cccbea 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -25,9 +25,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/core/types" ) // Tests whether the dataset size calculator works correctly by cross checking the diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 4a71ac26b1..f6ac5578d2 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/consensus/misc" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/params" set "gopkg.in/fatih/set.v0" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 438a99dd66..56dd80a887 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index 1b3dcee302..be5c7a139e 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -33,10 +33,10 @@ import ( "unsafe" mmap "github.com/edsrzf/mmap-go" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/rpc" "github.com/hashicorp/golang-lru/simplelru" ) diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index 31116da437..5c4b4d0e46 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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/ethereum/go-ethereum/issues/14943 +// It reproduces https://github.com/empyrean/go-ethereum/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 b5e742d8bb..c61a2ff42f 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -24,10 +24,10 @@ import ( "runtime" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 9b22bd7a52..1a1b19bda2 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 4a5e7c37e0..4e6295c216 100644 --- a/consensus/misc/forks.go +++ b/consensus/misc/forks.go @@ -19,9 +19,9 @@ package misc import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index b28cc438e2..4fde085a96 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/accounts/usbwallet" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/rpc" "github.com/robertkrimen/otto" ) diff --git a/console/console.go b/console/console.go index b280d4e65d..71dba2a49d 100644 --- a/console/console.go +++ b/console/console.go @@ -28,9 +28,9 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/internal/web3ext" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/internal/jsre" + "github.com/empyrean/go-ethereum/internal/web3ext" + "github.com/empyrean/go-ethereum/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 7b1629c032..fdd45326c6 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/node" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/internal/jsre" + "github.com/empyrean/go-ethereum/node" ) const ( diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index 1f3e1112ec..0415283dbe 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/ethereum/go-ethereum && \ + git clone --depth 1 https://github.com/empyrean/go-ethereum && \ (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 8c4fe9f595..68e991cf9b 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/ethereum/go-ethereum && \ + git clone --depth 1 https://github.com/empyrean/go-ethereum && \ (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 8d4e7fe81a..7830495bd2 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.8 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 --branch release/1.8 https://github.com/empyrean/go-ethereum && \ (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 4cfc4f58c0..4aeb19c292 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.8 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 --branch release/1.8 https://github.com/empyrean/go-ethereum && \ (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 72ec366e21..f81238cac9 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/ethereum/go-ethereum" + config.vm.synced_folder "../../", "/home/vagrant/go/src/github.com/empyrean/go-ethereum" end diff --git a/containers/vagrant/provisioners/shell/centos.sh b/containers/vagrant/provisioners/shell/centos.sh index 744da4bfd4..0cf46065c9 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/ethereum/go-ethereum/build/bin/" +GETH_PATH="~vagrant/go/src/github.com/empyrean/go-ethereum/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 1c1793336d..6bb5ce7731 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/ethereum/go-ethereum/build/bin/" +GETH_PATH="~vagrant/go/src/github.com/empyrean/go-ethereum/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 1c1793336d..6bb5ce7731 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/ethereum/go-ethereum/build/bin/" +GETH_PATH="~vagrant/go/src/github.com/empyrean/go-ethereum/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 b2b2365f31..b80ae09b5b 100644 --- a/contracts/chequebook/api.go +++ b/contracts/chequebook/api.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index 92bd896e0a..20e2b2e379 100644 --- a/contracts/chequebook/cheque.go +++ b/contracts/chequebook/cheque.go @@ -36,14 +36,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/contracts/chequebook/contract" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 6b6b28e657..bd4053d729 100644 --- a/contracts/chequebook/cheque_test.go +++ b/contracts/chequebook/cheque_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/accounts/abi/bind/backends" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/contracts/chequebook/contract" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index e275ac9b8d..e8ed917b93 100644 --- a/contracts/chequebook/contract/chequebook.go +++ b/contracts/chequebook/contract/chequebook.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/accounts/abi" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 45f6d68f3e..b43b6e3d94 100644 --- a/contracts/chequebook/gencode.go +++ b/contracts/chequebook/gencode.go @@ -25,11 +25,11 @@ import ( "io/ioutil" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/accounts/abi/bind/backends" + "github.com/empyrean/go-ethereum/contracts/chequebook/contract" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/crypto" ) var ( diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index cbf6cb05b3..f9f5abe00b 100644 --- a/contracts/ens/contract/ens.go +++ b/contracts/ens/contract/ens.go @@ -6,12 +6,12 @@ package contract import ( "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/accounts/abi" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 a08380adfc..793e65f6f4 100644 --- a/contracts/ens/contract/fifsregistrar.go +++ b/contracts/ens/contract/fifsregistrar.go @@ -6,10 +6,10 @@ package contract import ( "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/accounts/abi" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 c567d5884a..a7eccf21e9 100644 --- a/contracts/ens/contract/publicresolver.go +++ b/contracts/ens/contract/publicresolver.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/accounts/abi" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 06045a5cd8..d181fab84f 100644 --- a/contracts/ens/ens.go +++ b/contracts/ens/ens.go @@ -23,11 +23,11 @@ package ens import ( "strings" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/contracts/ens/contract" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" ) var ( diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index 0016f47dbf..b7cbefbf91 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -20,11 +20,11 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/contracts/ens/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/accounts/abi/bind/backends" + "github.com/empyrean/go-ethereum/contracts/ens/contract" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/crypto" ) var ( diff --git a/core/asm/asm.go b/core/asm/asm.go index ce22f93f92..17cac79b57 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index 1b9025a549..a8f25359a0 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -23,8 +23,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index e23f0d19d1..53ed2c2661 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,14 +23,14 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index 98958809b7..71f60bc1ab 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -19,10 +19,10 @@ package core import ( "fmt" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 e334b3c3cd..0b017cc53a 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index cb72402654..e36258fcc6 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -29,21 +29,21 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/shyftdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/shyftdb" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/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 748cdc5c71..523dc52103 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) // Test fork of length N starting from block i @@ -1196,7 +1196,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/ethereum/go-ethereum/pull/15941 +// https://github.com/empyrean/go-ethereum/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 f20ba4aaf2..92ddcde7b1 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -16,7 +16,7 @@ package core -import "github.com/ethereum/go-ethereum/common" +import "github.com/empyrean/go-ethereum/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 540085450d..c67a5871e3 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -19,7 +19,7 @@ package bloombits import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 f9bcef96e0..1db75df350 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 ce3031702f..5f44f198b8 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common/bitutil" + "github.com/empyrean/go-ethereum/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 7a5f78ef3a..bfbcd2ed4b 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/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/ethereum/go-ethereum/issues/15309. +// bitset matching https://github.com/empyrean/go-ethereum/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 158ed83245..e69619871a 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/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 9fc09eda51..0de5827c0a 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index 33846fe011..3a03ba623b 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/consensus/misc" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) // So we can deterministically seed different blockchains diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 93be43ddce..7b67a643cd 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -20,12 +20,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index e0a3e3ff37..8f4df8cbe8 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/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 37f0daf952..108867c577 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -24,13 +24,13 @@ import ( "math/big" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/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 ab4e45a478..3a0aff53b2 100644 --- a/core/database_util_test.go +++ b/core/database_util_test.go @@ -21,11 +21,11 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/rlp" ) // Tests block header storage and retrieval operations. diff --git a/core/events.go b/core/events.go index 6f404f612b..447ac30ab2 100644 --- a/core/events.go +++ b/core/events.go @@ -17,8 +17,8 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" ) // TxPreEvent is posted when a transaction enters the transaction pool. diff --git a/core/evm.go b/core/evm.go index 55db53927b..d462d6d3e3 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,10 +19,10 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index bb8ea1d6a2..fadc882ecc 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index 64fb9b9248..3e03688d26 100644 --- a/core/gen_genesis_account.go +++ b/core/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index 26f7a771f1..e297d05079 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -26,16 +26,16 @@ import ( "strings" _ "github.com/lib/pq" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/shyftdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/shyftdb" "database/sql" "strconv" "time" diff --git a/core/genesis_test.go b/core/genesis_test.go index bcdd2844e3..5c4f1dffeb 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index 73cd5d2c41..09a0ee0715 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -25,12 +25,12 @@ import ( mrand "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/params" "github.com/hashicorp/golang-lru" "sync/atomic" ) diff --git a/core/helper_test.go b/core/helper_test.go index 698a2924cb..9c9c760a7c 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -20,9 +20,9 @@ import ( "container/list" "fmt" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index 565e8c5826..43cc34e71b 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -34,8 +34,8 @@ import ( "sort" "strconv" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/state/database.go b/core/state/database.go index 36926ec69d..a2db9ee839 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -20,9 +20,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/dump.go b/core/state/dump.go index 46e612850a..cf6fd9f881 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/trie" ) type DumpAccount struct { diff --git a/core/state/iterator.go b/core/state/iterator.go index 6a5c73d3d1..a86c18a99e 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -20,9 +20,9 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/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 9e46c851cd..7e47fd9212 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 a89bb3d13a..74367d90ee 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -19,7 +19,7 @@ package state import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) type journalEntry interface { diff --git a/core/state/managed_state.go b/core/state/managed_state.go index 1390ef4a00..eedb6ec397 100644 --- a/core/state/managed_state.go +++ b/core/state/managed_state.go @@ -19,7 +19,7 @@ package state import ( "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index 1cfdd3a890..e9d8d60beb 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index b2112bfaec..3efd323daf 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index 6d42d63d82..d103760c1a 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index 776693e248..685a3b324f 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -23,12 +23,12 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/trie" ) type revision struct { diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index d9e3d9b797..0981ac88a8 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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/ethereum/go-ethereum/pull/15549. +// https://github.com/empyrean/go-ethereum/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 28fcf6ae05..219053d9a1 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -19,9 +19,9 @@ package state import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 8f14a44e7a..de9247d301 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/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 4dc58b9dea..564239e63d 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -17,14 +17,14 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/consensus/misc" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index b19bc12e42..ce13bec076 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -21,10 +21,10 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/params" ) var ( diff --git a/core/tx_journal.go b/core/tx_journal.go index e872d7b530..54cf17ba0b 100644 --- a/core/tx_journal.go +++ b/core/tx_journal.go @@ -21,10 +21,10 @@ import ( "io" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 55fc42617d..472d37ff77 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -22,9 +22,9 @@ import ( "math/big" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 d579f501af..f294b6efca 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -20,8 +20,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 089bd215ad..55de9f6dc0 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/params" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 1cf533aa65..7a1c98d9f2 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index d0bbaf0aa7..a3a48b9bef 100644 --- a/core/types.go +++ b/core/types.go @@ -17,9 +17,9 @@ package core import ( - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 8c0fff255a..434dfed917 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -27,10 +27,10 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/rlp" ) var ( diff --git a/core/types/block_test.go b/core/types/block_test.go index a35fbc25b1..996c934c78 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -23,8 +23,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index a76b6f33c5..91be3f5df3 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index a28ac0e7af..2ad5dedc4c 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/ethereum/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index 00c42c5bc6..d6711e6b95 100644 --- a/core/types/derive_sha.go +++ b/core/types/derive_sha.go @@ -19,9 +19,9 @@ package types import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 1b92cd9cf4..084f88aa54 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 1b5ae3c653..9197b87f9b 100644 --- a/core/types/gen_log_json.go +++ b/core/types/gen_log_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index c297adebb6..3169fb15ae 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index c27da67096..8cc12be4e7 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" ) var _ = (*txdataMarshaling)(nil) diff --git a/core/types/log.go b/core/types/log.go index be5de38da7..aaef29ac77 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -20,9 +20,9 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/rlp" ) //go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go diff --git a/core/types/log_test.go b/core/types/log_test.go index 0e56acfe4a..dc8e581434 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index f945f6f6a2..8ef929e1d5 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -22,9 +22,9 @@ import ( "io" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/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 a2710b2cc7..f99db3589c 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -24,10 +24,10 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/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 dfc84fdac7..8664e03847 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -22,9 +22,9 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 689fc38a9b..6027eb03e3 100644 --- a/core/types/transaction_signing_test.go +++ b/core/types/transaction_signing_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index d1861b14cd..4cdafcbe0c 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis.go b/core/vm/analysis.go index f9c4298d39..af195d3d05 100644 --- a/core/vm/analysis.go +++ b/core/vm/analysis.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 17de38decb..b0d411bdc5 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" ) // calculates the memory size required for a step diff --git a/core/vm/contract.go b/core/vm/contract.go index 66748e8215..13457421bb 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 237450ea96..21e7b94946 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -21,11 +21,11 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/bn256" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/bn256" + "github.com/empyrean/go-ethereum/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 96083337c9..9f5d35aa10 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -21,7 +21,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index 46e7baff4c..df5a6fa184 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/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 dd64d5f178..71b4378271 100644 --- a/core/vm/gas.go +++ b/core/vm/gas.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/params" ) const ( diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 83adba428e..7271257984 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -17,9 +17,9 @@ package vm import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/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 ade3ca6318..4b5eb193a0 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -6,9 +6,9 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" ) var _ = (*structLogMarshaling)(nil) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 66e804fb7e..dd4e55432a 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/params" ) var ( diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 134363bb74..b05773362e 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/params" ) type twoOperandTest struct { diff --git a/core/vm/interface.go b/core/vm/interface.go index 1ef91cf1d6..7edcef8470 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 95490adfc4..ee61d14d4b 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -20,8 +20,8 @@ import ( "fmt" "sync/atomic" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 3389941353..368ff0966b 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index 4c820d8b53..b46700ee19 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -23,10 +23,10 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core/types" ) type Storage map[common.Hash]common.Hash diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index 915f7177e7..69cb233510 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/params" ) type dummyContractRef struct { diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index bec0235bcc..8648fa1fea 100644 --- a/core/vm/memory_table.go +++ b/core/vm/memory_table.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common/math" ) func memorySha3(stack *Stack) *big.Int { diff --git a/core/vm/noop.go b/core/vm/noop.go index b71ead0d77..0963c3b488 100644 --- a/core/vm/noop.go +++ b/core/vm/noop.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 31c9b9cf9d..d6d395024b 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -17,9 +17,9 @@ package runtime import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index edbf541766..4ce22875a4 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -21,12 +21,12 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) // Config is a basic type specifying certain configuration flags for running diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go index b7d0ddc384..b768da7618 100644 --- a/core/vm/runtime/runtime_example_test.go +++ b/core/vm/runtime/runtime_example_test.go @@ -19,8 +19,8 @@ package runtime_test import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm/runtime" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 2c4dc50265..dd9e315f08 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -21,11 +21,11 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/accounts/abi" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/ethdb" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index a4b1cfcd89..d5f7f983b4 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -19,7 +19,7 @@ package vm import ( "fmt" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/params" ) func makeStackFunc(pop, push int) stackValidationFunc { diff --git a/core/vm/vm_jit.go b/core/vm/vm_jit.go index eb3acfb10d..e6a3771f55 100644 --- a/core/vm/vm_jit.go +++ b/core/vm/vm_jit.go @@ -38,9 +38,9 @@ import ( "math/big" "unsafe" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/params" ) type JitVm struct { diff --git a/crypto/bn256/bn256_amd64.go b/crypto/bn256/bn256_amd64.go index 35b4839c24..d7bfe83352 100644 --- a/crypto/bn256/bn256_amd64.go +++ b/crypto/bn256/bn256_amd64.go @@ -22,7 +22,7 @@ package bn256 import ( "math/big" - "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" + "github.com/empyrean/go-ethereum/crypto/bn256/cloudflare" ) // G1 is an abstract cyclic group. The zero value is suitable for use as the diff --git a/crypto/bn256/bn256_other.go b/crypto/bn256/bn256_other.go index 81977a0a81..1b5ca77d72 100644 --- a/crypto/bn256/bn256_other.go +++ b/crypto/bn256/bn256_other.go @@ -22,7 +22,7 @@ package bn256 import ( "math/big" - "github.com/ethereum/go-ethereum/crypto/bn256/google" + "github.com/empyrean/go-ethereum/crypto/bn256/google" ) // G1 is an abstract cyclic group. The zero value is suitable for use as the diff --git a/crypto/crypto.go b/crypto/crypto.go index 1c4d5a2e02..7c4dc75eb8 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -28,10 +28,10 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/rlp" ) var ( diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 8350354623..f6df6a2bd5 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -25,7 +25,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index 9cd5c79f7e..f1e6464739 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -40,7 +40,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 6312daf5a1..2e7eefc82c 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/ethereum/go-ethereum/crypto" + ethcrypto "github.com/empyrean/go-ethereum/crypto" ) var ( diff --git a/crypto/secp256k1/curve.go b/crypto/secp256k1/curve.go index df80481857..69dfecc2f8 100644 --- a/crypto/secp256k1/curve.go +++ b/crypto/secp256k1/curve.go @@ -36,7 +36,7 @@ import ( "math/big" "unsafe" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common/math" ) /* diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go index f6582ecd54..5cf684e2c2 100644 --- a/crypto/secp256k1/secp256_test.go +++ b/crypto/secp256k1/secp256_test.go @@ -24,8 +24,8 @@ import ( "encoding/hex" "testing" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/randentropy" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/crypto/randentropy" ) const TestCount = 1000 diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 340bfc221e..f958892deb 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -23,8 +23,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/crypto/secp256k1" ) // Ecrecover returns the uncompressed public key that created the given signature. diff --git a/crypto/signature_test.go b/crypto/signature_test.go index aecff76bfb..ec274f3baa 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" ) var ( diff --git a/dashboard/assets.go b/dashboard/assets.go index 521d134a6a..57cc66ff96 100644 --- a/dashboard/assets.go +++ b/dashboard/assets.go @@ -31423,7 +31423,7 @@ var _bundleJs = []byte((((((((((`!function(modules) { }, _react2.default.createElement("span", { style: _common.styles.light }, "Commit "), _react2.default.createElement("a", { - href: "https://github.com/ethereum/go-ethereum/commit/" + general.commit, + href: "https://github.com/empyrean/go-ethereum/commit/" + general.commit, target: "_blank", style: { color: "inherit", diff --git a/dashboard/assets/components/Footer.jsx b/dashboard/assets/components/Footer.jsx index 20830cbba8..b123b8b871 100644 --- a/dashboard/assets/components/Footer.jsx +++ b/dashboard/assets/components/Footer.jsx @@ -165,7 +165,7 @@ class Footer extends Component { {general.commit && ( {'Commit '} - + {general.commit.substring(0, 8)} diff --git a/dashboard/cpu.go b/dashboard/cpu.go index c89879028d..f601bb88b6 100644 --- a/dashboard/cpu.go +++ b/dashboard/cpu.go @@ -21,7 +21,7 @@ package dashboard import ( "syscall" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index 399fa34c08..58b5e3d510 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -33,11 +33,11 @@ import ( "time" "github.com/elastic/gosigar" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rpc" "golang.org/x/net/websocket" ) diff --git a/eth/api.go b/eth/api.go index a345b57e49..b34a258729 100644 --- a/eth/api.go +++ b/eth/api.go @@ -25,17 +25,17 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/miner" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index ecd5488a24..2e63bb45e4 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -20,20 +20,20 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/bloombits" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/eth/gasprice" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rpc" ) // EthApiBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index 900a82bb6a..584f40e5ab 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/api_tracer.go b/eth/api_tracer.go index e639bba33a..3c194b7a47 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -26,18 +26,18 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/eth/tracers" + "github.com/empyrean/go-ethereum/internal/ethapi" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/trie" ) const ( diff --git a/eth/backend.go b/eth/backend.go index 44425ece9a..84d306e2d0 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -24,29 +24,29 @@ import ( "runtime" "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/consensus/clique" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/bloombits" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/eth/filters" + "github.com/empyrean/go-ethereum/eth/gasprice" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/internal/ethapi" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/miner" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/rpc" ) type LesServer interface { diff --git a/eth/bloombits.go b/eth/bloombits.go index c5597391c5..ed9e65e37c 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -19,13 +19,13 @@ package eth import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/bitutil" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/bloombits" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) const ( diff --git a/eth/config.go b/eth/config.go index dd7f42c7d9..2a84f4e295 100644 --- a/eth/config.go +++ b/eth/config.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/eth/gasprice" + "github.com/empyrean/go-ethereum/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 d41afa17c0..8d9d544f5c 100644 --- a/eth/db_upgrade.go +++ b/eth/db_upgrade.go @@ -21,11 +21,11 @@ import ( "bytes" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/rlp" ) var deduplicateData = []byte("dbUpgrade_20170714deduplicateData") diff --git a/eth/downloader/api.go b/eth/downloader/api.go index d496fa6a4d..66777eb894 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -20,9 +20,9 @@ import ( "context" "sync" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/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 62842adbc6..41a0899f4d 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,15 +25,15 @@ import ( "sync/atomic" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + ethereum "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/params" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index cb671a7df4..1d3c0c1593 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/trie" ) var ( diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go index b45acff7d0..4e32c4c0cc 100644 --- a/eth/downloader/fakepeer.go +++ b/eth/downloader/fakepeer.go @@ -19,10 +19,10 @@ package downloader import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 d4eb337946..1d6222b71c 100644 --- a/eth/downloader/metrics.go +++ b/eth/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index a4aa861146..0778261cd0 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 359cce54b5..b73e3baecc 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -25,10 +25,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index ee6c7b4914..da03f88543 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 3f30ea9dd1..f423710961 100644 --- a/eth/downloader/types.go +++ b/eth/downloader/types.go @@ -19,7 +19,7 @@ package downloader import ( "fmt" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 db554e1440..7a2f2850f9 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,10 +22,10 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/log" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 9d53b98b60..85ac9a68ff 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index d68d12f000..4c473f6b6e 100644 --- a/eth/fetcher/metrics.go +++ b/eth/fetcher/metrics.go @@ -19,7 +19,7 @@ package fetcher import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 406c9442e0..4a890c5f17 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,13 +25,13 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 4ae37f9779..a10fe2f093 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index 0a0929bc10..24446fd345 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/node" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/bitutil" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/bloombits" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 5dfe60e772..0773bbd459 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -20,13 +20,13 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/bloombits" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index f8097c7b95..0c64c55be4 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,12 +25,12 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/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 61761151a2..a7c9f83c45 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/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/bloombits" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 0018142c46..79205ef3c1 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,14 +23,14 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 54325692c6..7171903b1f 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -22,11 +22,11 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/internal/ethapi" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rpc" ) var maxPrice = big.NewInt(500 * params.Shannon) diff --git a/eth/gen_config.go b/eth/gen_config.go index 4f2e82d941..fdd4b9af1c 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -5,12 +5,12 @@ package eth import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/eth/gasprice" ) var _ = (*configMarshaling)(nil) diff --git a/eth/handler.go b/eth/handler.go index 3fae0cd00d..ab0e623775 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -26,20 +26,20 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/fetcher" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/consensus/misc" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/eth/fetcher" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index e336dfa285..f827f36a9c 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/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 2b05cea801..a847d6f110 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -27,18 +27,18 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 0533a2a875..41620c28b1 100644 --- a/eth/metrics.go +++ b/eth/metrics.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index 42ead53965..bbda5dbf96 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/eth/protocol.go b/eth/protocol.go index cd7db57f23..dffe4a7089 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -21,11 +21,11 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index b2f93d8dd1..49a86ba8da 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/rlp" ) func init() { diff --git a/eth/sync.go b/eth/sync.go index e49e40087e..52dd309d00 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/discover" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index 88c10c7f74..c2b4752048 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/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 f0afeab6cb..e4d13b16b8 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -25,11 +25,11 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" duktape "gopkg.in/olebedev/go-duktape.v3" ) diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go index 117c376b81..96ce3f96e7 100644 --- a/eth/tracers/tracer_test.go +++ b/eth/tracers/tracer_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/params" ) type account struct{} diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 4e1ef23ad2..4dff2aa460 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -21,7 +21,7 @@ import ( "strings" "unicode" - "github.com/ethereum/go-ethereum/eth/tracers/internal/tracers" + "github.com/empyrean/go-ethereum/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 bf8120228f..22c8897b05 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -25,15 +25,15 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/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 87a912901a..293d0223dd 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -24,12 +24,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 178eb2be98..e3ce982420 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -16,7 +16,7 @@ package ethclient -import "github.com/ethereum/go-ethereum" +import "github.com/empyrean/go-ethereum" // Verify that Client implements the ethereum interfaces. var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index 74a93f1e2f..fbd229f49c 100644 --- a/ethclient/signer.go +++ b/ethclient/signer.go @@ -20,8 +20,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 8c557e4820..9dbfebf18a 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 5e4a3ca34a..0f3e0e211e 100644 --- a/ethdb/database_test.go +++ b/ethdb/database_test.go @@ -25,7 +25,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/ethdb" ) func newTestLDB() (*ethdb.LDBDatabase, func()) { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index 8efd7bf845..8fbae7991c 100644 --- a/ethdb/memory_database.go +++ b/ethdb/memory_database.go @@ -20,7 +20,7 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) /* diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index ae7e252654..309dc19f29 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,17 +30,17 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/les" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 9b5ad50df5..d7067fc139 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/ethereum/go-ethereum/event" + "github.com/empyrean/go-ethereum/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 825a8deeac..abc63a6a0a 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/event" + "github.com/empyrean/go-ethereum/event" ) // This example demonstrates how SubscriptionScope can be used to control the lifetime of diff --git a/event/example_subscription_test.go b/event/example_subscription_test.go index 5c76b55d98..1d4c41f4cd 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/ethereum/go-ethereum/event" + "github.com/empyrean/go-ethereum/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index d03f465075..17d44eedc8 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/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 1ae1eba48a..3f7a84323e 100644 --- a/interfaces.go +++ b/interfaces.go @@ -22,8 +22,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 048b7d7635..1366fd6141 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -33,7 +33,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 1f181bf8b0..17e3673d6a 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,10 +24,10 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/log/term" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/exp" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/log/term" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/metrics/exp" colorable "github.com/mattn/go-colorable" "gopkg.in/urfave/cli.v1" ) diff --git a/internal/debug/trace.go b/internal/debug/trace.go index cab5deaafd..9ed95bceb8 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -23,7 +23,7 @@ import ( "os" "runtime/trace" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 61ddff688c..56627a2005 100644 --- a/internal/ethapi/addrlock.go +++ b/internal/ethapi/addrlock.go @@ -19,7 +19,7 @@ package ethapi import ( "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 6525aa212c..92300c6b9e 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -25,21 +25,21 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/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/ethereum/go-ethereum/wiki/Management-APIs#personal_sign +// https://github.com/empyrean/go-ethereum/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/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover +// https://github.com/empyrean/go-ethereum/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 af95d7906f..31d216a469 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -21,17 +21,17 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/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 9c7ad16d18..3dd2dea808 100644 --- a/internal/guide/guide_test.go +++ b/internal/guide/guide_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/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 9bb899384b..17634f0e36 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/ethereum/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33 + * Reference: https://github.com/empyrean/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33 */ "use strict"; diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index f05865eca6..8930e21d4f 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -26,8 +26,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/jsre/deps" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/internal/jsre/deps" "github.com/robertkrimen/otto" ) diff --git a/les/api_backend.go b/les/api_backend.go index 3fc5c33a44..64e9d63138 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -20,21 +20,21 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/bloombits" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/eth/gasprice" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/light" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index 6a324cb04b..3134a14f1d 100644 --- a/les/backend.go +++ b/les/backend.go @@ -22,27 +22,27 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - rpc "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/bloombits" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/eth/filters" + "github.com/empyrean/go-ethereum/eth/gasprice" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/internal/ethapi" + "github.com/empyrean/go-ethereum/light" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discv5" + "github.com/empyrean/go-ethereum/params" + rpc "github.com/empyrean/go-ethereum/rpc" ) type LightEthereum struct { diff --git a/les/bloombits.go b/les/bloombits.go index de233d7518..a1b8ef400a 100644 --- a/les/bloombits.go +++ b/les/bloombits.go @@ -19,8 +19,8 @@ package les import ( "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/light" + "github.com/empyrean/go-ethereum/common/bitutil" + "github.com/empyrean/go-ethereum/light" ) const ( diff --git a/les/fetcher.go b/les/fetcher.go index e12a2c78a2..9d51df7f58 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/light" + "github.com/empyrean/go-ethereum/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index d50eb809cc..fe74a84df5 100644 --- a/les/flowcontrol/control.go +++ b/les/flowcontrol/control.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index 28cc6f0fe7..9e284ca049 100644 --- a/les/flowcontrol/manager.go +++ b/les/flowcontrol/manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/common/mclock" ) const rcConst = 1000000 diff --git a/les/handler.go b/les/handler.go index 9627f392be..8965ac54a8 100644 --- a/les/handler.go +++ b/les/handler.go @@ -26,22 +26,22 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/light" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/discv5" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index 9468032f67..1289bbedc6 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/light" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/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 6d997a1a36..54dc3656d7 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -25,20 +25,20 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/les/flowcontrol" + "github.com/empyrean/go-ethereum/light" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index c282a62a1a..d204817617 100644 --- a/les/metrics.go +++ b/les/metrics.go @@ -17,8 +17,8 @@ package les import ( - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index f8412aaad7..0da7f4c86e 100644 --- a/les/odr.go +++ b/les/odr.go @@ -19,10 +19,10 @@ package les import ( "context" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/light" + "github.com/empyrean/go-ethereum/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index 34d759dd2a..dcf3c62b2b 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -23,15 +23,15 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/light" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index 88e121cda6..df9922c8c7 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/light" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/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 caf5680778..af2d03cd71 100644 --- a/les/peer.go +++ b/les/peer.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/les/flowcontrol" + "github.com/empyrean/go-ethereum/light" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index e1c4625bce..c1b01f583b 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -26,11 +26,11 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/secp256k1" + "github.com/empyrean/go-ethereum/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index c13625de8e..4b2daca32c 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index e262a3cb47..ca7d2e47b0 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/common/mclock" ) var ( diff --git a/les/server.go b/les/server.go index 28b87008a0..ba5468ebe6 100644 --- a/les/server.go +++ b/les/server.go @@ -23,17 +23,17 @@ import ( "math" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/les/flowcontrol" + "github.com/empyrean/go-ethereum/light" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discv5" + "github.com/empyrean/go-ethereum/rlp" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index a84c29c3ac..ccd7f21f9d 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/discv5" + "github.com/empyrean/go-ethereum/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index c0e17f97d9..711c7b57a1 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/light" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/light" ) const ( diff --git a/les/txrelay.go b/les/txrelay.go index 7a02cc837e..4d07699cfe 100644 --- a/les/txrelay.go +++ b/les/txrelay.go @@ -19,8 +19,8 @@ package les import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index 2784615d35..e77f00215d 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -24,16 +24,16 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" "github.com/hashicorp/golang-lru" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index 0af7551d41..57202d1db6 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index 6f25219c13..bff9228f29 100644 --- a/light/nodeset.go +++ b/light/nodeset.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/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 e2c3d9c5a4..1ef28de75b 100644 --- a/light/odr.go +++ b/light/odr.go @@ -22,10 +22,10 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 d3f9374fd8..09551c8d7f 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,18 +24,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index d56330e36b..f37502327d 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -20,11 +20,11 @@ import ( "bytes" "context" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index 384a635f76..f3be175951 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -22,15 +22,15 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/bitutil" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/trie" ) const ( diff --git a/light/trie.go b/light/trie.go index c07e99461c..8f65e23db6 100644 --- a/light/trie.go +++ b/light/trie.go @@ -21,12 +21,12 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/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 0d6b2cc1d8..ccf3fa3ec0 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/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index ca41490bdc..96db05503c 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,15 +22,15 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index 13d7d3cebb..28b0be36ac 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) type testTxRelay struct { diff --git a/log/format.go b/log/format.go index 0b07abb2ac..aeb5ae1fd6 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/ethereum/go-ethereum/", + "github.com/empyrean/go-ethereum/", } // PrintOrigins sets or unsets log location (file:line) printing for terminal diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index c19d00a94d..63255a7c5f 100644 --- a/metrics/exp/exp.go +++ b/metrics/exp/exp.go @@ -8,7 +8,7 @@ import ( "net/http" "sync" - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/metrics" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index d5cb4da66f..0f29c3a1e3 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -6,7 +6,7 @@ import ( uurl "net/url" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/metrics" "github.com/influxdata/influxdb/client" ) diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index f8c8c9ecb7..5c76c0b28b 100644 --- a/metrics/librato/librato.go +++ b/metrics/librato/librato.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index e24324814c..251be26e3b 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) // Enabled is checked by the constructor functions for all of the diff --git a/miner/agent.go b/miner/agent.go index e3cebbd2e2..e145c50cd0 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -21,8 +21,8 @@ import ( "sync/atomic" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/log" ) type CpuAgent struct { diff --git a/miner/miner.go b/miner/miner.go index fec0a40f5a..1795486060 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -21,17 +21,17 @@ import ( "fmt" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/params" ) // Backend wraps all methods required for mining. diff --git a/miner/remote_agent.go b/miner/remote_agent.go index 287e7530c3..1c6181b66f 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/log" ) type hashrate struct { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index d7d0fb0286..90437d60d9 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -20,9 +20,9 @@ import ( "container/ring" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 456af1764a..594a91d422 100644 --- a/miner/unconfirmed_test.go +++ b/miner/unconfirmed_test.go @@ -19,8 +19,8 @@ package miner import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" ) // noopHeaderRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index 15395ae0b9..429d150b1d 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -24,17 +24,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/consensus" + "github.com/empyrean/go-ethereum/consensus/misc" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/params" "gopkg.in/fatih/set.v0" ) diff --git a/mobile/accounts.go b/mobile/accounts.go index 4d979bffff..d41751e483 100644 --- a/mobile/accounts.go +++ b/mobile/accounts.go @@ -23,10 +23,10 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index 3d3bd66d08..65e2c08ac2 100644 --- a/mobile/android_test.go +++ b/mobile/android_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/build" + "github.com/empyrean/go-ethereum/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/ethereum/go-ethereum/mobile") + gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/empyrean/go-ethereum/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 dd7b158786..06a52d5c83 100644 --- a/mobile/big.go +++ b/mobile/big.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index d6e621a258..05bb46d3e6 100644 --- a/mobile/bind.go +++ b/mobile/bind.go @@ -22,10 +22,10 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/accounts/abi" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 047d8e1f65..c782cb613b 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index 9b3c93ccd9..ccea0a6ced 100644 --- a/mobile/discover.go +++ b/mobile/discover.go @@ -22,7 +22,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/p2p/discv5" + "github.com/empyrean/go-ethereum/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 66399c6b56..b1ba8d4b22 100644 --- a/mobile/ethclient.go +++ b/mobile/ethclient.go @@ -21,8 +21,8 @@ package geth import ( "math/big" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethclient" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index 0eb1d90552..b8b6f24766 100644 --- a/mobile/ethereum.go +++ b/mobile/ethereum.go @@ -21,8 +21,8 @@ package geth import ( "errors" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" + ethereum "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index 7e3b8f4915..b5da05e6e9 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,17 +24,17 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/eth" + "github.com/empyrean/go-ethereum/eth/downloader" + "github.com/empyrean/go-ethereum/ethclient" + "github.com/empyrean/go-ethereum/ethstats" + "github.com/empyrean/go-ethereum/les" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/nat" + "github.com/empyrean/go-ethereum/params" + whisper "github.com/empyrean/go-ethereum/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 2025d85edc..5243ed2bf1 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index ac0c26088a..2aaddbec47 100644 --- a/mobile/interface.go +++ b/mobile/interface.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/logger.go b/mobile/logger.go index 7078c4fd2c..70a90b39ae 100644 --- a/mobile/logger.go +++ b/mobile/logger.go @@ -19,7 +19,7 @@ package geth import ( "os" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) // SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go). diff --git a/mobile/p2p.go b/mobile/p2p.go index a80d9fff2e..6d83970e4b 100644 --- a/mobile/p2p.go +++ b/mobile/p2p.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index 45fe870ee3..b011ed989b 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -21,9 +21,9 @@ package geth import ( "encoding/json" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/p2p/discv5" + "github.com/empyrean/go-ethereum/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 4790afceff..242bc2fbef 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,9 +23,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 72093e3d5b..b2675d6bf2 100644 --- a/mobile/vm.go +++ b/mobile/vm.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 a3b8bc0bb5..c7a29e4ca0 100644 --- a/node/api.go +++ b/node/api.go @@ -22,12 +22,12 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/rpc" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/node/config.go b/node/config.go index dda24583ee..ab549446e9 100644 --- a/node/config.go +++ b/node/config.go @@ -25,14 +25,14 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/accounts/keystore" + "github.com/empyrean/go-ethereum/accounts/usbwallet" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" ) const ( diff --git a/node/config_test.go b/node/config_test.go index b81d3d6120..c7b5bf8b38 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -24,8 +24,8 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index 8875605807..04dd5d2a11 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,8 +22,8 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/nat" ) const ( diff --git a/node/node.go b/node/node.go index 6e03cd1606..8ecb004851 100644 --- a/node/node.go +++ b/node/node.go @@ -26,13 +26,13 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/internal/debug" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/rpc" "github.com/prometheus/prometheus/util/flock" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index ee06f4065c..12a86022ba 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,9 +20,9 @@ import ( "fmt" "log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/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 2880efa619..1b28376844 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 55062a5004..10ef03068a 100644 --- a/node/service.go +++ b/node/service.go @@ -19,11 +19,11 @@ package node import ( "reflect" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/accounts" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index 8eddce3ed7..ffd230f382 100644 --- a/node/utils_test.go +++ b/node/utils_test.go @@ -22,8 +22,8 @@ package node import ( "reflect" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index d8feceb9f3..87c1ad6d00 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -24,9 +24,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 2a7941fc65..c1627574cb 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/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/netutil" ) func init() { diff --git a/p2p/discover/database.go b/p2p/discover/database.go index 6f98de9b42..5214c7d8a8 100644 --- a/p2p/discover/database.go +++ b/p2p/discover/database.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 3b0c84115c..a001b14031 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -31,9 +31,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/secp256k1" ) const NodeIDBits = 512 diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go index ed8db4dc65..4f2feb9edc 100644 --- a/p2p/discover/node_test.go +++ b/p2p/discover/node_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" ) func ExampleNewNode() { diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 1bb52399fb..d6eca87c10 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,7 +25,7 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index 6509326e69..b115666ceb 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -33,10 +33,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index 3ce48d2995..dd0d6ae8f4 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index 524c6e4988..7fa7fae2de 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -25,11 +25,11 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/nat" + "github.com/empyrean/go-ethereum/p2p/netutil" + "github.com/empyrean/go-ethereum/rlp" ) const Version = 4 diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index db9804f7bc..994338aac3 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 3c2d5744c3..07e14f3029 100644 --- a/p2p/discv5/database.go +++ b/p2p/discv5/database.go @@ -28,9 +28,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 52c677b623..2766bcc6e8 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,13 +24,13 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/netutil" + "github.com/empyrean/go-ethereum/rlp" ) var ( diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index 369282ca9c..c54f897202 100644 --- a/p2p/discv5/net_test.go +++ b/p2p/discv5/net_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index fd88a55b15..bb6344bdb9 100644 --- a/p2p/discv5/node.go +++ b/p2p/discv5/node.go @@ -30,8 +30,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index ce4ad9e4d4..3f711decac 100644 --- a/p2p/discv5/node_test.go +++ b/p2p/discv5/node_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 4fb5f657ae..6feb8e204f 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index 543faecd48..bb86fd9fc5 100644 --- a/p2p/discv5/sim_test.go +++ b/p2p/discv5/sim_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index 2cf05009cb..b790d46a9b 100644 --- a/p2p/discv5/table.go +++ b/p2p/discv5/table.go @@ -29,7 +29,7 @@ import ( "net" "sort" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index a29943dab9..0e6050b432 100644 --- a/p2p/discv5/table_test.go +++ b/p2p/discv5/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index b3d1ac4baf..3a771cd429 100644 --- a/p2p/discv5/ticket.go +++ b/p2p/discv5/ticket.go @@ -25,10 +25,10 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index e7a7f8e02a..416e66033a 100644 --- a/p2p/discv5/topic.go +++ b/p2p/discv5/topic.go @@ -23,8 +23,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/log" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index ba79993f29..2032da6b5f 100644 --- a/p2p/discv5/topic_test.go +++ b/p2p/discv5/topic_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index 6ce72d2c15..25e646559e 100644 --- a/p2p/discv5/udp.go +++ b/p2p/discv5/udp.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/nat" + "github.com/empyrean/go-ethereum/p2p/netutil" + "github.com/empyrean/go-ethereum/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index 7d31815947..4fa82af2ee 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/rlp" ) func init() { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 2c3afb43e9..79ac622e98 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -35,9 +35,9 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/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 ce7767d105..751bd8b1fc 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index 7591e6effb..beaa9cd1ad 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -22,8 +22,8 @@ import ( "io" "net" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index 50b419970d..34a6b35d19 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 4cbff90aca..46f1e9c189 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -21,7 +21,7 @@ package p2p import ( "net" - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/metrics" ) var ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index a254648c66..426e967515 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/peer.go b/p2p/peer.go index 477d8c2190..ecda121b94 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/rlp" ) const ( diff --git a/p2p/protocol.go b/p2p/protocol.go index ee747ba23d..40c58e24db 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,7 +19,7 @@ package p2p import ( "fmt" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/discover" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/protocols/protocol.go b/p2p/protocols/protocol.go index 9914c99587..c62a6f0c63 100644 --- a/p2p/protocols/protocol.go +++ b/p2p/protocols/protocol.go @@ -34,7 +34,7 @@ import ( "reflect" "sync" - "github.com/ethereum/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p" ) // error codes used by this protocol scheme diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go index 053f537a62..367b5d7ed3 100644 --- a/p2p/protocols/protocol_test.go +++ b/p2p/protocols/protocol_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/simulations/adapters" + p2ptest "github.com/empyrean/go-ethereum/p2p/testing" ) // handshake message type diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 1889edac99..59f2f81587 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -35,12 +35,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/crypto/secp256k1" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/ecies" + "github.com/empyrean/go-ethereum/crypto/secp256k1" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/rlp" "github.com/golang/snappy" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index bca4604021..ebe0276b0a 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/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/ecies" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/rlp" ) func TestSharedSecret(t *testing.T) { diff --git a/p2p/server.go b/p2p/server.go index c41d1dc156..380d869646 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/mclock" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/discv5" + "github.com/empyrean/go-ethereum/p2p/nat" + "github.com/empyrean/go-ethereum/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index 10c36528eb..5b22ad9893 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/discover" ) func init() { diff --git a/p2p/simulations/adapters/docker.go b/p2p/simulations/adapters/docker.go index 8ef5629fb5..a5ab27c818 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/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/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 a566fb27d8..4700686595 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/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index 48d7c17301..2c7ab00ac7 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,12 +23,12 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/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 5b4b47fe2f..4e8a469aaf 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/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/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 6a0ead53a5..45a6e3f9a5 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/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/simulations" + "github.com/empyrean/go-ethereum/p2p/simulations/adapters" + "github.com/empyrean/go-ethereum/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 97dd742e88..dad03b8338 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -29,11 +29,11 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/simulations/adapters" + "github.com/empyrean/go-ethereum/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 677a8fb147..7a87cdfb3e 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/simulations/adapters" + "github.com/empyrean/go-ethereum/rpc" ) // testService implements the node.Service interface and provides protocols diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index c38e288552..20c2d68994 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 de8ec0b337..f50e7f979d 100644 --- a/p2p/simulations/mocker_test.go +++ b/p2p/simulations/mocker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/discover" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index caf428ece1..1c914c9fac 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/empyrean/go-ethereum/event" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/simulations/adapters" ) var dialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index 2a062121be..b08dabf84f 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/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 28886e924a..cf7c6ade80 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/discover" ) // Simulation provides a framework for running actions in a simulated network diff --git a/p2p/testing/peerpool.go b/p2p/testing/peerpool.go index 45c6e61425..d6d5ae761d 100644 --- a/p2p/testing/peerpool.go +++ b/p2p/testing/peerpool.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/discover" ) type TestPeer interface { diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go index 361285f06e..2f5aa02ec3 100644 --- a/p2p/testing/protocolsession.go +++ b/p2p/testing/protocolsession.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/simulations/adapters" ) var errTimedOut = errors.New("timed out") diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go index a797412d60..bc5a2548c5 100644 --- a/p2p/testing/protocoltester.go +++ b/p2p/testing/protocoltester.go @@ -32,14 +32,14 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/simulations" + "github.com/empyrean/go-ethereum/p2p/simulations/adapters" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/rpc" ) // ProtocolTester is the tester environment used for unit testing protocol diff --git a/params/config.go b/params/config.go index 2599d8c4e7..eae072793c 100644 --- a/params/config.go +++ b/params/config.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) var ( diff --git a/params/dao.go b/params/dao.go index da3c8dfc99..cefd28aa07 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 8aa84ec982..f58416e085 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -32,7 +32,7 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 8276a9eadd..08b580d864 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -22,7 +22,7 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/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 4f354d389e..d11b3d2489 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/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) func TestClientRequest(t *testing.T) { diff --git a/rpc/ipc.go b/rpc/ipc.go index 8de18a56fe..120d6f38b3 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -21,7 +21,7 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 837011f51b..4aff7955bf 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index 11373b504c..2d8ccdbcfd 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -25,7 +25,7 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types.go b/rpc/types.go index f2375604ed..dd475ae58a 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/hexutil" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types_test.go b/rpc/types_test.go index 68b6d3c54f..f80f26c25e 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index a6e1cec28a..d02dc1da77 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" "golang.org/x/net/websocket" "gopkg.in/fatih/set.v0" ) diff --git a/shyftBlockExplorerApi/handler.go b/shyftBlockExplorerApi/handler.go index 496941db7b..fd076e45af 100644 --- a/shyftBlockExplorerApi/handler.go +++ b/shyftBlockExplorerApi/handler.go @@ -8,7 +8,7 @@ import ( _ "github.com/lib/pq" - "github.com/ethereum/go-ethereum/shyftdb" + "github.com/empyrean/go-ethereum/shyftdb" "github.com/gorilla/mux" "bytes" "io/ioutil" diff --git a/shyftDb/db.go b/shyftDb/db.go index f95871fd28..9cb8b3e312 100644 --- a/shyftDb/db.go +++ b/shyftDb/db.go @@ -1,14 +1,14 @@ package shyftdb import ( - "fmt" - "database/sql" + "database/sql" + "fmt" "os" ) var blockExplorerDb *sql.DB -func InitDB() (*sql.DB, error){ +func InitDB() (*sql.DB, error) { var connStr string if "test" == os.Getenv("SHYFT_ENV") { connStr = "user=postgres dbname=shyftdbtest sslmode=disable" @@ -27,11 +27,11 @@ func InitDB() (*sql.DB, error){ } func DBConnection() (*sql.DB, error) { - if (blockExplorerDb == nil) { + if blockExplorerDb == nil { _, err := InitDB() - if(err != nil) { + if err != nil { return nil, err } } return blockExplorerDb, nil -} \ No newline at end of file +} diff --git a/shyftDb/postgres_test.go b/shyftDb/postgres_test.go index 7a652301a5..99f41a7e7a 100644 --- a/shyftDb/postgres_test.go +++ b/shyftDb/postgres_test.go @@ -22,13 +22,13 @@ func ClearTables() { fmt.Println(err) } - sqlStatementTx:= `DELETE FROM txs` + sqlStatementTx := `DELETE FROM txs` _, err = blockExplorerDbTest.Exec(sqlStatementTx) if err != nil { panic(err) } - sqlStatementAcc:= `DELETE FROM accounts` + sqlStatementAcc := `DELETE FROM accounts` _, err = blockExplorerDbTest.Exec(sqlStatementAcc) if err != nil { panic(err) @@ -39,4 +39,4 @@ func ClearTables() { if err != nil { panic(err) } -} \ No newline at end of file +} diff --git a/shyftDb/shyft_database_util.go b/shyftDb/shyft_database_util.go index 658abe6e07..36304a7444 100644 --- a/shyftDb/shyft_database_util.go +++ b/shyftDb/shyft_database_util.go @@ -1,36 +1,36 @@ package shyftdb import ( + "database/sql" "encoding/json" "fmt" - "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "time" - "strconv" - "database/sql" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" "log" + "math/big" + "strconv" + "time" + Rewards "github.com/empyrean/go-ethereum/consensus/ethash" _ "github.com/lib/pq" - Rewards "github.com/ethereum/go-ethereum/consensus/ethash" ) //SBlock type type SBlock struct { - Hash string - Coinbase string - Number string - GasUsed uint64 - GasLimit uint64 - TxCount int + Hash string + Coinbase string + Number string + GasUsed uint64 + GasLimit uint64 + TxCount int UncleCount int Age string ParentHash string - UncleHash string + UncleHash string Difficulty string - Size string - Nonce uint64 - Rewards string + Size string + Nonce uint64 + Rewards string } //blockRes struct @@ -42,8 +42,8 @@ type blockRes struct { } type SAccounts struct { - Addr string - Balance string + Addr string + Balance string TxCountAccount string } @@ -62,7 +62,7 @@ type ShyftTxEntry struct { Amount *big.Int GasPrice *big.Int Gas uint64 - Cost *big.Int + Cost *big.Int Nonce uint64 Data []byte } @@ -72,21 +72,21 @@ type txRes struct { } type ShyftTxEntryPretty struct { - TxHash string - To string - From string - BlockHash string + TxHash string + To string + From string + BlockHash string BlockNumber string - Amount string - GasPrice uint64 - Gas uint64 - GasLimit uint64 - Cost uint64 - Nonce uint64 - Status string - IsContract bool - Age time.Time - Data []byte + Amount string + GasPrice uint64 + Gas uint64 + GasLimit uint64 + Cost uint64 + Nonce uint64 + Status string + IsContract bool + Age time.Time + Data []byte } type ShyftAccountEntry struct { @@ -95,11 +95,11 @@ type ShyftAccountEntry struct { } type SendAndReceive struct { - To string - From string - Amount string - Address string - Balance string + To string + From string + Amount string + Address string + Balance string TxCountAccount string } @@ -107,11 +107,11 @@ type SendAndReceive struct { func WriteBlock(block *types.Block, receipts []*types.Receipt) error { sqldb, err := DBConnection() - if (err != nil) { + if err != nil { panic(err) } - rewards := writeMinerRewards(sqldb,block) + rewards := writeMinerRewards(sqldb, block) coinbase := block.Header().Coinbase.String() number := block.Header().Number.String() gasUsed := block.Header().GasUsed @@ -151,14 +151,14 @@ func WriteBlock(block *types.Block, receipts []*types.Receipt) error { } //writeTransactions writes to sqldb -func writeTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.Hash, blockNumber string, receipts []*types.Receipt, age time.Time, gasLimit uint64) error { +func writeTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.Hash, blockNumber string, receipts []*types.Receipt, age time.Time, gasLimit uint64) error { txData := ShyftTxEntry{ TxHash: tx.Hash(), From: tx.From(), To: tx.To(), BlockHash: blockHash.Hex(), Amount: tx.Value(), - Cost: tx.Cost(), + Cost: tx.Cost(), GasPrice: tx.GasPrice(), Gas: tx.Gas(), Nonce: tx.Nonce(), @@ -177,7 +177,7 @@ func writeTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.Ha var isContract bool var statusFromReciept string - if (to == nil){ + if to == nil { var contractAddressFromReciept string for _, receipt := range receipts { statusReciept := (*types.ReceiptForStorage)(receipt).Status @@ -193,7 +193,7 @@ func writeTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.Ha var retNonce string isContract = true sqlStatement := `INSERT INTO txs(txhash, from_addr, to_addr, blockhash, blockNumber, amount, gasprice, gas, gasLimit,txfee, nonce, isContract, txStatus, age, data) VALUES(($1), ($2), ($3), ($4), ($5), ($6), ($7), ($8), ($9), ($10), ($11), ($12), ($13), ($14), ($15)) RETURNING nonce` - qerr := sqldb.QueryRow(sqlStatement, txHash, from, contractAddressFromReciept, blockHasher, blockNumber, amount, gasPrice, gas, gasLimit, txFee, nonce, isContract, statusFromReciept, age,data).Scan(&retNonce) + qerr := sqldb.QueryRow(sqlStatement, txHash, from, contractAddressFromReciept, blockHasher, blockNumber, amount, gasPrice, gas, gasLimit, txFee, nonce, isContract, statusFromReciept, age, data).Scan(&retNonce) if qerr != nil { panic(qerr) @@ -212,7 +212,7 @@ func writeTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.Ha } sqlStatement := `INSERT INTO txs(txhash, from_addr, to_addr, blockhash, blockNumber, amount, gasprice, gas, gasLimit, txfee, nonce, isContract, txStatus, age, data) VALUES(($1), ($2), ($3), ($4), ($5), ($6), ($7), ($8), ($9), ($10), ($11), ($12), ($13), ($14), ($15)) RETURNING nonce` - qerr := sqldb.QueryRow(sqlStatement, txHash, from, to.Hex(), blockHasher, blockNumber, amount, gasPrice, gas, gasLimit, txFee, nonce, isContract, statusFromReciept, age,data).Scan(&retNonce) + qerr := sqldb.QueryRow(sqlStatement, txHash, from, to.Hex(), blockHasher, blockNumber, amount, gasPrice, gas, gasLimit, txFee, nonce, isContract, statusFromReciept, age, data).Scan(&retNonce) if qerr != nil { panic(qerr) @@ -243,7 +243,7 @@ func writeContractBalance(sqldb *sql.DB, tx *types.Transaction) error { panic(insertErr) } default: - getAccountBalanceSender:= GetAccount(sqldb, fromAddr) + getAccountBalanceSender := GetAccount(sqldb, fromAddr) var senderBalance SendAndReceive if err := json.Unmarshal([]byte(getAccountBalanceSender), &senderBalance); err != nil { log.Fatal(err) @@ -350,15 +350,15 @@ func writeFromBalance(sqldb *sql.DB, tx *types.Transaction) error { func writeBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, string, string, string, string) { sendAndReceiveData := SendAndReceive{ - To: tx.To().Hex(), - From: tx.From().Hex(), + To: tx.To().Hex(), + From: tx.From().Hex(), Amount: tx.Value().String(), } toAddr := sendAndReceiveData.To fromAddr := sendAndReceiveData.From getAccountBalanceReceiver := GetAccount(sqldb, toAddr) - getAccountBalanceSender:= GetAccount(sqldb, fromAddr) + getAccountBalanceSender := GetAccount(sqldb, fromAddr) var receiverBalance SendAndReceive if err := json.Unmarshal([]byte(getAccountBalanceReceiver), &receiverBalance); err != nil { @@ -397,7 +397,7 @@ func writeMinerRewards(sqldb *sql.DB, block *types.Block) string { // https://ethereum.stackexchange.com/questions/27172/different-uncles-reward // line 551 in consensus.go (shyft_go-ethereum/consensus/ethash/consensus.go) // Some weird constants to avoid constant memory allocs for them. - var big8 = big.NewInt(8) + var big8 = big.NewInt(8) var uncleRewards []*big.Int var uncleAddrs []string @@ -517,23 +517,23 @@ func GetAllBlocks(sqldb *sql.DB) string { &size, &nonce, &rewards, - &num,) + &num) arr.Blocks = append(arr.Blocks, SBlock{ - Hash: hash, - Coinbase: coinbase, - GasUsed: gasUsed, - GasLimit: gasLimit, - TxCount: txCount, + Hash: hash, + Coinbase: coinbase, + GasUsed: gasUsed, + GasLimit: gasLimit, + TxCount: txCount, UncleCount: uncleCount, - Age: age, - ParentHash:parentHash, - UncleHash:uncleHash, - Difficulty:difficulty, - Size: size, - Nonce:nonce, - Rewards: rewards, - Number: num, + Age: age, + ParentHash: parentHash, + UncleHash: uncleHash, + Difficulty: difficulty, + Size: size, + Nonce: nonce, + Rewards: rewards, + Number: num, }) blocks, _ := json.Marshal(arr.Blocks) @@ -576,23 +576,23 @@ func GetBlock(sqldb *sql.DB, blockNumber string) string { &size, &nonce, &rewards, - &num,) + &num) block := SBlock{ - Hash: hash, - Coinbase: coinbase, - GasUsed: gasUsed, - GasLimit: gasLimit, - TxCount: txCount, + Hash: hash, + Coinbase: coinbase, + GasUsed: gasUsed, + GasLimit: gasLimit, + TxCount: txCount, UncleCount: uncleCount, - Age: age, - ParentHash:parentHash, - UncleHash:uncleHash, - Difficulty:difficulty, - Size: size, - Nonce:nonce, - Rewards: rewards, - Number: num, + Age: age, + ParentHash: parentHash, + UncleHash: uncleHash, + Difficulty: difficulty, + Size: size, + Nonce: nonce, + Rewards: rewards, + Number: num, } json, _ := json.Marshal(block) return string(json) @@ -629,23 +629,23 @@ func GetRecentBlock(sqldb *sql.DB) string { &size, &nonce, &rewards, - &num,) + &num) block := SBlock{ - Hash: hash, - Coinbase: coinbase, - GasUsed: gasUsed, - GasLimit: gasLimit, - TxCount: txCount, + Hash: hash, + Coinbase: coinbase, + GasUsed: gasUsed, + GasLimit: gasLimit, + TxCount: txCount, UncleCount: uncleCount, - Age: age, - ParentHash:parentHash, - UncleHash:uncleHash, - Difficulty:difficulty, - Size: size, - Nonce:nonce, - Rewards: rewards, - Number: num, + Age: age, + ParentHash: parentHash, + UncleHash: uncleHash, + Difficulty: difficulty, + Size: size, + Nonce: nonce, + Rewards: rewards, + Number: num, } json, _ := json.Marshal(block) return string(json) @@ -695,21 +695,21 @@ func GetAllTransactionsFromBlock(sqldb *sql.DB, blockNumber string) string { ) arr.TxEntry = append(arr.TxEntry, ShyftTxEntryPretty{ - TxHash: txhash, - To: to_addr, - From: from_addr, - BlockHash: blockhash, + TxHash: txhash, + To: to_addr, + From: from_addr, + BlockHash: blockhash, BlockNumber: blocknumber, - Amount: amount, - GasPrice: gasprice, - Gas: gas, - GasLimit: gasLimit, - Cost: txfee, - Nonce: nonce, - Status: status, - IsContract: isContract, - Age: age, - Data: data, + Amount: amount, + GasPrice: gasprice, + Gas: gas, + GasLimit: gasLimit, + Cost: txfee, + Nonce: nonce, + Status: status, + IsContract: isContract, + Age: age, + Data: data, }) tx, _ := json.Marshal(arr.TxEntry) @@ -759,23 +759,23 @@ func GetAllBlocksMinedByAddress(sqldb *sql.DB, coinbase string) string { &size, &nonce, &rewards, - &num,) + &num) arr.Blocks = append(arr.Blocks, SBlock{ - Hash: hash, - Coinbase: coinbase, - GasUsed: gasUsed, - GasLimit: gasLimit, - TxCount: txCount, + Hash: hash, + Coinbase: coinbase, + GasUsed: gasUsed, + GasLimit: gasLimit, + TxCount: txCount, UncleCount: uncleCount, - Age: age, - ParentHash:parentHash, - UncleHash:uncleHash, - Difficulty:difficulty, - Size: size, - Nonce:nonce, - Rewards: rewards, - Number: num, + Age: age, + ParentHash: parentHash, + UncleHash: uncleHash, + Difficulty: difficulty, + Size: size, + Nonce: nonce, + Rewards: rewards, + Number: num, }) blocks, _ := json.Marshal(arr.Blocks) @@ -830,21 +830,21 @@ func GetAllTransactions(sqldb *sql.DB) string { ) arr.TxEntry = append(arr.TxEntry, ShyftTxEntryPretty{ - TxHash: txhash, - To: to_addr, - From: from_addr, - BlockHash: blockhash, + TxHash: txhash, + To: to_addr, + From: from_addr, + BlockHash: blockhash, BlockNumber: blocknumber, - Amount: amount, - GasPrice: gasprice, - Gas: gas, - GasLimit: gasLimit, - Cost: txfee, - Nonce: nonce, - Status: status, - IsContract: isContract, - Age: age, - Data: data, + Amount: amount, + GasPrice: gasprice, + Gas: gas, + GasLimit: gasLimit, + Cost: txfee, + Nonce: nonce, + Status: status, + IsContract: isContract, + Age: age, + Data: data, }) tx, _ := json.Marshal(arr.TxEntry) @@ -891,21 +891,21 @@ func GetTransaction(sqldb *sql.DB, txHash string) string { &data) tx := ShyftTxEntryPretty{ - TxHash: txhash, - To: to_addr, - From: from_addr, - BlockHash: blockhash, + TxHash: txhash, + To: to_addr, + From: from_addr, + BlockHash: blockhash, BlockNumber: blocknumber, - Amount: amount, - GasPrice: gasprice, - Gas: gas, - GasLimit: gasLimit, - Cost: txfee, - Nonce: nonce, - Status: status, - IsContract: isContract, - Age: age, - Data: data, + Amount: amount, + GasPrice: gasprice, + Gas: gas, + GasLimit: gasLimit, + Cost: txfee, + Nonce: nonce, + Status: status, + IsContract: isContract, + Age: age, + Data: data, } json, _ := json.Marshal(tx) @@ -925,8 +925,8 @@ func GetAccount(sqldb *sql.DB, address string) string { &txCountAccount) account := SAccounts{ - Addr: addr, - Balance: balance, + Addr: addr, + Balance: balance, TxCountAccount: txCountAccount, } json, _ := json.Marshal(account) @@ -960,8 +960,8 @@ func GetAllAccounts(sqldb *sql.DB) string { ) array.AllAccounts = append(array.AllAccounts, SAccounts{ - Addr: addr, - Balance: balance, + Addr: addr, + Balance: balance, TxCountAccount: txCountAccount, }) @@ -1017,21 +1017,21 @@ func GetAccountTxs(sqldb *sql.DB, address string) string { ) arr.TxEntry = append(arr.TxEntry, ShyftTxEntryPretty{ - TxHash: txhash, - To: to_addr, - From: from_addr, - BlockHash: blockhash, + TxHash: txhash, + To: to_addr, + From: from_addr, + BlockHash: blockhash, BlockNumber: blocknumber, - Amount: amount, - GasPrice: gasprice, - Gas: gas, - GasLimit: gasLimit, - Cost: txfee, - Nonce: nonce, - Status: status, - IsContract: isContract, - Age: age, - Data: data, + Amount: amount, + GasPrice: gasprice, + Gas: gas, + GasLimit: gasLimit, + Cost: txfee, + Nonce: nonce, + Status: status, + IsContract: isContract, + Age: age, + Data: data, }) tx, _ := json.Marshal(arr.TxEntry) diff --git a/shyftDb/shyft_database_util_test.go b/shyftDb/shyft_database_util_test.go index 5e76048fc1..92753f5e3a 100644 --- a/shyftDb/shyft_database_util_test.go +++ b/shyftDb/shyft_database_util_test.go @@ -1,27 +1,27 @@ package shyftdb import ( - "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/core/types" "math/big" + "testing" //"time" "encoding/json" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto" "strconv" ) func TestBlockToReturnBlock(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) + key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") + signer := types.NewEIP155Signer(big.NewInt(2147483647)) //Nonce, To Address,Value, GasLimit, Gasprice, data tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) - mytx,_ := types.SignTx(tx1, signer, key) + mytx, _ := types.SignTx(tx1, signer, key) tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) - mytx2,_ := types.SignTx(tx2, signer, key) + mytx2, _ := types.SignTx(tx2, signer, key) tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) - mytx3,_ := types.SignTx(tx3, signer, key) + mytx3, _ := types.SignTx(tx3, signer, key) txs := []*types.Transaction{mytx, mytx2, mytx3} receipt := &types.Receipt{ @@ -45,14 +45,14 @@ func TestBlockToReturnBlock(t *testing.T) { } sqldb, err := DBConnection() - if (err != nil) { + if err != nil { panic(err) } entry := GetBlock(sqldb, block.Number().String()) - byt := []byte(entry) - var data SBlock - json.Unmarshal(byt, &data) + byt := []byte(entry) + var data SBlock + json.Unmarshal(byt, &data) //TODO Difficulty, rewards, age if block.Hash().String() != data.Hash { @@ -101,17 +101,17 @@ func TestBlockToReturnBlock(t *testing.T) { } func TestGetRecentBlock(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) + key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") + signer := types.NewEIP155Signer(big.NewInt(2147483647)) //Nonce, To Address,Value, GasLimit, Gasprice, data tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) - mytx,_ := types.SignTx(tx1, signer, key) + mytx, _ := types.SignTx(tx1, signer, key) tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) - mytx2,_ := types.SignTx(tx2, signer, key) + mytx2, _ := types.SignTx(tx2, signer, key) tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) - mytx3,_ := types.SignTx(tx3, signer, key) - txs := []*types.Transaction{mytx, mytx2} + mytx3, _ := types.SignTx(tx3, signer, key) + txs := []*types.Transaction{mytx, mytx2} txs1 := []*types.Transaction{mytx3} receipt1 := &types.Receipt{ @@ -139,7 +139,7 @@ func TestGetRecentBlock(t *testing.T) { } sqldb, err := DBConnection() - if (err != nil) { + if err != nil { panic(err) } @@ -182,19 +182,19 @@ func TestGetRecentBlock(t *testing.T) { t.Fatalf("Block nonce [%v]: Block nonce not found", block.Nonce()) } - if allTxsFromBlock:= GetAllTransactionsFromBlock(sqldb, block2.Number().String()); len(allTxsFromBlock) == 0 { + if allTxsFromBlock := GetAllTransactionsFromBlock(sqldb, block2.Number().String()); len(allTxsFromBlock) == 0 { t.Fatalf("GetAllTransactionsFromBlock [%v]: GetAllTransactionsFromBlock did not return correctly", allTxsFromBlock) } ClearTables() } func TestContractCreationTx(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) + key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") + signer := types.NewEIP155Signer(big.NewInt(2147483647)) //Nonce,Value, GasLimit, Gasprice, data contractCreation := types.NewContractCreation(1, big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) - mytx,_ := types.SignTx(contractCreation, signer, key) + mytx, _ := types.SignTx(contractCreation, signer, key) txs := []*types.Transaction{mytx} receipt2 := &types.Receipt{ @@ -222,7 +222,7 @@ func TestContractCreationTx(t *testing.T) { } sqldb, err := DBConnection() - if (err != nil) { + if err != nil { panic(err) } @@ -289,16 +289,16 @@ func TestContractCreationTx(t *testing.T) { } func TestTransactionsToReturnTransactions(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) + key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") + signer := types.NewEIP155Signer(big.NewInt(2147483647)) //Nonce, To Address,Value, GasLimit, Gasprice, data tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) - mytx,_ := types.SignTx(tx1, signer, key) + mytx, _ := types.SignTx(tx1, signer, key) tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) - mytx2,_ := types.SignTx(tx2, signer, key) + mytx2, _ := types.SignTx(tx2, signer, key) tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) - mytx3,_ := types.SignTx(tx3, signer, key) + mytx3, _ := types.SignTx(tx3, signer, key) txs := []*types.Transaction{mytx, mytx2, mytx3} receipt1 := &types.Receipt{ @@ -320,17 +320,17 @@ func TestTransactionsToReturnTransactions(t *testing.T) { t.Fatalf("Failed to write block into database: %v", err) } sqldb, err := DBConnection() - if (err != nil) { + if err != nil { panic(err) } - + for _, tx := range txs { txn := GetTransaction(sqldb, tx.Hash().String()) - byt := []byte(txn) - var data ShyftTxEntryPretty - json.Unmarshal(byt, &data) + byt := []byte(txn) + var data ShyftTxEntryPretty + json.Unmarshal(byt, &data) - //TODO age, data + //TODO age, data if tx.Hash().String() != data.TxHash { t.Fatalf("txHash [%v]: tx Hash not found", tx.Hash().String()) } @@ -392,16 +392,16 @@ func TestTransactionsToReturnTransactions(t *testing.T) { } func TestAccountsToReturnAccounts(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) + key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") + signer := types.NewEIP155Signer(big.NewInt(2147483647)) //Nonce, To Address,Value, GasLimit, Gasprice, data tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) - mytx,_ := types.SignTx(tx1, signer, key) + mytx, _ := types.SignTx(tx1, signer, key) tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) - mytx2,_ := types.SignTx(tx2, signer, key) + mytx2, _ := types.SignTx(tx2, signer, key) tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) - mytx3,_ := types.SignTx(tx3, signer, key) + mytx3, _ := types.SignTx(tx3, signer, key) txs := []*types.Transaction{mytx, mytx2, mytx3} receipt1 := &types.Receipt{ @@ -418,21 +418,20 @@ func TestAccountsToReturnAccounts(t *testing.T) { receipts := []*types.Receipt{receipt1} block := types.NewBlock(&types.Header{Number: big.NewInt(315)}, txs, nil, receipts) - if err := WriteBlock(block, receipts); err != nil { - t.Fatalf("Failed to write block into database: %v", err) - } + if err := WriteBlock(block, receipts); err != nil { + t.Fatalf("Failed to write block into database: %v", err) + } sqldb, err := DBConnection() - if (err != nil) { + if err != nil { panic(err) } - for _, tx := range txs { - accountAddrTo := GetAccount(sqldb, tx.To().String()) - byts := []byte(accountAddrTo) - var accountDataTo SAccounts - json.Unmarshal(byts, &accountDataTo) + accountAddrTo := GetAccount(sqldb, tx.To().String()) + byts := []byte(accountAddrTo) + var accountDataTo SAccounts + json.Unmarshal(byts, &accountDataTo) if tx.To().String() != accountDataTo.Addr { t.Fatalf("To address [%v]: To address not found", accountDataTo.Addr) @@ -453,6 +452,3 @@ func TestAccountsToReturnAccounts(t *testing.T) { } ClearTables() } - - - diff --git a/swarm/api/api.go b/swarm/api/api.go index 0cf12fdbed..eedcd9f276 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -30,10 +30,10 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/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 4ee26bd8ad..7a20bf37a7 100644 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -24,9 +24,9 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 8165d52d7e..6a18b1b241 100644 --- a/swarm/api/client/client.go +++ b/swarm/api/client/client.go @@ -33,7 +33,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/empyrean/go-ethereum/swarm/api" ) var ( diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go index c1d144e370..0fc0051773 100644 --- a/swarm/api/client/client_test.go +++ b/swarm/api/client/client_test.go @@ -25,8 +25,8 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/empyrean/go-ethereum/swarm/api" + "github.com/empyrean/go-ethereum/swarm/testutil" ) // TestClientUploadDownloadRaw test uploading and downloading raw data to swarm diff --git a/swarm/api/config.go b/swarm/api/config.go index 6b224140a4..aa53e4d4ae 100644 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -22,14 +22,14 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/contracts/ens" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/swarm/network" + "github.com/empyrean/go-ethereum/swarm/services/swap" + "github.com/empyrean/go-ethereum/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index 5636b6dafb..02c46d29fe 100644 --- a/swarm/api/config_test.go +++ b/swarm/api/config_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" ) func TestConfig(t *testing.T) { diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index f5dc90e2e5..acf01fee8d 100644 --- a/swarm/api/filesystem.go +++ b/swarm/api/filesystem.go @@ -26,9 +26,9 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go index 8a15e735dc..f6c02cf782 100644 --- a/swarm/api/filesystem_test.go +++ b/swarm/api/filesystem_test.go @@ -24,8 +24,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 9a65412cf9..25b940ee8f 100644 --- a/swarm/api/http/error.go +++ b/swarm/api/http/error.go @@ -28,9 +28,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/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 dc545722e1..9cc7b13866 100644 --- a/swarm/api/http/error_test.go +++ b/swarm/api/http/error_test.go @@ -25,7 +25,7 @@ import ( "golang.org/x/net/html" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/empyrean/go-ethereum/swarm/testutil" ) func TestError(t *testing.T) { diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index 0194317716..3d442e69f8 100644 --- a/swarm/api/http/roundtripper.go +++ b/swarm/api/http/roundtripper.go @@ -20,17 +20,17 @@ import ( "fmt" "net/http" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) /* http roundtripper to register for bzz url scheme -see https://github.com/ethereum/go-ethereum/issues/2040 +see https://github.com/empyrean/go-ethereum/issues/2040 Usage: import ( - "github.com/ethereum/go-ethereum/common/httpclient" - "github.com/ethereum/go-ethereum/swarm/api/http" + "github.com/empyrean/go-ethereum/common/httpclient" + "github.com/empyrean/go-ethereum/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 b8e7436cf0..e7902101d2 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -35,11 +35,11 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/swarm/api" + "github.com/empyrean/go-ethereum/swarm/storage" "github.com/rs/cors" ) diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index b2efc0ea15..77062476ad 100644 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -26,11 +26,11 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/swarm/api" + swarm "github.com/empyrean/go-ethereum/swarm/api/client" + "github.com/empyrean/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/swarm/testutil" ) func TestBzzGetPath(t *testing.T) { diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go index cd9d212897..4f52a54b17 100644 --- a/swarm/api/http/templates.go +++ b/swarm/api/http/templates.go @@ -20,7 +20,7 @@ import ( "html/template" "path" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/empyrean/go-ethereum/swarm/api" ) type htmlListData struct { diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index 685a300fca..01aed997ac 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index 7098ca16fd..ac8a2fb98f 100644 --- a/swarm/api/manifest_test.go +++ b/swarm/api/manifest_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/testapi.go b/swarm/api/testapi.go index 6631196c17..bc9c981d51 100644 --- a/swarm/api/testapi.go +++ b/swarm/api/testapi.go @@ -17,7 +17,7 @@ package api import ( - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/empyrean/go-ethereum/swarm/network" ) type Control struct { diff --git a/swarm/dev/Makefile b/swarm/dev/Makefile index 365964b7f5..8204baf765 100644 --- a/swarm/dev/Makefile +++ b/swarm/dev/Makefile @@ -3,12 +3,12 @@ default: build build: - go build -o bin/swarm github.com/ethereum/go-ethereum/cmd/swarm - go build -o bin/geth github.com/ethereum/go-ethereum/cmd/geth - go build -o bin/bootnode github.com/ethereum/go-ethereum/cmd/bootnode + go build -o bin/swarm github.com/empyrean/go-ethereum/cmd/swarm + go build -o bin/geth github.com/empyrean/go-ethereum/cmd/geth + go build -o bin/bootnode github.com/empyrean/go-ethereum/cmd/bootnode cluster: build scripts/boot-cluster.sh test: - go test -v github.com/ethereum/go-ethereum/swarm/... + go test -v github.com/empyrean/go-ethereum/swarm/... diff --git a/swarm/dev/bashrc b/swarm/dev/bashrc index efb504fa36..b3cb4f861a 100644 --- a/swarm/dev/bashrc +++ b/swarm/dev/bashrc @@ -1,4 +1,4 @@ -export ROOT="${GOPATH}/src/github.com/ethereum/go-ethereum" +export ROOT="${GOPATH}/src/github.com/empyrean/go-ethereum" export PATH="${ROOT}/swarm/dev/bin:${PATH}" cd "${ROOT}/swarm/dev" diff --git a/swarm/dev/run.sh b/swarm/dev/run.sh index 2ad600dedf..8a4810433f 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/ethereum/go-ethereum" \ + --volume "${ROOT}:/go/src/github.com/empyrean/go-ethereum" \ --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 c94a0773f5..d51a4063dc 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/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/swarm/storage" "golang.org/x/net/context" ) diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go index 2493bdab19..2ff31d742a 100644 --- a/swarm/fuse/swarmfs.go +++ b/swarm/fuse/swarmfs.go @@ -17,7 +17,7 @@ package fuse import ( - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/empyrean/go-ethereum/swarm/api" "sync" "time" ) diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index 42af36345f..bd69fe3957 100644 --- a/swarm/fuse/swarmfs_test.go +++ b/swarm/fuse/swarmfs_test.go @@ -27,8 +27,8 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/swarm/api" + "github.com/empyrean/go-ethereum/swarm/storage" ) type fileInfo struct { diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index 75742845a2..182029f942 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/swarm/api" ) var ( diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go index 169b674876..66d4d885da 100644 --- a/swarm/fuse/swarmfs_util.go +++ b/swarm/fuse/swarmfs_util.go @@ -24,7 +24,7 @@ import ( "os/exec" "runtime" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) func externalUnmount(mountPoint string) error { diff --git a/swarm/metrics/flags.go b/swarm/metrics/flags.go index 48b231b219..d5fe98df9e 100644 --- a/swarm/metrics/flags.go +++ b/swarm/metrics/flags.go @@ -19,10 +19,10 @@ package metrics import ( "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" - gethmetrics "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/log" + gethmetrics "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/metrics/influxdb" "gopkg.in/urfave/cli.v1" ) diff --git a/swarm/network/depo.go b/swarm/network/depo.go index 5ffbf8be11..829715e62a 100644 --- a/swarm/network/depo.go +++ b/swarm/network/depo.go @@ -22,9 +22,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/swarm/storage" ) //metrics variables diff --git a/swarm/network/forwarding.go b/swarm/network/forwarding.go index 88a82a678c..ea2685b84b 100644 --- a/swarm/network/forwarding.go +++ b/swarm/network/forwarding.go @@ -21,8 +21,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/swarm/storage" ) const requesterCount = 3 diff --git a/swarm/network/hive.go b/swarm/network/hive.go index 8404ffcc2a..c798c1f47d 100644 --- a/swarm/network/hive.go +++ b/swarm/network/hive.go @@ -22,13 +22,13 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/swarm/network/kademlia" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/netutil" + "github.com/empyrean/go-ethereum/swarm/network/kademlia" + "github.com/empyrean/go-ethereum/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 4c38a846f9..5d77b3e371 100644 --- a/swarm/network/kademlia/address.go +++ b/swarm/network/kademlia/address.go @@ -21,7 +21,7 @@ import ( "math/rand" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) type Address common.Hash diff --git a/swarm/network/kademlia/address_test.go b/swarm/network/kademlia/address_test.go index c062c8eafb..fbb8095992 100644 --- a/swarm/network/kademlia/address_test.go +++ b/swarm/network/kademlia/address_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 b37ced5ba0..fd6f4ad328 100644 --- a/swarm/network/kademlia/kaddb.go +++ b/swarm/network/kademlia/kaddb.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) type NodeData interface { diff --git a/swarm/network/kademlia/kademlia.go b/swarm/network/kademlia/kademlia.go index b5999b52d4..33ff4383c2 100644 --- a/swarm/network/kademlia/kademlia.go +++ b/swarm/network/kademlia/kademlia.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" ) //metrics variables diff --git a/swarm/network/messages.go b/swarm/network/messages.go index d920def959..732ae2fbb4 100644 --- a/swarm/network/messages.go +++ b/swarm/network/messages.go @@ -21,11 +21,11 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/swarm/network/kademlia" - "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/contracts/chequebook" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/swarm/network/kademlia" + "github.com/empyrean/go-ethereum/swarm/services/swap" + "github.com/empyrean/go-ethereum/swarm/storage" ) /* diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index 1cbe00a973..22abc2eba2 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -37,13 +37,13 @@ import ( "strconv" "time" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - bzzswap "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/contracts/chequebook" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/p2p" + bzzswap "github.com/empyrean/go-ethereum/swarm/services/swap" + "github.com/empyrean/go-ethereum/swarm/services/swap/swap" + "github.com/empyrean/go-ethereum/swarm/storage" ) //metrics variables diff --git a/swarm/network/syncdb.go b/swarm/network/syncdb.go index 88b4b68dd0..d0877cf69d 100644 --- a/swarm/network/syncdb.go +++ b/swarm/network/syncdb.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 be21d156f9..310493caba 100644 --- a/swarm/network/syncdb_test.go +++ b/swarm/network/syncdb_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/swarm/storage" ) func init() { diff --git a/swarm/network/syncer.go b/swarm/network/syncer.go index 6d729fcb9e..09a1a9c74f 100644 --- a/swarm/network/syncer.go +++ b/swarm/network/syncer.go @@ -22,8 +22,8 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 1f9b22b904..d241581f84 100644 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -26,14 +26,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/contracts/chequebook" + "github.com/empyrean/go-ethereum/contracts/chequebook/contract" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 a78f1f0e2a..eec8d5f13e 100644 --- a/swarm/services/swap/swap/swap.go +++ b/swarm/services/swap/swap/swap.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 222e0770f3..8e2b48149b 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/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) type testInPayment struct { diff --git a/swarm/storage/chunker.go b/swarm/storage/chunker.go index 2b397f8010..83d044aa07 100644 --- a/swarm/storage/chunker.go +++ b/swarm/storage/chunker.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/metrics" ) /* diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go index c8bd12299a..47566bd163 100644 --- a/swarm/storage/chunker_test.go +++ b/swarm/storage/chunker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/crypto/sha3" ) /* diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index cd4c2ef139..aaa9a8fc02 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) type brokenLimitedReader struct { diff --git a/swarm/storage/database.go b/swarm/storage/database.go index 2532490cc9..8687e8370b 100644 --- a/swarm/storage/database.go +++ b/swarm/storage/database.go @@ -22,7 +22,7 @@ package storage import ( "fmt" - "github.com/ethereum/go-ethereum/compression/rle" + "github.com/empyrean/go-ethereum/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 42a0e5a8a6..a3323a3083 100644 --- a/swarm/storage/dbstore.go +++ b/swarm/storage/dbstore.go @@ -32,9 +32,9 @@ import ( "io/ioutil" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/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 dd165b5768..5a2790709e 100644 --- a/swarm/storage/dbstore_test.go +++ b/swarm/storage/dbstore_test.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) func initDbStore(t *testing.T) *DbStore { diff --git a/swarm/storage/dpa.go b/swarm/storage/dpa.go index 44a2669f12..aecd9127c0 100644 --- a/swarm/storage/dpa.go +++ b/swarm/storage/dpa.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) /* diff --git a/swarm/storage/localstore.go b/swarm/storage/localstore.go index ece0c86155..662a9bcba3 100644 --- a/swarm/storage/localstore.go +++ b/swarm/storage/localstore.go @@ -19,7 +19,7 @@ package storage import ( "encoding/binary" - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/metrics" ) //metrics variables diff --git a/swarm/storage/memstore.go b/swarm/storage/memstore.go index d6be542203..6b755b6a1f 100644 --- a/swarm/storage/memstore.go +++ b/swarm/storage/memstore.go @@ -22,8 +22,8 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" ) //metrics variables diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index 5d4f17deb1..300a8cfd39 100644 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -21,7 +21,7 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/log" ) /* diff --git a/swarm/storage/types.go b/swarm/storage/types.go index d35f1f9294..c371f33252 100644 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -24,9 +24,9 @@ import ( "io" "sync" - "github.com/ethereum/go-ethereum/bmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/bmt" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto/sha3" ) type Hasher func() hash.Hash diff --git a/swarm/swarm.go b/swarm/swarm.go index 0a120db1fa..8cf3af71ec 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -27,24 +27,24 @@ import ( "time" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/api" - httpapi "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/fuse" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/accounts/abi/bind" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/contracts/chequebook" + "github.com/empyrean/go-ethereum/contracts/ens" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethclient" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/node" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/swarm/api" + httpapi "github.com/empyrean/go-ethereum/swarm/api/http" + "github.com/empyrean/go-ethereum/swarm/fuse" + "github.com/empyrean/go-ethereum/swarm/network" + "github.com/empyrean/go-ethereum/swarm/storage" ) var ( diff --git a/swarm/swarm_test.go b/swarm/swarm_test.go index 8b1ae28884..9219f8c2f6 100644 --- a/swarm/swarm_test.go +++ b/swarm/swarm_test.go @@ -19,7 +19,7 @@ package swarm import ( "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) func TestParseEnsAPIAddress(t *testing.T) { diff --git a/swarm/testutil/http.go b/swarm/testutil/http.go index f2922fab00..bd8832fe2c 100644 --- a/swarm/testutil/http.go +++ b/swarm/testutil/http.go @@ -22,9 +22,9 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - httpapi "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/empyrean/go-ethereum/swarm/api" + httpapi "github.com/empyrean/go-ethereum/swarm/api/http" + "github.com/empyrean/go-ethereum/swarm/storage" ) func NewTestSwarmServer(t *testing.T) *TestSwarmServer { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index beba484833..983cf96d7e 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -24,17 +24,17 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index 6006373009..6b0f70d2f3 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -21,8 +21,8 @@ import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 00d699cf75..b13b35dcc6 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/consensus/ethash" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/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 5cfd4bd0ae..2b3244b20a 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index 88f36ce999..81706d7276 100644 --- a/tests/gen_difficultytest.go +++ b/tests/gen_difficultytest.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index 1d4baf2fd7..a18a8c59fe 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 451ffcbf43..245c59f0fe 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index 2948842d97..a07460ebb2 100644 --- a/tests/gen_tttransaction.go +++ b/tests/gen_tttransaction.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" ) var _ = (*ttTransactionMarshaling)(nil) diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index a5f01cf456..f3a6c996a5 100644 --- a/tests/gen_vmexec.go +++ b/tests/gen_vmexec.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" ) var _ = (*vmExecMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index ff8ee7da18..fe1a27fcad 100644 --- a/tests/init.go +++ b/tests/init.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/params" ) // This table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index fbb214b08c..e44c0dfa80 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -29,7 +29,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 58ef8a6428..c3e6588638 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -24,7 +24,7 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index 9ca5f18303..5ab609f068 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 3b761bd771..2e0b575abc 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -23,18 +23,18 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" ) // StateTest checks transaction processing without block context. diff --git a/tests/transaction_test.go b/tests/transaction_test.go index c743996c2a..32c67a8663 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 2028d2a278..2c3ba0fdd7 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core/types" + "github.com/empyrean/go-ethereum/params" + "github.com/empyrean/go-ethereum/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/tests/vm_test.go b/tests/vm_test.go index c9f5e225e9..f20129ca5c 100644 --- a/tests/vm_test.go +++ b/tests/vm_test.go @@ -19,7 +19,7 @@ package tests import ( "testing" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/core/vm" ) func TestVM(t *testing.T) { diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index b365167a69..1287f51aea 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -22,15 +22,15 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/core" + "github.com/empyrean/go-ethereum/core/state" + "github.com/empyrean/go-ethereum/core/vm" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/params" ) // VMTest checks EVM execution without block or transaction context. diff --git a/trie/database.go b/trie/database.go index da36e72f98..deb4118f46 100644 --- a/trie/database.go +++ b/trie/database.go @@ -20,9 +20,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/log" ) // secureKeyPrefix is the database key prefix used to store trie node preimages. diff --git a/trie/errors.go b/trie/errors.go index 567b80078c..78fef29176 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -19,7 +19,7 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index 2fc44787ac..4996b957c5 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -21,9 +21,9 @@ import ( "hash" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/empyrean/go-ethereum/rlp" ) type hasher struct { diff --git a/trie/iterator.go b/trie/iterator.go index 76146c0d64..991151c02c 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,7 +21,7 @@ import ( "container/heap" "errors" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 dce1c78b5d..20ec011656 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -22,8 +22,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/ethdb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index a7697fc0c6..9bfd193d5c 100644 --- a/trie/node.go +++ b/trie/node.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 508e4a6cf4..ef1d8b18f6 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -20,11 +20,11 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/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 fff313d7fd..6dbfbeb232 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 3881ee18a0..90093410b4 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -19,8 +19,8 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/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 aedf5a1cde..c34dfcfd87 100644 --- a/trie/secure_trie_test.go +++ b/trie/secure_trie_test.go @@ -22,9 +22,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index b573a9f732..a7d452f4b0 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,8 +20,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/ethdb" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/trie/sync_test.go b/trie/sync_test.go index 4a720612b6..ba5068fa5c 100644 --- a/trie/sync_test.go +++ b/trie/sync_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index 31a404e3a0..68108f31a3 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -21,10 +21,10 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/metrics" ) var ( diff --git a/trie/trie_test.go b/trie/trie_test.go index 9972226288..bf648b3e70 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/ethdb" + "github.com/empyrean/go-ethereum/rlp" ) func init() { diff --git a/vendor/vendor.json b/vendor/vendor.json index a4f0d50adf..d0db2d2004 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -794,5 +794,5 @@ "revisionTime": "2017-08-11T01:42:03Z" } ], - "rootPath": "github.com/ethereum/go-ethereum" + "rootPath": "github.com/empyrean/go-ethereum" } diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index 57e6505ad1..d5b0070d0a 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -20,12 +20,12 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/rlp" + whisper "github.com/empyrean/go-ethereum/whisper/whisperv6" "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 d5b993afb9..9d715786da 100644 --- a/whisper/mailserver/server_test.go +++ b/whisper/mailserver/server_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + whisper "github.com/empyrean/go-ethereum/whisper/whisperv6" ) const powRequirement = 0.00001 diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go index 61b4775d95..d3aa226cd3 100644 --- a/whisper/shhclient/client.go +++ b/whisper/shhclient/client.go @@ -19,10 +19,10 @@ package shhclient import ( "context" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/empyrean/go-ethereum" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/rpc" + whisper "github.com/empyrean/go-ethereum/whisper/whisperv5" ) // Client defines typed wrappers for the Whisper v5 RPC API. diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go index ee566625c9..4fd27e7d42 100644 --- a/whisper/whisperv5/api.go +++ b/whisper/whisperv5/api.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/rpc" ) const ( diff --git a/whisper/whisperv5/benchmarks_test.go b/whisper/whisperv5/benchmarks_test.go index dcfbcb56d8..be1c55de27 100644 --- a/whisper/whisperv5/benchmarks_test.go +++ b/whisper/whisperv5/benchmarks_test.go @@ -19,7 +19,7 @@ package whisperv5 import ( "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto" ) func BenchmarkDeriveKeyMaterial(b *testing.B) { diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go index 169cbba9dd..45fe3cf7a8 100644 --- a/whisper/whisperv5/envelope.go +++ b/whisper/whisperv5/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/ecies" + "github.com/empyrean/go-ethereum/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 3190334ebb..9cd7169bbb 100644 --- a/whisper/whisperv5/filter.go +++ b/whisper/whisperv5/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" ) type Filter struct { diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go index 01034a3513..89ac9253d6 100644 --- a/whisper/whisperv5/filter_test.go +++ b/whisper/whisperv5/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" ) var seed int64 diff --git a/whisper/whisperv5/gen_criteria_json.go b/whisper/whisperv5/gen_criteria_json.go index 1c0e389ad9..ca6e6b551c 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/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv5/gen_message_json.go b/whisper/whisperv5/gen_message_json.go index b4c4274d07..8e23774903 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/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv5/gen_newmessage_json.go b/whisper/whisperv5/gen_newmessage_json.go index 97ffb64ad3..e068dff620 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/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go index c27535cd1a..eb3439299e 100644 --- a/whisper/whisperv5/message.go +++ b/whisper/whisperv5/message.go @@ -27,10 +27,10 @@ import ( "errors" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/ecies" + "github.com/empyrean/go-ethereum/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 2edf945df0..2e4323d140 100644 --- a/whisper/whisperv5/message_test.go +++ b/whisper/whisperv5/message_test.go @@ -21,8 +21,8 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go index 179c931795..1a91c17d05 100644 --- a/whisper/whisperv5/peer.go +++ b/whisper/whisperv5/peer.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/rlp" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go index bae2adb6f5..b0094c60e5 100644 --- a/whisper/whisperv5/peer_test.go +++ b/whisper/whisperv5/peer_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/nat" ) var keys []string = []string{ diff --git a/whisper/whisperv5/topic.go b/whisper/whisperv5/topic.go index c4ea67eefa..edeef0affb 100644 --- a/whisper/whisperv5/topic.go +++ b/whisper/whisperv5/topic.go @@ -19,8 +19,8 @@ package whisperv5 import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" ) // Topic represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go index 85849ccce4..65f9564454 100644 --- a/whisper/whisperv5/whisper.go +++ b/whisper/whisperv5/whisper.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/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 8af085292a..b42860cc92 100644 --- a/whisper/whisperv5/whisper_test.go +++ b/whisper/whisperv5/whisper_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" ) func TestWhisperBasic(t *testing.T) { diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go index 96e2b17e7c..33bb787aeb 100644 --- a/whisper/whisperv6/api.go +++ b/whisper/whisperv6/api.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/rpc" ) const ( diff --git a/whisper/whisperv6/benchmarks_test.go b/whisper/whisperv6/benchmarks_test.go index 0473179da5..b39e1a7e39 100644 --- a/whisper/whisperv6/benchmarks_test.go +++ b/whisper/whisperv6/benchmarks_test.go @@ -20,7 +20,7 @@ import ( "crypto/sha256" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go index c42d1fa8ac..21bc6bebab 100644 --- a/whisper/whisperv6/envelope.go +++ b/whisper/whisperv6/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/math" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/ecies" + "github.com/empyrean/go-ethereum/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 410b250a3f..fb17ef2d3b 100644 --- a/whisper/whisperv6/envelope_test.go +++ b/whisper/whisperv6/envelope_test.go @@ -22,7 +22,7 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto" ) func TestEnvelopeOpenAcceptsOnlyOneKeyTypeInFilter(t *testing.T) { diff --git a/whisper/whisperv6/filter.go b/whisper/whisperv6/filter.go index 2f170ddebe..760e7e8621 100644 --- a/whisper/whisperv6/filter.go +++ b/whisper/whisperv6/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" ) // Filter represents a Whisper message filter diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go index 0bb7986c39..c2ab9756eb 100644 --- a/whisper/whisperv6/filter_test.go +++ b/whisper/whisperv6/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" ) var seed int64 diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go index 1a428d6df7..634a574ea0 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/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv6/gen_message_json.go b/whisper/whisperv6/gen_message_json.go index 6218f5df6e..40f7d67490 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/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv6/gen_newmessage_json.go b/whisper/whisperv6/gen_newmessage_json.go index 75a1279ae3..891e8707e0 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/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv6/message.go b/whisper/whisperv6/message.go index b8318cbe8f..f6a9535c1d 100644 --- a/whisper/whisperv6/message.go +++ b/whisper/whisperv6/message.go @@ -28,10 +28,10 @@ import ( mrand "math/rand" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/log" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/crypto/ecies" + "github.com/empyrean/go-ethereum/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 0a5c1c8533..70902dcda2 100644 --- a/whisper/whisperv6/message_test.go +++ b/whisper/whisperv6/message_test.go @@ -23,9 +23,9 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go index 2bf1c905b2..576f631dba 100644 --- a/whisper/whisperv6/peer.go +++ b/whisper/whisperv6/peer.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/rlp" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv6/peer_test.go b/whisper/whisperv6/peer_test.go index ec985ae65b..18d9228287 100644 --- a/whisper/whisperv6/peer_test.go +++ b/whisper/whisperv6/peer_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/empyrean/go-ethereum/p2p/nat" ) var keys = []string{ diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go index 4dd8f283c3..f9f5575b7c 100644 --- a/whisper/whisperv6/topic.go +++ b/whisper/whisperv6/topic.go @@ -19,8 +19,8 @@ package whisperv6 import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go index 880cced098..9f5e02a486 100644 --- a/whisper/whisperv6/whisper.go +++ b/whisper/whisperv6/whisper.go @@ -26,12 +26,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/empyrean/go-ethereum/common" + "github.com/empyrean/go-ethereum/crypto" + "github.com/empyrean/go-ethereum/log" + "github.com/empyrean/go-ethereum/p2p" + "github.com/empyrean/go-ethereum/rlp" + "github.com/empyrean/go-ethereum/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 7fe256309e..9dd7d79843 100644 --- a/whisper/whisperv6/whisper_test.go +++ b/whisper/whisperv6/whisper_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/empyrean/go-ethereum/common" "golang.org/x/crypto/pbkdf2" )