From 976f61da068642ec42dd816ea0c8c8e59cc76cdb Mon Sep 17 00:00:00 2001 From: wjcloud Date: Tue, 10 Oct 2017 20:13:50 +0900 Subject: [PATCH] Update repository --- .github/CONTRIBUTING.md | 4 +- .travis.yml | 2 +- README.md | 22 ++++----- accounts/abi/abi.go | 2 +- accounts/abi/abi_test.go | 4 +- accounts/abi/bind/auth.go | 8 ++-- accounts/abi/bind/backend.go | 6 +-- accounts/abi/bind/backends/simulated.go | 22 ++++----- accounts/abi/bind/base.go | 10 ++-- accounts/abi/bind/bind.go | 4 +- accounts/abi/bind/bind_test.go | 2 +- accounts/abi/bind/template.go | 2 +- accounts/abi/bind/util.go | 6 +-- accounts/abi/bind/util_test.go | 12 ++--- accounts/abi/event.go | 4 +- accounts/abi/event_test.go | 4 +- accounts/abi/method.go | 2 +- accounts/abi/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/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/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 | 34 ++++++------- cmd/geth/accountcmd.go | 12 ++--- cmd/geth/accountcmd_test.go | 2 +- cmd/geth/bugcmd.go | 8 ++-- cmd/geth/chaincmd.go | 18 +++---- 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/module.go | 2 +- cmd/puppeth/module_dashboard.go | 8 ++-- cmd/puppeth/module_ethstats.go | 2 +- cmd/puppeth/module_faucet.go | 6 +-- cmd/puppeth/module_nginx.go | 2 +- cmd/puppeth/module_node.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_faucet.go | 4 +- cmd/puppeth/wizard_genesis.go | 8 ++-- cmd/puppeth/wizard_intro.go | 2 +- cmd/puppeth/wizard_netstats.go | 4 +- cmd/puppeth/wizard_network.go | 2 +- cmd/puppeth/wizard_nginx.go | 2 +- cmd/puppeth/wizard_node.go | 6 +-- cmd/rlpdump/main.go | 2 +- cmd/swarm/db.go | 6 +-- cmd/swarm/hash.go | 4 +- cmd/swarm/list.go | 4 +- cmd/swarm/main.go | 34 ++++++------- cmd/swarm/manifest.go | 6 +-- cmd/swarm/run_test.go | 12 ++--- cmd/swarm/upload.go | 4 +- cmd/utils/cmd.go | 12 ++--- cmd/utils/customflags.go | 2 +- cmd/utils/flags.go | 48 +++++++++---------- 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 | 26 +++++----- consensus/clique/snapshot.go | 8 ++-- consensus/clique/snapshot_test.go | 12 ++--- consensus/consensus.go | 10 ++-- consensus/ethash/algorithm.go | 10 ++-- consensus/ethash/algorithm_test.go | 6 +-- consensus/ethash/consensus.go | 14 +++--- consensus/ethash/consensus_test.go | 6 +-- consensus/ethash/ethash.go | 6 +-- consensus/ethash/ethash_test.go | 2 +- 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 | 10 ++-- 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 | 8 ++-- contracts/chequebook/gencode.go | 10 ++-- contracts/ens/contract/ens.go | 8 ++-- contracts/ens/ens.go | 10 ++-- contracts/ens/ens_test.go | 8 ++-- contracts/release/contract.go | 8 ++-- contracts/release/contract_test.go | 10 ++-- contracts/release/release.go | 20 ++++---- core/asm/asm.go | 2 +- core/asm/compiler.go | 4 +- core/bench_test.go | 16 +++---- core/block_validator.go | 10 ++-- core/block_validator_test.go | 10 ++-- core/blockchain.go | 28 +++++------ core/blockchain_test.go | 16 +++---- core/blocks.go | 2 +- core/bloombits/generator.go | 2 +- core/bloombits/generator_test.go | 2 +- core/bloombits/matcher.go | 4 +- core/bloombits/matcher_test.go | 2 +- core/chain_indexer.go | 10 ++-- core/chain_indexer_test.go | 4 +- core/chain_makers.go | 16 +++---- core/chain_makers_test.go | 12 ++--- core/dao_test.go | 8 ++-- core/database_util.go | 14 +++--- core/database_util_test.go | 10 ++-- core/events.go | 4 +- core/evm.go | 8 ++-- core/gen_genesis.go | 8 ++-- core/gen_genesis_account.go | 6 +-- core/genesis.go | 18 +++---- core/genesis_test.go | 10 ++-- core/headerchain.go | 12 ++--- core/helper_test.go | 6 +-- core/mkalloc.go | 4 +- core/state/database.go | 6 +-- core/state/dump.go | 6 +-- core/state/iterator.go | 6 +-- core/state/iterator_test.go | 2 +- core/state/journal.go | 2 +- core/state/managed_state.go | 2 +- core/state/managed_state_test.go | 4 +- core/state/state_object.go | 8 ++-- core/state/state_test.go | 6 +-- core/state/statedb.go | 12 ++--- core/state/statedb_test.go | 6 +-- core/state/sync.go | 6 +-- core/state/sync_test.go | 8 ++-- core/state_processor.go | 16 +++---- core/state_transition.go | 10 ++-- core/tx_journal.go | 8 ++-- core/tx_list.go | 6 +-- core/tx_list_test.go | 4 +- core/tx_pool.go | 14 +++--- core/tx_pool_test.go | 14 +++--- core/types.go | 6 +-- core/types/block.go | 8 ++-- core/types/block_test.go | 4 +- core/types/bloom9.go | 4 +- core/types/bloom9_test.go | 2 +- core/types/derive_sha.go | 6 +-- core/types/gen_header_json.go | 4 +- core/types/gen_log_json.go | 4 +- core/types/gen_receipt_json.go | 4 +- core/types/gen_tx_json.go | 4 +- core/types/log.go | 6 +-- core/types/log_test.go | 4 +- core/types/receipt.go | 6 +-- core/types/transaction.go | 8 ++-- core/types/transaction_signing.go | 6 +-- core/types/transaction_signing_test.go | 6 +-- core/types/transaction_test.go | 6 +-- core/vm/analysis.go | 2 +- core/vm/common.go | 4 +- core/vm/contract.go | 2 +- core/vm/contracts.go | 10 ++-- core/vm/contracts_test.go | 2 +- core/vm/evm.go | 6 +-- core/vm/gas.go | 2 +- core/vm/gas_table.go | 6 +-- core/vm/gen_structlog.go | 6 +-- core/vm/instructions.go | 10 ++-- core/vm/instructions_test.go | 4 +- core/vm/interface.go | 4 +- core/vm/interpreter.go | 8 ++-- core/vm/jump_table.go | 2 +- core/vm/logger.go | 8 ++-- core/vm/logger_test.go | 4 +- core/vm/memory_table.go | 2 +- core/vm/noop.go | 4 +- core/vm/runtime/env.go | 6 +-- core/vm/runtime/runtime.go | 12 ++--- core/vm/runtime/runtime_example_test.go | 4 +- core/vm/runtime/runtime_test.go | 10 ++-- core/vm/stack_table.go | 2 +- core/vm/vm_jit.go | 6 +-- crypto/crypto.go | 8 ++-- crypto/crypto_test.go | 2 +- crypto/ecies/ecies_test.go | 2 +- crypto/ecies/params.go | 2 +- crypto/secp256k1/curve.go | 2 +- crypto/secp256k1/secp256_test.go | 4 +- crypto/signature_cgo.go | 4 +- eth/api.go | 26 +++++----- eth/api_backend.go | 28 +++++------ eth/api_test.go | 6 +-- eth/backend.go | 46 +++++++++--------- eth/bind.go | 14 +++--- eth/bloombits.go | 14 +++--- eth/config.go | 12 ++--- eth/db_upgrade.go | 10 ++-- eth/downloader/api.go | 6 +-- eth/downloader/downloader.go | 14 +++--- eth/downloader/downloader_test.go | 18 +++---- eth/downloader/metrics.go | 2 +- eth/downloader/peer.go | 6 +-- eth/downloader/queue.go | 6 +-- eth/downloader/statesync.go | 12 ++--- eth/downloader/types.go | 2 +- eth/fetcher/fetcher.go | 8 ++-- eth/fetcher/fetcher_test.go | 12 ++--- eth/fetcher/metrics.go | 2 +- eth/filters/api.go | 12 ++--- eth/filters/api_test.go | 4 +- eth/filters/bench_test.go | 16 +++---- eth/filters/filter.go | 14 +++--- eth/filters/filter_system.go | 10 ++-- eth/filters/filter_system_test.go | 16 +++---- eth/filters/filter_test.go | 14 +++--- eth/gasprice/gasprice.go | 8 ++-- eth/gen_config.go | 10 ++-- 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 +-- 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/build/env.go | 2 +- internal/debug/api.go | 2 +- internal/debug/flags.go | 4 +- internal/debug/trace.go | 2 +- internal/ethapi/addrlock.go | 2 +- internal/ethapi/api.go | 34 ++++++------- internal/ethapi/backend.go | 22 ++++----- internal/ethapi/tracer.go | 6 +-- internal/ethapi/tracer_test.go | 6 +-- 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 | 40 ++++++++-------- les/fetcher.go | 14 +++--- les/flowcontrol/control.go | 2 +- les/flowcontrol/manager.go | 2 +- les/handler.go | 32 ++++++------- les/handler_test.go | 18 +++---- les/helper_test.go | 26 +++++----- les/metrics.go | 4 +- les/odr.go | 6 +-- les/odr_requests.go | 18 +++---- les/odr_test.go | 20 ++++---- les/peer.go | 12 ++--- les/protocol.go | 4 +- les/request_test.go | 10 ++-- les/retrieve.go | 2 +- les/server.go | 24 +++++----- les/serverpool.go | 14 +++--- les/sync.go | 6 +-- les/txrelay.go | 4 +- light/lightchain.go | 18 +++---- light/lightchain_test.go | 12 ++--- light/odr.go | 12 ++--- light/odr_test.go | 24 +++++----- light/odr_util.go | 12 ++--- light/trie.go | 10 ++-- light/trie_test.go | 14 +++--- light/txpool.go | 18 +++---- light/txpool_test.go | 14 +++--- log/format.go | 2 +- metrics/metrics.go | 2 +- miner/agent.go | 4 +- miner/miner.go | 22 ++++----- miner/remote_agent.go | 10 ++-- miner/unconfirmed.go | 6 +-- miner/unconfirmed_test.go | 4 +- miner/worker.go | 22 ++++----- mobile/accounts.go | 8 ++-- mobile/android_test.go | 4 +- mobile/big.go | 2 +- mobile/bind.go | 8 ++-- mobile/common.go | 2 +- mobile/discover.go | 2 +- mobile/ethclient.go | 4 +- mobile/ethereum.go | 4 +- mobile/geth.go | 22 ++++----- mobile/init.go | 2 +- mobile/interface.go | 2 +- mobile/logger.go | 2 +- mobile/p2p.go | 2 +- mobile/params.go | 6 +-- mobile/types.go | 6 +-- mobile/vm.go | 2 +- node/api.go | 10 ++-- node/config.go | 16 +++---- node/config_test.go | 4 +- node/defaults.go | 4 +- node/node.go | 14 +++--- node/node_example_test.go | 6 +-- node/node_test.go | 6 +-- node/service.go | 10 ++-- node/utils_test.go | 4 +- p2p/dial.go | 6 +-- p2p/dial_test.go | 4 +- p2p/discover/database.go | 6 +-- p2p/discover/node.go | 6 +-- p2p/discover/node_test.go | 4 +- p2p/discover/ntp.go | 2 +- p2p/discover/table.go | 6 +-- p2p/discover/table_test.go | 4 +- p2p/discover/udp.go | 10 ++-- p2p/discover/udp_test.go | 6 +-- p2p/discv5/database.go | 6 +-- p2p/discv5/net.go | 16 +++---- 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 | 6 +-- p2p/discv5/topic.go | 2 +- p2p/discv5/topic_test.go | 4 +- p2p/discv5/udp.go | 12 ++--- p2p/discv5/udp_test.go | 6 +-- p2p/message.go | 6 +-- p2p/metrics.go | 2 +- p2p/nat/nat.go | 2 +- p2p/peer.go | 10 ++-- p2p/protocol.go | 2 +- p2p/rlpx.go | 12 ++--- p2p/rlpx_test.go | 10 ++-- p2p/server.go | 16 +++---- p2p/server_test.go | 6 +-- p2p/simulations/adapters/docker.go | 4 +- p2p/simulations/adapters/exec.go | 10 ++-- p2p/simulations/adapters/inproc.go | 10 ++-- 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/network.go | 10 ++-- p2p/simulations/network_test.go | 4 +- p2p/simulations/simulation.go | 2 +- params/config.go | 2 +- params/dao.go | 2 +- rpc/client.go | 2 +- rpc/client_example_test.go | 2 +- rpc/client_test.go | 2 +- rpc/ipc.go | 2 +- rpc/json.go | 2 +- rpc/server.go | 2 +- rpc/types.go | 2 +- rpc/types_test.go | 2 +- rpc/websocket.go | 2 +- swarm/api/api.go | 6 +-- swarm/api/api_test.go | 6 +-- swarm/api/client/client.go | 2 +- swarm/api/client/client_test.go | 4 +- swarm/api/config.go | 12 ++--- swarm/api/config_test.go | 4 +- swarm/api/filesystem.go | 6 +-- swarm/api/filesystem_test.go | 4 +- swarm/api/http/error.go | 4 +- swarm/api/http/error_test.go | 2 +- swarm/api/http/roundtripper.go | 8 ++-- swarm/api/http/server.go | 8 ++-- swarm/api/http/server_test.go | 10 ++-- swarm/api/http/templates.go | 2 +- swarm/api/manifest.go | 6 +-- swarm/api/manifest_test.go | 2 +- swarm/api/testapi.go | 2 +- swarm/dev/Makefile | 8 ++-- swarm/dev/bashrc | 2 +- swarm/dev/run.sh | 2 +- swarm/fuse/fuse_file.go | 4 +- swarm/fuse/swarmfs.go | 2 +- swarm/fuse/swarmfs_test.go | 4 +- swarm/fuse/swarmfs_unix.go | 6 +-- swarm/fuse/swarmfs_util.go | 2 +- swarm/network/depo.go | 4 +- swarm/network/forwarding.go | 4 +- swarm/network/hive.go | 12 ++--- swarm/network/kademlia/address.go | 2 +- swarm/network/kademlia/address_test.go | 2 +- swarm/network/kademlia/kaddb.go | 2 +- swarm/network/kademlia/kademlia.go | 2 +- swarm/network/messages.go | 10 ++-- swarm/network/protocol.go | 12 ++--- swarm/network/syncdb.go | 4 +- swarm/network/syncdb_test.go | 6 +-- swarm/network/syncer.go | 4 +- swarm/services/swap/swap.go | 16 +++---- swarm/services/swap/swap/swap.go | 2 +- swarm/services/swap/swap/swap_test.go | 2 +- swarm/storage/chunker_test.go | 2 +- swarm/storage/common_test.go | 2 +- swarm/storage/database.go | 2 +- swarm/storage/dbstore.go | 4 +- swarm/storage/dbstore_test.go | 2 +- swarm/storage/dpa.go | 2 +- swarm/storage/memstore.go | 2 +- swarm/storage/netstore.go | 2 +- swarm/storage/types.go | 6 +-- swarm/swarm.go | 32 ++++++------- swarm/testutil/http.go | 6 +-- tests/block_test_util.go | 22 ++++----- tests/difficulty_test.go | 4 +- tests/difficulty_test_util.go | 10 ++-- tests/gen_btheader.go | 8 ++-- tests/gen_difficultytest.go | 4 +- tests/gen_stenv.go | 4 +- tests/gen_sttransaction.go | 4 +- tests/gen_tttransaction.go | 6 +-- tests/gen_vmexec.go | 6 +-- tests/init.go | 2 +- tests/init_test.go | 2 +- tests/rlp_test_util.go | 2 +- tests/state_test.go | 2 +- tests/state_test_util.go | 24 +++++----- tests/transaction_test.go | 2 +- tests/transaction_test_util.go | 12 ++--- tests/vm_test.go | 2 +- tests/vm_test_util.go | 18 +++---- trie/errors.go | 2 +- trie/hasher.go | 6 +-- trie/iterator.go | 2 +- trie/iterator_test.go | 4 +- trie/node.go | 4 +- trie/proof.go | 8 ++-- trie/proof_test.go | 4 +- trie/secure_trie.go | 4 +- trie/secure_trie_test.go | 6 +-- trie/sync.go | 2 +- trie/sync_test.go | 4 +- trie/trie.go | 6 +-- trie/trie_test.go | 4 +- vendor/vendor.json | 2 +- whisper/mailserver/mailserver.go | 12 ++--- whisper/mailserver/server_test.go | 6 +-- whisper/shhclient/client.go | 8 ++-- whisper/whisperv2/api.go | 6 +-- whisper/whisperv2/envelope.go | 10 ++-- whisper/whisperv2/envelope_test.go | 4 +- whisper/whisperv2/filter.go | 2 +- whisper/whisperv2/main.go | 12 ++--- whisper/whisperv2/message.go | 8 ++-- whisper/whisperv2/message_test.go | 2 +- whisper/whisperv2/peer.go | 8 ++-- whisper/whisperv2/peer_test.go | 4 +- whisper/whisperv2/topic.go | 2 +- whisper/whisperv2/whisper.go | 14 +++--- whisper/whisperv2/whisper_test.go | 4 +- whisper/whisperv5/api.go | 12 ++--- whisper/whisperv5/benchmarks_test.go | 2 +- whisper/whisperv5/envelope.go | 10 ++-- whisper/whisperv5/filter.go | 6 +-- whisper/whisperv5/filter_test.go | 4 +- whisper/whisperv5/gen_criteria_json.go | 2 +- whisper/whisperv5/gen_message_json.go | 2 +- whisper/whisperv5/gen_newmessage_json.go | 2 +- whisper/whisperv5/message.go | 8 ++-- whisper/whisperv5/message_test.go | 4 +- whisper/whisperv5/peer.go | 8 ++-- whisper/whisperv5/peer_test.go | 10 ++-- whisper/whisperv5/topic.go | 4 +- whisper/whisperv5/whisper.go | 10 ++-- whisper/whisperv5/whisper_test.go | 2 +- 531 files changed, 1928 insertions(+), 1928 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a332b815d0..a18e6bc0ba 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 [Bitchin' tricks](https://github.com/ethereum/go-ethereum/wiki/bitchin-tricks) wiki page for more info +in the right hands. Please check our [Bitchin' tricks](https://github.com/EthereumCommonwealth/go-callisto/wiki/bitchin-tricks) wiki page 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/EthereumCommonwealth/go-callisto/wiki/Developers'-Guide) for more details on configuring your environment, testing, and dependency management. diff --git a/.travis.yml b/.travis.yml index 8a7f65e3d6..f6ad9cd385 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/ethereum/go-ethereum +go_import_path: github.com/EthereumCommonwealth/go-callisto sudo: false matrix: include: diff --git a/README.md b/README.md index ab741fcc90..b72d2256df 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) -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/go-ethereum?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +)](https://godoc.org/github.com/EthereumCommonwealth/go-callisto) +[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/EthereumCommonwealth/go-callisto?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) Automated builds are available for stable releases and the unstable master branch. Binary archives are published at https://geth.ethereum.org/downloads/. @@ -13,7 +13,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/EthereumCommonwealth/go-callisto/wiki/Building-Ethereum) on the wiki. Building geth requires both a Go (version 1.7 or later) and a C compiler. @@ -32,8 +32,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/EthereumCommonwealth/go-callisto/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/EthereumCommonwealth/go-callisto/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 insolated, 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. | @@ -44,7 +44,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/EthereumCommonwealth/go-callisto/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: * Bump the memory allowance of the database to 512MB (`--cache=512`), which can help significantly in sync times especially for HDD users. This flag is optional and you can set it as high or as low as you'd like, though we'd recommend the 512MB - 2GB range. - * 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/EthereumCommonwealth/go-callisto/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/EthereumCommonwealth/go-callisto/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`. @@ -135,7 +135,7 @@ This will start geth in fast sync mode with a DB memory allowance of 512MB just 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/EthereumCommonwealth/go-callisto/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 @@ -275,7 +275,7 @@ anyone on the internet, and are grateful for even the smallest of fixes! If you'd like to contribute to go-ethereum, please fork, fix, commit and send a pull request for the maintainers to review and merge into the main code base. If you wish to submit more -complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/ethereum/go-ethereum) +complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/EthereumCommonwealth/go-callisto) to ensure those changes are in line with the general philosophy of the project and/or get some early feedback which can make both your efforts much lighter as well as our review and merge procedures quick and simple. @@ -288,7 +288,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/EthereumCommonwealth/go-callisto/wiki/Developers'-Guide) for more details on configuring your environment, managing project dependencies and testing procedures. ## License diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go index 2a06d474b8..0e557063ce 100644 --- a/accounts/abi/abi.go +++ b/accounts/abi/abi.go @@ -23,7 +23,7 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/EthereumCommonwealth/go-callisto/common" ) // The ABI holds information about a contract's context and available diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index a3aa9446ef..52fd94cfdb 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) // formatSilceOutput add padding to the value and adds a size diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index e6bb0c3b52..aae6c3cd0b 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/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/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 25b61928e1..b153e3a121 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/EthereumCommonwealth/go-callisto" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 0621e81c2b..642693290e 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,17 +24,17 @@ 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/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/EthereumCommonwealth/go-callisto" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) // 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 b40bd65e80..b99af73410 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -22,11 +22,11 @@ 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/EthereumCommonwealth/go-callisto" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) // 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 f587580884..44ac83813e 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/EthereumCommonwealth/go-callisto/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/EthereumCommonwealth/go-callisto/accounts/abi" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index 43ed53b922..b2f53e5ba7 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/EthereumCommonwealth/go-callisto/common" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index d07610e7c2..f6085307a7 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/EthereumCommonwealth/go-callisto/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index d129993ca1..3771974f6d 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/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 d24aa721e5..1ab39b3fed 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/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind/backends" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index 51ab842418..2c2d549b2d 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/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 b5054a0329..aaf7606e45 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) func TestEventId(t *testing.T) { diff --git a/accounts/abi/method.go b/accounts/abi/method.go index 62b3d29575..fdaeaba17c 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -21,7 +21,7 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) // Callable method given a `Name` and whether the method is a constant. diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go index 5d3efff52e..1623a47632 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" ) var ( diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index 4d8a3f0318..0f270ae6b6 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/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 c6cfb56ea0..e879e8d84f 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/EthereumCommonwealth/go-callisto/common" ) func TestPack(t *testing.T) { diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index 984a5bb4c1..4f32c132dc 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/EthereumCommonwealth/go-callisto/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 fc41c88ac7..86368d6291 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/EthereumCommonwealth/go-callisto/common" ) // toGoSliceType parses the input and casts it to the proper slice defined by the ABI diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index 8e3afee4e6..b22cb03eeb 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/EthereumCommonwealth/go-callisto/common" ) func TestSimpleMethodUnpack(t *testing.T) { diff --git a/accounts/accounts.go b/accounts/accounts.go index 76951e1a42..71e18e2b06 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/EthereumCommonwealth/go-callisto" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/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 dc6ac6ccb3..06170378ef 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -28,9 +28,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/log" ) // Minimum amount of time between cache reloads. This limit applies if the platform does diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index ab8aa9e6c3..9264036179 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -28,8 +28,8 @@ import ( "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" + "github.com/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" ) var ( diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index 211fa863d7..39cd04ad89 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" "github.com/pborman/uuid" ) diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 80ccd37419..971b86195f 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/event" ) var ( diff --git a/accounts/keystore/keystore_passphrase.go b/accounts/keystore/keystore_passphrase.go index 535608a600..b739009fa5 100644 --- a/accounts/keystore/keystore_passphrase.go +++ b/accounts/keystore/keystore_passphrase.go @@ -35,10 +35,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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/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..54ebb19b2a 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/EthereumCommonwealth/go-callisto/common" ) const ( diff --git a/accounts/keystore/keystore_plain.go b/accounts/keystore/keystore_plain.go index b490ca72b8..aa635391b8 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/EthereumCommonwealth/go-callisto/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/keystore_plain_test.go b/accounts/keystore/keystore_plain_test.go index a1c3bc4b6c..7af6b163e1 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/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 132b74439e..155ea4f569 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/keystore_wallet.go b/accounts/keystore/keystore_wallet.go index 758fdfe364..13f4b7c5c9 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/EthereumCommonwealth/go-callisto" + "github.com/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index ed900ad085..b204506553 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/crypto" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index f4d6477912..282ce505d9 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/EthereumCommonwealth/go-callisto/log" "github.com/rjeczalik/notify" ) diff --git a/accounts/manager.go b/accounts/manager.go index 78ddb13683..7ab12ed61f 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/event" + "github.com/EthereumCommonwealth/go-callisto/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..11e8e7892c 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" "github.com/karalabe/hid" ) diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index f5def61d23..141952bfb3 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index 159cb2ea97..a4d9e7fb94 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/accounts/usbwallet/internal/trezor" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/log" "github.com/golang/protobuf/proto" ) diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index 8b3b5a5224..6b27b1e531 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/EthereumCommonwealth/go-callisto" + "github.com/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/log" "github.com/karalabe/hid" ) diff --git a/bmt/bmt_test.go b/bmt/bmt_test.go index 57df83060a..25ee98861a 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/EthereumCommonwealth/go-callisto/crypto/sha3" ) const ( diff --git a/build/ci.go b/build/ci.go index 6fe03db713..7b95814609 100644 --- a/build/ci.go +++ b/build/ci.go @@ -57,7 +57,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/internal/build" + "github.com/EthereumCommonwealth/go-callisto/internal/build" ) var ( @@ -721,7 +721,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/EthereumCommonwealth/go-callisto/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven @@ -841,7 +841,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/EthereumCommonwealth/go-callisto/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 5c9ce6705c..2e6a86ae5b 100644 --- a/build/deb.control +++ b/build/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.9 Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: git://github.com/ethereum/go-ethereum.git -Vcs-Browser: https://github.com/ethereum/go-ethereum +Vcs-Git: git://github.com/EthereumCommonwealth/go-callisto.git +Vcs-Browser: https://github.com/EthereumCommonwealth/go-callisto Package: {{.Name}} Architecture: any diff --git a/build/mvn.pom b/build/mvn.pom index 7670246ba9..0e2ba8b4c7 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/EthereumCommonwealth/go-callisto 2015 @@ -48,10 +48,10 @@ GitHub Issues - https://github.com/ethereum/go-ethereum/issues/ + https://github.com/EthereumCommonwealth/go-callisto/issues/ - https://github.com/ethereum/go-ethereum + https://github.com/EthereumCommonwealth/go-callisto diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index 57ef5a37c6..870c4d4de3 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/EthereumCommonwealth/go-callisto/issues" +!define UPDATEURL "https://github.com/EthereumCommonwealth/go-callisto/releases" +!define ABOUTURL "https://github.com/EthereumCommonwealth/go-callisto#ethereum-go" !define /date NOW "%Y%m%d" PageEx license diff --git a/build/pod.podspec b/build/pod.podspec index 2c14c280c7..c2c8cb631f 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/EthereumCommonwealth/go-callisto' 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/EthereumCommonwealth/go-callisto.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..ad012dea10 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/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index e1734d89ac..f03860f1b2 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -23,13 +23,13 @@ import ( "fmt" "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/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/discv5" + "github.com/EthereumCommonwealth/go-callisto/p2p/nat" + "github.com/EthereumCommonwealth/go-callisto/p2p/netutil" ) func main() { diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index c019a2fe70..2f451f1abc 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/EthereumCommonwealth/go-callisto/cmd/evm/internal/compiler" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 4a442cf784..df3587fea2 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/EthereumCommonwealth/go-callisto/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..ff9ea51ef2 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/EthereumCommonwealth/go-callisto/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 eb7b0c4660..a185c58801 100644 --- a/cmd/evm/json_logger.go +++ b/cmd/evm/json_logger.go @@ -21,9 +21,9 @@ import ( "io" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core/vm" ) type JSONLogger struct { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 6c39cf8b88..2284114d74 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/EthereumCommonwealth/go-callisto/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 96de0c76ac..7e5cd7a2a1 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/EthereumCommonwealth/go-callisto/cmd/evm/internal/compiler" + "github.com/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/core/vm/runtime" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/params" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index 3a4cc51c03..2767409ca7 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/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/tests" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 8cd62441ed..d394c17b30 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -38,23 +38,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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/ethclient" + "github.com/EthereumCommonwealth/go-callisto/ethstats" + "github.com/EthereumCommonwealth/go-callisto/les" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/discv5" + "github.com/EthereumCommonwealth/go-callisto/p2p/nat" + "github.com/EthereumCommonwealth/go-callisto/params" "golang.org/x/net/websocket" ) diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index 0f53c92b0a..dfed9b6108 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/console" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go index 66e3e02a4e..94bb96d8fc 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/EthereumCommonwealth/go-callisto/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..535c0a7b74 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/EthereumCommonwealth/go-callisto/cmd/internal/browser" + "github.com/EthereumCommonwealth/go-callisto/params" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/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/EthereumCommonwealth/go-callisto/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 12bc1d7c66..e2fba777af 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -25,15 +25,15 @@ 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/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/console" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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 d3600f1416..23ce3b172c 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -28,12 +28,12 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/contracts/release" - "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/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/contracts/release" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/params" + whisper "github.com/EthereumCommonwealth/go-callisto/whisper/whisperv5" "github.com/naoina/toml" ) diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 2bb452d736..eec4199b77 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -21,10 +21,10 @@ import ( "os/signal" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/console" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/rpc" "gopkg.in/urfave/cli.v1" ) @@ -40,7 +40,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/Javascipt-Console.`, +See https://github.com/EthereumCommonwealth/go-callisto/wiki/Javascipt-Console.`, } attachCommand = cli.Command{ @@ -53,7 +53,7 @@ See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Console.`, Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Console. +See https://github.com/EthereumCommonwealth/go-callisto/wiki/Javascipt-Console. This command allows to open a console on a running geth node.`, } @@ -66,7 +66,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/Javascipt-Console`, +JavaScript API. See https://github.com/EthereumCommonwealth/go-callisto/wiki/Javascipt-Console`, } ) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 258b9e6dd9..3f19a49cfc 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/EthereumCommonwealth/go-callisto/params" ) const ( diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index a8dbc51630..c22d25a64d 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/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 8166c9ce80..b31a498eae 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/console" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/ethclient" + "github.com/EthereumCommonwealth/go-callisto/internal/debug" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/metrics" + "github.com/EthereumCommonwealth/go-callisto/node" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index 2e68dcda32..259cf624ac 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/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go index cd19caa276..8252073ae3 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/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/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..f570a58efb 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/EthereumCommonwealth/go-callisto/internal/cmdtest" ) func tmpdir(t *testing.T) string { diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 80861d8525..ef45459ebe 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -22,8 +22,8 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/internal/debug" + "github.com/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/internal/debug" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index 56b74d135b..168da2b7aa 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -29,12 +29,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/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/simulations" + "github.com/EthereumCommonwealth/go-callisto/p2p/simulations/adapters" + "github.com/EthereumCommonwealth/go-callisto/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index b6a029a01a..62f6f0a52c 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/EthereumCommonwealth/go-callisto/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 1cf6cab799..91b0c06779 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/log" ) // dashboardContent is the actual dashboard HTML content to serve up when users @@ -253,7 +253,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.*;
@@ -284,7 +284,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
@@ -322,7 +322,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/EthereumCommonwealth/go-callisto/cmd/puppeth


Copyright 2017. The go-ethereum Authors.

diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index 6ce662f65f..7452136ddf 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -24,7 +24,7 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/log" ) // ethstatsDockerfile is the Dockerfile required to build an ethstats backend diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go index acf1e4324e..645b12a1b3 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/log" ) // faucetDockerfile is the Dockerfile required to build an faucet container to @@ -39,8 +39,8 @@ ENV GOPATH /go RUN \ apk add --update git go make gcc musl-dev ca-certificates linux-headers && \ mkdir -p $GOPATH/src/github.com/ethereum && \ - (cd $GOPATH/src/github.com/ethereum && git clone --depth=1 https://github.com/ethereum/go-ethereum) && \ - go build -v github.com/ethereum/go-ethereum/cmd/faucet && \ + (cd $GOPATH/src/github.com/ethereum && git clone --depth=1 https://github.com/EthereumCommonwealth/go-callisto) && \ + go build -v github.com/EthereumCommonwealth/go-callisto/cmd/faucet && \ apk del git go make gcc musl-dev linux-headers && \ rm -rf $GOPATH && rm -rf /var/cache/apk/* diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index fd6d1d74ed..2c5f0aeddb 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -23,7 +23,7 @@ import ( "math/rand" "path/filepath" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/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 8f912f9ebd..350ffa1a8f 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/log" ) // nodeDockerfile is the Dockerfile required to run an Ethereum node. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index f783a7981a..fa53c863c9 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/EthereumCommonwealth/go-callisto/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index 26f8466850..23facdec0d 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -29,7 +29,7 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/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 3fdd639f80..fb83160cb1 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -30,9 +30,9 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index 53a28a5350..85f0c841b7 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/EthereumCommonwealth/go-callisto/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 504d8fd9cb..44cde3abea 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/log" ) // deployEthstats queries the user for various input on deploying an ethstats diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go index 51c4e2f7f4..196b9031eb 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -21,8 +21,8 @@ import ( "fmt" "net/http" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/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 222fc2a7ca..9759b2d9d0 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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 2d9a097ee7..9545e49023 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -25,7 +25,7 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index c069721982..73fd7af2ed 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -22,8 +22,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/log" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index ff2ff74f58..5a93980200 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/EthereumCommonwealth/go-callisto/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 86fba29f59..eea5ccecb2 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/EthereumCommonwealth/go-callisto/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 05232486b6..74fd437933 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/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/log" ) // deployNode creates a new node configuration based on some user input. diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index 7d328e59b3..9282bd3148 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/EthereumCommonwealth/go-callisto/rlp" ) var ( diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index dfd2d069b9..25264dadbd 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/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index 792e8d0d7a..e0067a9696 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/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 57b5517c6e..0994ea20ca 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/EthereumCommonwealth/go-callisto/cmd/utils" + swarm "github.com/EthereumCommonwealth/go-callisto/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 603fd9b941..aeefcc42d6 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -31,23 +31,23 @@ import ( "syscall" "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/contracts/ens" - "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/rpc" - "github.com/ethereum/go-ethereum/swarm" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" + "github.com/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/console" + "github.com/EthereumCommonwealth/go-callisto/contracts/ens" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethclient" + "github.com/EthereumCommonwealth/go-callisto/internal/debug" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rpc" + "github.com/EthereumCommonwealth/go-callisto/swarm" + bzzapi "github.com/EthereumCommonwealth/go-callisto/swarm/api" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index 7c4d6052c1..cb9e501e22 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/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/swarm/api" + swarm "github.com/EthereumCommonwealth/go-callisto/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index aaaf9e1e53..c7058c7473 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -27,12 +27,12 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "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/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/internal/cmdtest" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rpc" + "github.com/EthereumCommonwealth/go-callisto/swarm" ) func init() { diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 9f4c525bb9..822b98f935 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/EthereumCommonwealth/go-callisto/cmd/utils" + swarm "github.com/EthereumCommonwealth/go-callisto/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 23b10c2d74..2950bfbab4 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -26,12 +26,12 @@ import ( "runtime" "strings" - "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/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/internal/debug" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index e5bf8724c1..82e100767d 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/EthereumCommonwealth/go-callisto/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index a62b4940ba..c2178baf80 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,30 +28,30 @@ 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/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/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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/eth/gasprice" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/ethstats" + "github.com/EthereumCommonwealth/go-callisto/les" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/metrics" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/discv5" + "github.com/EthereumCommonwealth/go-callisto/p2p/nat" + "github.com/EthereumCommonwealth/go-callisto/p2p/netutil" + "github.com/EthereumCommonwealth/go-callisto/params" + whisper "github.com/EthereumCommonwealth/go-callisto/whisper/whisperv5" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 05e6b29086..aa027c05fa 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -34,16 +34,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/whisperv5" + "github.com/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/console" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/nat" + "github.com/EthereumCommonwealth/go-callisto/whisper/mailserver" + whisper "github.com/EthereumCommonwealth/go-callisto/whisper/whisperv5" "golang.org/x/crypto/pbkdf2" ) diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index 9bd1de103a..ac59880b31 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/EthereumCommonwealth/go-callisto/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..b749a7a82c 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/EthereumCommonwealth/go-callisto/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..a34d2a7e4f 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/EthereumCommonwealth/go-callisto/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index be9810dc8c..780ef4df7e 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/EthereumCommonwealth/go-callisto/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/number/int.go b/common/number/int.go index 6dab2436de..df63968c5e 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/EthereumCommonwealth/go-callisto/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..7fde1a5a18 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/EthereumCommonwealth/go-callisto/common" ) func TestSet(t *testing.T) { diff --git a/common/types.go b/common/types.go index d31bbf741b..bf31bb995f 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/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" ) const ( diff --git a/compression/rle/read_write.go b/compression/rle/read_write.go index 0e7ad90aec..1f48a27407 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/EthereumCommonwealth/go-callisto/crypto" ) const ( diff --git a/consensus/clique/api.go b/consensus/clique/api.go index b875eef012..5bb2bafbf2 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/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 d2fb6934b9..52222dc904 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -25,19 +25,19 @@ 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/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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/rpc" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 9ebdb8df15..89fd4ae3d6 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index f18934b890..794293794f 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) type testerVote struct { diff --git a/consensus/consensus.go b/consensus/consensus.go index 865238cee0..45435ff734 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) // ChainReader defines a small collection of methods needed to access the local diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index a737bc636b..f1880d71d6 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -26,11 +26,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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/bitutil" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/log" ) const ( diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index 7e4307a74a..6205ebfff6 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) // Tests that verification caches can be correctly generated. diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index e059636375..df93e75bec 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/consensus/misc" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/params" set "gopkg.in/fatih/set.v0" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index a58d220efa..f2a723a91e 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/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index dd61470728..c028e3763a 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -32,9 +32,9 @@ 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/rpc" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/rpc" metrics "github.com/rcrowley/go-metrics" ) diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index b3a2f32f70..0e6d961643 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) // Tests that ethash works correctly in test mode. diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index 784e8f6491..2f1b9f9672 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/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..7d343b1f06 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/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 4a5e7c37e0..b41e35fb1b 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index b28cc438e2..c5d85b24cd 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/EthereumCommonwealth/go-callisto/accounts/usbwallet" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/rpc" "github.com/robertkrimen/otto" ) diff --git a/console/console.go b/console/console.go index 3cd2ad34b7..a24ee9b6ad 100644 --- a/console/console.go +++ b/console/console.go @@ -27,9 +27,9 @@ import ( "sort" "strings" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/internal/web3ext" - "github.com/ethereum/go-ethereum/rpc" + "github.com/EthereumCommonwealth/go-callisto/internal/jsre" + "github.com/EthereumCommonwealth/go-callisto/internal/web3ext" + "github.com/EthereumCommonwealth/go-callisto/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 8ac499bd12..73e51d6ae4 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/internal/jsre" + "github.com/EthereumCommonwealth/go-callisto/node" ) const ( diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index d239129d53..552e4206cc 100644 --- a/containers/docker/develop-alpine/Dockerfile +++ b/containers/docker/develop-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.5 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/EthereumCommonwealth/go-callisto && \ (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 c79becb55a..8670276e9e 100644 --- a/containers/docker/develop-ubuntu/Dockerfile +++ b/containers/docker/develop-ubuntu/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:xenial RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang git make gcc libc-dev ca-certificates && \ - git clone --depth 1 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 https://github.com/EthereumCommonwealth/go-callisto && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang 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 44402361d7..e9387ecfb3 100644 --- a/containers/docker/master-alpine/Dockerfile +++ b/containers/docker/master-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.5 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 --branch release/1.7 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 --branch release/1.7 https://github.com/EthereumCommonwealth/go-callisto && \ (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 cc4fad10c4..2f236a59f6 100644 --- a/containers/docker/master-ubuntu/Dockerfile +++ b/containers/docker/master-ubuntu/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:xenial RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang git make gcc libc-dev ca-certificates && \ - git clone --depth 1 --branch release/1.7 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 --branch release/1.7 https://github.com/EthereumCommonwealth/go-callisto && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang git make gcc libc-dev && apt autoremove -y && apt-get clean && \ diff --git a/containers/vagrant/Vagrantfile b/containers/vagrant/Vagrantfile index 72ec366e21..566e216a59 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/EthereumCommonwealth/go-callisto" end diff --git a/containers/vagrant/provisioners/shell/centos.sh b/containers/vagrant/provisioners/shell/centos.sh index 744da4bfd4..611de4be8a 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/EthereumCommonwealth/go-callisto/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..aa9ab32395 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/EthereumCommonwealth/go-callisto/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..aa9ab32395 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/EthereumCommonwealth/go-callisto/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..428a3bc170 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/EthereumCommonwealth/go-callisto/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index 09daa92484..0415796837 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/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/contracts/chequebook/contract" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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 b7555d0815..4105f2261f 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/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind/backends" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/contracts/chequebook/contract" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index 47090152cc..eeda1684d6 100644 --- a/contracts/chequebook/contract/chequebook.go +++ b/contracts/chequebook/contract/chequebook.go @@ -7,10 +7,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/EthereumCommonwealth/go-callisto/accounts/abi" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) // ChequebookABI is the input ABI used to generate the binding from. diff --git a/contracts/chequebook/gencode.go b/contracts/chequebook/gencode.go index faa927279d..f5ceed4e08 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/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind/backends" + "github.com/EthereumCommonwealth/go-callisto/contracts/chequebook/contract" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) var ( diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index aca16de508..e0a24016cb 100644 --- a/contracts/ens/contract/ens.go +++ b/contracts/ens/contract/ens.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/EthereumCommonwealth/go-callisto/accounts/abi" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) // ENSABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/ens.go b/contracts/ens/ens.go index c292a1714a..e091b869a8 100644 --- a/contracts/ens/ens.go +++ b/contracts/ens/ens.go @@ -22,11 +22,11 @@ import ( "math/big" "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/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/contracts/ens/contract" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) var ( diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index 5faa9b1ad4..b854d98227 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -20,10 +20,10 @@ 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/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind/backends" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) var ( diff --git a/contracts/release/contract.go b/contracts/release/contract.go index 6a0b099311..d5ebd56c52 100644 --- a/contracts/release/contract.go +++ b/contracts/release/contract.go @@ -7,10 +7,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/EthereumCommonwealth/go-callisto/accounts/abi" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) // ReleaseOracleABI is the input ABI used to generate the binding from. diff --git a/contracts/release/contract_test.go b/contracts/release/contract_test.go index 0b2b2f0487..d7cfe24c8c 100644 --- a/contracts/release/contract_test.go +++ b/contracts/release/contract_test.go @@ -21,11 +21,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/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind/backends" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) // setupReleaseTest creates a blockchain simulator and deploys a version oracle diff --git a/contracts/release/release.go b/contracts/release/release.go index 28a35381d4..3571864987 100644 --- a/contracts/release/release.go +++ b/contracts/release/release.go @@ -25,15 +25,15 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/internal/ethapi" - "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/rpc" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/internal/ethapi" + "github.com/EthereumCommonwealth/go-callisto/les" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) // Interval to check for new releases @@ -149,7 +149,7 @@ func (r *ReleaseService) checkVersion() { warning := fmt.Sprintf("Client v%d.%d.%d-%x seems older than the latest upstream release v%d.%d.%d-%x", r.config.Major, r.config.Minor, r.config.Patch, r.config.Commit[:4], version.Major, version.Minor, version.Patch, version.Commit[:4]) - howtofix := fmt.Sprintf("Please check https://github.com/ethereum/go-ethereum/releases for new releases") + howtofix := fmt.Sprintf("Please check https://github.com/EthereumCommonwealth/go-callisto/releases for new releases") separator := strings.Repeat("-", len(warning)) log.Warn(separator) diff --git a/core/asm/asm.go b/core/asm/asm.go index 5fe827e7c1..c051643fbb 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/EthereumCommonwealth/go-callisto/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index b2c85375cc..5eb77eb518 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/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index ab25c27d39..fc4499d604 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index e9cfd04827..ad4f06e5e1 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/math" - "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/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/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 6d54c2b932..d47d6bc949 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/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index 57a881f384..383d6d8b91 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -27,20 +27,20 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/mclock" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/metrics" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/trie" "github.com/hashicorp/golang-lru" ) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index cb1df8d4b0..4ee8d41356 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) // newTestBlockChain creates a blockchain without validation. diff --git a/core/blocks.go b/core/blocks.go index f20ba4aaf2..7b267b6610 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/EthereumCommonwealth/go-callisto/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..90fc9b72c6 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/EthereumCommonwealth/go-callisto/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..9dbb2e6226 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/EthereumCommonwealth/go-callisto/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 e33de018a5..96e2508a49 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -25,8 +25,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/EthereumCommonwealth/go-callisto/common/bitutil" + "github.com/EthereumCommonwealth/go-callisto/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 f95d0ea9e0..9c872f39e4 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/EthereumCommonwealth/go-callisto/common" ) const testSectionSize = 4096 diff --git a/core/chain_indexer.go b/core/chain_indexer.go index f4c207dcca..529c1d2b48 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/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 b761e8a5b2..490791eb7f 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index dd3e2fb192..988861d67a 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/ethash" - "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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/consensus/misc" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) // So we can deterministically seed different blockchains diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 2260c62fbd..f9f30ba90a 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/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index b9898ff7c8..2d714f3d69 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/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/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 1730a048e7..ee6c757d78 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -24,13 +24,13 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/metrics" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/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 36f43cf50a..7f45107987 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // Tests block header storage and retrieval operations. diff --git a/core/events.go b/core/events.go index 6f404f612b..f8b80479d7 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) // TxPreEvent is posted when a transaction enters the transaction pool. diff --git a/core/evm.go b/core/evm.go index 4912aa6505..ef94c57f31 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index 4d75704a6d..82957c2e51 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/params" ) func (g Genesis) MarshalJSON() ([]byte, error) { diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index 15c9565a23..292fea60a0 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index fd6ed61159..7fec6042e9 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -25,15 +25,15 @@ 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/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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) //go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go diff --git a/core/genesis_test.go b/core/genesis_test.go index 482f861904..8606a19718 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index 0e5215293d..32d547ebfb 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/params" "github.com/hashicorp/golang-lru" ) diff --git a/core/helper_test.go b/core/helper_test.go index 698a2924cb..0afb6344b6 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/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index 565e8c5826..3ffea06025 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/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/state/database.go b/core/state/database.go index 946625e76e..6f108f239c 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/dump.go b/core/state/dump.go index 46e612850a..cc5dbba01a 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/trie" ) type DumpAccount struct { diff --git a/core/state/iterator.go b/core/state/iterator.go index 6a5c73d3d1..9a966df054 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/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 ff66ba7a94..64ac622b99 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/EthereumCommonwealth/go-callisto/common" ) // 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 ddc819fe5f..a00e594d70 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/EthereumCommonwealth/go-callisto/common" ) type journalEntry interface { diff --git a/core/state/managed_state.go b/core/state/managed_state.go index 1390ef4a00..18986fce9d 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/EthereumCommonwealth/go-callisto/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index 1cfdd3a890..05ba05e515 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index b2378c69c8..8c457d6750 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,10 +22,10 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/trie" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index bbae3685bb..ecd7960bcb 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index 002fa62496..8b3ed38571 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/trie" ) type revision struct { diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index b2bd18e65e..76c9eff2ea 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" ) // Tests that updating a state trie does not leak any database writes prior to diff --git a/core/state/sync.go b/core/state/sync.go index 28fcf6ae05..de475ce493 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 06c572ea62..3b1679e0dc 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/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 689c83785f..817dde83d8 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -19,14 +19,14 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/consensus/misc" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index e7a0685893..62e78b09a7 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -20,11 +20,11 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/params" ) var ( diff --git a/core/tx_journal.go b/core/tx_journal.go index 94a9ff9b8c..cbe21fe032 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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 2935929d72..725bbab9a2 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/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 b4f0b5228b..cebe7f06b4 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/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 0ad7651795..d96120a403 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/metrics" + "github.com/EthereumCommonwealth/go-callisto/params" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 17d7368774..e10f11987f 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index 1cfbbab29b..cd88853c06 100644 --- a/core/types.go +++ b/core/types.go @@ -19,9 +19,9 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/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 1d00d9f930..a293205caa 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -26,10 +26,10 @@ import ( "sync/atomic" "time" - "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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) var ( diff --git a/core/types/block_test.go b/core/types/block_test.go index 93435ca00c..f297037ad3 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index a76b6f33c5..e0ddbdabba 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/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index a28ac0e7af..21b769967d 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/EthereumCommonwealth/go-callisto/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index 00c42c5bc6..53d60d0736 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index bcff7a940d..a0b631e48e 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" ) func (h Header) MarshalJSON() ([]byte, error) { diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 92c699c2a7..02f5db12cb 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" ) func (l Log) MarshalJSON() ([]byte, error) { diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index b95d99c951..b9ed034ada 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" ) func (r Receipt) MarshalJSON() ([]byte, error) { diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index 4fb658e0d9..a6a9a216b9 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" ) func (t txdata) MarshalJSON() ([]byte, error) { diff --git a/core/types/log.go b/core/types/log.go index be5de38da7..9a017d3bbb 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/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..04b223d98c 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index bc3c996b4f..d761c74ed1 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/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 a46521236c..8cd3242b5d 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/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..6a71f356f1 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 7f799fb101..955e24707f 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index 30ecb84ddb..f9d6a60430 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis.go b/core/vm/analysis.go index d5f048d1d0..9cffbb2686 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/EthereumCommonwealth/go-callisto/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..fb59a88ed6 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" ) // calculates the memory size required for a step diff --git a/core/vm/contract.go b/core/vm/contract.go index 66748e8215..bee98fb377 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/EthereumCommonwealth/go-callisto/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 7344b6043c..b048072ba0 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/bn256" + "github.com/EthereumCommonwealth/go-callisto/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 513651835a..ad6dc92d0b 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -5,7 +5,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/EthereumCommonwealth/go-callisto/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index 093c7d4c14..d642363174 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -20,9 +20,9 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/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..9c4cc094de 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/EthereumCommonwealth/go-callisto/params" ) const ( diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 0d8e295a52..19bd0f4ffd 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -19,9 +19,9 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/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 88df942dcf..3c6c3ce9ae 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" ) func (s StructLog) MarshalJSON() ([]byte, error) { diff --git a/core/vm/instructions.go b/core/vm/instructions.go index b6d6e22c4c..e4add25429 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/params" ) var ( diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 18644989c1..6f4fe77e53 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -4,8 +4,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/params" ) func TestByteOp(t *testing.T) { diff --git a/core/vm/interface.go b/core/vm/interface.go index c0c52732bb..59c4f7807d 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 94b922c797..8dbc69ff4b 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -20,10 +20,10 @@ import ( "fmt" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 9ef192fdf9..cbb8a188d5 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/EthereumCommonwealth/go-callisto/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index 623c0d5632..a8266e4ca8 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) type Storage map[common.Hash]common.Hash diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index b6fa31132a..0a85d93f35 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/params" ) type dummyContractRef struct { diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index bec0235bcc..203d1236f8 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/EthereumCommonwealth/go-callisto/common/math" ) func memorySha3(stack *Stack) *big.Int { diff --git a/core/vm/noop.go b/core/vm/noop.go index 2a04a95654..69936f8eb2 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/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 818da1be26..647ae7bcbf 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -19,9 +19,9 @@ package runtime import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index edbf541766..cda7a446ec 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/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..7d2f5cbd98 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 2c4dc50265..acaaefa763 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/EthereumCommonwealth/go-callisto/accounts/abi" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/ethdb" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index a4b1cfcd89..24d4205384 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/EthereumCommonwealth/go-callisto/params" ) func makeStackFunc(pop, push int) stackValidationFunc { diff --git a/core/vm/vm_jit.go b/core/vm/vm_jit.go index eb3acfb10d..203c12b1fc 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/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/params" ) type JitVm struct { diff --git a/crypto/crypto.go b/crypto/crypto.go index 8161769d3d..5c3f4a0dc7 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) var ( diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 92302948ed..382bc8fbe3 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/EthereumCommonwealth/go-callisto/common" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index 9cd5c79f7e..17dde04711 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/EthereumCommonwealth/go-callisto/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 6312daf5a1..3ee6428fd3 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/EthereumCommonwealth/go-callisto/crypto" ) var ( diff --git a/crypto/secp256k1/curve.go b/crypto/secp256k1/curve.go index ec6d266cec..dbc3a1c138 100644 --- a/crypto/secp256k1/curve.go +++ b/crypto/secp256k1/curve.go @@ -37,7 +37,7 @@ import ( "sync" "unsafe" - "github.com/ethereum/go-ethereum/common/math" + "github.com/EthereumCommonwealth/go-callisto/common/math" ) /* diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go index f6582ecd54..d109a6517a 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/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/crypto/randentropy" ) const TestCount = 1000 diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index feec5e7be1..58d7ae45d0 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/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/crypto/secp256k1" ) func Ecrecover(hash, sig []byte) ([]byte, error) { diff --git a/eth/api.go b/eth/api.go index e91f51bb99..65a740d900 100644 --- a/eth/api.go +++ b/eth/api.go @@ -28,19 +28,19 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/internal/ethapi" - "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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/internal/ethapi" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/miner" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/rpc" + "github.com/EthereumCommonwealth/go-callisto/trie" ) const defaultTraceTimeout = 5 * time.Second diff --git a/eth/api_backend.go b/eth/api_backend.go index 91f392f94f..928da3ea58 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/bloombits" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/eth/gasprice" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) // EthApiBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index 49ce386886..212c05939d 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/backend.go b/eth/backend.go index 6a06bd829b..cbbf286ceb 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -25,29 +25,29 @@ import ( "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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/consensus/clique" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/bloombits" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/eth/filters" + "github.com/EthereumCommonwealth/go-callisto/eth/gasprice" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/internal/ethapi" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/miner" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) type LesServer interface { diff --git a/eth/bind.go b/eth/bind.go index d09977dbc2..53a0f18f3b 100644 --- a/eth/bind.go +++ b/eth/bind.go @@ -20,13 +20,13 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/EthereumCommonwealth/go-callisto" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/internal/ethapi" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) // ContractBackend implements bind.ContractBackend with direct calls to Ethereum diff --git a/eth/bloombits.go b/eth/bloombits.go index 32f6c7b318..d51230f478 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/bitutil" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/bloombits" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) const ( diff --git a/eth/config.go b/eth/config.go index 7bcfd403ea..61bfe00fdc 100644 --- a/eth/config.go +++ b/eth/config.go @@ -23,12 +23,12 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/eth/gasprice" + "github.com/EthereumCommonwealth/go-callisto/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..2f63df71cf 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) var deduplicateData = []byte("dbUpgrade_20170714deduplicateData") diff --git a/eth/downloader/api.go b/eth/downloader/api.go index d496fa6a4d..c394089f61 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/EthereumCommonwealth/go-callisto" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/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 5782d4cf53..6d5b4df88f 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -27,13 +27,13 @@ import ( "sync/atomic" "time" - ethereum "github.com/ethereum/go-ethereum" - "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/ethereum/go-ethereum/params" + ethereum "github.com/EthereumCommonwealth/go-callisto" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/params" "github.com/rcrowley/go-metrics" ) diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index 58f6e9a624..410ae50091 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/core" - "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/ethereum/go-ethereum/trie" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/trie" ) var ( diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index 58764ccf06..8bb6d1718a 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/EthereumCommonwealth/go-callisto/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index e638744ea5..c3f2b40a58 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 6926f1d8c8..9639394270 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -25,9 +25,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/log" "github.com/rcrowley/go-metrics" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index a0b05c9be6..407d62128a 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -23,12 +23,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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..b4edb4b9fa 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/EthereumCommonwealth/go-callisto/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 98cc1a76b6..94dffec511 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/log" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 85d2f8645e..e6e662772c 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index 1ed8075bf3..5c55a26925 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/EthereumCommonwealth/go-callisto/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 03c1d6afc8..5e6c6bde7d 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 4ae37f9779..38fbb30725 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index abbf4593e9..a7af501a93 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/bitutil" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/bloombits" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 026cbf95ca..653b88a290 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -21,13 +21,13 @@ import ( "math/big" "time" - "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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/bloombits" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index e08cedb274..4b8603c6de 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/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 bc3511f23a..302fa8736f 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -25,14 +25,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/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" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/bloombits" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 11235e95a7..ed39f187b0 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,13 +23,13 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index c662348e16..9c1c3558b9 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -22,10 +22,10 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/internal/ethapi" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) var maxPrice = big.NewInt(500 * params.Shannon) diff --git a/eth/gen_config.go b/eth/gen_config.go index 4a4cd7b9c5..04f249c831 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -5,11 +5,11 @@ package eth import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/eth/gasprice" ) func (c Config) MarshalTOML() (interface{}, error) { diff --git a/eth/handler.go b/eth/handler.go index cee719ddb6..9bad0383c0 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/consensus/misc" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/eth/fetcher" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index 6752cd2a84..ae2b2face6 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/params" ) var bigTxGas = new(big.Int).SetUint64(params.TxGas) diff --git a/eth/helper_test.go b/eth/helper_test.go index b665531352..3622ca3951 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 5fa2597d4d..d9f13a3baf 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/EthereumCommonwealth/go-callisto/metrics" + "github.com/EthereumCommonwealth/go-callisto/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index 42ead53965..ed8c4f6d5e 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/eth/protocol.go b/eth/protocol.go index 2c41376fa8..024d6f407f 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index d3a44ae91f..344f073f8c 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) func init() { diff --git a/eth/sync.go b/eth/sync.go index a8ae646170..d5a20d8a70 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index 9eaa1156fb..a27d9b5c93 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/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" ) // Tests that fast sync gets disabled as soon as a real block is successfully diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index 7f73ab113c..6c605869bf 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/EthereumCommonwealth/go-callisto" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 178eb2be98..0cd1f8fdfd 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/EthereumCommonwealth/go-callisto" // Verify that Client implements the ethereum interfaces. var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index 74a93f1e2f..7ff773f97b 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/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 93755dd7e3..c6b087ddce 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/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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..bcf4f1e021 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/EthereumCommonwealth/go-callisto/ethdb" ) func newTestLDB() (*ethdb.LDBDatabase, func()) { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index 699bd0c9fd..245553a4e6 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/EthereumCommonwealth/go-callisto/common" ) /* diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index bb03dc72b0..c173a79968 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/mclock" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/les" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 9b5ad50df5..380a730012 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/EthereumCommonwealth/go-callisto/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 825a8deeac..599eca49d2 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/EthereumCommonwealth/go-callisto/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..476af709ed 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/EthereumCommonwealth/go-callisto/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index d03f465075..402bff4c42 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/EthereumCommonwealth/go-callisto/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 67f236ef75..675834049c 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) // NotFound is returned by API methods if the requested item does not exist. diff --git a/internal/build/env.go b/internal/build/env.go index c47681ebed..f9560609dd 100644 --- a/internal/build/env.go +++ b/internal/build/env.go @@ -81,7 +81,7 @@ func Env() Environment { // LocalEnv returns build environment metadata gathered from git. func LocalEnv() Environment { - env := applyEnvFlags(Environment{Name: "local", Repo: "ethereum/go-ethereum"}) + env := applyEnvFlags(Environment{Name: "local", Repo: "EthereumCommonwealth/go-callisto"}) if _, err := os.Stat(".git"); err != nil { return env } diff --git a/internal/debug/api.go b/internal/debug/api.go index 3547b05641..2c65a2a167 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/EthereumCommonwealth/go-callisto/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 6247cc7dc0..5be4f6a830 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,8 +24,8 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/log/term" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/log/term" colorable "github.com/mattn/go-colorable" "gopkg.in/urfave/cli.v1" ) diff --git a/internal/debug/trace.go b/internal/debug/trace.go index cab5deaafd..fc4181e86d 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/EthereumCommonwealth/go-callisto/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 5a9c948b83..6f591f74a3 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/EthereumCommonwealth/go-callisto/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 1ffb5a1803..9b19943551 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -24,21 +24,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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/rpc" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) @@ -390,7 +390,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/EthereumCommonwealth/go-callisto/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} @@ -417,7 +417,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/EthereumCommonwealth/go-callisto/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 368fa48726..c7d03c3416 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) // Backend interface provides the common API services (that are provided by diff --git a/internal/ethapi/tracer.go b/internal/ethapi/tracer.go index 0516265270..9ed11be540 100644 --- a/internal/ethapi/tracer.go +++ b/internal/ethapi/tracer.go @@ -23,9 +23,9 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/core/vm" "github.com/robertkrimen/otto" ) diff --git a/internal/ethapi/tracer_test.go b/internal/ethapi/tracer_test.go index 5093dafd6e..8ccd0c4e90 100644 --- a/internal/ethapi/tracer_test.go +++ b/internal/ethapi/tracer_test.go @@ -23,9 +23,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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/params" ) type account struct{} diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index 9c7ad16d18..2091a13820 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/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/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..38e426baff 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/EthereumCommonwealth/go-callisto/blob/swarm/internal/web3ext/web3ext.go#L33 */ "use strict"; diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index f05865eca6..8916161492 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/internal/jsre/deps" "github.com/robertkrimen/otto" ) diff --git a/les/api_backend.go b/les/api_backend.go index 0d2d31b673..f809d8916f 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/bloombits" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/eth/gasprice" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/light" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index 4c33417c03..4169f62849 100644 --- a/les/backend.go +++ b/les/backend.go @@ -22,26 +22,26 @@ 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/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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/eth/filters" + "github.com/EthereumCommonwealth/go-callisto/eth/gasprice" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/internal/ethapi" + "github.com/EthereumCommonwealth/go-callisto/light" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discv5" + "github.com/EthereumCommonwealth/go-callisto/params" + rpc "github.com/EthereumCommonwealth/go-callisto/rpc" ) type LightEthereum struct { diff --git a/les/fetcher.go b/les/fetcher.go index 4fc142f0f4..4f4df4b2b8 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/mclock" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/light" + "github.com/EthereumCommonwealth/go-callisto/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index d50eb809cc..50b0222c35 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/EthereumCommonwealth/go-callisto/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index 28cc6f0fe7..13d7409655 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/EthereumCommonwealth/go-callisto/common/mclock" ) const rcConst = 1000000 diff --git a/les/handler.go b/les/handler.go index df7eb6af51..8dea97202d 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" - "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/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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/discv5" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index b1f1aa0951..4510e8966a 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -20,15 +20,15 @@ import ( "math/rand" "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/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/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 b33454e1d0..27fc576be6 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -25,19 +25,19 @@ 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/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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/les/flowcontrol" + "github.com/EthereumCommonwealth/go-callisto/light" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index 0162a1d1ad..88ca8dfb41 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/EthereumCommonwealth/go-callisto/metrics" + "github.com/EthereumCommonwealth/go-callisto/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index 3f7584b48e..85960f6162 100644 --- a/les/odr.go +++ b/les/odr.go @@ -19,9 +19,9 @@ package les import ( "context" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/light" + "github.com/EthereumCommonwealth/go-callisto/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index 1f853b3417..7b2163e8b7 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/light" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index f56c4036d4..5e96f92aee 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,16 +23,16 @@ 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/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/light" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/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 3ba2df3fe8..6a48fa0254 100644 --- a/les/peer.go +++ b/les/peer.go @@ -24,12 +24,12 @@ 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/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/les/flowcontrol" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index 33d930ee0c..faca22c129 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -22,8 +22,8 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index 6b594462dc..b2f69eca1d 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,11 +21,11 @@ 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/ethdb" - "github.com/ethereum/go-ethereum/light" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index b060e0b0d8..8d67ae241a 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/EthereumCommonwealth/go-callisto/common/mclock" ) var ( diff --git a/les/server.go b/les/server.go index 8b27307141..26f8749e92 100644 --- a/les/server.go +++ b/les/server.go @@ -23,18 +23,18 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "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/ethereum/go-ethereum/trie" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/les/flowcontrol" + "github.com/EthereumCommonwealth/go-callisto/light" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discv5" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/trie" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index f4e4df2fbf..4657bfae85 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/EthereumCommonwealth/go-callisto/common/mclock" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/discv5" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index c0e17f97d9..19875f7a06 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/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/light" ) const ( diff --git a/les/txrelay.go b/les/txrelay.go index 7a02cc837e..b58a1f42b9 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index 4c877a771a..02b7ed75cd 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -23,15 +23,15 @@ 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/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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" "github.com/hashicorp/golang-lru" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index 40a4d396a8..8dcd7022ac 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) // So we can deterministically seed different blockchains diff --git a/light/odr.go b/light/odr.go index d19a488f62..6fde68eb88 100644 --- a/light/odr.go +++ b/light/odr.go @@ -22,12 +22,12 @@ 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/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // 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 c0c5438fdb..1f6ab56bd3 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" + "github.com/EthereumCommonwealth/go-callisto/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index fcdfdb82c6..7f1e50377f 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -22,12 +22,12 @@ import ( "errors" "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/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/trie.go b/light/trie.go index 7502b6e5dd..0cb42ae086 100644 --- a/light/trie.go +++ b/light/trie.go @@ -20,11 +20,11 @@ import ( "context" "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/trie" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/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 5f45c01af9..dcd798310d 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/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index bd215b9928..273951bcc9 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index fe7936ac28..06bd3d7df2 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) type testTxRelay struct { diff --git a/log/format.go b/log/format.go index 0b07abb2ac..7151dc12ea 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/EthereumCommonwealth/go-callisto/", } // PrintOrigins sets or unsets log location (file:line) printing for terminal diff --git a/metrics/metrics.go b/metrics/metrics.go index da2cdbc53c..ab9651a082 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/log" "github.com/rcrowley/go-metrics" "github.com/rcrowley/go-metrics/exp" ) diff --git a/miner/agent.go b/miner/agent.go index e3cebbd2e2..d2a3fccb19 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/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/log" ) type CpuAgent struct { diff --git a/miner/miner.go b/miner/miner.go index fec0a40f5a..b0bde01214 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/params" ) // Backend wraps all methods required for mining. diff --git a/miner/remote_agent.go b/miner/remote_agent.go index aac7ce8655..9b5ac94768 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/log" ) type hashrate struct { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index ee52d8512f..4685a35a34 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/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..be6ae12f55 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) // noopHeaderRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index bf24970f5c..4e1320ac95 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/consensus" + "github.com/EthereumCommonwealth/go-callisto/consensus/misc" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/params" "gopkg.in/fatih/set.v0" ) diff --git a/mobile/accounts.go b/mobile/accounts.go index 4d979bffff..d771538800 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index 345e009b41..dfc9f38b1d 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/EthereumCommonwealth/go-callisto/internal/build" ) // androidTestClass is a Java class to do some lightweight tests against the Android @@ -202,7 +202,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/EthereumCommonwealth/go-callisto/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 564fbad47c..70923a14a1 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/EthereumCommonwealth/go-callisto/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index 7b79bedafd..0a85dc88c0 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/EthereumCommonwealth/go-callisto/accounts/abi" + "github.com/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/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..54aaa9d1f6 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/EthereumCommonwealth/go-callisto/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index 9b3c93ccd9..1b10b4c715 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/EthereumCommonwealth/go-callisto/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 7f31a89989..74a43322c5 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/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index c9bb3013c2..05d0989a5a 100644 --- a/mobile/ethereum.go +++ b/mobile/ethereum.go @@ -22,8 +22,8 @@ import ( "errors" "math/big" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" + ethereum "github.com/EthereumCommonwealth/go-callisto" + "github.com/EthereumCommonwealth/go-callisto/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index 7b39faadec..0c26fa0ea1 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/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/eth" + "github.com/EthereumCommonwealth/go-callisto/eth/downloader" + "github.com/EthereumCommonwealth/go-callisto/ethclient" + "github.com/EthereumCommonwealth/go-callisto/ethstats" + "github.com/EthereumCommonwealth/go-callisto/les" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/nat" + "github.com/EthereumCommonwealth/go-callisto/params" + whisper "github.com/EthereumCommonwealth/go-callisto/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..313670b48b 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index 72958e66a2..0f5be292d3 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/EthereumCommonwealth/go-callisto/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..e7084e4e87 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/EthereumCommonwealth/go-callisto/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..417aea1664 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/EthereumCommonwealth/go-callisto/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..14696cc996 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/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/p2p/discv5" + "github.com/EthereumCommonwealth/go-callisto/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 b7f8a3bc15..238fa723ef 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/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..15e1003d07 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/EthereumCommonwealth/go-callisto/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 1b04b70938..b4feaab1c3 100644 --- a/node/api.go +++ b/node/api.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "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/rpc" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/rpc" "github.com/rcrowley/go-metrics" ) diff --git a/node/config.go b/node/config.go index be9e21b4fa..cf1a45a6c7 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/accounts/keystore" + "github.com/EthereumCommonwealth/go-callisto/accounts/usbwallet" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" ) const ( diff --git a/node/config_test.go b/node/config_test.go index b81d3d6120..bd2ded200b 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/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index 848f08e05c..ec73dfbb00 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/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/nat" ) const ( diff --git a/node/node.go b/node/node.go index 6f189d8fe5..6f8771c8f5 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/internal/debug" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rpc" "github.com/prometheus/prometheus/util/flock" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index ee06f4065c..a793bd6d6c 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/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/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..588e149ef2 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/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 55062a5004..e62a9b0d0e 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/EthereumCommonwealth/go-callisto/accounts" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/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..4120484924 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/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index 2d9e3a0edc..cab1ddabfc 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/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index ad18ef9abe..2eb1056d3f 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/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/netutil" ) func init() { diff --git a/p2p/discover/database.go b/p2p/discover/database.go index 7206a63c63..654cecfc62 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/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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 fc928a91af..10ff808edb 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -30,9 +30,9 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/secp256k1" ) const NodeIDBits = 512 diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go index ed8db4dc65..932d1b0432 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) func ExampleNewNode() { diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 1bb52399fb..30cd5a083c 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/EthereumCommonwealth/go-callisto/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index 2f5a26c34c..d680296e69 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -32,9 +32,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index 1037cc6099..63b5216fa1 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index f9eb99ee36..37f7279e84 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/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p/nat" + "github.com/EthereumCommonwealth/go-callisto/p2p/netutil" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) const Version = 4 diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index 21e8b561da..23bebd617f 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index a3b044ec18..cad5162923 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/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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 a39cfcc645..efb0b54cd8 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,14 +24,14 @@ 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/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/mclock" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p/nat" + "github.com/EthereumCommonwealth/go-callisto/p2p/netutil" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) var ( diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index bd234f5ba6..738f3dc80e 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index 2db7a508f0..21470744c8 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index ce4ad9e4d4..514a49b456 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index f78d5dc43c..5d64f43a8f 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/EthereumCommonwealth/go-callisto/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index bf57872e2d..d2d18c9bba 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/EthereumCommonwealth/go-callisto/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..0d25723536 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/EthereumCommonwealth/go-callisto/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index a29943dab9..d8e3022097 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index 48dd114f06..f485e7a231 100644 --- a/p2p/discv5/ticket.go +++ b/p2p/discv5/ticket.go @@ -25,9 +25,9 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/mclock" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index b6bea013c7..113292cdbf 100644 --- a/p2p/discv5/topic.go +++ b/p2p/discv5/topic.go @@ -23,7 +23,7 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/EthereumCommonwealth/go-callisto/common/mclock" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index ba79993f29..3e4910e024 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index 26087cd8e5..0e05664800 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p/nat" + "github.com/EthereumCommonwealth/go-callisto/p2p/netutil" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index 7d31815947..066ff489c0 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) func init() { diff --git a/p2p/message.go b/p2p/message.go index 5690494bf4..8f83564b11 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -27,9 +27,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/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 98b61901d5..58c92b6ecb 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/EthereumCommonwealth/go-callisto/metrics" ) var ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index a254648c66..21ba08aa87 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/EthereumCommonwealth/go-callisto/log" "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/peer.go b/p2p/peer.go index 1d2b726e8b..1e6cd9eaf2 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/EthereumCommonwealth/go-callisto/common/mclock" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) const ( diff --git a/p2p/protocol.go b/p2p/protocol.go index ee747ba23d..68254548b7 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/EthereumCommonwealth/go-callisto/p2p/discover" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 24037ecc13..20d64c6c1d 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/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/ecies" + "github.com/EthereumCommonwealth/go-callisto/crypto/secp256k1" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/rlp" "github.com/golang/snappy" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index f4cefa650b..badd1c681b 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/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/ecies" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) func TestSharedSecret(t *testing.T) { diff --git a/p2p/server.go b/p2p/server.go index d1d578401b..07a2cef567 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/mclock" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/discv5" + "github.com/EthereumCommonwealth/go-callisto/p2p/nat" + "github.com/EthereumCommonwealth/go-callisto/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index 11dd83e5d6..2a5c817c2a 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" ) func init() { diff --git a/p2p/simulations/adapters/docker.go b/p2p/simulations/adapters/docker.go index 022314b3d7..df4fc95d87 100644 --- a/p2p/simulations/adapters/docker.go +++ b/p2p/simulations/adapters/docker.go @@ -28,8 +28,8 @@ import ( "strings" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/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 bdb92cc1d2..208efcb1d7 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/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index c97188defc..c9aa9debeb 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,11 +23,11 @@ import ( "net" "sync" - "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/rpc" + "github.com/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/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 ed6cfc5046..fd7554b878 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/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/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..bf30a8821e 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/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/simulations" + "github.com/EthereumCommonwealth/go-callisto/p2p/simulations/adapters" + "github.com/EthereumCommonwealth/go-callisto/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 3fa8b92925..50c8b18327 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -28,11 +28,11 @@ import ( "strconv" "strings" - "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/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/simulations/adapters" + "github.com/EthereumCommonwealth/go-callisto/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..ae71e3663b 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/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/simulations/adapters" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) // testService implements the node.Service interface and provides protocols diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 06890ffcf2..47c4d2d057 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -23,11 +23,11 @@ import ( "fmt" "sync" - "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/EthereumCommonwealth/go-callisto/event" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/simulations/adapters" ) // NetworkConfig defines configuration options for starting a Network diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index 2a062121be..6cf313ed4d 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/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/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..61b0117507 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/EthereumCommonwealth/go-callisto/p2p/discover" ) // Simulation provides a framework for running actions in a simulated network diff --git a/params/config.go b/params/config.go index bff701f092..cd59d019de 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/EthereumCommonwealth/go-callisto/common" ) var ( diff --git a/params/dao.go b/params/dao.go index da3c8dfc99..c33d9d4c54 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/EthereumCommonwealth/go-callisto/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..49f08ee875 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/EthereumCommonwealth/go-callisto/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 8276a9eadd..28b21a1c39 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/EthereumCommonwealth/go-callisto/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..0fe83fcfa0 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/EthereumCommonwealth/go-callisto/log" ) func TestClientRequest(t *testing.T) { diff --git a/rpc/ipc.go b/rpc/ipc.go index 8de18a56fe..2476a0743f 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -21,7 +21,7 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/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 2e7fd599e2..82716795d2 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index 30c288349e..1e40b7547e 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/EthereumCommonwealth/go-callisto/log" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types.go b/rpc/types.go index f2375604ed..bbc10b3ec8 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/EthereumCommonwealth/go-callisto/common/hexutil" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types_test.go b/rpc/types_test.go index 30cef9b22e..750b4c0eba 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/EthereumCommonwealth/go-callisto/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index 5f9593a43f..1bb593d8fb 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/log" "golang.org/x/net/websocket" "gopkg.in/fatih/set.v0" ) diff --git a/swarm/api/api.go b/swarm/api/api.go index 79de29a1cf..b2ec09fd99 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -29,9 +29,9 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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 f9caed27f5..41cfd7f9fb 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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 7952d3fb68..e16ec3ae82 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/EthereumCommonwealth/go-callisto/swarm/api" ) var ( diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go index edf385dd08..951084f001 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/EthereumCommonwealth/go-callisto/swarm/api" + "github.com/EthereumCommonwealth/go-callisto/swarm/testutil" ) // TestClientUploadDownloadRaw test uploading and downloading raw data to swarm diff --git a/swarm/api/config.go b/swarm/api/config.go index d8d25b1c82..aacfd9914a 100644 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -24,12 +24,12 @@ 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/swarm/network" - "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/contracts/ens" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/swarm/network" + "github.com/EthereumCommonwealth/go-callisto/swarm/services/swap" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index 85d056270e..e3b9b172e9 100644 --- a/swarm/api/config_test.go +++ b/swarm/api/config_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) var ( diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index f5dc90e2e5..d266478047 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go index 8a15e735dc..42cb20b8af 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/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 b4d46b3c48..d2853e9f26 100644 --- a/swarm/api/http/error.go +++ b/swarm/api/http/error.go @@ -28,8 +28,8 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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 465fbf4cad..a3df5d123f 100644 --- a/swarm/api/http/error_test.go +++ b/swarm/api/http/error_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/EthereumCommonwealth/go-callisto/swarm/testutil" ) func TestError(t *testing.T) { diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index 328177a218..3c31b62a2c 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/EthereumCommonwealth/go-callisto/log" ) /* http roundtripper to register for bzz url scheme -see https://github.com/ethereum/go-ethereum/issues/2040 +see https://github.com/EthereumCommonwealth/go-callisto/issues/2040 Usage: import ( - "github.com/ethereum/go-ethereum/common/httpclient" - "github.com/ethereum/go-ethereum/swarm/api/http" + "github.com/EthereumCommonwealth/go-callisto/common/httpclient" + "github.com/EthereumCommonwealth/go-callisto/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 65f6afab72..9a83833b69 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -35,10 +35,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/swarm/api" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" "github.com/rs/cors" ) diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index ffeaf6e0d8..128639fc89 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/swarm/api" + swarm "github.com/EthereumCommonwealth/go-callisto/swarm/api/client" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" + "github.com/EthereumCommonwealth/go-callisto/swarm/testutil" ) func TestBzzrGetPath(t *testing.T) { diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go index 9ae434a7ed..1bffd2333c 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/EthereumCommonwealth/go-callisto/swarm/api" ) type htmlListData struct { diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index d3eced1980..0f2e7e5ba6 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index f048627c51..2f0b74f9cc 100644 --- a/swarm/api/manifest_test.go +++ b/swarm/api/manifest_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/testapi.go b/swarm/api/testapi.go index 6631196c17..577be417bf 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/EthereumCommonwealth/go-callisto/swarm/network" ) type Control struct { diff --git a/swarm/dev/Makefile b/swarm/dev/Makefile index 365964b7f5..f0aa830f68 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/EthereumCommonwealth/go-callisto/cmd/swarm + go build -o bin/geth github.com/EthereumCommonwealth/go-callisto/cmd/geth + go build -o bin/bootnode github.com/EthereumCommonwealth/go-callisto/cmd/bootnode cluster: build scripts/boot-cluster.sh test: - go test -v github.com/ethereum/go-ethereum/swarm/... + go test -v github.com/EthereumCommonwealth/go-callisto/swarm/... diff --git a/swarm/dev/bashrc b/swarm/dev/bashrc index efb504fa36..215c6012db 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/EthereumCommonwealth/go-callisto" 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..af0049b2dd 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/EthereumCommonwealth/go-callisto" \ --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 0cb59dfb38..6bf85a9510 100644 --- a/swarm/fuse/fuse_file.go +++ b/swarm/fuse/fuse_file.go @@ -22,8 +22,8 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" "errors" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" "golang.org/x/net/context" "io" "os" diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go index 2493bdab19..c6251accf0 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/EthereumCommonwealth/go-callisto/swarm/api" "sync" "time" ) diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index 93f1d4c2fd..42df831d74 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/EthereumCommonwealth/go-callisto/swarm/api" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" ) type fileInfo struct { diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index 75742845a2..79a05c2edb 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/swarm/api" ) var ( diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go index d39966c0e3..2b366ff7ec 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/EthereumCommonwealth/go-callisto/log" ) func externalUnmount(mountPoint string) error { diff --git a/swarm/network/depo.go b/swarm/network/depo.go index 8695bf5d98..2764f7f566 100644 --- a/swarm/network/depo.go +++ b/swarm/network/depo.go @@ -22,8 +22,8 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" ) // Handler for storage/retrieval related protocol requests diff --git a/swarm/network/forwarding.go b/swarm/network/forwarding.go index 88a82a678c..42370cc857 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/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" ) const requesterCount = 3 diff --git a/swarm/network/hive.go b/swarm/network/hive.go index d37b7e4006..675e3f3c73 100644 --- a/swarm/network/hive.go +++ b/swarm/network/hive.go @@ -22,12 +22,12 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/netutil" + "github.com/EthereumCommonwealth/go-callisto/swarm/network/kademlia" + "github.com/EthereumCommonwealth/go-callisto/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 16c5ce5322..73b3d82a64 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/EthereumCommonwealth/go-callisto/common" ) type Address common.Hash diff --git a/swarm/network/kademlia/address_test.go b/swarm/network/kademlia/address_test.go index c062c8eafb..2900652989 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/EthereumCommonwealth/go-callisto/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 3e4b261fde..7ef8df1656 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/EthereumCommonwealth/go-callisto/log" ) type NodeData interface { diff --git a/swarm/network/kademlia/kademlia.go b/swarm/network/kademlia/kademlia.go index bf976a3e1d..d9b9bfe5bd 100644 --- a/swarm/network/kademlia/kademlia.go +++ b/swarm/network/kademlia/kademlia.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/log" ) const ( diff --git a/swarm/network/messages.go b/swarm/network/messages.go index d920def959..1909ee7ef2 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/EthereumCommonwealth/go-callisto/contracts/chequebook" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/swarm/network/kademlia" + "github.com/EthereumCommonwealth/go-callisto/swarm/services/swap" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" ) /* diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index 2f880df570..47e30fd825 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -37,12 +37,12 @@ import ( "strconv" "time" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/log" - "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/EthereumCommonwealth/go-callisto/contracts/chequebook" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + bzzswap "github.com/EthereumCommonwealth/go-callisto/swarm/services/swap" + "github.com/EthereumCommonwealth/go-callisto/swarm/services/swap/swap" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" ) const ( diff --git a/swarm/network/syncdb.go b/swarm/network/syncdb.go index 88b4b68dd0..8eec47a8b7 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/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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..6387c169ad 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/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" ) func init() { diff --git a/swarm/network/syncer.go b/swarm/network/syncer.go index a3814e4232..62fc79e397 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/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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 093892e8d9..d2b14bc25b 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/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/contracts/chequebook" + "github.com/EthereumCommonwealth/go-callisto/contracts/chequebook/contract" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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..a5c3ad2332 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/EthereumCommonwealth/go-callisto/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..3fe8daf460 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/EthereumCommonwealth/go-callisto/common" ) type testInPayment struct { diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go index b41d7dd333..160d991d5f 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/EthereumCommonwealth/go-callisto/crypto/sha3" ) /* diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index cd4c2ef139..fe846f528d 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/EthereumCommonwealth/go-callisto/log" ) type brokenLimitedReader struct { diff --git a/swarm/storage/database.go b/swarm/storage/database.go index 2532490cc9..a4db0a78cc 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/EthereumCommonwealth/go-callisto/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 46a5c16ccc..8c153ff55e 100644 --- a/swarm/storage/dbstore.go +++ b/swarm/storage/dbstore.go @@ -32,8 +32,8 @@ import ( "io/ioutil" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/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..26f1eee636 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/EthereumCommonwealth/go-callisto/common" ) func initDbStore(t *testing.T) *DbStore { diff --git a/swarm/storage/dpa.go b/swarm/storage/dpa.go index 44a2669f12..e0497d145f 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/EthereumCommonwealth/go-callisto/log" ) /* diff --git a/swarm/storage/memstore.go b/swarm/storage/memstore.go index 155dd00882..628ec9b2ac 100644 --- a/swarm/storage/memstore.go +++ b/swarm/storage/memstore.go @@ -22,7 +22,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/log" ) const ( diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index 7b0612edc5..4b171294d7 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/EthereumCommonwealth/go-callisto/log" ) /* diff --git a/swarm/storage/types.go b/swarm/storage/types.go index d35f1f9294..97e526e612 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/EthereumCommonwealth/go-callisto/bmt" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" ) type Hasher func() hash.Hash diff --git a/swarm/swarm.go b/swarm/swarm.go index 9db15325ae..6f8c6a2712 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -23,22 +23,22 @@ import ( "fmt" "net" - "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/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "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/EthereumCommonwealth/go-callisto/accounts/abi/bind" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/contracts/chequebook" + "github.com/EthereumCommonwealth/go-callisto/contracts/ens" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethclient" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/node" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/rpc" + "github.com/EthereumCommonwealth/go-callisto/swarm/api" + httpapi "github.com/EthereumCommonwealth/go-callisto/swarm/api/http" + "github.com/EthereumCommonwealth/go-callisto/swarm/fuse" + "github.com/EthereumCommonwealth/go-callisto/swarm/network" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" ) // the swarm stack diff --git a/swarm/testutil/http.go b/swarm/testutil/http.go index f2922fab00..56611a4428 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/EthereumCommonwealth/go-callisto/swarm/api" + httpapi "github.com/EthereumCommonwealth/go-callisto/swarm/api/http" + "github.com/EthereumCommonwealth/go-callisto/swarm/storage" ) func NewTestSwarmServer(t *testing.T) *TestSwarmServer { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index a789e6d887..6f38055266 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index a449b1cfa6..2ec7e79446 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -22,8 +22,8 @@ import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 7541477933..f6b3c19ed0 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/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 5d65e0dbce..f5f290b121 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index 88f36ce999..8ed3e2f054 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index c780524bc3..34e3639b4a 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 5a489d00b8..480c8ad8e2 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/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index b6759be912..8c29d4d110 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" ) var _ = (*ttTransactionMarshaling)(nil) diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index dd2d3d94e7..3ec28561c3 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" ) var _ = (*vmExecMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index a2c633ad67..25b287a3f9 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/EthereumCommonwealth/go-callisto/params" ) // This table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index ebb0d32c34..8f690cbbe9 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/EthereumCommonwealth/go-callisto/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 58ef8a6428..e2530dd014 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/EthereumCommonwealth/go-callisto/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index 5a67b290db..48b237e250 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/EthereumCommonwealth/go-callisto/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 64bf09cb42..7ea9bd2d40 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // StateTest checks transaction processing without block context. diff --git a/tests/transaction_test.go b/tests/transaction_test.go index c743996c2a..2d4c68cf59 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/EthereumCommonwealth/go-callisto/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 472b3d6f24..004aeb9cca 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core/types" + "github.com/EthereumCommonwealth/go-callisto/params" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/tests/vm_test.go b/tests/vm_test.go index c9f5e225e9..39a876cbbd 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/EthereumCommonwealth/go-callisto/core/vm" ) func TestVM(t *testing.T) { diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index 0aa37955ce..402e1865c6 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/core" + "github.com/EthereumCommonwealth/go-callisto/core/state" + "github.com/EthereumCommonwealth/go-callisto/core/vm" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" + "github.com/EthereumCommonwealth/go-callisto/params" ) // VMTest checks EVM execution without block or transaction context. diff --git a/trie/errors.go b/trie/errors.go index 567b80078c..5bc95cabd3 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/EthereumCommonwealth/go-callisto/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index 4719aabf62..cdbecc7985 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) type hasher struct { diff --git a/trie/iterator.go b/trie/iterator.go index 76146c0d64..7ad47b7208 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/EthereumCommonwealth/go-callisto/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 4808d8b0c6..ba6eea6965 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/ethdb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index a7697fc0c6..6ce11d8c19 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/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 298f648c4b..5c2d39e82d 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -21,10 +21,10 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // Prove constructs a merkle proof for key. The result contains all diff --git a/trie/proof_test.go b/trie/proof_test.go index 91ebcd4a57..259f0cdf61 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 20c303f31c..fc6c67759a 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/log" ) var secureKeyPrefix = []byte("secure-key-") diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go index d74102e2a2..aa79793a35 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/ethdb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index fea10051f4..f61916802a 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/EthereumCommonwealth/go-callisto/common" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/trie/sync_test.go b/trie/sync_test.go index ec16a25bd9..1968b0e84e 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index 7f69a3d1de..6b178817ed 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -21,9 +21,9 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/log" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto/sha3" + "github.com/EthereumCommonwealth/go-callisto/log" "github.com/rcrowley/go-metrics" ) diff --git a/trie/trie_test.go b/trie/trie_test.go index 1c90950703..f7e2ad8333 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -29,8 +29,8 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/ethdb" ) func init() { diff --git a/vendor/vendor.json b/vendor/vendor.json index daa2f72d3d..4f3983eac9 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -688,5 +688,5 @@ "revisionTime": "2017-08-11T01:42:03Z" } ], - "rootPath": "github.com/ethereum/go-ethereum" + "rootPath": "github.com/EthereumCommonwealth/go-callisto" } diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index 0ec6ec570c..2dd7ea1d42 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -21,12 +21,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/whisperv5" + "github.com/EthereumCommonwealth/go-callisto/cmd/utils" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/rlp" + whisper "github.com/EthereumCommonwealth/go-callisto/whisper/whisperv5" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/whisper/mailserver/server_test.go b/whisper/mailserver/server_test.go index 9155ee85a6..d467d6ea49 100644 --- a/whisper/mailserver/server_test.go +++ b/whisper/mailserver/server_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + whisper "github.com/EthereumCommonwealth/go-callisto/whisper/whisperv5" ) const powRequirement = 0.00001 diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go index 61c1b7ab72..b8ceb193a4 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/EthereumCommonwealth/go-callisto" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/rpc" + whisper "github.com/EthereumCommonwealth/go-callisto/whisper/whisperv5" ) // Client defines typed wrappers for the Whisper v5 RPC API. diff --git a/whisper/whisperv2/api.go b/whisper/whisperv2/api.go index 5c6d170959..67e6bfe1d0 100644 --- a/whisper/whisperv2/api.go +++ b/whisper/whisperv2/api.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) // PublicWhisperAPI provides the whisper RPC service. diff --git a/whisper/whisperv2/envelope.go b/whisper/whisperv2/envelope.go index 9f1c682040..a7c9bf26d9 100644 --- a/whisper/whisperv2/envelope.go +++ b/whisper/whisperv2/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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/ecies" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv2/envelope_test.go b/whisper/whisperv2/envelope_test.go index 490ed9f6f8..498df5c5fa 100644 --- a/whisper/whisperv2/envelope_test.go +++ b/whisper/whisperv2/envelope_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/ecies" ) func TestEnvelopeOpen(t *testing.T) { diff --git a/whisper/whisperv2/filter.go b/whisper/whisperv2/filter.go index 7404859b78..bbad620074 100644 --- a/whisper/whisperv2/filter.go +++ b/whisper/whisperv2/filter.go @@ -21,7 +21,7 @@ package whisperv2 import ( "crypto/ecdsa" - "github.com/ethereum/go-ethereum/event/filter" + "github.com/EthereumCommonwealth/go-callisto/event/filter" ) // Filter is used to subscribe to specific types of whisper messages. diff --git a/whisper/whisperv2/main.go b/whisper/whisperv2/main.go index be41604890..648ebd6598 100644 --- a/whisper/whisperv2/main.go +++ b/whisper/whisperv2/main.go @@ -27,12 +27,12 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/whisper" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/logger" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/nat" + "github.com/EthereumCommonwealth/go-callisto/whisper" ) func main() { diff --git a/whisper/whisperv2/message.go b/whisper/whisperv2/message.go index 66648c3be8..8dd70dab8b 100644 --- a/whisper/whisperv2/message.go +++ b/whisper/whisperv2/message.go @@ -26,10 +26,10 @@ import ( "math/rand" "time" - "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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/ecies" + "github.com/EthereumCommonwealth/go-callisto/log" ) // Message represents an end-user data packet to transmit through the Whisper diff --git a/whisper/whisperv2/message_test.go b/whisper/whisperv2/message_test.go index c760ac54c4..c115decc4a 100644 --- a/whisper/whisperv2/message_test.go +++ b/whisper/whisperv2/message_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) // Tests whether a message can be wrapped without any identity or encryption. diff --git a/whisper/whisperv2/peer.go b/whisper/whisperv2/peer.go index 71798408b9..443e9892a1 100644 --- a/whisper/whisperv2/peer.go +++ b/whisper/whisperv2/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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv2/peer_test.go b/whisper/whisperv2/peer_test.go index 87ca5063df..33a6611060 100644 --- a/whisper/whisperv2/peer_test.go +++ b/whisper/whisperv2/peer_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" ) type testPeer struct { diff --git a/whisper/whisperv2/topic.go b/whisper/whisperv2/topic.go index 3e2b47bd3f..9816926ade 100644 --- a/whisper/whisperv2/topic.go +++ b/whisper/whisperv2/topic.go @@ -19,7 +19,7 @@ package whisperv2 -import "github.com/ethereum/go-ethereum/crypto" +import "github.com/EthereumCommonwealth/go-callisto/crypto" // Topic represents a cryptographically secure, probabilistic partial // classifications of a message, determined as the first (left) 4 bytes of the diff --git a/whisper/whisperv2/whisper.go b/whisper/whisperv2/whisper.go index 61c36918d4..df1c9afa0f 100644 --- a/whisper/whisperv2/whisper.go +++ b/whisper/whisperv2/whisper.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/event/filter" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/ecies" + "github.com/EthereumCommonwealth/go-callisto/event/filter" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rpc" "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv2/whisper_test.go b/whisper/whisperv2/whisper_test.go index 1e0d3f85d4..523623cbb9 100644 --- a/whisper/whisperv2/whisper_test.go +++ b/whisper/whisperv2/whisper_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" ) func startTestCluster(n int) []*Whisper { diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go index 96c4b0e6c4..970f95cc3b 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/rpc" ) const ( diff --git a/whisper/whisperv5/benchmarks_test.go b/whisper/whisperv5/benchmarks_test.go index dcfbcb56d8..48efc861be 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/EthereumCommonwealth/go-callisto/crypto" ) func BenchmarkDeriveKeyMaterial(b *testing.B) { diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go index 169cbba9dd..ca85018532 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/math" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/ecies" + "github.com/EthereumCommonwealth/go-callisto/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 b5e893e0ff..255bd6259d 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" ) type Filter struct { diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go index bd35e7f20f..cd0d940216 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" ) var seed int64 diff --git a/whisper/whisperv5/gen_criteria_json.go b/whisper/whisperv5/gen_criteria_json.go index df0de85dfa..a1fc454d3e 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/EthereumCommonwealth/go-callisto/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv5/gen_message_json.go b/whisper/whisperv5/gen_message_json.go index 1855573317..f67b1f472b 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/EthereumCommonwealth/go-callisto/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv5/gen_newmessage_json.go b/whisper/whisperv5/gen_newmessage_json.go index d0a47185ea..d748e7a06b 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/EthereumCommonwealth/go-callisto/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go index c27535cd1a..950b1cb349 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/crypto/ecies" + "github.com/EthereumCommonwealth/go-callisto/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..804c05a34f 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/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go index 179c931795..a34aa94363 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/rlp" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go index bae2adb6f5..042db47775 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/p2p/discover" + "github.com/EthereumCommonwealth/go-callisto/p2p/nat" ) var keys []string = []string{ diff --git a/whisper/whisperv5/topic.go b/whisper/whisperv5/topic.go index d1996c4604..341f6bbf7d 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/common/hexutil" ) // Topic represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go index d09246f699..5b8f9ea266 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/EthereumCommonwealth/go-callisto/common" + "github.com/EthereumCommonwealth/go-callisto/crypto" + "github.com/EthereumCommonwealth/go-callisto/log" + "github.com/EthereumCommonwealth/go-callisto/p2p" + "github.com/EthereumCommonwealth/go-callisto/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..81f18d5b82 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/EthereumCommonwealth/go-callisto/common" ) func TestWhisperBasic(t *testing.T) {