From 1337be95f74a1d2a1a7316737efde413f29bcb2f Mon Sep 17 00:00:00 2001 From: Chengcheng Zhang <943420582@qq.com> Date: Fri, 6 Dec 2019 17:01:15 +0800 Subject: [PATCH] rename (#465) --- .travis.yml | 2 +- Makefile | 2 +- README.md | 7 +++-- accesstoken/accesstoken.go | 6 ++-- accesstoken/accesstoken_test.go | 4 +-- account/accounts.go | 24 +++++++-------- account/builder.go | 20 ++++++------ account/builder_test.go | 8 ++--- account/indexer.go | 2 +- account/store.go | 4 +-- account/utxo_keeper.go | 4 +-- account/utxo_keeper_test.go | 10 +++--- api/accounts.go | 12 ++++---- api/api.go | 32 +++++++++---------- api/api_test.go | 8 ++--- api/bbft.go | 2 +- api/block_retrieve.go | 8 ++--- api/compile.go | 8 ++--- api/errors.go | 24 +++++++-------- api/hsm.go | 4 +-- api/message.go | 14 ++++----- api/miner.go | 8 ++--- api/nodeinfo.go | 16 +++++----- api/program.go | 4 +-- api/query.go | 24 +++++++-------- api/receivers.go | 2 +- api/request.go | 8 ++--- api/transact.go | 10 +++--- api/wallet.go | 8 ++--- api/websocket.go | 2 +- application/mov/common/type.go | 2 +- application/mov/database/mov_store.go | 8 ++--- application/mov/database/mov_store_test.go | 16 +++++----- asset/annotate.go | 4 +-- asset/asset.go | 12 ++++---- blockchain/pseudohsm/image.go | 2 +- blockchain/pseudohsm/image_test.go | 2 +- blockchain/pseudohsm/key.go | 2 +- blockchain/pseudohsm/keycache.go | 2 +- blockchain/pseudohsm/keycache_test.go | 2 +- blockchain/pseudohsm/keystore_passphrase.go | 6 ++-- blockchain/pseudohsm/keystore_passphrase_test.go | 2 +- blockchain/pseudohsm/pseudohsm.go | 6 ++-- blockchain/pseudohsm/pseudohsm_test.go | 4 +-- blockchain/query/annotated.go | 6 ++-- blockchain/rpc/rpc.go | 4 +-- blockchain/rpc/rpc_test.go | 2 +- blockchain/signers/signers.go | 4 +-- blockchain/txbuilder/actions.go | 14 ++++----- blockchain/txbuilder/builder.go | 6 ++-- blockchain/txbuilder/constraint.go | 6 ++-- blockchain/txbuilder/data_witness.go | 2 +- blockchain/txbuilder/estimate.go | 6 ++-- blockchain/txbuilder/finalize.go | 14 ++++----- blockchain/txbuilder/rawtxsig_witness.go | 2 +- blockchain/txbuilder/signature_program.go | 4 +-- blockchain/txbuilder/signature_witness.go | 10 +++--- blockchain/txbuilder/signing_instruction.go | 6 ++-- blockchain/txbuilder/txbuilder.go | 12 ++++---- blockchain/txbuilder/txbuilder_test.go | 20 ++++++------ blockchain/txbuilder/types.go | 8 ++--- blockchain/txbuilder/witness.go | 6 ++-- blockchain/txbuilder/witness_test.go | 4 +-- cmd/consensusreward/main.go | 6 ++-- cmd/fedd/main.go | 10 +++--- cmd/precognitive/main.go | 8 ++--- cmd/utxomerge/main.go | 2 +- cmd/vaporcli/commands/accesstoken.go | 2 +- cmd/vaporcli/commands/account.go | 4 +-- cmd/vaporcli/commands/asset.go | 4 +-- cmd/vaporcli/commands/block.go | 4 +-- cmd/vaporcli/commands/key.go | 6 ++-- cmd/vaporcli/commands/mining.go | 2 +- cmd/vaporcli/commands/net.go | 2 +- cmd/vaporcli/commands/program.go | 2 +- cmd/vaporcli/commands/template.go | 2 +- cmd/vaporcli/commands/transaction.go | 10 +++--- cmd/vaporcli/commands/txfeed.go | 2 +- cmd/vaporcli/commands/util.go | 8 ++--- cmd/vaporcli/commands/vaporcli.go | 2 +- cmd/vaporcli/commands/version.go | 2 +- cmd/vaporcli/commands/wallet.go | 2 +- cmd/vaporcli/main.go | 2 +- cmd/vapord/commands/init.go | 4 +-- cmd/vapord/commands/root.go | 2 +- cmd/vapord/commands/run_node.go | 2 +- cmd/vapord/commands/version.go | 2 +- cmd/vapord/main.go | 4 +-- cmd/votereward/main.go | 10 +++--- common/address.go | 4 +-- common/address_test.go | 4 +-- common/arithmetic/calculate.go | 6 ++-- config/config.go | 2 +- config/federation_test.go | 2 +- config/genesis.go | 12 ++++---- consensus/general.go | 2 +- consensus/segwit/segwit.go | 6 ++-- crypto/crypto.go | 2 +- crypto/ed25519/chainkd/chainkd.go | 4 +-- crypto/ed25519/chainkd/expanded_key.go | 4 +-- crypto/ed25519/chainkd/expanded_key_test.go | 2 +- crypto/ed25519/chainkd/util.go | 2 +- crypto/ed25519/ecmath/point.go | 2 +- crypto/ed25519/ecmath/scalar.go | 2 +- crypto/ed25519/ed25519.go | 2 +- crypto/ed25519/ed25519_test.go | 2 +- database/account_store.go | 16 +++++----- database/account_store_test.go | 14 ++++----- database/cache.go | 8 ++--- database/cache_test.go | 6 ++-- database/store.go | 14 ++++----- database/store_test.go | 16 +++++----- database/utxo_view.go | 10 +++--- database/utxo_view_test.go | 10 +++--- database/wallet_store.go | 14 ++++----- database/wallet_store_test.go | 18 +++++------ docker/fed | 4 +-- docker/vapor | 4 +-- docker/vapord/vapord.Dockerfile | 2 +- encoding/blockchain/blockchain.go | 2 +- equity/compiler/ast.go | 2 +- equity/compiler/cmd/equitycmd/equitycmd.go | 14 ++++----- equity/compiler/compile.go | 8 ++--- equity/compiler/compile_test.go | 4 +-- equity/equity/main.go | 4 +-- equity/equity/util/instance.go | 4 +-- equity/equity/util/shift.go | 4 +-- event/event.go | 4 +-- log/log.go | 2 +- net/http/authn/authn.go | 4 +-- net/http/authn/authn_test.go | 6 ++-- net/http/httperror/httperror.go | 4 +-- net/http/httperror/httperror_test.go | 2 +- net/http/httpjson/handler_test.go | 2 +- net/http/httpjson/io.go | 2 +- net/websocket/wsclient.go | 2 +- net/websocket/wsnotificationmaneger.go | 8 ++--- netsync/chainmgr/block_keeper.go | 12 ++++---- netsync/chainmgr/block_keeper_test.go | 20 ++++++------ netsync/chainmgr/block_process.go | 6 ++-- netsync/chainmgr/block_process_test.go | 8 ++--- netsync/chainmgr/fast_sync.go | 10 +++--- netsync/chainmgr/fast_sync_test.go | 16 +++++----- netsync/chainmgr/handle.go | 22 ++++++------- netsync/chainmgr/msg_fetcher.go | 10 +++--- netsync/chainmgr/protocol_reactor.go | 8 ++--- netsync/chainmgr/storage.go | 6 ++-- netsync/chainmgr/storage_test.go | 4 +-- netsync/chainmgr/tool_test.go | 16 +++++----- netsync/chainmgr/tx_keeper.go | 4 +-- netsync/chainmgr/tx_keeper_test.go | 14 ++++----- netsync/consensusmgr/block_fetcher.go | 4 +-- netsync/consensusmgr/block_fetcher_test.go | 6 ++-- netsync/consensusmgr/broadcast_msg.go | 2 +- netsync/consensusmgr/consensus_msg.go | 6 ++-- netsync/consensusmgr/consensus_msg_test.go | 4 +-- netsync/consensusmgr/handle.go | 12 ++++---- netsync/consensusmgr/handle_test.go | 12 ++++---- netsync/consensusmgr/reactor.go | 4 +-- netsync/messages/chain_msg.go | 4 +-- netsync/messages/chain_msg_test.go | 6 ++-- netsync/peers/peer.go | 10 +++--- netsync/peers/peer_test.go | 8 ++--- netsync/sync_manager.go | 18 +++++------ node/node.go | 36 +++++++++++----------- node/node_test.go | 2 +- p2p/base_reactor.go | 2 +- p2p/connection/connection.go | 2 +- p2p/connection/secret_connection.go | 2 +- p2p/connection/secret_connection_test.go | 2 +- p2p/discover/dht/database.go | 6 ++-- p2p/discover/dht/dns_seeds.go | 4 +-- p2p/discover/dht/dns_seeds_test.go | 2 +- p2p/discover/dht/net.go | 8 ++--- p2p/discover/dht/net_test.go | 4 +-- p2p/discover/dht/node.go | 4 +-- p2p/discover/dht/table.go | 4 +-- p2p/discover/dht/ticket.go | 4 +-- p2p/discover/dht/udp.go | 12 ++++---- p2p/discover/dht/udp_test.go | 6 ++-- p2p/discover/mdns/lan_discover.go | 2 +- p2p/listener.go | 6 ++-- p2p/node_info.go | 10 +++--- p2p/node_info_test.go | 4 +-- p2p/peer.go | 8 ++--- p2p/peer_test.go | 10 +++--- p2p/security/blacklist.go | 4 +-- p2p/security/security.go | 2 +- p2p/signlib/chainkd.go | 2 +- p2p/switch.go | 24 +++++++-------- p2p/switch_test.go | 12 ++++---- p2p/test_util.go | 10 +++--- proposal/blockproposer/blockproposer.go | 12 ++++---- proposal/proposal.go | 20 ++++++------ proposal/proposal_test.go | 10 +++--- proposal/sort.go | 2 +- protocol/bbft.go | 14 ++++----- protocol/bc/asset.go | 4 +-- protocol/bc/entry.go | 6 ++-- protocol/bc/tx.go | 4 +-- protocol/bc/types/block.go | 6 ++-- protocol/bc/types/block_commitment.go | 4 +-- protocol/bc/types/block_commitment_test.go | 4 +-- protocol/bc/types/block_header.go | 8 ++--- protocol/bc/types/block_header_test.go | 6 ++-- protocol/bc/types/block_witness.go | 2 +- protocol/bc/types/block_witness_test.go | 4 +-- protocol/bc/types/crosschain_input.go | 2 +- protocol/bc/types/crosschain_output.go | 2 +- protocol/bc/types/intrachain_output.go | 2 +- protocol/bc/types/map.go | 8 ++--- protocol/bc/types/map_test.go | 6 ++-- protocol/bc/types/merkle.go | 4 +-- protocol/bc/types/merkle_test.go | 6 ++-- protocol/bc/types/output_commitment.go | 6 ++-- protocol/bc/types/output_commitment_test.go | 6 ++-- protocol/bc/types/spend.go | 2 +- protocol/bc/types/spend_commitment.go | 6 ++-- protocol/bc/types/spend_commitment_test.go | 6 ++-- protocol/bc/types/spend_test.go | 6 ++-- protocol/bc/types/transaction.go | 6 ++-- protocol/bc/types/transaction_test.go | 8 ++--- protocol/bc/types/txinput.go | 6 ++-- protocol/bc/types/txinput_test.go | 4 +-- protocol/bc/types/txoutput.go | 6 ++-- protocol/bc/types/txoutput_test.go | 6 ++-- protocol/bc/types/veto_input.go | 2 +- protocol/bc/types/vote_output.go | 2 +- protocol/block.go | 14 ++++----- protocol/block_test.go | 10 +++--- protocol/consensus_node_manager.go | 10 +++--- protocol/consensus_node_manager_test.go | 14 ++++----- protocol/orphan_manage.go | 4 +-- protocol/orphan_manage_test.go | 6 ++-- protocol/protocol.go | 12 ++++---- protocol/state/consensus_result.go | 16 +++++----- protocol/state/consensus_result_test.go | 14 ++++----- protocol/state/utxo_view.go | 8 ++--- protocol/state/utxo_view_test.go | 10 +++--- protocol/store.go | 8 ++--- protocol/tx.go | 8 ++--- protocol/txpool.go | 10 +++--- protocol/txpool_test.go | 14 ++++----- protocol/validation/block.go | 10 +++--- protocol/validation/block_test.go | 14 ++++----- protocol/validation/test/tx_ugly_test.go | 18 +++++------ protocol/validation/tx.go | 12 ++++---- protocol/validation/tx_scene_test.go | 8 ++--- protocol/validation/tx_test.go | 16 +++++----- protocol/validation/vmcontext.go | 10 +++--- protocol/validation/vmcontext_test.go | 8 ++--- protocol/vm/assemble.go | 2 +- protocol/vm/assemble_test.go | 2 +- protocol/vm/bitwise_test.go | 2 +- protocol/vm/control_test.go | 2 +- protocol/vm/crypto.go | 6 ++-- protocol/vm/crypto_test.go | 2 +- protocol/vm/introspection_test.go | 4 +-- protocol/vm/numeric.go | 2 +- protocol/vm/numeric_test.go | 2 +- protocol/vm/ops.go | 4 +-- protocol/vm/ops_test.go | 6 ++-- protocol/vm/pushdata_test.go | 2 +- protocol/vm/splice.go | 2 +- protocol/vm/splice_test.go | 2 +- protocol/vm/stack.go | 2 +- protocol/vm/stack_test.go | 2 +- protocol/vm/vm.go | 2 +- protocol/vm/vm_test.go | 4 +-- protocol/vm/vmutil/builder.go | 4 +-- protocol/vm/vmutil/builder_test.go | 2 +- protocol/vm/vmutil/script.go | 6 ++-- protocol/vm/vmutil/script_test.go | 4 +-- test/accounts_test.go | 20 ++++++------ test/bench_blockchain_test.go | 32 +++++++++---------- test/block_test.go | 10 +++--- test/block_test_util.go | 10 +++--- test/builder_test.go | 10 +++--- test/chain_test_util.go | 18 +++++------ test/integration/run_test.go | 6 ++-- test/integration/standard_transaction_test.go | 18 +++++------ test/mock/chain.go | 6 ++-- test/mock/crosschain_tx.go | 10 +++--- test/mock/mempool.go | 4 +-- test/performance/mining_test.go | 10 +++--- test/performance/rpc_test.go | 2 +- test/protocol_test.go | 8 ++--- test/protocol_test_util.go | 6 ++-- test/tx_test_util.go | 32 +++++++++---------- test/util.go | 26 ++++++++-------- test/utxo_view/utxo_view_test.go | 14 ++++----- test/utxo_view/utxo_view_test_util.go | 8 ++--- test/wallet_test.go | 30 +++++++++--------- test/wallet_test_util.go | 22 ++++++------- testutil/hex.go | 2 +- testutil/keys.go | 4 +-- toolbar/apinode/account.go | 12 ++++---- toolbar/apinode/block.go | 6 ++-- toolbar/apinode/node.go | 6 ++-- toolbar/apinode/node_test.go | 6 ++-- toolbar/apinode/query.go | 10 +++--- toolbar/apinode/transaction.go | 10 +++--- toolbar/common/address.go | 8 ++--- toolbar/common/consensus.go | 4 +-- toolbar/common/db.go | 2 +- toolbar/consensusreward/consensus_reward.go | 10 +++--- toolbar/federation/api/handler.go | 8 ++--- toolbar/federation/api/server.go | 4 +-- toolbar/federation/common/util.go | 6 ++-- toolbar/federation/config/config.go | 4 +-- toolbar/federation/database/asset_store.go | 4 +-- toolbar/federation/database/orm/asset.go | 2 +- toolbar/federation/database/orm/chain.go | 2 +- .../federation/database/orm/cross_transaction.go | 6 ++-- .../database/orm/cross_transaction_req.go | 2 +- toolbar/federation/service/node.go | 6 ++-- toolbar/federation/synchron/errors.go | 2 +- toolbar/federation/synchron/mainchain_keeper.go | 16 +++++----- toolbar/federation/synchron/sidechain_keeper.go | 18 +++++------ toolbar/mergeutxo/merger_utxo.go | 8 ++--- toolbar/precognitive/api/handler.go | 4 +-- toolbar/precognitive/api/server.go | 4 +-- toolbar/precognitive/config/config.go | 4 +-- toolbar/precognitive/database/orm/node.go | 4 +-- toolbar/precognitive/monitor/connection.go | 4 +-- toolbar/precognitive/monitor/discover.go | 4 +-- toolbar/precognitive/monitor/mock.go | 4 +-- toolbar/precognitive/monitor/monitor.go | 26 ++++++++-------- toolbar/precognitive/monitor/stats.go | 10 +++--- toolbar/server/display.go | 2 +- toolbar/server/errors.go | 2 +- toolbar/server/handle.go | 2 +- toolbar/server/pagination.go | 2 +- toolbar/vote_reward/config/config.go | 2 +- .../settlementvotereward/settlementreward.go | 12 ++++---- toolbar/vote_reward/synchron/block_keeper.go | 12 ++++---- util/util.go | 6 ++-- vendor/github.com/miekg/dns/dnssec_keyscan.go | 2 +- vendor/github.com/miekg/dns/dnssec_privkey.go | 2 +- wallet/annotated.go | 18 +++++------ wallet/indexer.go | 14 ++++----- wallet/mnemonic/mnemonic.go | 2 +- wallet/recovery.go | 14 ++++----- wallet/recovery_test.go | 24 +++++++-------- wallet/store.go | 8 ++--- wallet/unconfirmed.go | 12 ++++---- wallet/unconfirmed_test.go | 24 +++++++-------- wallet/utxo.go | 12 ++++---- wallet/utxo_test.go | 12 ++++---- wallet/wallet.go | 16 +++++----- wallet/wallet_test.go | 34 ++++++++++---------- 351 files changed, 1308 insertions(+), 1307 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02a340a5..f32dc512 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/vapor +go_import_path: github.com/bytom/vapor dist: trusty sudo: false diff --git a/Makefile b/Makefile index 9575331b..305051f0 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ endif PACKAGES := $(shell go list ./... | grep -v '/vendor/' | grep -v '/crypto/ed25519/chainkd' | grep -v '/mining/tensority') -BUILD_FLAGS := -ldflags "-X github.com/vapor/version.GitCommit=`git rev-parse HEAD`" +BUILD_FLAGS := -ldflags "-X github.com/bytom/vapor/version.GitCommit=`git rev-parse HEAD`" VAPORD_BINARY32 := vapord-$(GOOS)_386 diff --git a/README.md b/README.md index 55fd2821..3e8b1654 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ Vapor ## Get source code ``` -$ git clone https://github.com/Bytom/vapor.git $GOPATH/src/github.com/vapor +$ cd $GOPATH/src/github.com/bytom +$ git clone https://github.com/Bytom/vapor.git ``` Then, you have two ways to get vapor executable file: @@ -23,7 +24,7 @@ Then, you have two ways to get vapor executable file: ## Installation ``` -$ cd $GOPATH/src/github.com/vapor +$ cd $GOPATH/src/github.com/bytom/vapor $ make install ``` @@ -51,7 +52,7 @@ $ vapord node --home ### Build the image ``` -$ cd $GOPATH/src/github.com/vapor +$ cd $GOPATH/src/github.com/bytom/vapor $ docker build -t vapor . ``` diff --git a/accesstoken/accesstoken.go b/accesstoken/accesstoken.go index 640f4aed..67736354 100644 --- a/accesstoken/accesstoken.go +++ b/accesstoken/accesstoken.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/vapor/crypto/sha3pool" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" + "github.com/bytom/vapor/crypto/sha3pool" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" ) const tokenSize = 32 diff --git a/accesstoken/accesstoken_test.go b/accesstoken/accesstoken_test.go index 16c470bd..548d451e 100644 --- a/accesstoken/accesstoken_test.go +++ b/accesstoken/accesstoken_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" ) func TestCreate(t *testing.T) { diff --git a/account/accounts.go b/account/accounts.go index ed86cc7c..d6db4e60 100644 --- a/account/accounts.go +++ b/account/accounts.go @@ -10,18 +10,18 @@ import ( "github.com/google/uuid" log "github.com/sirupsen/logrus" - "github.com/vapor/blockchain/signers" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/common" - "github.com/vapor/consensus" - "github.com/vapor/consensus/segwit" - "github.com/vapor/crypto" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/errors" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/consensus/segwit" + "github.com/bytom/vapor/crypto" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/vm/vmutil" ) const ( diff --git a/account/builder.go b/account/builder.go index af80a000..552dcc78 100644 --- a/account/builder.go +++ b/account/builder.go @@ -4,16 +4,16 @@ import ( "context" stdjson "encoding/json" - "github.com/vapor/blockchain/signers" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/common" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/encoding/json" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm/vmutil" ) var ( diff --git a/account/builder_test.go b/account/builder_test.go index 1ca6a625..66ef62e0 100644 --- a/account/builder_test.go +++ b/account/builder_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/consensus" - "github.com/vapor/protocol/bc" - "github.com/vapor/testutil" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/testutil" ) func TestMergeSpendAction(t *testing.T) { diff --git a/account/indexer.go b/account/indexer.go index 7e8b3de6..6a1be022 100644 --- a/account/indexer.go +++ b/account/indexer.go @@ -1,7 +1,7 @@ package account import ( - "github.com/vapor/blockchain/query" + "github.com/bytom/vapor/blockchain/query" ) //Annotated init an annotated account object diff --git a/account/store.go b/account/store.go index b502980c..afe233aa 100644 --- a/account/store.go +++ b/account/store.go @@ -1,8 +1,8 @@ package account import ( - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/protocol/bc" ) // AccountStore interface contains account storage functions. diff --git a/account/utxo_keeper.go b/account/utxo_keeper.go index 4af1a5db..c9a5ea6c 100644 --- a/account/utxo_keeper.go +++ b/account/utxo_keeper.go @@ -9,8 +9,8 @@ import ( "time" log "github.com/sirupsen/logrus" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" ) const desireUtxoCount = 5 diff --git a/account/utxo_keeper_test.go b/account/utxo_keeper_test.go index 50b2d77e..4738c6c0 100644 --- a/account/utxo_keeper_test.go +++ b/account/utxo_keeper_test.go @@ -8,11 +8,11 @@ import ( "time" "github.com/golang/groupcache/lru" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/crypto/ed25519/chainkd" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/protocol/bc" - "github.com/vapor/testutil" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/testutil" ) func TestAddUnconfirmedUtxo(t *testing.T) { diff --git a/api/accounts.go b/api/accounts.go index b75aa513..79e74ab2 100644 --- a/api/accounts.go +++ b/api/accounts.go @@ -7,12 +7,12 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/account" - "github.com/vapor/blockchain/signers" - "github.com/vapor/common" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/protocol/vm/vmutil" ) type CreateAccountReq struct { diff --git a/api/api.go b/api/api.go index a030f392..cc54ae8a 100644 --- a/api/api.go +++ b/api/api.go @@ -11,22 +11,22 @@ import ( log "github.com/sirupsen/logrus" cmn "github.com/tendermint/tmlibs/common" - "github.com/vapor/accesstoken" - cfg "github.com/vapor/config" - "github.com/vapor/dashboard/dashboard" - "github.com/vapor/dashboard/equity" - "github.com/vapor/errors" - "github.com/vapor/event" - "github.com/vapor/net/http/authn" - "github.com/vapor/net/http/gzip" - "github.com/vapor/net/http/httpjson" - "github.com/vapor/net/http/static" - "github.com/vapor/net/websocket" - "github.com/vapor/netsync/peers" - "github.com/vapor/p2p" - "github.com/vapor/proposal/blockproposer" - "github.com/vapor/protocol" - "github.com/vapor/wallet" + "github.com/bytom/vapor/accesstoken" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/dashboard/dashboard" + "github.com/bytom/vapor/dashboard/equity" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/net/http/authn" + "github.com/bytom/vapor/net/http/gzip" + "github.com/bytom/vapor/net/http/httpjson" + "github.com/bytom/vapor/net/http/static" + "github.com/bytom/vapor/net/websocket" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/p2p" + "github.com/bytom/vapor/proposal/blockproposer" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/wallet" ) var ( diff --git a/api/api_test.go b/api/api_test.go index e9840830..96ce9702 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -6,10 +6,10 @@ import ( "os" "testing" - "github.com/vapor/accesstoken" - "github.com/vapor/blockchain/rpc" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/testutil" + "github.com/bytom/vapor/accesstoken" + "github.com/bytom/vapor/blockchain/rpc" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/testutil" ) func TestAPIHandler(t *testing.T) { diff --git a/api/bbft.go b/api/bbft.go index 0ab6fe6a..02e70039 100644 --- a/api/bbft.go +++ b/api/bbft.go @@ -3,7 +3,7 @@ package api import ( "sort" - chainjson "github.com/vapor/encoding/json" + chainjson "github.com/bytom/vapor/encoding/json" ) type VoteInfo struct { diff --git a/api/block_retrieve.go b/api/block_retrieve.go index 10b9fb0f..cc2ac519 100644 --- a/api/block_retrieve.go +++ b/api/block_retrieve.go @@ -3,10 +3,10 @@ package api import ( set "gopkg.in/fatih/set.v0" - "github.com/vapor/blockchain/query" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/blockchain/query" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) // return best block hash diff --git a/api/compile.go b/api/compile.go index c1af857f..dd5d9faa 100644 --- a/api/compile.go +++ b/api/compile.go @@ -3,10 +3,10 @@ package api import ( "strings" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/equity/compiler" - "github.com/vapor/errors" - "github.com/vapor/protocol/vm" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/equity/compiler" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/vm" ) // pre-define contract error types diff --git a/api/errors.go b/api/errors.go index 0a6c38f7..06102be3 100644 --- a/api/errors.go +++ b/api/errors.go @@ -3,18 +3,18 @@ package api import ( "context" - "github.com/vapor/account" - "github.com/vapor/asset" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/blockchain/rpc" - "github.com/vapor/blockchain/signers" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/errors" - "github.com/vapor/net/http/httperror" - "github.com/vapor/net/http/httpjson" - "github.com/vapor/protocol" - "github.com/vapor/protocol/validation" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/blockchain/rpc" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/net/http/httperror" + "github.com/bytom/vapor/net/http/httpjson" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/validation" + "github.com/bytom/vapor/protocol/vm" ) var ( diff --git a/api/hsm.go b/api/hsm.go index 3158c20b..bdda0e6c 100644 --- a/api/hsm.go +++ b/api/hsm.go @@ -5,8 +5,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/crypto/ed25519/chainkd" ) type CreateKeyReq struct { diff --git a/api/message.go b/api/message.go index 44489bef..622170bb 100644 --- a/api/message.go +++ b/api/message.go @@ -5,13 +5,13 @@ import ( "encoding/hex" "strings" - "github.com/vapor/blockchain/signers" - "github.com/vapor/common" - "github.com/vapor/consensus" - "github.com/vapor/crypto" - "github.com/vapor/crypto/ed25519" - "github.com/vapor/crypto/ed25519/chainkd" - chainjson "github.com/vapor/encoding/json" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto" + "github.com/bytom/vapor/crypto/ed25519" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + chainjson "github.com/bytom/vapor/encoding/json" ) // SignMsgResp is response for sign message diff --git a/api/miner.go b/api/miner.go index a7029e97..1e9f6c96 100644 --- a/api/miner.go +++ b/api/miner.go @@ -4,10 +4,10 @@ import ( "context" "strconv" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/errors" - "github.com/vapor/event" - "github.com/vapor/protocol/bc/types" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol/bc/types" ) type CoinbaseArbitrary struct { diff --git a/api/nodeinfo.go b/api/nodeinfo.go index ac085ffa..6557e336 100644 --- a/api/nodeinfo.go +++ b/api/nodeinfo.go @@ -6,14 +6,14 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/common" - cfg "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/crypto" - "github.com/vapor/errors" - "github.com/vapor/netsync/peers" - "github.com/vapor/p2p" - "github.com/vapor/version" + "github.com/bytom/vapor/common" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/p2p" + "github.com/bytom/vapor/version" ) type VersionInfo struct { diff --git a/api/program.go b/api/program.go index 86381d15..716bb787 100644 --- a/api/program.go +++ b/api/program.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "fmt" - "github.com/vapor/consensus/segwit" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/consensus/segwit" + "github.com/bytom/vapor/protocol/vm" ) // DecodeProgResp is response for decode program diff --git a/api/query.go b/api/query.go index fba82b85..2216dd90 100644 --- a/api/query.go +++ b/api/query.go @@ -7,18 +7,18 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/account" - "github.com/vapor/asset" - "github.com/vapor/blockchain/query" - "github.com/vapor/blockchain/signers" - "github.com/vapor/common/arithmetic" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519" - "github.com/vapor/crypto/ed25519/chainkd" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/query" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/common/arithmetic" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) // POST /list-accounts diff --git a/api/receivers.go b/api/receivers.go index 28564da8..730c1528 100644 --- a/api/receivers.go +++ b/api/receivers.go @@ -3,7 +3,7 @@ package api import ( "context" - "github.com/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/blockchain/txbuilder" ) type AccountFilter struct { diff --git a/api/request.go b/api/request.go index 28f62b37..6e9efeaa 100644 --- a/api/request.go +++ b/api/request.go @@ -4,10 +4,10 @@ import ( "context" "strings" - "github.com/vapor/consensus" - "github.com/vapor/encoding/json" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc/types" ) // action error diff --git a/api/transact.go b/api/transact.go index 67d4429f..26719d31 100644 --- a/api/transact.go +++ b/api/transact.go @@ -8,11 +8,11 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/account" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) var ( diff --git a/api/wallet.go b/api/wallet.go index c59109a1..d7b1fb81 100644 --- a/api/wallet.go +++ b/api/wallet.go @@ -3,10 +3,10 @@ package api import ( "context" - "github.com/vapor/account" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/errors" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/errors" ) // POST /wallet error diff --git a/api/websocket.go b/api/websocket.go index 26070c4d..ba7a9123 100644 --- a/api/websocket.go +++ b/api/websocket.go @@ -6,7 +6,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/net/websocket" + "github.com/bytom/vapor/net/websocket" ) // timeZeroVal is simply the zero value for a time.Time and is used to avoid diff --git a/application/mov/common/type.go b/application/mov/common/type.go index 031e3781..d56dac08 100644 --- a/application/mov/common/type.go +++ b/application/mov/common/type.go @@ -1,6 +1,6 @@ package common -import "github.com/vapor/protocol/bc" +import "github.com/bytom/vapor/protocol/bc" type MovUtxo struct { SourceID *bc.Hash diff --git a/application/mov/database/mov_store.go b/application/mov/database/mov_store.go index 4aa831a3..252886a4 100644 --- a/application/mov/database/mov_store.go +++ b/application/mov/database/mov_store.go @@ -6,10 +6,10 @@ import ( "errors" "math" - "github.com/vapor/application/mov/common" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/application/mov/common" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) const ( diff --git a/application/mov/database/mov_store_test.go b/application/mov/database/mov_store_test.go index 7f17fc70..f212ae07 100644 --- a/application/mov/database/mov_store_test.go +++ b/application/mov/database/mov_store_test.go @@ -9,14 +9,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/vapor/application/mov/common" - "github.com/vapor/consensus" - "github.com/vapor/database/leveldb" - dbm "github.com/vapor/database/leveldb" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/testutil" + "github.com/bytom/vapor/application/mov/common" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/database/leveldb" + dbm "github.com/bytom/vapor/database/leveldb" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/testutil" ) var ( diff --git a/asset/annotate.go b/asset/annotate.go index 723e0bb9..5177efa9 100644 --- a/asset/annotate.go +++ b/asset/annotate.go @@ -3,8 +3,8 @@ package asset import ( "encoding/json" - "github.com/vapor/blockchain/query" - chainjson "github.com/vapor/encoding/json" + "github.com/bytom/vapor/blockchain/query" + chainjson "github.com/bytom/vapor/encoding/json" ) //Annotated annotate the asset diff --git a/asset/asset.go b/asset/asset.go index 9574d79b..ae0e8499 100644 --- a/asset/asset.go +++ b/asset/asset.go @@ -8,12 +8,12 @@ import ( "github.com/golang/groupcache/lru" - "github.com/vapor/consensus" - dbm "github.com/vapor/database/leveldb" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/errors" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/consensus" + dbm "github.com/bytom/vapor/database/leveldb" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" ) // DefaultNativeAsset native BTM asset diff --git a/blockchain/pseudohsm/image.go b/blockchain/pseudohsm/image.go index 1c691ca3..8d50d4cf 100644 --- a/blockchain/pseudohsm/image.go +++ b/blockchain/pseudohsm/image.go @@ -9,7 +9,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/ed25519/chainkd" ) const logModule = "pseudohsm" diff --git a/blockchain/pseudohsm/image_test.go b/blockchain/pseudohsm/image_test.go index 79c6646a..063e6ab0 100644 --- a/blockchain/pseudohsm/image_test.go +++ b/blockchain/pseudohsm/image_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/ed25519/chainkd" ) func TestRestore(t *testing.T) { diff --git a/blockchain/pseudohsm/key.go b/blockchain/pseudohsm/key.go index bb94410c..8d40e6ed 100644 --- a/blockchain/pseudohsm/key.go +++ b/blockchain/pseudohsm/key.go @@ -8,7 +8,7 @@ import ( "time" "github.com/pborman/uuid" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/ed25519/chainkd" ) const ( diff --git a/blockchain/pseudohsm/keycache.go b/blockchain/pseudohsm/keycache.go index 7ab39fba..2030a4dc 100644 --- a/blockchain/pseudohsm/keycache.go +++ b/blockchain/pseudohsm/keycache.go @@ -15,7 +15,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/ed25519/chainkd" ) // Minimum amount of time between cache reloads. This limit applies if the platform does diff --git a/blockchain/pseudohsm/keycache_test.go b/blockchain/pseudohsm/keycache_test.go index 8b6f1f4e..3d109176 100644 --- a/blockchain/pseudohsm/keycache_test.go +++ b/blockchain/pseudohsm/keycache_test.go @@ -14,7 +14,7 @@ import ( "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/ed25519/chainkd" ) var ( diff --git a/blockchain/pseudohsm/keystore_passphrase.go b/blockchain/pseudohsm/keystore_passphrase.go index 17cba239..5ec72929 100644 --- a/blockchain/pseudohsm/keystore_passphrase.go +++ b/blockchain/pseudohsm/keystore_passphrase.go @@ -17,9 +17,9 @@ import ( "path/filepath" "github.com/pborman/uuid" - "github.com/vapor/crypto" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/crypto/randentropy" + "github.com/bytom/vapor/crypto" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/randentropy" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" ) diff --git a/blockchain/pseudohsm/keystore_passphrase_test.go b/blockchain/pseudohsm/keystore_passphrase_test.go index 8fa2dc91..fa5e3a83 100644 --- a/blockchain/pseudohsm/keystore_passphrase_test.go +++ b/blockchain/pseudohsm/keystore_passphrase_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/pborman/uuid" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/ed25519/chainkd" ) const ( diff --git a/blockchain/pseudohsm/pseudohsm.go b/blockchain/pseudohsm/pseudohsm.go index 51b672a0..989bec1d 100644 --- a/blockchain/pseudohsm/pseudohsm.go +++ b/blockchain/pseudohsm/pseudohsm.go @@ -12,9 +12,9 @@ import ( "github.com/pborman/uuid" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/errors" - mnem "github.com/vapor/wallet/mnemonic" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/errors" + mnem "github.com/bytom/vapor/wallet/mnemonic" ) // pre-define errors for supporting bytom errorFormatter diff --git a/blockchain/pseudohsm/pseudohsm_test.go b/blockchain/pseudohsm/pseudohsm_test.go index 8fd2857e..e3cd3bb1 100644 --- a/blockchain/pseudohsm/pseudohsm_test.go +++ b/blockchain/pseudohsm/pseudohsm_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/vapor/crypto/ed25519" - "github.com/vapor/errors" + "github.com/bytom/vapor/crypto/ed25519" + "github.com/bytom/vapor/errors" ) const dirPath = "testdata/pseudo" diff --git a/blockchain/query/annotated.go b/blockchain/query/annotated.go index 2b1894a1..471704d7 100644 --- a/blockchain/query/annotated.go +++ b/blockchain/query/annotated.go @@ -3,9 +3,9 @@ package query import ( "encoding/json" - "github.com/vapor/crypto/ed25519/chainkd" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/protocol/bc" ) //AnnotatedTx means an annotated transaction. diff --git a/blockchain/rpc/rpc.go b/blockchain/rpc/rpc.go index 0710c93c..87ba1425 100644 --- a/blockchain/rpc/rpc.go +++ b/blockchain/rpc/rpc.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/vapor/errors" - "github.com/vapor/net/http/httperror" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/net/http/httperror" ) // Bytom-specific header fields diff --git a/blockchain/rpc/rpc_test.go b/blockchain/rpc/rpc_test.go index 3e6964f1..34f9ea5e 100644 --- a/blockchain/rpc/rpc_test.go +++ b/blockchain/rpc/rpc_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/vapor/testutil" + "github.com/bytom/vapor/testutil" ) func TestRPCCallJSON(t *testing.T) { diff --git a/blockchain/signers/signers.go b/blockchain/signers/signers.go index 53baf461..61768c86 100644 --- a/blockchain/signers/signers.go +++ b/blockchain/signers/signers.go @@ -4,8 +4,8 @@ package signers import ( "bytes" "encoding/binary" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/errors" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/errors" ) type keySpace byte diff --git a/blockchain/txbuilder/actions.go b/blockchain/txbuilder/actions.go index f5b40bc0..907d1af7 100644 --- a/blockchain/txbuilder/actions.go +++ b/blockchain/txbuilder/actions.go @@ -7,13 +7,13 @@ import ( "golang.org/x/crypto/sha3" - "github.com/vapor/common" - cfg "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/encoding/json" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/common" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm/vmutil" ) // DecodeControlAddressAction convert input data to action struct diff --git a/blockchain/txbuilder/builder.go b/blockchain/txbuilder/builder.go index 2c357ad1..ef0d6284 100644 --- a/blockchain/txbuilder/builder.go +++ b/blockchain/txbuilder/builder.go @@ -4,9 +4,9 @@ import ( "math" "time" - "github.com/vapor/common/arithmetic" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/common/arithmetic" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc/types" ) // NewBuilder return new TemplateBuilder instance diff --git a/blockchain/txbuilder/constraint.go b/blockchain/txbuilder/constraint.go index 937a4c82..1c2e592e 100644 --- a/blockchain/txbuilder/constraint.go +++ b/blockchain/txbuilder/constraint.go @@ -1,9 +1,9 @@ package txbuilder import ( - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/vm" - "github.com/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/vm" + "github.com/bytom/vapor/protocol/vm/vmutil" ) // Constraint types express a constraint on an input of a proposed diff --git a/blockchain/txbuilder/data_witness.go b/blockchain/txbuilder/data_witness.go index 1f49b2ca..5af1a739 100644 --- a/blockchain/txbuilder/data_witness.go +++ b/blockchain/txbuilder/data_witness.go @@ -3,7 +3,7 @@ package txbuilder import ( "encoding/json" - chainjson "github.com/vapor/encoding/json" + chainjson "github.com/bytom/vapor/encoding/json" ) // DataWitness used sign transaction diff --git a/blockchain/txbuilder/estimate.go b/blockchain/txbuilder/estimate.go index dd74d8e4..6a83414d 100644 --- a/blockchain/txbuilder/estimate.go +++ b/blockchain/txbuilder/estimate.go @@ -1,9 +1,9 @@ package txbuilder import ( - "github.com/vapor/consensus" - "github.com/vapor/consensus/segwit" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/consensus/segwit" + "github.com/bytom/vapor/protocol/bc/types" ) // EstimateTxGasInfo estimate transaction consumed gas diff --git a/blockchain/txbuilder/finalize.go b/blockchain/txbuilder/finalize.go index 09558762..3a6ef254 100644 --- a/blockchain/txbuilder/finalize.go +++ b/blockchain/txbuilder/finalize.go @@ -4,13 +4,13 @@ import ( "bytes" "context" - "github.com/vapor/common/arithmetic" - cfg "github.com/vapor/config" - "github.com/vapor/errors" - "github.com/vapor/math/checked" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/common/arithmetic" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/math/checked" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm" ) var ( diff --git a/blockchain/txbuilder/rawtxsig_witness.go b/blockchain/txbuilder/rawtxsig_witness.go index dabc8c90..1bc6b845 100644 --- a/blockchain/txbuilder/rawtxsig_witness.go +++ b/blockchain/txbuilder/rawtxsig_witness.go @@ -6,7 +6,7 @@ import ( log "github.com/sirupsen/logrus" - chainjson "github.com/vapor/encoding/json" + chainjson "github.com/bytom/vapor/encoding/json" ) // TODO(bobg): most of the code here is duplicated from diff --git a/blockchain/txbuilder/signature_program.go b/blockchain/txbuilder/signature_program.go index 800c7834..23ad2d3b 100644 --- a/blockchain/txbuilder/signature_program.go +++ b/blockchain/txbuilder/signature_program.go @@ -1,8 +1,8 @@ package txbuilder import ( - "github.com/vapor/protocol/vm" - "github.com/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/protocol/vm" + "github.com/bytom/vapor/protocol/vm/vmutil" ) // Signature programs constrain how the signed inputs of a transaction diff --git a/blockchain/txbuilder/signature_witness.go b/blockchain/txbuilder/signature_witness.go index 63c8612c..17c44ba2 100644 --- a/blockchain/txbuilder/signature_witness.go +++ b/blockchain/txbuilder/signature_witness.go @@ -6,11 +6,11 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/crypto/sha3pool" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/errors" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/sha3pool" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/vm" ) type ( diff --git a/blockchain/txbuilder/signing_instruction.go b/blockchain/txbuilder/signing_instruction.go index bf04773a..6a111980 100644 --- a/blockchain/txbuilder/signing_instruction.go +++ b/blockchain/txbuilder/signing_instruction.go @@ -3,9 +3,9 @@ package txbuilder import ( "encoding/json" - "github.com/vapor/crypto/ed25519/chainkd" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/errors" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/errors" ) func (si *SigningInstruction) AddDataWitness(data chainjson.HexBytes) { diff --git a/blockchain/txbuilder/txbuilder.go b/blockchain/txbuilder/txbuilder.go index 2bfd342e..93f25d22 100644 --- a/blockchain/txbuilder/txbuilder.go +++ b/blockchain/txbuilder/txbuilder.go @@ -9,12 +9,12 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/errors" - "github.com/vapor/math/checked" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/math/checked" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm" ) const logModule = "txbuilder" diff --git a/blockchain/txbuilder/txbuilder_test.go b/blockchain/txbuilder/txbuilder_test.go index bc85f8ff..bd520302 100644 --- a/blockchain/txbuilder/txbuilder_test.go +++ b/blockchain/txbuilder/txbuilder_test.go @@ -10,16 +10,16 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/common" - "github.com/vapor/consensus" - "github.com/vapor/crypto" - "github.com/vapor/crypto/ed25519/chainkd" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm/vmutil" - "github.com/vapor/testutil" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/testutil" ) type testAction bc.AssetAmount diff --git a/blockchain/txbuilder/types.go b/blockchain/txbuilder/types.go index 9de666fb..b758b0fa 100644 --- a/blockchain/txbuilder/types.go +++ b/blockchain/txbuilder/types.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" - "github.com/vapor/crypto/ed25519/chainkd" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) // Template represents a partially- or fully-signed transaction. diff --git a/blockchain/txbuilder/witness.go b/blockchain/txbuilder/witness.go index 582b06ff..5437a581 100644 --- a/blockchain/txbuilder/witness.go +++ b/blockchain/txbuilder/witness.go @@ -3,9 +3,9 @@ package txbuilder import ( "context" - "github.com/vapor/crypto/ed25519/chainkd" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/errors" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/errors" ) // SignFunc is the function passed into Sign that produces diff --git a/blockchain/txbuilder/witness_test.go b/blockchain/txbuilder/witness_test.go index 49e5bde5..a4e093a2 100644 --- a/blockchain/txbuilder/witness_test.go +++ b/blockchain/txbuilder/witness_test.go @@ -6,8 +6,8 @@ import ( "github.com/davecgh/go-spew/spew" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/testutil" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/testutil" ) func TestWitnessJSON(t *testing.T) { diff --git a/cmd/consensusreward/main.go b/cmd/consensusreward/main.go index b38d07a5..c466170f 100644 --- a/cmd/consensusreward/main.go +++ b/cmd/consensusreward/main.go @@ -7,9 +7,9 @@ import ( "github.com/spf13/cobra" "github.com/tendermint/tmlibs/cli" - "github.com/vapor/consensus" - "github.com/vapor/toolbar/consensusreward" - cfg "github.com/vapor/toolbar/consensusreward/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/toolbar/consensusreward" + cfg "github.com/bytom/vapor/toolbar/consensusreward/config" ) const logModule = "consensusereward" diff --git a/cmd/fedd/main.go b/cmd/fedd/main.go index 3cb91c6e..bb21b3d9 100644 --- a/cmd/fedd/main.go +++ b/cmd/fedd/main.go @@ -5,11 +5,11 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/toolbar/federation/api" - "github.com/vapor/toolbar/federation/config" - "github.com/vapor/toolbar/federation/database" - "github.com/vapor/toolbar/common" - "github.com/vapor/toolbar/federation/synchron" + "github.com/bytom/vapor/toolbar/federation/api" + "github.com/bytom/vapor/toolbar/federation/config" + "github.com/bytom/vapor/toolbar/federation/database" + "github.com/bytom/vapor/toolbar/common" + "github.com/bytom/vapor/toolbar/federation/synchron" ) func main() { diff --git a/cmd/precognitive/main.go b/cmd/precognitive/main.go index 07913bef..b464e3e5 100644 --- a/cmd/precognitive/main.go +++ b/cmd/precognitive/main.go @@ -5,10 +5,10 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/toolbar/common" - "github.com/vapor/toolbar/precognitive/api" - "github.com/vapor/toolbar/precognitive/config" - "github.com/vapor/toolbar/precognitive/monitor" + "github.com/bytom/vapor/toolbar/common" + "github.com/bytom/vapor/toolbar/precognitive/api" + "github.com/bytom/vapor/toolbar/precognitive/config" + "github.com/bytom/vapor/toolbar/precognitive/monitor" ) func main() { diff --git a/cmd/utxomerge/main.go b/cmd/utxomerge/main.go index 326595f3..03eb883c 100644 --- a/cmd/utxomerge/main.go +++ b/cmd/utxomerge/main.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" "github.com/tendermint/tmlibs/cli" - "github.com/vapor/toolbar/mergeutxo" + "github.com/bytom/vapor/toolbar/mergeutxo" ) var RootCmd = &cobra.Command{ diff --git a/cmd/vaporcli/commands/accesstoken.go b/cmd/vaporcli/commands/accesstoken.go index d1bfe9db..e8cea5da 100644 --- a/cmd/vaporcli/commands/accesstoken.go +++ b/cmd/vaporcli/commands/accesstoken.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" - "github.com/vapor/util" + "github.com/bytom/vapor/util" ) var createAccessTokenCmd = &cobra.Command{ diff --git a/cmd/vaporcli/commands/account.go b/cmd/vaporcli/commands/account.go index e5d3dd83..ab1c5e90 100644 --- a/cmd/vaporcli/commands/account.go +++ b/cmd/vaporcli/commands/account.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/util" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/util" ) func init() { diff --git a/cmd/vaporcli/commands/asset.go b/cmd/vaporcli/commands/asset.go index feec29ad..c4701363 100644 --- a/cmd/vaporcli/commands/asset.go +++ b/cmd/vaporcli/commands/asset.go @@ -8,8 +8,8 @@ import ( jww "github.com/spf13/jwalterweatherman" "encoding/hex" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/util" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/util" ) func init() { diff --git a/cmd/vaporcli/commands/block.go b/cmd/vaporcli/commands/block.go index 9ce41962..881429c0 100644 --- a/cmd/vaporcli/commands/block.go +++ b/cmd/vaporcli/commands/block.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/util" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/util" ) func init() { diff --git a/cmd/vaporcli/commands/key.go b/cmd/vaporcli/commands/key.go index a3179083..626c4d95 100644 --- a/cmd/vaporcli/commands/key.go +++ b/cmd/vaporcli/commands/key.go @@ -7,9 +7,9 @@ import ( "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" - "github.com/vapor/crypto/ed25519/chainkd" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/util" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/util" ) var createKeyCmd = &cobra.Command{ diff --git a/cmd/vaporcli/commands/mining.go b/cmd/vaporcli/commands/mining.go index 1cc62846..fc4932c1 100644 --- a/cmd/vaporcli/commands/mining.go +++ b/cmd/vaporcli/commands/mining.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" - "github.com/vapor/util" + "github.com/bytom/vapor/util" ) var isMiningCmd = &cobra.Command{ diff --git a/cmd/vaporcli/commands/net.go b/cmd/vaporcli/commands/net.go index 0f75f600..c768edea 100644 --- a/cmd/vaporcli/commands/net.go +++ b/cmd/vaporcli/commands/net.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/vapor/util" + "github.com/bytom/vapor/util" ) var netInfoCmd = &cobra.Command{ diff --git a/cmd/vaporcli/commands/program.go b/cmd/vaporcli/commands/program.go index 71426bc7..d0d9e584 100644 --- a/cmd/vaporcli/commands/program.go +++ b/cmd/vaporcli/commands/program.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/vapor/util" + "github.com/bytom/vapor/util" ) var decodeProgCmd = &cobra.Command{ diff --git a/cmd/vaporcli/commands/template.go b/cmd/vaporcli/commands/template.go index eea20ca9..9e747c37 100644 --- a/cmd/vaporcli/commands/template.go +++ b/cmd/vaporcli/commands/template.go @@ -3,7 +3,7 @@ package commands import ( "fmt" - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) const ( diff --git a/cmd/vaporcli/commands/transaction.go b/cmd/vaporcli/commands/transaction.go index 308ab944..7724485d 100644 --- a/cmd/vaporcli/commands/transaction.go +++ b/cmd/vaporcli/commands/transaction.go @@ -9,11 +9,11 @@ import ( "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" - "github.com/vapor/api" - "github.com/vapor/blockchain/txbuilder" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/util" + "github.com/bytom/vapor/api" + "github.com/bytom/vapor/blockchain/txbuilder" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/util" ) func init() { diff --git a/cmd/vaporcli/commands/txfeed.go b/cmd/vaporcli/commands/txfeed.go index 630a8a4f..65b93631 100644 --- a/cmd/vaporcli/commands/txfeed.go +++ b/cmd/vaporcli/commands/txfeed.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" - "github.com/vapor/util" + "github.com/bytom/vapor/util" ) var createTransactionFeedCmd = &cobra.Command{ diff --git a/cmd/vaporcli/commands/util.go b/cmd/vaporcli/commands/util.go index 2657ce19..9204692c 100644 --- a/cmd/vaporcli/commands/util.go +++ b/cmd/vaporcli/commands/util.go @@ -7,10 +7,10 @@ import ( jww "github.com/spf13/jwalterweatherman" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/encoding/json" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/util" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/encoding/json" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/util" ) // accountIns is used for account related request. diff --git a/cmd/vaporcli/commands/vaporcli.go b/cmd/vaporcli/commands/vaporcli.go index d90427a1..58b14e56 100644 --- a/cmd/vaporcli/commands/vaporcli.go +++ b/cmd/vaporcli/commands/vaporcli.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/vapor/util" + "github.com/bytom/vapor/util" ) // vaporcli usage template diff --git a/cmd/vaporcli/commands/version.go b/cmd/vaporcli/commands/version.go index 9ce75851..483aeca0 100644 --- a/cmd/vaporcli/commands/version.go +++ b/cmd/vaporcli/commands/version.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" - "github.com/vapor/version" + "github.com/bytom/vapor/version" ) var versionCmd = &cobra.Command{ diff --git a/cmd/vaporcli/commands/wallet.go b/cmd/vaporcli/commands/wallet.go index 823781ed..4d51a297 100644 --- a/cmd/vaporcli/commands/wallet.go +++ b/cmd/vaporcli/commands/wallet.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" - "github.com/vapor/util" + "github.com/bytom/vapor/util" ) var walletInfoCmd = &cobra.Command{ diff --git a/cmd/vaporcli/main.go b/cmd/vaporcli/main.go index afb61ecc..458f4368 100644 --- a/cmd/vaporcli/main.go +++ b/cmd/vaporcli/main.go @@ -3,7 +3,7 @@ package main import ( "runtime" - cmd "github.com/vapor/cmd/vaporcli/commands" + cmd "github.com/bytom/vapor/cmd/vaporcli/commands" ) func main() { diff --git a/cmd/vapord/commands/init.go b/cmd/vapord/commands/init.go index aa0f144c..f60dbd91 100644 --- a/cmd/vapord/commands/init.go +++ b/cmd/vapord/commands/init.go @@ -9,8 +9,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - cfg "github.com/vapor/config" - "github.com/vapor/crypto/ed25519/chainkd" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/crypto/ed25519/chainkd" ) var initFilesCmd = &cobra.Command{ diff --git a/cmd/vapord/commands/root.go b/cmd/vapord/commands/root.go index 6f75655e..ed4060d7 100644 --- a/cmd/vapord/commands/root.go +++ b/cmd/vapord/commands/root.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/viper" cmn "github.com/tendermint/tmlibs/common" - cfg "github.com/vapor/config" + cfg "github.com/bytom/vapor/config" ) var ( diff --git a/cmd/vapord/commands/run_node.go b/cmd/vapord/commands/run_node.go index 3e8993b1..2cc8bc7b 100644 --- a/cmd/vapord/commands/run_node.go +++ b/cmd/vapord/commands/run_node.go @@ -7,7 +7,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/vapor/node" + "github.com/bytom/vapor/node" ) const logModule = "cmd" diff --git a/cmd/vapord/commands/version.go b/cmd/vapord/commands/version.go index 91c26224..3743b9e0 100644 --- a/cmd/vapord/commands/version.go +++ b/cmd/vapord/commands/version.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/vapor/version" + "github.com/bytom/vapor/version" ) var versionCmd = &cobra.Command{ diff --git a/cmd/vapord/main.go b/cmd/vapord/main.go index 9d6efb26..2ddfd200 100644 --- a/cmd/vapord/main.go +++ b/cmd/vapord/main.go @@ -10,8 +10,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/tendermint/tmlibs/cli" - "github.com/vapor/cmd/vapord/commands" - "github.com/vapor/config" + "github.com/bytom/vapor/cmd/vapord/commands" + "github.com/bytom/vapor/config" ) // ContextHook is a hook for logrus. diff --git a/cmd/votereward/main.go b/cmd/votereward/main.go index 275632dc..8fb1c96f 100644 --- a/cmd/votereward/main.go +++ b/cmd/votereward/main.go @@ -7,11 +7,11 @@ import ( "github.com/spf13/cobra" "github.com/tendermint/tmlibs/cli" - "github.com/vapor/consensus" - "github.com/vapor/toolbar/common" - cfg "github.com/vapor/toolbar/vote_reward/config" - "github.com/vapor/toolbar/vote_reward/settlementvotereward" - "github.com/vapor/toolbar/vote_reward/synchron" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/toolbar/common" + cfg "github.com/bytom/vapor/toolbar/vote_reward/config" + "github.com/bytom/vapor/toolbar/vote_reward/settlementvotereward" + "github.com/bytom/vapor/toolbar/vote_reward/synchron" ) const logModule = "reward" diff --git a/common/address.go b/common/address.go index 3fe4999f..f4618a6b 100644 --- a/common/address.go +++ b/common/address.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/vapor/common/bech32" - "github.com/vapor/consensus" + "github.com/bytom/vapor/common/bech32" + "github.com/bytom/vapor/consensus" ) var ( diff --git a/common/address_test.go b/common/address_test.go index b1b3d5b9..1794cf16 100644 --- a/common/address_test.go +++ b/common/address_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/vapor/common/bech32" - "github.com/vapor/consensus" + "github.com/bytom/vapor/common/bech32" + "github.com/bytom/vapor/consensus" ) func TestAddresses(t *testing.T) { diff --git a/common/arithmetic/calculate.go b/common/arithmetic/calculate.go index 394666c3..875537cb 100644 --- a/common/arithmetic/calculate.go +++ b/common/arithmetic/calculate.go @@ -1,9 +1,9 @@ package arithmetic import ( - "github.com/vapor/consensus" - "github.com/vapor/math/checked" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/math/checked" + "github.com/bytom/vapor/protocol/bc/types" ) // CalculateTxFee calculate transaction fee diff --git a/config/config.go b/config/config.go index 02d2c7cf..fa19b304 100644 --- a/config/config.go +++ b/config/config.go @@ -10,7 +10,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/ed25519/chainkd" ) var ( diff --git a/config/federation_test.go b/config/federation_test.go index 00e92ade..1c36d863 100644 --- a/config/federation_test.go +++ b/config/federation_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/vapor/testutil" + "github.com/bytom/vapor/testutil" ) func TestFederation(t *testing.T) { diff --git a/config/genesis.go b/config/genesis.go index a3b2f7e2..9e36bc65 100644 --- a/config/genesis.go +++ b/config/genesis.go @@ -5,12 +5,12 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/consensus" - "github.com/vapor/crypto" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm/vmutil" ) // FedAddressPath is used to derive federation root xpubs for signing cross-chain txs diff --git a/consensus/general.go b/consensus/general.go index b34f19d8..07c32e8a 100644 --- a/consensus/general.go +++ b/consensus/general.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc" ) // basic constant diff --git a/consensus/segwit/segwit.go b/consensus/segwit/segwit.go index 5f62f338..75151417 100644 --- a/consensus/segwit/segwit.go +++ b/consensus/segwit/segwit.go @@ -3,9 +3,9 @@ package segwit import ( "errors" - "github.com/vapor/consensus" - "github.com/vapor/protocol/vm" - "github.com/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/protocol/vm" + "github.com/bytom/vapor/protocol/vm/vmutil" ) func IsP2WScript(prog []byte) bool { diff --git a/crypto/crypto.go b/crypto/crypto.go index fd434b4a..c044c29c 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -1,7 +1,7 @@ package crypto import ( - "github.com/vapor/common" + "github.com/bytom/vapor/common" "golang.org/x/crypto/ripemd160" "golang.org/x/crypto/sha3" ) diff --git a/crypto/ed25519/chainkd/chainkd.go b/crypto/ed25519/chainkd/chainkd.go index 9b6d2212..92805bcd 100644 --- a/crypto/ed25519/chainkd/chainkd.go +++ b/crypto/ed25519/chainkd/chainkd.go @@ -6,8 +6,8 @@ import ( "crypto/sha512" "io" - "github.com/vapor/crypto/ed25519" - "github.com/vapor/crypto/ed25519/ecmath" + "github.com/bytom/vapor/crypto/ed25519" + "github.com/bytom/vapor/crypto/ed25519/ecmath" ) type ( diff --git a/crypto/ed25519/chainkd/expanded_key.go b/crypto/ed25519/chainkd/expanded_key.go index 5926b287..022689de 100644 --- a/crypto/ed25519/chainkd/expanded_key.go +++ b/crypto/ed25519/chainkd/expanded_key.go @@ -14,8 +14,8 @@ import ( "io" "strconv" - "github.com/vapor/crypto/ed25519" - "github.com/vapor/crypto/ed25519/internal/edwards25519" + "github.com/bytom/vapor/crypto/ed25519" + "github.com/bytom/vapor/crypto/ed25519/internal/edwards25519" ) const ( diff --git a/crypto/ed25519/chainkd/expanded_key_test.go b/crypto/ed25519/chainkd/expanded_key_test.go index 3d3a614d..23b3c77e 100644 --- a/crypto/ed25519/chainkd/expanded_key_test.go +++ b/crypto/ed25519/chainkd/expanded_key_test.go @@ -5,7 +5,7 @@ import ( "crypto" "testing" - "github.com/vapor/crypto/ed25519" + "github.com/bytom/vapor/crypto/ed25519" ) // Testing basic InnerSign+Verify and the invariants: diff --git a/crypto/ed25519/chainkd/util.go b/crypto/ed25519/chainkd/util.go index a8274d75..cbb82945 100644 --- a/crypto/ed25519/chainkd/util.go +++ b/crypto/ed25519/chainkd/util.go @@ -3,7 +3,7 @@ package chainkd import ( "io" - "github.com/vapor/crypto/ed25519" + "github.com/bytom/vapor/crypto/ed25519" ) // Utility functions diff --git a/crypto/ed25519/ecmath/point.go b/crypto/ed25519/ecmath/point.go index 9d363098..c75cf4e3 100644 --- a/crypto/ed25519/ecmath/point.go +++ b/crypto/ed25519/ecmath/point.go @@ -3,7 +3,7 @@ package ecmath import ( "crypto/subtle" - "github.com/vapor/crypto/ed25519/internal/edwards25519" + "github.com/bytom/vapor/crypto/ed25519/internal/edwards25519" ) // Point is a point on the ed25519 curve. diff --git a/crypto/ed25519/ecmath/scalar.go b/crypto/ed25519/ecmath/scalar.go index d3ab1c15..e5022348 100644 --- a/crypto/ed25519/ecmath/scalar.go +++ b/crypto/ed25519/ecmath/scalar.go @@ -3,7 +3,7 @@ package ecmath import ( "crypto/subtle" - "github.com/vapor/crypto/ed25519/internal/edwards25519" + "github.com/bytom/vapor/crypto/ed25519/internal/edwards25519" ) // Scalar is a 256-bit little-endian scalar. diff --git a/crypto/ed25519/ed25519.go b/crypto/ed25519/ed25519.go index aa22b5b9..c791082b 100644 --- a/crypto/ed25519/ed25519.go +++ b/crypto/ed25519/ed25519.go @@ -16,7 +16,7 @@ import ( "io" "strconv" - "github.com/vapor/crypto/ed25519/internal/edwards25519" + "github.com/bytom/vapor/crypto/ed25519/internal/edwards25519" ) const ( diff --git a/crypto/ed25519/ed25519_test.go b/crypto/ed25519/ed25519_test.go index 08728e06..5afeb1a3 100644 --- a/crypto/ed25519/ed25519_test.go +++ b/crypto/ed25519/ed25519_test.go @@ -15,7 +15,7 @@ import ( "strings" "testing" - "github.com/vapor/crypto/ed25519/internal/edwards25519" + "github.com/bytom/vapor/crypto/ed25519/internal/edwards25519" ) type zeroReader struct{} diff --git a/database/account_store.go b/database/account_store.go index d050f494..8d15bcf7 100644 --- a/database/account_store.go +++ b/database/account_store.go @@ -5,14 +5,14 @@ import ( "sort" "strings" - acc "github.com/vapor/account" - "github.com/vapor/blockchain/signers" - "github.com/vapor/common" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/crypto/sha3pool" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" + acc "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/sha3pool" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" ) const ( diff --git a/database/account_store_test.go b/database/account_store_test.go index 680554c9..3a43e92b 100644 --- a/database/account_store_test.go +++ b/database/account_store_test.go @@ -6,15 +6,15 @@ import ( "sort" "testing" - "github.com/vapor/common" - "github.com/vapor/testutil" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/testutil" - "github.com/vapor/blockchain/signers" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/crypto/ed25519/chainkd" - acc "github.com/vapor/account" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/protocol/bc" + acc "github.com/bytom/vapor/account" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/protocol/bc" ) func TestDeleteAccount(t *testing.T) { diff --git a/database/cache.go b/database/cache.go index e6fb4d84..10bb6286 100644 --- a/database/cache.go +++ b/database/cache.go @@ -5,10 +5,10 @@ import ( "github.com/golang/groupcache/singleflight" - "github.com/vapor/common" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" ) const ( diff --git a/database/cache_test.go b/database/cache_test.go index b88ad3a3..8dea9adc 100644 --- a/database/cache_test.go +++ b/database/cache_test.go @@ -3,9 +3,9 @@ package database import ( "testing" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" ) func TestBlockCache(t *testing.T) { diff --git a/database/store.go b/database/store.go index bff69c62..c4cdda63 100644 --- a/database/store.go +++ b/database/store.go @@ -9,13 +9,13 @@ import ( "github.com/golang/protobuf/proto" log "github.com/sirupsen/logrus" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/database/storage" - "github.com/vapor/errors" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" ) const ( diff --git a/database/store_test.go b/database/store_test.go index 3686838d..548f6b24 100644 --- a/database/store_test.go +++ b/database/store_test.go @@ -4,14 +4,14 @@ import ( "os" "testing" - "github.com/vapor/consensus" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/database/storage" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" + "github.com/bytom/vapor/testutil" ) func TestSaveChainStatus(t *testing.T) { diff --git a/database/utxo_view.go b/database/utxo_view.go index 987a23d8..81a7f28b 100644 --- a/database/utxo_view.go +++ b/database/utxo_view.go @@ -2,11 +2,11 @@ package database import ( "github.com/golang/protobuf/proto" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/database/storage" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/state" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/state" ) const utxoPreFix = "UT:" diff --git a/database/utxo_view_test.go b/database/utxo_view_test.go index b776b54b..9f39d2be 100644 --- a/database/utxo_view_test.go +++ b/database/utxo_view_test.go @@ -4,11 +4,11 @@ import ( "os" "testing" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/database/storage" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/state" - "github.com/vapor/testutil" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/state" + "github.com/bytom/vapor/testutil" ) func TestSaveUtxoView(t *testing.T) { diff --git a/database/wallet_store.go b/database/wallet_store.go index ded9cfdb..d0bfa5ab 100644 --- a/database/wallet_store.go +++ b/database/wallet_store.go @@ -9,13 +9,13 @@ import ( log "github.com/sirupsen/logrus" - acc "github.com/vapor/account" - "github.com/vapor/asset" - "github.com/vapor/blockchain/query" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/wallet" + acc "github.com/bytom/vapor/account" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/query" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/wallet" ) const ( diff --git a/database/wallet_store_test.go b/database/wallet_store_test.go index 96cd9b1e..e23052cc 100644 --- a/database/wallet_store_test.go +++ b/database/wallet_store_test.go @@ -10,15 +10,15 @@ import ( "sort" "testing" - acc "github.com/vapor/account" - "github.com/vapor/asset" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/blockchain/query" - "github.com/vapor/crypto/ed25519/chainkd" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/protocol/bc" - "github.com/vapor/testutil" - "github.com/vapor/wallet" + acc "github.com/bytom/vapor/account" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/blockchain/query" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/testutil" + "github.com/bytom/vapor/wallet" ) func TestAccountIndexKey(t *testing.T) { diff --git a/docker/fed b/docker/fed index 9003ec29..d31b68c5 100644 --- a/docker/fed +++ b/docker/fed @@ -4,7 +4,7 @@ FROM golang:1.12-alpine as builder RUN apk add --no-cache make git ADD . /go/src/github.com/vapor -WORKDIR /go/src/github.com/vapor/cmd/fedd +WORKDIR /go/src/github.com/bytom/vapor/cmd/fedd RUN GOOS=linux CGO_ENABLED=0 go build -ldflags="-s -w" -installsuffix cgo -o fed main.go @@ -12,6 +12,6 @@ RUN GOOS=linux CGO_ENABLED=0 go build -ldflags="-s -w" -installsuffix cgo -o fed FROM alpine:latest RUN apk add --no-cache ca-certificates -COPY --from=builder /go/src/github.com/vapor/cmd/fedd/fed /usr/local/bin/ +COPY --from=builder /go/src/github.com/bytom/vapor/cmd/fedd/fed /usr/local/bin/ EXPOSE 9886 diff --git a/docker/vapor b/docker/vapor index 3cb63a2f..fdd558a5 100644 --- a/docker/vapor +++ b/docker/vapor @@ -10,7 +10,7 @@ RUN cd /go/src/github.com/vapor && make vapord && make vaporcli FROM alpine:latest RUN apk add --no-cache ca-certificates -COPY --from=builder /go/src/github.com/vapor/cmd/vapord/vapord /usr/local/bin/ -COPY --from=builder /go/src/github.com/vapor/cmd/vaporcli/vaporcli /usr/local/bin/ +COPY --from=builder /go/src/github.com/bytom/vapor/cmd/vapord/vapord /usr/local/bin/ +COPY --from=builder /go/src/github.com/bytom/vapor/cmd/vaporcli/vaporcli /usr/local/bin/ EXPOSE 9889 56656 56657 56658 diff --git a/docker/vapord/vapord.Dockerfile b/docker/vapord/vapord.Dockerfile index 92a8b1dc..61e3344b 100644 --- a/docker/vapord/vapord.Dockerfile +++ b/docker/vapord/vapord.Dockerfile @@ -1,6 +1,6 @@ FROM bytom/golang-gcc-gpp:1.11.2 as builder LABEL stage=vapord_builder -WORKDIR /go/src/github.com/vapor +WORKDIR /go/src/github.com/bytom/vapor COPY . . RUN go build -o /usr/local/vapord/vapord ./cmd/vapord/main.go # save node public key in /usr/local/vapord/node_pubkey.txt diff --git a/encoding/blockchain/blockchain.go b/encoding/blockchain/blockchain.go index 9b1f5df6..bf6d7583 100644 --- a/encoding/blockchain/blockchain.go +++ b/encoding/blockchain/blockchain.go @@ -9,7 +9,7 @@ import ( "math" "sync" - "github.com/vapor/encoding/bufpool" + "github.com/bytom/vapor/encoding/bufpool" ) var bufPool = sync.Pool{New: func() interface{} { return new([9]byte) }} diff --git a/equity/compiler/ast.go b/equity/compiler/ast.go index 85db64ec..cb642c78 100644 --- a/equity/compiler/ast.go +++ b/equity/compiler/ast.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - chainjson "github.com/vapor/encoding/json" + chainjson "github.com/bytom/vapor/encoding/json" ) // Contract is a compiled Equity contract. diff --git a/equity/compiler/cmd/equitycmd/equitycmd.go b/equity/compiler/cmd/equitycmd/equitycmd.go index 2a2a470d..38d2f3a6 100644 --- a/equity/compiler/cmd/equitycmd/equitycmd.go +++ b/equity/compiler/cmd/equitycmd/equitycmd.go @@ -8,12 +8,12 @@ import ( "os" "strings" - "github.com/vapor/equity/compiler" + "github.com/bytom/vapor/equity/compiler" ) var ( // generateInstPath is the directory (need to combine with GOPATH) for store generated contract instance - generateInstPath = "/src/github.com/vapor/equity/instance/" + generateInstPath = "/src/github.com/bytom/vapor/equity/instance/" ) func main() { @@ -66,8 +66,8 @@ func main() { "bytes": true, "encoding/hex": true, "fmt": true, - "github.com/vapor/equity/compiler": true, - "github.com/vapor/protocol/vm": true, + "github.com/bytom/vapor/equity/compiler": true, + "github.com/bytom/vapor/protocol/vm": true, } buf := new(bytes.Buffer) @@ -254,7 +254,7 @@ func asGoParams(params []*compiler.Param) (goParams string, imports []string) { typ = "uint64" case "Asset": typ = "bc.AssetID" - imports = append(imports, "github.com/vapor/protocol/bc") + imports = append(imports, "github.com/bytom/vapor/protocol/bc") strFlag = true case "Boolean": typ = "bool" @@ -268,7 +268,7 @@ func asGoParams(params []*compiler.Param) (goParams string, imports []string) { strFlag = true case "PublicKey": typ = "ed25519.PublicKey" - imports = append(imports, "github.com/vapor/crypto/ed25519") + imports = append(imports, "github.com/bytom/vapor/crypto/ed25519") strFlag = true case "Signature": typ = "[]byte" @@ -281,7 +281,7 @@ func asGoParams(params []*compiler.Param) (goParams string, imports []string) { } if strFlag { - imports = append(imports, "github.com/vapor/encoding/json") + imports = append(imports, "github.com/bytom/vapor/encoding/json") } return strings.Join(strs, ", "), imports } diff --git a/equity/compiler/compile.go b/equity/compiler/compile.go index 0e623e3c..28be7b50 100644 --- a/equity/compiler/compile.go +++ b/equity/compiler/compile.go @@ -6,10 +6,10 @@ import ( "io" "io/ioutil" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/errors" - "github.com/vapor/protocol/vm" - "github.com/vapor/protocol/vm/vmutil" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/vm" + "github.com/bytom/vapor/protocol/vm/vmutil" ) // ValueInfo describes how a blockchain value is used in a contract diff --git a/equity/compiler/compile_test.go b/equity/compiler/compile_test.go index 733ede25..395917f7 100644 --- a/equity/compiler/compile_test.go +++ b/equity/compiler/compile_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - chainjson "github.com/vapor/encoding/json" + chainjson "github.com/bytom/vapor/encoding/json" - "github.com/vapor/equity/compiler/equitytest" + "github.com/bytom/vapor/equity/compiler/equitytest" ) func TestCompile(t *testing.T) { diff --git a/equity/equity/main.go b/equity/equity/main.go index a4733ccb..20e74132 100644 --- a/equity/equity/main.go +++ b/equity/equity/main.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" - "github.com/vapor/equity/compiler" - equityutil "github.com/vapor/equity/equity/util" + "github.com/bytom/vapor/equity/compiler" + equityutil "github.com/bytom/vapor/equity/equity/util" ) const ( diff --git a/equity/equity/util/instance.go b/equity/equity/util/instance.go index ee4ef021..12241e48 100644 --- a/equity/equity/util/instance.go +++ b/equity/equity/util/instance.go @@ -5,9 +5,9 @@ import ( "errors" "strconv" - chainjson "github.com/vapor/encoding/json" + chainjson "github.com/bytom/vapor/encoding/json" - "github.com/vapor/equity/compiler" + "github.com/bytom/vapor/equity/compiler" ) // InstantiateContract instantiate contract parameters diff --git a/equity/equity/util/shift.go b/equity/equity/util/shift.go index c9cc0035..de86f209 100644 --- a/equity/equity/util/shift.go +++ b/equity/equity/util/shift.go @@ -6,9 +6,9 @@ import ( "encoding/hex" "errors" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/protocol/vm" - "github.com/vapor/equity/compiler" + "github.com/bytom/vapor/equity/compiler" ) const ( diff --git a/event/event.go b/event/event.go index e13c92e5..4fab1d09 100644 --- a/event/event.go +++ b/event/event.go @@ -9,8 +9,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) const ( diff --git a/log/log.go b/log/log.go index 818e5ef3..e16ceead 100644 --- a/log/log.go +++ b/log/log.go @@ -12,7 +12,7 @@ import ( rotatelogs "github.com/lestrrat-go/file-rotatelogs" "github.com/sirupsen/logrus" - "github.com/vapor/config" + "github.com/bytom/vapor/config" ) const ( diff --git a/net/http/authn/authn.go b/net/http/authn/authn.go index f3f8897e..8b619291 100644 --- a/net/http/authn/authn.go +++ b/net/http/authn/authn.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/vapor/accesstoken" - "github.com/vapor/errors" + "github.com/bytom/vapor/accesstoken" + "github.com/bytom/vapor/errors" ) const tokenExpiry = time.Minute * 5 diff --git a/net/http/authn/authn_test.go b/net/http/authn/authn_test.go index c1d151f6..0daa453b 100644 --- a/net/http/authn/authn_test.go +++ b/net/http/authn/authn_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/vapor/accesstoken" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" + "github.com/bytom/vapor/accesstoken" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" ) func TestAuthenticate(t *testing.T) { diff --git a/net/http/httperror/httperror.go b/net/http/httperror/httperror.go index b902c9f3..5edc84be 100644 --- a/net/http/httperror/httperror.go +++ b/net/http/httperror/httperror.go @@ -6,8 +6,8 @@ import ( "context" "net/http" - "github.com/vapor/errors" - "github.com/vapor/net/http/httpjson" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/net/http/httpjson" ) // Info contains a set of error codes to send to the user. diff --git a/net/http/httperror/httperror_test.go b/net/http/httperror/httperror_test.go index 852fccfc..c80d1283 100644 --- a/net/http/httperror/httperror_test.go +++ b/net/http/httperror/httperror_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) var ( diff --git a/net/http/httpjson/handler_test.go b/net/http/httpjson/handler_test.go index e2b8559b..dd0f3e72 100644 --- a/net/http/httpjson/handler_test.go +++ b/net/http/httpjson/handler_test.go @@ -9,7 +9,7 @@ import ( "testing" "testing/iotest" - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) func TestHandler(t *testing.T) { diff --git a/net/http/httpjson/io.go b/net/http/httpjson/io.go index 0d57d191..94c3f14c 100644 --- a/net/http/httpjson/io.go +++ b/net/http/httpjson/io.go @@ -8,7 +8,7 @@ import ( "reflect" log "github.com/sirupsen/logrus" - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) const logModule = "httpjson" diff --git a/net/websocket/wsclient.go b/net/websocket/wsclient.go index ea8261b4..8a2e3c4d 100644 --- a/net/websocket/wsclient.go +++ b/net/websocket/wsclient.go @@ -12,7 +12,7 @@ import ( "github.com/gorilla/websocket" log "github.com/sirupsen/logrus" - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) // websocketSendBufferSize is the number of elements the send channel diff --git a/net/websocket/wsnotificationmaneger.go b/net/websocket/wsnotificationmaneger.go index b1d692a0..3e7957dd 100644 --- a/net/websocket/wsnotificationmaneger.go +++ b/net/websocket/wsnotificationmaneger.go @@ -7,10 +7,10 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/event" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) // Notification types diff --git a/netsync/chainmgr/block_keeper.go b/netsync/chainmgr/block_keeper.go index c670d23a..5d0522d9 100644 --- a/netsync/chainmgr/block_keeper.go +++ b/netsync/chainmgr/block_keeper.go @@ -5,12 +5,12 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/consensus" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/netsync/peers" - "github.com/vapor/p2p/security" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/consensus" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/p2p/security" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) const ( diff --git a/netsync/chainmgr/block_keeper_test.go b/netsync/chainmgr/block_keeper_test.go index 9472f21c..e34e48bd 100644 --- a/netsync/chainmgr/block_keeper_test.go +++ b/netsync/chainmgr/block_keeper_test.go @@ -7,16 +7,16 @@ import ( "testing" "time" - "github.com/vapor/consensus" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" - msgs "github.com/vapor/netsync/messages" - "github.com/vapor/netsync/peers" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/test/mock" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" + msgs "github.com/bytom/vapor/netsync/messages" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/test/mock" + "github.com/bytom/vapor/testutil" ) func TestCheckSyncType(t *testing.T) { diff --git a/netsync/chainmgr/block_process.go b/netsync/chainmgr/block_process.go index fac5cb51..d1e45a65 100644 --- a/netsync/chainmgr/block_process.go +++ b/netsync/chainmgr/block_process.go @@ -5,9 +5,9 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/errors" - "github.com/vapor/netsync/peers" - "github.com/vapor/p2p/security" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/p2p/security" ) var errOrphanBlock = errors.New("fast sync inserting orphan block") diff --git a/netsync/chainmgr/block_process_test.go b/netsync/chainmgr/block_process_test.go index 7663dc84..70503fbb 100644 --- a/netsync/chainmgr/block_process_test.go +++ b/netsync/chainmgr/block_process_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/netsync/peers" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/test/mock" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/test/mock" ) func TestBlockProcess(t *testing.T) { diff --git a/netsync/chainmgr/fast_sync.go b/netsync/chainmgr/fast_sync.go index 55659873..6b8ea72c 100644 --- a/netsync/chainmgr/fast_sync.go +++ b/netsync/chainmgr/fast_sync.go @@ -5,11 +5,11 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/errors" - "github.com/vapor/netsync/peers" - "github.com/vapor/p2p/security" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/p2p/security" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) var ( diff --git a/netsync/chainmgr/fast_sync_test.go b/netsync/chainmgr/fast_sync_test.go index 07e2fca9..75019497 100644 --- a/netsync/chainmgr/fast_sync_test.go +++ b/netsync/chainmgr/fast_sync_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "github.com/vapor/consensus" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" - "github.com/vapor/netsync/peers" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/test/mock" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/test/mock" + "github.com/bytom/vapor/testutil" ) func TestBlockLocator(t *testing.T) { diff --git a/netsync/chainmgr/handle.go b/netsync/chainmgr/handle.go index 656a950c..e57e60a7 100644 --- a/netsync/chainmgr/handle.go +++ b/netsync/chainmgr/handle.go @@ -6,17 +6,17 @@ import ( log "github.com/sirupsen/logrus" - cfg "github.com/vapor/config" - "github.com/vapor/consensus" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/event" - msgs "github.com/vapor/netsync/messages" - "github.com/vapor/netsync/peers" - "github.com/vapor/p2p" - "github.com/vapor/p2p/security" - core "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/event" + msgs "github.com/bytom/vapor/netsync/messages" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/p2p" + "github.com/bytom/vapor/p2p/security" + core "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) const ( diff --git a/netsync/chainmgr/msg_fetcher.go b/netsync/chainmgr/msg_fetcher.go index 1435602c..457574bf 100644 --- a/netsync/chainmgr/msg_fetcher.go +++ b/netsync/chainmgr/msg_fetcher.go @@ -6,11 +6,11 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/errors" - "github.com/vapor/netsync/peers" - "github.com/vapor/p2p/security" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/p2p/security" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) const ( diff --git a/netsync/chainmgr/protocol_reactor.go b/netsync/chainmgr/protocol_reactor.go index 0b3c5a7c..e07d9d00 100644 --- a/netsync/chainmgr/protocol_reactor.go +++ b/netsync/chainmgr/protocol_reactor.go @@ -6,10 +6,10 @@ import ( log "github.com/sirupsen/logrus" "github.com/tendermint/go-wire" - "github.com/vapor/errors" - msgs "github.com/vapor/netsync/messages" - "github.com/vapor/p2p" - "github.com/vapor/p2p/connection" + "github.com/bytom/vapor/errors" + msgs "github.com/bytom/vapor/netsync/messages" + "github.com/bytom/vapor/p2p" + "github.com/bytom/vapor/p2p/connection" ) //ProtocolReactor handles new coming protocol message. diff --git a/netsync/chainmgr/storage.go b/netsync/chainmgr/storage.go index 2bab996c..ff6b758c 100644 --- a/netsync/chainmgr/storage.go +++ b/netsync/chainmgr/storage.go @@ -4,9 +4,9 @@ import ( "encoding/binary" "sync" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc/types" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc/types" ) var ( diff --git a/netsync/chainmgr/storage_test.go b/netsync/chainmgr/storage_test.go index c15d14b1..19b9cc4e 100644 --- a/netsync/chainmgr/storage_test.go +++ b/netsync/chainmgr/storage_test.go @@ -7,8 +7,8 @@ import ( "github.com/davecgh/go-spew/spew" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/protocol/bc/types" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/protocol/bc/types" ) func TestReadWriteBlocks(t *testing.T) { diff --git a/netsync/chainmgr/tool_test.go b/netsync/chainmgr/tool_test.go index 9e4bf63e..b0ac3e72 100644 --- a/netsync/chainmgr/tool_test.go +++ b/netsync/chainmgr/tool_test.go @@ -8,14 +8,14 @@ import ( "github.com/tendermint/go-wire" "github.com/tendermint/tmlibs/flowrate" - dbm "github.com/vapor/database/leveldb" - - "github.com/vapor/consensus" - "github.com/vapor/event" - "github.com/vapor/netsync/peers" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/test/mock" + dbm "github.com/bytom/vapor/database/leveldb" + + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/test/mock" ) type P2PPeer struct { diff --git a/netsync/chainmgr/tx_keeper.go b/netsync/chainmgr/tx_keeper.go index 6c6f5f9e..8dd6e7ed 100644 --- a/netsync/chainmgr/tx_keeper.go +++ b/netsync/chainmgr/tx_keeper.go @@ -6,8 +6,8 @@ import ( log "github.com/sirupsen/logrus" - core "github.com/vapor/protocol" - "github.com/vapor/protocol/bc/types" + core "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc/types" ) const ( diff --git a/netsync/chainmgr/tx_keeper_test.go b/netsync/chainmgr/tx_keeper_test.go index b5ac9916..cfe85600 100644 --- a/netsync/chainmgr/tx_keeper_test.go +++ b/netsync/chainmgr/tx_keeper_test.go @@ -9,13 +9,13 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/consensus" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/protocol" - core "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/test/mock" + "github.com/bytom/vapor/consensus" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/protocol" + core "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/test/mock" ) const txsNumber = 2000 diff --git a/netsync/consensusmgr/block_fetcher.go b/netsync/consensusmgr/block_fetcher.go index 96f7fed6..6e28330e 100644 --- a/netsync/consensusmgr/block_fetcher.go +++ b/netsync/consensusmgr/block_fetcher.go @@ -4,8 +4,8 @@ import ( log "github.com/sirupsen/logrus" "gopkg.in/karalabe/cookiejar.v2/collections/prque" - "github.com/vapor/p2p/security" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/p2p/security" + "github.com/bytom/vapor/protocol/bc" ) const ( diff --git a/netsync/consensusmgr/block_fetcher_test.go b/netsync/consensusmgr/block_fetcher_test.go index 96703516..0ecf3053 100644 --- a/netsync/consensusmgr/block_fetcher_test.go +++ b/netsync/consensusmgr/block_fetcher_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/vapor/netsync/peers" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) type peerMgr struct { diff --git a/netsync/consensusmgr/broadcast_msg.go b/netsync/consensusmgr/broadcast_msg.go index b11695a0..c3bd741a 100644 --- a/netsync/consensusmgr/broadcast_msg.go +++ b/netsync/consensusmgr/broadcast_msg.go @@ -1,7 +1,7 @@ package consensusmgr import ( - "github.com/vapor/netsync/peers" + "github.com/bytom/vapor/netsync/peers" ) // BroadcastMsg the message that can be broadcast diff --git a/netsync/consensusmgr/consensus_msg.go b/netsync/consensusmgr/consensus_msg.go index f47cf81a..7178d6b8 100644 --- a/netsync/consensusmgr/consensus_msg.go +++ b/netsync/consensusmgr/consensus_msg.go @@ -8,9 +8,9 @@ import ( "github.com/tendermint/go-wire" - "github.com/vapor/netsync/peers" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) const ( diff --git a/netsync/consensusmgr/consensus_msg_test.go b/netsync/consensusmgr/consensus_msg_test.go index d00c93bb..5ff5fa3f 100644 --- a/netsync/consensusmgr/consensus_msg_test.go +++ b/netsync/consensusmgr/consensus_msg_test.go @@ -7,8 +7,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/tendermint/go-wire" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) var _ = wire.RegisterInterface( diff --git a/netsync/consensusmgr/handle.go b/netsync/consensusmgr/handle.go index a9e3a631..a397dd5e 100644 --- a/netsync/consensusmgr/handle.go +++ b/netsync/consensusmgr/handle.go @@ -5,12 +5,12 @@ import ( "github.com/sirupsen/logrus" - "github.com/vapor/event" - "github.com/vapor/netsync/peers" - "github.com/vapor/p2p" - "github.com/vapor/p2p/security" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/p2p" + "github.com/bytom/vapor/p2p/security" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) // Switch is the interface for p2p switch. diff --git a/netsync/consensusmgr/handle_test.go b/netsync/consensusmgr/handle_test.go index 832b6777..8f1736f6 100644 --- a/netsync/consensusmgr/handle_test.go +++ b/netsync/consensusmgr/handle_test.go @@ -9,12 +9,12 @@ import ( "github.com/tendermint/tmlibs/flowrate" - "github.com/vapor/consensus" - "github.com/vapor/event" - "github.com/vapor/netsync/peers" - "github.com/vapor/p2p" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/p2p" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) type p2peer struct { diff --git a/netsync/consensusmgr/reactor.go b/netsync/consensusmgr/reactor.go index 10405fb9..c46fe285 100644 --- a/netsync/consensusmgr/reactor.go +++ b/netsync/consensusmgr/reactor.go @@ -3,8 +3,8 @@ package consensusmgr import ( "github.com/sirupsen/logrus" - "github.com/vapor/p2p" - "github.com/vapor/p2p/connection" + "github.com/bytom/vapor/p2p" + "github.com/bytom/vapor/p2p/connection" ) const ( diff --git a/netsync/messages/chain_msg.go b/netsync/messages/chain_msg.go index 3ef82dce..c5e268ef 100644 --- a/netsync/messages/chain_msg.go +++ b/netsync/messages/chain_msg.go @@ -7,8 +7,8 @@ import ( "github.com/tendermint/go-wire" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) //protocol msg byte diff --git a/netsync/messages/chain_msg_test.go b/netsync/messages/chain_msg_test.go index 19900b74..53a2f1b9 100644 --- a/netsync/messages/chain_msg_test.go +++ b/netsync/messages/chain_msg_test.go @@ -6,9 +6,9 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/consensus" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) var txs = []*types.Tx{ diff --git a/netsync/peers/peer.go b/netsync/peers/peer.go index dea5a241..4e39c05f 100644 --- a/netsync/peers/peer.go +++ b/netsync/peers/peer.go @@ -10,11 +10,11 @@ import ( "github.com/tendermint/tmlibs/flowrate" "gopkg.in/fatih/set.v0" - "github.com/vapor/consensus" - "github.com/vapor/errors" - msgs "github.com/vapor/netsync/messages" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + msgs "github.com/bytom/vapor/netsync/messages" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) const ( diff --git a/netsync/peers/peer_test.go b/netsync/peers/peer_test.go index 514d2695..3fa000af 100644 --- a/netsync/peers/peer_test.go +++ b/netsync/peers/peer_test.go @@ -7,10 +7,10 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/tendermint/tmlibs/flowrate" - "github.com/vapor/consensus" - "github.com/vapor/p2p/security" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/p2p/security" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) var ( diff --git a/netsync/sync_manager.go b/netsync/sync_manager.go index 307d6c32..839d1db2 100644 --- a/netsync/sync_manager.go +++ b/netsync/sync_manager.go @@ -5,15 +5,15 @@ import ( "github.com/sirupsen/logrus" - "github.com/vapor/config" - "github.com/vapor/consensus" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/event" - "github.com/vapor/netsync/chainmgr" - "github.com/vapor/netsync/consensusmgr" - "github.com/vapor/netsync/peers" - "github.com/vapor/p2p" - "github.com/vapor/protocol" + "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/netsync/chainmgr" + "github.com/bytom/vapor/netsync/consensusmgr" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/p2p" + "github.com/bytom/vapor/protocol" ) const ( diff --git a/node/node.go b/node/node.go index c160f17c..1b00877f 100644 --- a/node/node.go +++ b/node/node.go @@ -14,24 +14,24 @@ import ( cmn "github.com/tendermint/tmlibs/common" browser "github.com/toqueteos/webbrowser" - "github.com/vapor/accesstoken" - "github.com/vapor/account" - "github.com/vapor/api" - "github.com/vapor/asset" - "github.com/vapor/blockchain/pseudohsm" - cfg "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/database" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/env" - "github.com/vapor/event" - vaporLog "github.com/vapor/log" - "github.com/vapor/net/websocket" - "github.com/vapor/netsync" - "github.com/vapor/proposal/blockproposer" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc/types" - w "github.com/vapor/wallet" + "github.com/bytom/vapor/accesstoken" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/api" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/pseudohsm" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/database" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/env" + "github.com/bytom/vapor/event" + vaporLog "github.com/bytom/vapor/log" + "github.com/bytom/vapor/net/websocket" + "github.com/bytom/vapor/netsync" + "github.com/bytom/vapor/proposal/blockproposer" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc/types" + w "github.com/bytom/vapor/wallet" ) const ( diff --git a/node/node_test.go b/node/node_test.go index 66011f77..de73324f 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - cfg "github.com/vapor/config" + cfg "github.com/bytom/vapor/config" ) func TestNodeUsedDataDir(t *testing.T) { diff --git a/p2p/base_reactor.go b/p2p/base_reactor.go index bd9b0958..7a6045da 100644 --- a/p2p/base_reactor.go +++ b/p2p/base_reactor.go @@ -3,7 +3,7 @@ package p2p import ( cmn "github.com/tendermint/tmlibs/common" - "github.com/vapor/p2p/connection" + "github.com/bytom/vapor/p2p/connection" ) //Reactor is responsible for handling incoming messages of one or more `Channels` diff --git a/p2p/connection/connection.go b/p2p/connection/connection.go index 46a97ad9..ea74e2d1 100644 --- a/p2p/connection/connection.go +++ b/p2p/connection/connection.go @@ -14,7 +14,7 @@ import ( cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/flowrate" - "github.com/vapor/common/compression" + "github.com/bytom/vapor/common/compression" ) const ( diff --git a/p2p/connection/secret_connection.go b/p2p/connection/secret_connection.go index 28cce510..36eb2d77 100644 --- a/p2p/connection/secret_connection.go +++ b/p2p/connection/secret_connection.go @@ -17,7 +17,7 @@ import ( "golang.org/x/crypto/nacl/secretbox" "golang.org/x/crypto/ripemd160" - "github.com/vapor/p2p/signlib" + "github.com/bytom/vapor/p2p/signlib" ) const ( diff --git a/p2p/connection/secret_connection_test.go b/p2p/connection/secret_connection_test.go index b4542cfe..9c102ec3 100644 --- a/p2p/connection/secret_connection_test.go +++ b/p2p/connection/secret_connection_test.go @@ -7,7 +7,7 @@ import ( cmn "github.com/tendermint/tmlibs/common" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/ed25519/chainkd" ) type dummyConn struct { diff --git a/p2p/discover/dht/database.go b/p2p/discover/dht/database.go index 13dc923f..ce285a64 100644 --- a/p2p/discover/dht/database.go +++ b/p2p/discover/dht/database.go @@ -15,9 +15,9 @@ import ( log "github.com/sirupsen/logrus" wire "github.com/tendermint/go-wire" - "github.com/vapor/crypto" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" + "github.com/bytom/vapor/crypto" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" ) var ( diff --git a/p2p/discover/dht/dns_seeds.go b/p2p/discover/dht/dns_seeds.go index d50584f2..2048311d 100644 --- a/p2p/discover/dht/dns_seeds.go +++ b/p2p/discover/dht/dns_seeds.go @@ -6,8 +6,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/consensus" - "github.com/vapor/errors" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" ) var ( diff --git a/p2p/discover/dht/dns_seeds_test.go b/p2p/discover/dht/dns_seeds_test.go index 03e322e6..256d7876 100644 --- a/p2p/discover/dht/dns_seeds_test.go +++ b/p2p/discover/dht/dns_seeds_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/vapor/consensus" + "github.com/bytom/vapor/consensus" ) var testnetAddr = []string{"1.2.3.4", "5.6.7.8"} diff --git a/p2p/discover/dht/net.go b/p2p/discover/dht/net.go index c3f6a0ef..5cd8667e 100644 --- a/p2p/discover/dht/net.go +++ b/p2p/discover/dht/net.go @@ -12,10 +12,10 @@ import ( "github.com/tendermint/go-wire" "golang.org/x/crypto/sha3" - "github.com/vapor/common" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/p2p/netutil" - "github.com/vapor/p2p/signlib" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/p2p/netutil" + "github.com/bytom/vapor/p2p/signlib" ) var ( diff --git a/p2p/discover/dht/net_test.go b/p2p/discover/dht/net_test.go index f83896d6..9b063de3 100644 --- a/p2p/discover/dht/net_test.go +++ b/p2p/discover/dht/net_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/vapor/common" - "github.com/vapor/p2p/signlib" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/p2p/signlib" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discover/dht/node.go b/p2p/discover/dht/node.go index 91c6da93..99fa958f 100644 --- a/p2p/discover/dht/node.go +++ b/p2p/discover/dht/node.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/vapor/common" - "github.com/vapor/crypto" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/crypto" ) // Node represents a host on the network. diff --git a/p2p/discover/dht/table.go b/p2p/discover/dht/table.go index eb7c8556..e67be9bd 100644 --- a/p2p/discover/dht/table.go +++ b/p2p/discover/dht/table.go @@ -14,8 +14,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/common" - "github.com/vapor/crypto" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/crypto" ) const ( diff --git a/p2p/discover/dht/ticket.go b/p2p/discover/dht/ticket.go index a3046cc0..f28d7dfb 100644 --- a/p2p/discover/dht/ticket.go +++ b/p2p/discover/dht/ticket.go @@ -11,8 +11,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/common" - "github.com/vapor/crypto" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/crypto" ) const ( diff --git a/p2p/discover/dht/udp.go b/p2p/discover/dht/udp.go index c8d73b70..5244d8ca 100644 --- a/p2p/discover/dht/udp.go +++ b/p2p/discover/dht/udp.go @@ -14,12 +14,12 @@ import ( log "github.com/sirupsen/logrus" "github.com/tendermint/go-wire" - "github.com/vapor/common" - cfg "github.com/vapor/config" - "github.com/vapor/crypto" - "github.com/vapor/p2p/netutil" - "github.com/vapor/p2p/signlib" - "github.com/vapor/version" + "github.com/bytom/vapor/common" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/crypto" + "github.com/bytom/vapor/p2p/netutil" + "github.com/bytom/vapor/p2p/signlib" + "github.com/bytom/vapor/version" ) const ( diff --git a/p2p/discover/dht/udp_test.go b/p2p/discover/dht/udp_test.go index d6f442f5..01dfa2ed 100644 --- a/p2p/discover/dht/udp_test.go +++ b/p2p/discover/dht/udp_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/vapor/common" - "github.com/vapor/errors" - "github.com/vapor/p2p/signlib" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/p2p/signlib" ) func TestPacketCodec(t *testing.T) { diff --git a/p2p/discover/mdns/lan_discover.go b/p2p/discover/mdns/lan_discover.go index 302e8e79..2fdf2751 100644 --- a/p2p/discover/mdns/lan_discover.go +++ b/p2p/discover/mdns/lan_discover.go @@ -7,7 +7,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/event" + "github.com/bytom/vapor/event" ) const ( diff --git a/p2p/listener.go b/p2p/listener.go index 2c3e92ef..fb430e94 100644 --- a/p2p/listener.go +++ b/p2p/listener.go @@ -10,9 +10,9 @@ import ( log "github.com/sirupsen/logrus" cmn "github.com/tendermint/tmlibs/common" - cfg "github.com/vapor/config" - "github.com/vapor/errors" - "github.com/vapor/p2p/upnp" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/p2p/upnp" ) const ( diff --git a/p2p/node_info.go b/p2p/node_info.go index d0c52a9d..be26e6d7 100644 --- a/p2p/node_info.go +++ b/p2p/node_info.go @@ -4,11 +4,11 @@ import ( "fmt" "net" - cfg "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/errors" - "github.com/vapor/p2p/signlib" - "github.com/vapor/version" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/p2p/signlib" + "github.com/bytom/vapor/version" ) const maxNodeInfoSize = 10240 // 10Kb diff --git a/p2p/node_info_test.go b/p2p/node_info_test.go index 0f3e5be5..8bf75c5c 100644 --- a/p2p/node_info_test.go +++ b/p2p/node_info_test.go @@ -8,8 +8,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/tendermint/go-wire" - "github.com/vapor/errors" - "github.com/vapor/p2p/signlib" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/p2p/signlib" ) func mockCompatibleWithFalse(remoteVerStr string) (bool, error) { diff --git a/p2p/peer.go b/p2p/peer.go index fbb663b3..768ea0f8 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -13,10 +13,10 @@ import ( cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/flowrate" - cfg "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/p2p/connection" - "github.com/vapor/p2p/signlib" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/p2p/connection" + "github.com/bytom/vapor/p2p/signlib" ) // peerConn contains the raw connection and its config. diff --git a/p2p/peer_test.go b/p2p/peer_test.go index bcaed18b..32ac6aad 100644 --- a/p2p/peer_test.go +++ b/p2p/peer_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - cfg "github.com/vapor/config" - "github.com/vapor/consensus" - conn "github.com/vapor/p2p/connection" - "github.com/vapor/p2p/signlib" - "github.com/vapor/version" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + conn "github.com/bytom/vapor/p2p/connection" + "github.com/bytom/vapor/p2p/signlib" + "github.com/bytom/vapor/version" ) const testCh = 0x01 diff --git a/p2p/security/blacklist.go b/p2p/security/blacklist.go index f8ca05e0..be5cace6 100644 --- a/p2p/security/blacklist.go +++ b/p2p/security/blacklist.go @@ -6,8 +6,8 @@ import ( "sync" "time" - cfg "github.com/vapor/config" - dbm "github.com/vapor/database/leveldb" + cfg "github.com/bytom/vapor/config" + dbm "github.com/bytom/vapor/database/leveldb" ) const ( diff --git a/p2p/security/security.go b/p2p/security/security.go index 47d5128e..eb52cf46 100644 --- a/p2p/security/security.go +++ b/p2p/security/security.go @@ -3,7 +3,7 @@ package security import ( log "github.com/sirupsen/logrus" - cfg "github.com/vapor/config" + cfg "github.com/bytom/vapor/config" ) const logModule = "p2pSecurity" diff --git a/p2p/signlib/chainkd.go b/p2p/signlib/chainkd.go index b15db257..0154bd4a 100644 --- a/p2p/signlib/chainkd.go +++ b/p2p/signlib/chainkd.go @@ -3,7 +3,7 @@ package signlib import ( "errors" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/ed25519/chainkd" ) const ( diff --git a/p2p/switch.go b/p2p/switch.go index c9e225dc..e39964d8 100644 --- a/p2p/switch.go +++ b/p2p/switch.go @@ -10,18 +10,18 @@ import ( log "github.com/sirupsen/logrus" cmn "github.com/tendermint/tmlibs/common" - cfg "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/errors" - "github.com/vapor/event" - "github.com/vapor/p2p/connection" - "github.com/vapor/p2p/discover/dht" - "github.com/vapor/p2p/discover/mdns" - "github.com/vapor/p2p/netutil" - security "github.com/vapor/p2p/security" - "github.com/vapor/p2p/signlib" - "github.com/vapor/version" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/p2p/connection" + "github.com/bytom/vapor/p2p/discover/dht" + "github.com/bytom/vapor/p2p/discover/mdns" + "github.com/bytom/vapor/p2p/netutil" + security "github.com/bytom/vapor/p2p/security" + "github.com/bytom/vapor/p2p/signlib" + "github.com/bytom/vapor/version" ) const ( diff --git a/p2p/switch_test.go b/p2p/switch_test.go index 7b162c23..6d32ed71 100644 --- a/p2p/switch_test.go +++ b/p2p/switch_test.go @@ -8,12 +8,12 @@ import ( "time" "github.com/davecgh/go-spew/spew" - cfg "github.com/vapor/config" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" - conn "github.com/vapor/p2p/connection" - "github.com/vapor/p2p/security" - "github.com/vapor/p2p/signlib" + cfg "github.com/bytom/vapor/config" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" + conn "github.com/bytom/vapor/p2p/connection" + "github.com/bytom/vapor/p2p/security" + "github.com/bytom/vapor/p2p/signlib" ) var ( diff --git a/p2p/test_util.go b/p2p/test_util.go index fc27e4ee..53d3ed66 100644 --- a/p2p/test_util.go +++ b/p2p/test_util.go @@ -6,11 +6,11 @@ import ( log "github.com/sirupsen/logrus" cmn "github.com/tendermint/tmlibs/common" - cfg "github.com/vapor/config" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/p2p/connection" - "github.com/vapor/p2p/discover/dht" - "github.com/vapor/p2p/signlib" + cfg "github.com/bytom/vapor/config" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/p2p/connection" + "github.com/bytom/vapor/p2p/discover/dht" + "github.com/bytom/vapor/p2p/signlib" ) //PanicOnAddPeerErr add peer error diff --git a/proposal/blockproposer/blockproposer.go b/proposal/blockproposer/blockproposer.go index 7f8c1da1..70c9018c 100644 --- a/proposal/blockproposer/blockproposer.go +++ b/proposal/blockproposer/blockproposer.go @@ -7,12 +7,12 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/account" - "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/event" - "github.com/vapor/proposal" - "github.com/vapor/protocol" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/proposal" + "github.com/bytom/vapor/protocol" ) const ( diff --git a/proposal/proposal.go b/proposal/proposal.go index 50d85d1b..0cdb5ad6 100644 --- a/proposal/proposal.go +++ b/proposal/proposal.go @@ -7,16 +7,16 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/account" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/consensus" - "github.com/vapor/errors" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" - "github.com/vapor/protocol/validation" - "github.com/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" + "github.com/bytom/vapor/protocol/validation" + "github.com/bytom/vapor/protocol/vm/vmutil" ) const logModule = "mining" diff --git a/proposal/proposal_test.go b/proposal/proposal_test.go index e211b143..73de939f 100644 --- a/proposal/proposal_test.go +++ b/proposal/proposal_test.go @@ -3,11 +3,11 @@ package proposal import ( "testing" - "github.com/vapor/consensus" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" + "github.com/bytom/vapor/testutil" ) func TestCalCoinbaseTxReward(t *testing.T) { diff --git a/proposal/sort.go b/proposal/sort.go index 45e80e23..a6a4edb7 100644 --- a/proposal/sort.go +++ b/proposal/sort.go @@ -1,6 +1,6 @@ package proposal -import "github.com/vapor/protocol" +import "github.com/bytom/vapor/protocol" type byTime []*protocol.TxDesc diff --git a/protocol/bbft.go b/protocol/bbft.go index a6a6debb..d62b3ed6 100644 --- a/protocol/bbft.go +++ b/protocol/bbft.go @@ -6,13 +6,13 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/config" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/errors" - "github.com/vapor/event" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" + "github.com/bytom/vapor/config" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" ) const ( diff --git a/protocol/bc/asset.go b/protocol/bc/asset.go index 553cd710..5060047e 100644 --- a/protocol/bc/asset.go +++ b/protocol/bc/asset.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/encoding/blockchain" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/encoding/blockchain" ) // NewAssetID convert byte array to aseet id diff --git a/protocol/bc/entry.go b/protocol/bc/entry.go index 71f5c8bf..c4335697 100644 --- a/protocol/bc/entry.go +++ b/protocol/bc/entry.go @@ -8,9 +8,9 @@ import ( "github.com/golang/protobuf/proto" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/errors" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/errors" ) // Entry is the interface implemented by each addressable unit in a diff --git a/protocol/bc/tx.go b/protocol/bc/tx.go index 0702e4ce..5858042a 100644 --- a/protocol/bc/tx.go +++ b/protocol/bc/tx.go @@ -1,8 +1,8 @@ package bc import ( - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/errors" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/errors" ) // Tx is a wrapper for the entries-based representation of a transaction. diff --git a/protocol/bc/types/block.go b/protocol/bc/types/block.go index 67198c42..654da54b 100644 --- a/protocol/bc/types/block.go +++ b/protocol/bc/types/block.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/encoding/bufpool" - "github.com/vapor/errors" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/encoding/bufpool" + "github.com/bytom/vapor/errors" ) // serflag variables, start with 1 diff --git a/protocol/bc/types/block_commitment.go b/protocol/bc/types/block_commitment.go index cd9cdd0c..fad89753 100644 --- a/protocol/bc/types/block_commitment.go +++ b/protocol/bc/types/block_commitment.go @@ -3,8 +3,8 @@ package types import ( "io" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/protocol/bc" ) // BlockCommitment store the TransactionsMerkleRoot && TransactionStatusHash diff --git a/protocol/bc/types/block_commitment_test.go b/protocol/bc/types/block_commitment_test.go index 937d06e1..c632db69 100644 --- a/protocol/bc/types/block_commitment_test.go +++ b/protocol/bc/types/block_commitment_test.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "testing" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/testutil" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/testutil" ) func TestReadWriteBlockCommitment(t *testing.T) { diff --git a/protocol/bc/types/block_header.go b/protocol/bc/types/block_header.go index 848f3f7b..51803b9b 100644 --- a/protocol/bc/types/block_header.go +++ b/protocol/bc/types/block_header.go @@ -6,10 +6,10 @@ import ( "io" "time" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/encoding/bufpool" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/encoding/bufpool" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" ) // BlockHeader defines information about a block and is used in the Bytom diff --git a/protocol/bc/types/block_header_test.go b/protocol/bc/types/block_header_test.go index 2ea6e01e..c75bbf4e 100644 --- a/protocol/bc/types/block_header_test.go +++ b/protocol/bc/types/block_header_test.go @@ -9,9 +9,9 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/errors" - "github.com/vapor/testutil" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/testutil" ) func TestBlockHeader(t *testing.T) { diff --git a/protocol/bc/types/block_witness.go b/protocol/bc/types/block_witness.go index cf270d9b..a756cd3e 100644 --- a/protocol/bc/types/block_witness.go +++ b/protocol/bc/types/block_witness.go @@ -3,7 +3,7 @@ package types import ( "io" - "github.com/vapor/encoding/blockchain" + "github.com/bytom/vapor/encoding/blockchain" ) type BlockWitness struct { diff --git a/protocol/bc/types/block_witness_test.go b/protocol/bc/types/block_witness_test.go index 11f74c3d..bcaefec0 100644 --- a/protocol/bc/types/block_witness_test.go +++ b/protocol/bc/types/block_witness_test.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "testing" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/testutil" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/testutil" ) func TestReadWriteBlockWitness(t *testing.T) { diff --git a/protocol/bc/types/crosschain_input.go b/protocol/bc/types/crosschain_input.go index ee8fb9bc..2e4417e8 100644 --- a/protocol/bc/types/crosschain_input.go +++ b/protocol/bc/types/crosschain_input.go @@ -1,7 +1,7 @@ package types import ( - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc" ) // CrossChainInput satisfies the TypedInput interface and represents a cross-chain transaction. diff --git a/protocol/bc/types/crosschain_output.go b/protocol/bc/types/crosschain_output.go index afc92014..6c3222bf 100644 --- a/protocol/bc/types/crosschain_output.go +++ b/protocol/bc/types/crosschain_output.go @@ -1,7 +1,7 @@ package types import ( - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc" ) // CrossChainOutput satisfies the TypedOutput interface and represents a cross-chain transaction. diff --git a/protocol/bc/types/intrachain_output.go b/protocol/bc/types/intrachain_output.go index a4d1b1d2..55e27736 100644 --- a/protocol/bc/types/intrachain_output.go +++ b/protocol/bc/types/intrachain_output.go @@ -1,7 +1,7 @@ package types import ( - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc" ) // IntraChainOutput satisfies the TypedOutput interface and represents a intra-chain transaction. diff --git a/protocol/bc/types/map.go b/protocol/bc/types/map.go index b75c9c6b..5a866898 100644 --- a/protocol/bc/types/map.go +++ b/protocol/bc/types/map.go @@ -4,10 +4,10 @@ import ( log "github.com/sirupsen/logrus" "golang.org/x/crypto/sha3" - "github.com/vapor/consensus" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/vm" - "github.com/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/vm" + "github.com/bytom/vapor/protocol/vm/vmutil" ) // MapTx converts a types TxData object into its entries-based diff --git a/protocol/bc/types/map_test.go b/protocol/bc/types/map_test.go index e0dfe074..19250605 100644 --- a/protocol/bc/types/map_test.go +++ b/protocol/bc/types/map_test.go @@ -6,9 +6,9 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/consensus" - "github.com/vapor/protocol/bc" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/testutil" ) func TestMapSpendTx(t *testing.T) { diff --git a/protocol/bc/types/merkle.go b/protocol/bc/types/merkle.go index ce9d6b6f..40ef392c 100644 --- a/protocol/bc/types/merkle.go +++ b/protocol/bc/types/merkle.go @@ -7,8 +7,8 @@ import ( "gopkg.in/fatih/set.v0" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/protocol/bc" ) // merkleFlag represent the type of merkle tree node, it's used to generate the structure of merkle tree diff --git a/protocol/bc/types/merkle_test.go b/protocol/bc/types/merkle_test.go index 2cc7bbee..e7fbf728 100644 --- a/protocol/bc/types/merkle_test.go +++ b/protocol/bc/types/merkle_test.go @@ -5,9 +5,9 @@ import ( "math/rand" "testing" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/vm" - "github.com/vapor/testutil" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/vm" + "github.com/bytom/vapor/testutil" ) func TestMerkleRoot(t *testing.T) { diff --git a/protocol/bc/types/output_commitment.go b/protocol/bc/types/output_commitment.go index aede38f2..7d473f95 100644 --- a/protocol/bc/types/output_commitment.go +++ b/protocol/bc/types/output_commitment.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" ) // OutputCommitment contains the commitment data for a transaction output. diff --git a/protocol/bc/types/output_commitment_test.go b/protocol/bc/types/output_commitment_test.go index 52aabda3..a9e5eeb0 100644 --- a/protocol/bc/types/output_commitment_test.go +++ b/protocol/bc/types/output_commitment_test.go @@ -5,9 +5,9 @@ import ( "encoding/hex" "testing" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/protocol/bc" - "github.com/vapor/testutil" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/testutil" ) func TestReadWriteOutputCommitment(t *testing.T) { diff --git a/protocol/bc/types/spend.go b/protocol/bc/types/spend.go index 15b2b69f..b9940135 100644 --- a/protocol/bc/types/spend.go +++ b/protocol/bc/types/spend.go @@ -1,7 +1,7 @@ package types import ( - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc" ) // SpendInput satisfies the TypedInput interface and represents a spend transaction. diff --git a/protocol/bc/types/spend_commitment.go b/protocol/bc/types/spend_commitment.go index 1102d580..d4670f11 100644 --- a/protocol/bc/types/spend_commitment.go +++ b/protocol/bc/types/spend_commitment.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" ) // SpendCommitment contains the commitment data for a transaction output. diff --git a/protocol/bc/types/spend_commitment_test.go b/protocol/bc/types/spend_commitment_test.go index 154abf4b..e55a1827 100644 --- a/protocol/bc/types/spend_commitment_test.go +++ b/protocol/bc/types/spend_commitment_test.go @@ -5,9 +5,9 @@ import ( "encoding/hex" "testing" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/protocol/bc" - "github.com/vapor/testutil" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/testutil" ) func TestReadWriteSpendCommitment(t *testing.T) { diff --git a/protocol/bc/types/spend_test.go b/protocol/bc/types/spend_test.go index 6b5d373f..ef73d8a7 100644 --- a/protocol/bc/types/spend_test.go +++ b/protocol/bc/types/spend_test.go @@ -8,9 +8,9 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/protocol/bc" - "github.com/vapor/testutil" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/testutil" ) func TestSerializationSpendCommitment(t *testing.T) { diff --git a/protocol/bc/types/transaction.go b/protocol/bc/types/transaction.go index 52f50a98..00bc8d3f 100644 --- a/protocol/bc/types/transaction.go +++ b/protocol/bc/types/transaction.go @@ -6,9 +6,9 @@ import ( "fmt" "io" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" ) const serRequired = 0x7 // Bit mask accepted serialization flag. diff --git a/protocol/bc/types/transaction_test.go b/protocol/bc/types/transaction_test.go index 680cf170..b0c381df 100644 --- a/protocol/bc/types/transaction_test.go +++ b/protocol/bc/types/transaction_test.go @@ -10,10 +10,10 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/consensus" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/testutil" ) func TestTransaction(t *testing.T) { diff --git a/protocol/bc/types/txinput.go b/protocol/bc/types/txinput.go index 0d8402c3..a155f567 100644 --- a/protocol/bc/types/txinput.go +++ b/protocol/bc/types/txinput.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" ) // serflag variables for input types. diff --git a/protocol/bc/types/txinput_test.go b/protocol/bc/types/txinput_test.go index 4b45ab4b..6a90ab18 100644 --- a/protocol/bc/types/txinput_test.go +++ b/protocol/bc/types/txinput_test.go @@ -8,8 +8,8 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/testutil" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/testutil" ) func TestSerializationSpend(t *testing.T) { diff --git a/protocol/bc/types/txoutput.go b/protocol/bc/types/txoutput.go index 7380bf11..555023cd 100644 --- a/protocol/bc/types/txoutput.go +++ b/protocol/bc/types/txoutput.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" ) // serflag variables for output types. diff --git a/protocol/bc/types/txoutput_test.go b/protocol/bc/types/txoutput_test.go index 58eaa85f..fa215c9f 100644 --- a/protocol/bc/types/txoutput_test.go +++ b/protocol/bc/types/txoutput_test.go @@ -8,9 +8,9 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/encoding/blockchain" - "github.com/vapor/protocol/bc" - "github.com/vapor/testutil" + "github.com/bytom/vapor/encoding/blockchain" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/testutil" ) func TestSerializationIntraChainTxOutput(t *testing.T) { diff --git a/protocol/bc/types/veto_input.go b/protocol/bc/types/veto_input.go index 548310fa..1dcd7a66 100644 --- a/protocol/bc/types/veto_input.go +++ b/protocol/bc/types/veto_input.go @@ -1,7 +1,7 @@ package types import ( - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc" ) // VetoInput satisfies the TypedInput interface and represents a veto transaction. diff --git a/protocol/bc/types/vote_output.go b/protocol/bc/types/vote_output.go index aeeac986..ffeb5957 100644 --- a/protocol/bc/types/vote_output.go +++ b/protocol/bc/types/vote_output.go @@ -1,7 +1,7 @@ package types import ( - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc" ) // VoteOutput satisfies the TypedOutput interface and represents a vote transaction. diff --git a/protocol/block.go b/protocol/block.go index 86c96504..937ba5a1 100644 --- a/protocol/block.go +++ b/protocol/block.go @@ -3,13 +3,13 @@ package protocol import ( log "github.com/sirupsen/logrus" - "github.com/vapor/config" - "github.com/vapor/errors" - "github.com/vapor/event" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" - "github.com/vapor/protocol/validation" + "github.com/bytom/vapor/config" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" + "github.com/bytom/vapor/protocol/validation" ) var ( diff --git a/protocol/block_test.go b/protocol/block_test.go index 4ee6479e..e32826f9 100644 --- a/protocol/block_test.go +++ b/protocol/block_test.go @@ -3,11 +3,11 @@ package protocol import ( "testing" - "github.com/vapor/database/storage" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" - "github.com/vapor/testutil" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" + "github.com/bytom/vapor/testutil" ) type mStore struct { diff --git a/protocol/consensus_node_manager.go b/protocol/consensus_node_manager.go index d55e7ccf..6b4668ee 100644 --- a/protocol/consensus_node_manager.go +++ b/protocol/consensus_node_manager.go @@ -1,11 +1,11 @@ package protocol import ( - "github.com/vapor/consensus" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" ) var ( diff --git a/protocol/consensus_node_manager_test.go b/protocol/consensus_node_manager_test.go index 94e8ee47..76e3428f 100644 --- a/protocol/consensus_node_manager_test.go +++ b/protocol/consensus_node_manager_test.go @@ -3,13 +3,13 @@ package protocol import ( "testing" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/database/storage" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" + "github.com/bytom/vapor/testutil" ) func TestGetConsensusNodes(t *testing.T) { diff --git a/protocol/orphan_manage.go b/protocol/orphan_manage.go index dc72718f..6808d81c 100644 --- a/protocol/orphan_manage.go +++ b/protocol/orphan_manage.go @@ -6,8 +6,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) var ( diff --git a/protocol/orphan_manage_test.go b/protocol/orphan_manage_test.go index 0434745b..bd5aed00 100644 --- a/protocol/orphan_manage_test.go +++ b/protocol/orphan_manage_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/testutil" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/testutil" ) var testBlocks = []*types.Block{ diff --git a/protocol/protocol.go b/protocol/protocol.go index d7ea9448..56c85fb4 100644 --- a/protocol/protocol.go +++ b/protocol/protocol.go @@ -5,12 +5,12 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/common" - "github.com/vapor/config" - "github.com/vapor/event" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/config" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" ) const ( diff --git a/protocol/state/consensus_result.go b/protocol/state/consensus_result.go index 9fd571b3..85b812aa 100644 --- a/protocol/state/consensus_result.go +++ b/protocol/state/consensus_result.go @@ -4,14 +4,14 @@ import ( "encoding/hex" "sort" - "github.com/vapor/common/arithmetic" - "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/errors" - "github.com/vapor/math/checked" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/common/arithmetic" + "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/math/checked" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) // fedConsensusPath is used to derive federation root xpubs for signing blocks diff --git a/protocol/state/consensus_result_test.go b/protocol/state/consensus_result_test.go index 807b13db..5783a31d 100644 --- a/protocol/state/consensus_result_test.go +++ b/protocol/state/consensus_result_test.go @@ -8,13 +8,13 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/errors" - "github.com/vapor/math/checked" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/math/checked" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/testutil" ) func TestApplyTransaction(t *testing.T) { diff --git a/protocol/state/utxo_view.go b/protocol/state/utxo_view.go index 0fd68398..98556f0f 100644 --- a/protocol/state/utxo_view.go +++ b/protocol/state/utxo_view.go @@ -1,10 +1,10 @@ package state import ( - "github.com/vapor/consensus" - "github.com/vapor/database/storage" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" ) // UtxoViewpoint represents a view into the set of unspent transaction outputs diff --git a/protocol/state/utxo_view_test.go b/protocol/state/utxo_view_test.go index 0d3ddaf6..befbde65 100644 --- a/protocol/state/utxo_view_test.go +++ b/protocol/state/utxo_view_test.go @@ -5,11 +5,11 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/consensus" - "github.com/vapor/database/storage" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/testutil" ) var defaultEntry = map[bc.Hash]bc.Entry{ diff --git a/protocol/store.go b/protocol/store.go index f93b1ba7..808b289f 100644 --- a/protocol/store.go +++ b/protocol/store.go @@ -3,10 +3,10 @@ package protocol import ( "errors" - "github.com/vapor/database/storage" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" ) var ( diff --git a/protocol/tx.go b/protocol/tx.go index bdd35162..f8636789 100644 --- a/protocol/tx.go +++ b/protocol/tx.go @@ -3,10 +3,10 @@ package protocol import ( log "github.com/sirupsen/logrus" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" - "github.com/vapor/protocol/validation" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" + "github.com/bytom/vapor/protocol/validation" ) // GetTransactionStatus return the transaction status of give block diff --git a/protocol/txpool.go b/protocol/txpool.go index 09e32b16..841e549b 100644 --- a/protocol/txpool.go +++ b/protocol/txpool.go @@ -9,11 +9,11 @@ import ( "github.com/golang/groupcache/lru" log "github.com/sirupsen/logrus" - "github.com/vapor/consensus" - "github.com/vapor/event" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" ) // msg type diff --git a/protocol/txpool_test.go b/protocol/txpool_test.go index a2e63a22..343eb073 100644 --- a/protocol/txpool_test.go +++ b/protocol/txpool_test.go @@ -6,13 +6,13 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/consensus" - "github.com/vapor/database/storage" - "github.com/vapor/event" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" + "github.com/bytom/vapor/testutil" ) var testTxs = []*types.Tx{ diff --git a/protocol/validation/block.go b/protocol/validation/block.go index 9ed82be6..42920141 100644 --- a/protocol/validation/block.go +++ b/protocol/validation/block.go @@ -7,11 +7,11 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/consensus" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" ) const logModule = "leveldb" diff --git a/protocol/validation/block_test.go b/protocol/validation/block_test.go index 63de5162..fdc1a4d0 100644 --- a/protocol/validation/block_test.go +++ b/protocol/validation/block_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" - "github.com/vapor/consensus" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" - "github.com/vapor/protocol/vm" - "github.com/vapor/protocol/vm/vmutil" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" + "github.com/bytom/vapor/protocol/vm" + "github.com/bytom/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/testutil" ) func TestCheckBlockTime(t *testing.T) { diff --git a/protocol/validation/test/tx_ugly_test.go b/protocol/validation/test/tx_ugly_test.go index a1897976..699b3de7 100644 --- a/protocol/validation/test/tx_ugly_test.go +++ b/protocol/validation/test/tx_ugly_test.go @@ -5,15 +5,15 @@ import ( "math" "testing" - "github.com/vapor/account" - "github.com/vapor/blockchain/signers" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/validation" - "github.com/vapor/protocol/vm/vmutil" - "github.com/vapor/testutil" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/validation" + "github.com/bytom/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/testutil" ) func TestValidateUglyTx(t *testing.T) { diff --git a/protocol/validation/tx.go b/protocol/validation/tx.go index 60532702..bb824796 100644 --- a/protocol/validation/tx.go +++ b/protocol/validation/tx.go @@ -5,12 +5,12 @@ import ( "math" "sync" - "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/errors" - "github.com/vapor/math/checked" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/math/checked" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/vm" ) const ( diff --git a/protocol/validation/tx_scene_test.go b/protocol/validation/tx_scene_test.go index 47068663..d528bb80 100644 --- a/protocol/validation/tx_scene_test.go +++ b/protocol/validation/tx_scene_test.go @@ -4,10 +4,10 @@ import ( "encoding/hex" "testing" - "github.com/vapor/consensus" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm" ) func TestValidateTx(t *testing.T) { diff --git a/protocol/validation/tx_test.go b/protocol/validation/tx_test.go index 484cfa2d..619a02ed 100644 --- a/protocol/validation/tx_test.go +++ b/protocol/validation/tx_test.go @@ -6,14 +6,14 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/consensus" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm" - "github.com/vapor/protocol/vm/vmutil" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm" + "github.com/bytom/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/testutil" ) func init() { diff --git a/protocol/validation/vmcontext.go b/protocol/validation/vmcontext.go index 7ac617c9..50c000d5 100644 --- a/protocol/validation/vmcontext.go +++ b/protocol/validation/vmcontext.go @@ -3,11 +3,11 @@ package validation import ( "bytes" - "github.com/vapor/consensus/segwit" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/consensus/segwit" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/vm" ) // NewTxVMContext generates the vm.Context for BVM diff --git a/protocol/validation/vmcontext_test.go b/protocol/validation/vmcontext_test.go index 9f6e7306..943aa4a0 100644 --- a/protocol/validation/vmcontext_test.go +++ b/protocol/validation/vmcontext_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm" ) func TestCheckOutput(t *testing.T) { diff --git a/protocol/vm/assemble.go b/protocol/vm/assemble.go index 833c50bf..a14e03eb 100644 --- a/protocol/vm/assemble.go +++ b/protocol/vm/assemble.go @@ -10,7 +10,7 @@ import ( "strings" "unicode" - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) // Assemble converts a string like "2 3 ADD 5 NUMEQUAL" into 0x525393559c. diff --git a/protocol/vm/assemble_test.go b/protocol/vm/assemble_test.go index 47d2a3db..ddf55a96 100644 --- a/protocol/vm/assemble_test.go +++ b/protocol/vm/assemble_test.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "testing" - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) func TestAssemble(t *testing.T) { diff --git a/protocol/vm/bitwise_test.go b/protocol/vm/bitwise_test.go index 3f04273f..04de1062 100644 --- a/protocol/vm/bitwise_test.go +++ b/protocol/vm/bitwise_test.go @@ -3,7 +3,7 @@ package vm import ( "testing" - "github.com/vapor/testutil" + "github.com/bytom/vapor/testutil" ) func TestBitwiseOps(t *testing.T) { diff --git a/protocol/vm/control_test.go b/protocol/vm/control_test.go index 6b362642..504f6559 100644 --- a/protocol/vm/control_test.go +++ b/protocol/vm/control_test.go @@ -3,7 +3,7 @@ package vm import ( "testing" - "github.com/vapor/testutil" + "github.com/bytom/vapor/testutil" ) func TestControlOps(t *testing.T) { diff --git a/protocol/vm/crypto.go b/protocol/vm/crypto.go index 7b915818..4dd21acb 100644 --- a/protocol/vm/crypto.go +++ b/protocol/vm/crypto.go @@ -6,9 +6,9 @@ import ( "golang.org/x/crypto/sha3" - "github.com/vapor/crypto" - "github.com/vapor/crypto/ed25519" - "github.com/vapor/math/checked" + "github.com/bytom/vapor/crypto" + "github.com/bytom/vapor/crypto/ed25519" + "github.com/bytom/vapor/math/checked" ) func opSha256(vm *virtualMachine) error { diff --git a/protocol/vm/crypto_test.go b/protocol/vm/crypto_test.go index 6c143298..91cbadb5 100644 --- a/protocol/vm/crypto_test.go +++ b/protocol/vm/crypto_test.go @@ -3,7 +3,7 @@ package vm import ( "testing" - "github.com/vapor/testutil" + "github.com/bytom/vapor/testutil" ) func TestCheckSig(t *testing.T) { diff --git a/protocol/vm/introspection_test.go b/protocol/vm/introspection_test.go index 29e6e022..983ec552 100644 --- a/protocol/vm/introspection_test.go +++ b/protocol/vm/introspection_test.go @@ -5,8 +5,8 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/vapor/errors" - "github.com/vapor/testutil" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/testutil" ) func TestOutputIDAndNonceOp(t *testing.T) { diff --git a/protocol/vm/numeric.go b/protocol/vm/numeric.go index 9a65af6a..0845c9cd 100644 --- a/protocol/vm/numeric.go +++ b/protocol/vm/numeric.go @@ -3,7 +3,7 @@ package vm import ( "math" - "github.com/vapor/math/checked" + "github.com/bytom/vapor/math/checked" ) func op1Add(vm *virtualMachine) error { diff --git a/protocol/vm/numeric_test.go b/protocol/vm/numeric_test.go index ed5bf03b..52759983 100644 --- a/protocol/vm/numeric_test.go +++ b/protocol/vm/numeric_test.go @@ -5,7 +5,7 @@ import ( "math" "testing" - "github.com/vapor/testutil" + "github.com/bytom/vapor/testutil" ) func TestNumericOps(t *testing.T) { diff --git a/protocol/vm/ops.go b/protocol/vm/ops.go index 5052c62d..0659fb7e 100644 --- a/protocol/vm/ops.go +++ b/protocol/vm/ops.go @@ -6,8 +6,8 @@ import ( "math" "reflect" - "github.com/vapor/errors" - "github.com/vapor/math/checked" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/math/checked" ) type Op uint8 diff --git a/protocol/vm/ops_test.go b/protocol/vm/ops_test.go index 4e8c2b6f..3244ff9b 100644 --- a/protocol/vm/ops_test.go +++ b/protocol/vm/ops_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" - "github.com/vapor/errors" - "github.com/vapor/math/checked" - "github.com/vapor/testutil" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/math/checked" + "github.com/bytom/vapor/testutil" ) func TestParseOp(t *testing.T) { diff --git a/protocol/vm/pushdata_test.go b/protocol/vm/pushdata_test.go index 21724fd2..87217c8b 100644 --- a/protocol/vm/pushdata_test.go +++ b/protocol/vm/pushdata_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/vapor/testutil" + "github.com/bytom/vapor/testutil" ) func TestPushdataOps(t *testing.T) { diff --git a/protocol/vm/splice.go b/protocol/vm/splice.go index cf08bcc0..8c0e012e 100644 --- a/protocol/vm/splice.go +++ b/protocol/vm/splice.go @@ -1,6 +1,6 @@ package vm -import "github.com/vapor/math/checked" +import "github.com/bytom/vapor/math/checked" func opCat(vm *virtualMachine) error { err := vm.applyCost(4) diff --git a/protocol/vm/splice_test.go b/protocol/vm/splice_test.go index ebee7cdd..f6b5a056 100644 --- a/protocol/vm/splice_test.go +++ b/protocol/vm/splice_test.go @@ -3,7 +3,7 @@ package vm import ( "testing" - "github.com/vapor/testutil" + "github.com/bytom/vapor/testutil" ) func TestSpliceOps(t *testing.T) { diff --git a/protocol/vm/stack.go b/protocol/vm/stack.go index c92239fe..72d2e1e7 100644 --- a/protocol/vm/stack.go +++ b/protocol/vm/stack.go @@ -1,6 +1,6 @@ package vm -import "github.com/vapor/math/checked" +import "github.com/bytom/vapor/math/checked" func opToAltStack(vm *virtualMachine) error { err := vm.applyCost(2) diff --git a/protocol/vm/stack_test.go b/protocol/vm/stack_test.go index 50869e05..c8ec8d9c 100644 --- a/protocol/vm/stack_test.go +++ b/protocol/vm/stack_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/vapor/testutil" + "github.com/bytom/vapor/testutil" ) func TestStackOps(t *testing.T) { diff --git a/protocol/vm/vm.go b/protocol/vm/vm.go index f7b5a539..f23ce7da 100644 --- a/protocol/vm/vm.go +++ b/protocol/vm/vm.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) type virtualMachine struct { diff --git a/protocol/vm/vm_test.go b/protocol/vm/vm_test.go index 7e82f31e..d53c546d 100644 --- a/protocol/vm/vm_test.go +++ b/protocol/vm/vm_test.go @@ -8,8 +8,8 @@ import ( "testing" "testing/quick" - "github.com/vapor/errors" - "github.com/vapor/testutil" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/testutil" ) type tracebuf struct { diff --git a/protocol/vm/vmutil/builder.go b/protocol/vm/vmutil/builder.go index 3d1da258..ed79c842 100644 --- a/protocol/vm/vmutil/builder.go +++ b/protocol/vm/vmutil/builder.go @@ -3,8 +3,8 @@ package vmutil import ( "encoding/binary" - "github.com/vapor/errors" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/vm" ) type Builder struct { diff --git a/protocol/vm/vmutil/builder_test.go b/protocol/vm/vmutil/builder_test.go index 62d8417a..a82b2ceb 100644 --- a/protocol/vm/vmutil/builder_test.go +++ b/protocol/vm/vmutil/builder_test.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "testing" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/protocol/vm" ) func TestAddJump(t *testing.T) { diff --git a/protocol/vm/vmutil/script.go b/protocol/vm/vmutil/script.go index adc0d77b..849ec69c 100644 --- a/protocol/vm/vmutil/script.go +++ b/protocol/vm/vmutil/script.go @@ -1,9 +1,9 @@ package vmutil import ( - "github.com/vapor/crypto/ed25519" - "github.com/vapor/errors" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/crypto/ed25519" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/vm" ) // pre-define errors diff --git a/protocol/vm/vmutil/script_test.go b/protocol/vm/vmutil/script_test.go index 623bccf7..eeb11e9f 100644 --- a/protocol/vm/vmutil/script_test.go +++ b/protocol/vm/vmutil/script_test.go @@ -4,8 +4,8 @@ import ( "encoding/hex" "testing" - "github.com/vapor/crypto/ed25519" - "github.com/vapor/errors" + "github.com/bytom/vapor/crypto/ed25519" + "github.com/bytom/vapor/errors" ) // TestIsUnspendable ensures the IsUnspendable function returns the expected diff --git a/test/accounts_test.go b/test/accounts_test.go index ba95631f..4fed7821 100644 --- a/test/accounts_test.go +++ b/test/accounts_test.go @@ -6,16 +6,16 @@ import ( "strings" "testing" - acc "github.com/vapor/account" - "github.com/vapor/blockchain/signers" - "github.com/vapor/config" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/database" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" - "github.com/vapor/event" - "github.com/vapor/protocol" - "github.com/vapor/testutil" + acc "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/config" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/database" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/testutil" ) func TestCreateAccountWithUppercase(t *testing.T) { diff --git a/test/bench_blockchain_test.go b/test/bench_blockchain_test.go index 092811d5..77cf9c17 100644 --- a/test/bench_blockchain_test.go +++ b/test/bench_blockchain_test.go @@ -7,22 +7,22 @@ import ( "testing" "time" - "github.com/vapor/account" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/blockchain/signers" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/database" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/database/storage" - "github.com/vapor/event" - "github.com/vapor/proposal" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/database" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/proposal" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" ) func BenchmarkChain_CoinBaseTx_NoAsset(b *testing.B) { diff --git a/test/block_test.go b/test/block_test.go index eeb6c95f..db5ccccd 100644 --- a/test/block_test.go +++ b/test/block_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/vapor/consensus" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/consensus" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm" ) func TestBlockHeader(t *testing.T) { diff --git a/test/block_test_util.go b/test/block_test_util.go index 890d6802..2d7e0ff5 100644 --- a/test/block_test_util.go +++ b/test/block_test_util.go @@ -1,11 +1,11 @@ package test import ( - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/validation" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/validation" + "github.com/bytom/vapor/protocol/vm" ) // NewBlock create block according to the current status of chain diff --git a/test/builder_test.go b/test/builder_test.go index 7eda6491..db44b535 100644 --- a/test/builder_test.go +++ b/test/builder_test.go @@ -3,11 +3,11 @@ package test import ( "testing" - acc "github.com/vapor/account" - "github.com/vapor/blockchain/signers" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/testutil" + acc "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/testutil" ) var ( diff --git a/test/chain_test_util.go b/test/chain_test_util.go index 2f5fdb02..36a92f87 100644 --- a/test/chain_test_util.go +++ b/test/chain_test_util.go @@ -6,15 +6,15 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/consensus" - "github.com/vapor/database" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/database/storage" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/database" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm" ) const utxoPrefix = "UT:" diff --git a/test/integration/run_test.go b/test/integration/run_test.go index f186ca22..c6685f34 100644 --- a/test/integration/run_test.go +++ b/test/integration/run_test.go @@ -3,9 +3,9 @@ package integration import ( "fmt" - cfg "github.com/vapor/config" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/util" + cfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/util" ) // Mock config. diff --git a/test/integration/standard_transaction_test.go b/test/integration/standard_transaction_test.go index a82961db..7d0f0002 100644 --- a/test/integration/standard_transaction_test.go +++ b/test/integration/standard_transaction_test.go @@ -6,15 +6,15 @@ import ( "os" "testing" - "github.com/vapor/account" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/blockchain/signers" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/database" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/validation" - "github.com/vapor/test" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/database" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/validation" + "github.com/bytom/vapor/test" ) func TestP2PKH(t *testing.T) { diff --git a/test/mock/chain.go b/test/mock/chain.go index 82fc7dc2..f4adecf6 100644 --- a/test/mock/chain.go +++ b/test/mock/chain.go @@ -4,9 +4,9 @@ import ( "errors" "math/rand" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) var ( diff --git a/test/mock/crosschain_tx.go b/test/mock/crosschain_tx.go index 2543e642..a6f55001 100644 --- a/test/mock/crosschain_tx.go +++ b/test/mock/crosschain_tx.go @@ -6,11 +6,11 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) func NewCrosschainTx(privateKey string) *types.Tx { diff --git a/test/mock/mempool.go b/test/mock/mempool.go index 767fb7b2..a2bec3cf 100644 --- a/test/mock/mempool.go +++ b/test/mock/mempool.go @@ -1,8 +1,8 @@ package mock import ( - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc/types" ) type Mempool struct { diff --git a/test/performance/mining_test.go b/test/performance/mining_test.go index 0f3f0d66..22a8720f 100644 --- a/test/performance/mining_test.go +++ b/test/performance/mining_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/vapor/account" - "github.com/vapor/database" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/proposal" - "github.com/vapor/test" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/database" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/proposal" + "github.com/bytom/vapor/test" ) // Function NewBlockTemplate's benchmark - 0.05s diff --git a/test/performance/rpc_test.go b/test/performance/rpc_test.go index 22f5c6ca..ad058858 100644 --- a/test/performance/rpc_test.go +++ b/test/performance/rpc_test.go @@ -3,7 +3,7 @@ package performance import ( "testing" - "github.com/vapor/util" + "github.com/bytom/vapor/util" ) // Test rpc call benchmark - 0.1 s/op diff --git a/test/protocol_test.go b/test/protocol_test.go index 7be6689d..e4d87a9a 100644 --- a/test/protocol_test.go +++ b/test/protocol_test.go @@ -6,10 +6,10 @@ import ( "os" "testing" - "github.com/vapor/consensus" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/consensus" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm" ) // case1: |------c1(height=7) diff --git a/test/protocol_test_util.go b/test/protocol_test_util.go index 7d895652..106d60a8 100644 --- a/test/protocol_test_util.go +++ b/test/protocol_test_util.go @@ -3,9 +3,9 @@ package test import ( "fmt" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc/types" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc/types" ) func declChain(name string, baseChain *protocol.Chain, baseHeight uint64, height uint64) (*protocol.Chain, error) { diff --git a/test/tx_test_util.go b/test/tx_test_util.go index f8ce45d9..c0eaa543 100644 --- a/test/tx_test_util.go +++ b/test/tx_test_util.go @@ -5,22 +5,22 @@ import ( "fmt" "time" - "github.com/vapor/account" - "github.com/vapor/asset" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/blockchain/signers" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/common" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/database" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm" - "github.com/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/database" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm" + "github.com/bytom/vapor/protocol/vm/vmutil" ) // TxGenerator used to generate new tx diff --git a/test/util.go b/test/util.go index 54b9b05e..44748931 100644 --- a/test/util.go +++ b/test/util.go @@ -4,19 +4,19 @@ import ( "context" "time" - "github.com/vapor/account" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/database" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/event" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/vm" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/database" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/vm" ) const ( diff --git a/test/utxo_view/utxo_view_test.go b/test/utxo_view/utxo_view_test.go index 317f8ba5..c3119e3d 100644 --- a/test/utxo_view/utxo_view_test.go +++ b/test/utxo_view/utxo_view_test.go @@ -4,16 +4,16 @@ import ( "os" "testing" - "github.com/vapor/testutil" + "github.com/bytom/vapor/testutil" "github.com/golang/protobuf/proto" - "github.com/vapor/database" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/database/storage" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" + "github.com/bytom/vapor/database" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/database/storage" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/protocol/state" ) func TestAttachOrDetachBlocks(t *testing.T) { diff --git a/test/utxo_view/utxo_view_test_util.go b/test/utxo_view/utxo_view_test_util.go index 1e021bc4..fdcf7901 100644 --- a/test/utxo_view/utxo_view_test_util.go +++ b/test/utxo_view/utxo_view_test_util.go @@ -3,10 +3,10 @@ package utxo_view import ( "encoding/hex" - "github.com/vapor/consensus" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/testutil" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/testutil" ) const utxoPreFix = "UT:" diff --git a/test/wallet_test.go b/test/wallet_test.go index fe4509c4..8f344015 100644 --- a/test/wallet_test.go +++ b/test/wallet_test.go @@ -7,21 +7,21 @@ import ( "testing" "time" - "github.com/vapor/account" - "github.com/vapor/asset" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/blockchain/signers" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/database" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/event" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - wt "github.com/vapor/wallet" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/database" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + wt "github.com/bytom/vapor/wallet" ) func TestWalletUpdate(t *testing.T) { diff --git a/test/wallet_test_util.go b/test/wallet_test_util.go index 570aeccc..f633f572 100644 --- a/test/wallet_test_util.go +++ b/test/wallet_test_util.go @@ -7,17 +7,17 @@ import ( "path" "reflect" - "github.com/vapor/account" - "github.com/vapor/asset" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/blockchain/signers" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/database" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/event" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc/types" - w "github.com/vapor/wallet" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/database" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc/types" + w "github.com/bytom/vapor/wallet" ) type walletTestConfig struct { diff --git a/testutil/hex.go b/testutil/hex.go index 84fbdc9b..c3994529 100644 --- a/testutil/hex.go +++ b/testutil/hex.go @@ -6,7 +6,7 @@ import ( "io" "testing" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc" ) func MustDecodeHash(s string) (h bc.Hash) { diff --git a/testutil/keys.go b/testutil/keys.go index 4fdbed74..070f8b11 100644 --- a/testutil/keys.go +++ b/testutil/keys.go @@ -1,8 +1,8 @@ package testutil import ( - "github.com/vapor/crypto/ed25519" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/ed25519" + "github.com/bytom/vapor/crypto/ed25519/chainkd" ) var ( diff --git a/toolbar/apinode/account.go b/toolbar/apinode/account.go index 818f7eee..f1a24d8d 100644 --- a/toolbar/apinode/account.go +++ b/toolbar/apinode/account.go @@ -3,12 +3,12 @@ package apinode import ( "encoding/json" - "github.com/vapor/api" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/blockchain/query" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/errors" + "github.com/bytom/vapor/api" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/blockchain/query" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/errors" ) func (n *Node) CreateKey(alias, password string) (*api.CreateKeyResp, error) { diff --git a/toolbar/apinode/block.go b/toolbar/apinode/block.go index 50ac53f8..7b6ae947 100644 --- a/toolbar/apinode/block.go +++ b/toolbar/apinode/block.go @@ -3,9 +3,9 @@ package apinode import ( "encoding/json" - "github.com/vapor/api" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/api" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc/types" ) func (n *Node) GetBlockByHash(hash string) (*types.Block, error) { diff --git a/toolbar/apinode/node.go b/toolbar/apinode/node.go index d15c068b..f0932368 100644 --- a/toolbar/apinode/node.go +++ b/toolbar/apinode/node.go @@ -3,9 +3,9 @@ package apinode import ( "encoding/json" - "github.com/vapor/errors" - "github.com/vapor/netsync/peers" - "github.com/vapor/toolbar/common" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/toolbar/common" ) // Node can invoke the api which provide by the full node server diff --git a/toolbar/apinode/node_test.go b/toolbar/apinode/node_test.go index 4bbae41a..902aba33 100644 --- a/toolbar/apinode/node_test.go +++ b/toolbar/apinode/node_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "testing" - "github.com/vapor/consensus" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" ) func buildTxRequest(accountID string, outputs map[string]uint64) ([]byte, error) { diff --git a/toolbar/apinode/query.go b/toolbar/apinode/query.go index 9486a09a..c04f1725 100644 --- a/toolbar/apinode/query.go +++ b/toolbar/apinode/query.go @@ -3,11 +3,11 @@ package apinode import ( "encoding/json" - "github.com/vapor/api" - "github.com/vapor/blockchain/query" - "github.com/vapor/errors" - "github.com/vapor/netsync/peers" - "github.com/vapor/wallet" + "github.com/bytom/vapor/api" + "github.com/bytom/vapor/blockchain/query" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/wallet" ) func (n *Node) ListAddresses(accountAlias string, from, count uint) (*[]api.AddressResp, error) { diff --git a/toolbar/apinode/transaction.go b/toolbar/apinode/transaction.go index 4e9c2422..31125954 100644 --- a/toolbar/apinode/transaction.go +++ b/toolbar/apinode/transaction.go @@ -4,11 +4,11 @@ import ( "encoding/hex" "encoding/json" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/consensus" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) type SpendAccountAction struct { diff --git a/toolbar/common/address.go b/toolbar/common/address.go index d6f7193a..aa352ce5 100644 --- a/toolbar/common/address.go +++ b/toolbar/common/address.go @@ -3,10 +3,10 @@ package common import ( "errors" - "github.com/vapor/common" - "github.com/vapor/consensus" - "github.com/vapor/consensus/segwit" - "github.com/vapor/protocol/vm/vmutil" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/consensus/segwit" + "github.com/bytom/vapor/protocol/vm/vmutil" ) func GetAddressFromControlProgram(prog []byte) string { diff --git a/toolbar/common/consensus.go b/toolbar/common/consensus.go index 50983b15..36dffd84 100644 --- a/toolbar/common/consensus.go +++ b/toolbar/common/consensus.go @@ -3,8 +3,8 @@ package common import ( "sort" - "github.com/vapor/api" - "github.com/vapor/consensus" + "github.com/bytom/vapor/api" + "github.com/bytom/vapor/consensus" ) const NumOfBPNode = 42 diff --git a/toolbar/common/db.go b/toolbar/common/db.go index 6519445f..bcfee19a 100644 --- a/toolbar/common/db.go +++ b/toolbar/common/db.go @@ -6,7 +6,7 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/jinzhu/gorm" - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) func NewMySQLDB(cfg MySQLConfig) (*gorm.DB, error) { diff --git a/toolbar/consensusreward/consensus_reward.go b/toolbar/consensusreward/consensus_reward.go index 63b675ed..2db9fefc 100644 --- a/toolbar/consensusreward/consensus_reward.go +++ b/toolbar/consensusreward/consensus_reward.go @@ -5,11 +5,11 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/consensus" - "github.com/vapor/errors" - "github.com/vapor/toolbar/apinode" - "github.com/vapor/toolbar/common" - "github.com/vapor/toolbar/consensusreward/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/toolbar/apinode" + "github.com/bytom/vapor/toolbar/common" + "github.com/bytom/vapor/toolbar/consensusreward/config" ) const standbyNodesRewardForConsensusCycle = 7610350076 // 400000000000000 / (365 * 24 * 60 / (500 * 1200 / 1000 / 60)) diff --git a/toolbar/federation/api/handler.go b/toolbar/federation/api/handler.go index 8a23b9f1..3888400f 100644 --- a/toolbar/federation/api/handler.go +++ b/toolbar/federation/api/handler.go @@ -7,10 +7,10 @@ import ( "github.com/gin-gonic/gin" - "github.com/vapor/errors" - "github.com/vapor/toolbar/federation/common" - "github.com/vapor/toolbar/federation/database/orm" - serverCommon "github.com/vapor/toolbar/server" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/toolbar/federation/common" + "github.com/bytom/vapor/toolbar/federation/database/orm" + serverCommon "github.com/bytom/vapor/toolbar/server" ) type listCrosschainTxsReq struct{ serverCommon.Display } diff --git a/toolbar/federation/api/server.go b/toolbar/federation/api/server.go index 3df39255..a74319f5 100644 --- a/toolbar/federation/api/server.go +++ b/toolbar/federation/api/server.go @@ -4,8 +4,8 @@ import ( "github.com/gin-gonic/gin" "github.com/jinzhu/gorm" - "github.com/vapor/toolbar/federation/config" - serverCommon "github.com/vapor/toolbar/server" + "github.com/bytom/vapor/toolbar/federation/config" + serverCommon "github.com/bytom/vapor/toolbar/server" ) type Server struct { diff --git a/toolbar/federation/common/util.go b/toolbar/federation/common/util.go index c02ed3db..4ac837d1 100644 --- a/toolbar/federation/common/util.go +++ b/toolbar/federation/common/util.go @@ -5,9 +5,9 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/consensus" - "github.com/vapor/consensus/segwit" - "github.com/vapor/wallet" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/consensus/segwit" + "github.com/bytom/vapor/wallet" ) func ProgToAddress(prog []byte, netParams *consensus.Params) string { diff --git a/toolbar/federation/config/config.go b/toolbar/federation/config/config.go index 45db1bab..b596a000 100644 --- a/toolbar/federation/config/config.go +++ b/toolbar/federation/config/config.go @@ -6,8 +6,8 @@ import ( log "github.com/sirupsen/logrus" - vaporJson "github.com/vapor/encoding/json" - "github.com/vapor/toolbar/common" + vaporJson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/toolbar/common" ) func NewConfig() *Config { diff --git a/toolbar/federation/database/asset_store.go b/toolbar/federation/database/asset_store.go index 54b09c5d..64129d52 100644 --- a/toolbar/federation/database/asset_store.go +++ b/toolbar/federation/database/asset_store.go @@ -6,8 +6,8 @@ import ( "github.com/golang/groupcache/lru" "github.com/jinzhu/gorm" - "github.com/vapor/errors" - "github.com/vapor/toolbar/federation/database/orm" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/toolbar/federation/database/orm" ) const ( diff --git a/toolbar/federation/database/orm/asset.go b/toolbar/federation/database/orm/asset.go index 1d39d494..56c50b18 100644 --- a/toolbar/federation/database/orm/asset.go +++ b/toolbar/federation/database/orm/asset.go @@ -1,7 +1,7 @@ package orm import ( - "github.com/vapor/toolbar/common" + "github.com/bytom/vapor/toolbar/common" ) type Asset struct { diff --git a/toolbar/federation/database/orm/chain.go b/toolbar/federation/database/orm/chain.go index 92656eb9..b727f854 100644 --- a/toolbar/federation/database/orm/chain.go +++ b/toolbar/federation/database/orm/chain.go @@ -1,7 +1,7 @@ package orm import ( - "github.com/vapor/toolbar/common" + "github.com/bytom/vapor/toolbar/common" ) type Chain struct { diff --git a/toolbar/federation/database/orm/cross_transaction.go b/toolbar/federation/database/orm/cross_transaction.go index 6c424db5..af57b89a 100644 --- a/toolbar/federation/database/orm/cross_transaction.go +++ b/toolbar/federation/database/orm/cross_transaction.go @@ -4,9 +4,9 @@ import ( "database/sql" "encoding/json" - "github.com/vapor/errors" - "github.com/vapor/toolbar/common" - fedCommon "github.com/vapor/toolbar/federation/common" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/toolbar/common" + fedCommon "github.com/bytom/vapor/toolbar/federation/common" ) type CrossTransaction struct { diff --git a/toolbar/federation/database/orm/cross_transaction_req.go b/toolbar/federation/database/orm/cross_transaction_req.go index 27195616..261cc277 100644 --- a/toolbar/federation/database/orm/cross_transaction_req.go +++ b/toolbar/federation/database/orm/cross_transaction_req.go @@ -1,7 +1,7 @@ package orm import ( - "github.com/vapor/toolbar/common" + "github.com/bytom/vapor/toolbar/common" ) type CrossTransactionReq struct { diff --git a/toolbar/federation/service/node.go b/toolbar/federation/service/node.go index 9b5a8568..5ca0042e 100644 --- a/toolbar/federation/service/node.go +++ b/toolbar/federation/service/node.go @@ -3,9 +3,9 @@ package service import ( "encoding/json" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/toolbar/common" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/toolbar/common" ) // Node can invoke the api which provide by the full node server diff --git a/toolbar/federation/synchron/errors.go b/toolbar/federation/synchron/errors.go index 5e58fde8..95a422ed 100644 --- a/toolbar/federation/synchron/errors.go +++ b/toolbar/federation/synchron/errors.go @@ -1,7 +1,7 @@ package synchron import ( - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) var ( diff --git a/toolbar/federation/synchron/mainchain_keeper.go b/toolbar/federation/synchron/mainchain_keeper.go index 8bb13d0f..117717c8 100644 --- a/toolbar/federation/synchron/mainchain_keeper.go +++ b/toolbar/federation/synchron/mainchain_keeper.go @@ -14,14 +14,14 @@ import ( "github.com/jinzhu/gorm" log "github.com/sirupsen/logrus" - "github.com/vapor/consensus" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/toolbar/federation/common" - "github.com/vapor/toolbar/federation/config" - "github.com/vapor/toolbar/federation/database" - "github.com/vapor/toolbar/federation/database/orm" - "github.com/vapor/toolbar/federation/service" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/toolbar/federation/common" + "github.com/bytom/vapor/toolbar/federation/config" + "github.com/bytom/vapor/toolbar/federation/database" + "github.com/bytom/vapor/toolbar/federation/database/orm" + "github.com/bytom/vapor/toolbar/federation/service" ) type mainchainKeeper struct { diff --git a/toolbar/federation/synchron/sidechain_keeper.go b/toolbar/federation/synchron/sidechain_keeper.go index 80061f18..0ec3d925 100644 --- a/toolbar/federation/synchron/sidechain_keeper.go +++ b/toolbar/federation/synchron/sidechain_keeper.go @@ -9,15 +9,15 @@ import ( "github.com/jinzhu/gorm" log "github.com/sirupsen/logrus" - "github.com/vapor/consensus" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/toolbar/federation/common" - "github.com/vapor/toolbar/federation/config" - "github.com/vapor/toolbar/federation/database" - "github.com/vapor/toolbar/federation/database/orm" - "github.com/vapor/toolbar/federation/service" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/toolbar/federation/common" + "github.com/bytom/vapor/toolbar/federation/config" + "github.com/bytom/vapor/toolbar/federation/database" + "github.com/bytom/vapor/toolbar/federation/database/orm" + "github.com/bytom/vapor/toolbar/federation/service" ) type sidechainKeeper struct { diff --git a/toolbar/mergeutxo/merger_utxo.go b/toolbar/mergeutxo/merger_utxo.go index d8ca307a..f30e9b17 100755 --- a/toolbar/mergeutxo/merger_utxo.go +++ b/toolbar/mergeutxo/merger_utxo.go @@ -1,10 +1,10 @@ package mergeutxo import ( - "github.com/vapor/consensus" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/toolbar/apinode" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/toolbar/apinode" ) func MergeUTXO(hostPort, accountID, password, address string, amount uint64) ([]string, error) { diff --git a/toolbar/precognitive/api/handler.go b/toolbar/precognitive/api/handler.go index 1a85c370..d3f01581 100644 --- a/toolbar/precognitive/api/handler.go +++ b/toolbar/precognitive/api/handler.go @@ -3,8 +3,8 @@ package api import ( "github.com/gin-gonic/gin" - "github.com/vapor/toolbar/precognitive/database/orm" - serverCommon "github.com/vapor/toolbar/server" + "github.com/bytom/vapor/toolbar/precognitive/database/orm" + serverCommon "github.com/bytom/vapor/toolbar/server" ) type listNodesReq struct{ serverCommon.Display } diff --git a/toolbar/precognitive/api/server.go b/toolbar/precognitive/api/server.go index b4e617d7..02a351d2 100644 --- a/toolbar/precognitive/api/server.go +++ b/toolbar/precognitive/api/server.go @@ -6,8 +6,8 @@ import ( "github.com/gin-gonic/gin" "github.com/jinzhu/gorm" - "github.com/vapor/toolbar/precognitive/config" - serverCommon "github.com/vapor/toolbar/server" + "github.com/bytom/vapor/toolbar/precognitive/config" + serverCommon "github.com/bytom/vapor/toolbar/server" ) type Server struct { diff --git a/toolbar/precognitive/config/config.go b/toolbar/precognitive/config/config.go index 3c5ba3f0..4f407945 100644 --- a/toolbar/precognitive/config/config.go +++ b/toolbar/precognitive/config/config.go @@ -5,9 +5,9 @@ import ( "os" log "github.com/sirupsen/logrus" - "github.com/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/ed25519/chainkd" - "github.com/vapor/toolbar/common" + "github.com/bytom/vapor/toolbar/common" ) func NewConfig() *Config { diff --git a/toolbar/precognitive/database/orm/node.go b/toolbar/precognitive/database/orm/node.go index addf7b17..944183a4 100644 --- a/toolbar/precognitive/database/orm/node.go +++ b/toolbar/precognitive/database/orm/node.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/vapor/toolbar/common" - precogCommon "github.com/vapor/toolbar/precognitive/common" + "github.com/bytom/vapor/toolbar/common" + precogCommon "github.com/bytom/vapor/toolbar/precognitive/common" ) type Node struct { diff --git a/toolbar/precognitive/monitor/connection.go b/toolbar/precognitive/monitor/connection.go index 60723772..19aebf18 100644 --- a/toolbar/precognitive/monitor/connection.go +++ b/toolbar/precognitive/monitor/connection.go @@ -6,8 +6,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/p2p" - "github.com/vapor/toolbar/precognitive/database/orm" + "github.com/bytom/vapor/p2p" + "github.com/bytom/vapor/toolbar/precognitive/database/orm" ) func (m *monitor) connectionRoutine() { diff --git a/toolbar/precognitive/monitor/discover.go b/toolbar/precognitive/monitor/discover.go index 6eb8781d..8d92d3a3 100644 --- a/toolbar/precognitive/monitor/discover.go +++ b/toolbar/precognitive/monitor/discover.go @@ -6,8 +6,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/p2p/discover/dht" - "github.com/vapor/toolbar/precognitive/config" + "github.com/bytom/vapor/p2p/discover/dht" + "github.com/bytom/vapor/toolbar/precognitive/config" ) var ( diff --git a/toolbar/precognitive/monitor/mock.go b/toolbar/precognitive/monitor/mock.go index 31a8411c..6c69e01c 100644 --- a/toolbar/precognitive/monitor/mock.go +++ b/toolbar/precognitive/monitor/mock.go @@ -1,8 +1,8 @@ package monitor import ( - "github.com/vapor/protocol/bc/types" - "github.com/vapor/test/mock" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/test/mock" ) func mockChainAndPool() (*mock.Chain, *mock.Mempool, error) { diff --git a/toolbar/precognitive/monitor/monitor.go b/toolbar/precognitive/monitor/monitor.go index d32e2a41..59e3b569 100644 --- a/toolbar/precognitive/monitor/monitor.go +++ b/toolbar/precognitive/monitor/monitor.go @@ -10,19 +10,19 @@ import ( "github.com/jinzhu/gorm" log "github.com/sirupsen/logrus" - vaporCfg "github.com/vapor/config" - "github.com/vapor/crypto/ed25519/chainkd" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/event" - "github.com/vapor/netsync/chainmgr" - "github.com/vapor/netsync/consensusmgr" - "github.com/vapor/netsync/peers" - "github.com/vapor/p2p" - "github.com/vapor/p2p/discover/dht" - "github.com/vapor/p2p/discover/mdns" - "github.com/vapor/p2p/signlib" - "github.com/vapor/test/mock" - "github.com/vapor/toolbar/precognitive/config" + vaporCfg "github.com/bytom/vapor/config" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/netsync/chainmgr" + "github.com/bytom/vapor/netsync/consensusmgr" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/p2p" + "github.com/bytom/vapor/p2p/discover/dht" + "github.com/bytom/vapor/p2p/discover/mdns" + "github.com/bytom/vapor/p2p/signlib" + "github.com/bytom/vapor/test/mock" + "github.com/bytom/vapor/toolbar/precognitive/config" ) type monitor struct { diff --git a/toolbar/precognitive/monitor/stats.go b/toolbar/precognitive/monitor/stats.go index 3538f61f..07f46fc4 100644 --- a/toolbar/precognitive/monitor/stats.go +++ b/toolbar/precognitive/monitor/stats.go @@ -10,11 +10,11 @@ import ( "github.com/jinzhu/gorm" log "github.com/sirupsen/logrus" - "github.com/vapor/netsync/peers" - "github.com/vapor/p2p" - "github.com/vapor/toolbar/precognitive/common" - "github.com/vapor/toolbar/precognitive/config" - "github.com/vapor/toolbar/precognitive/database/orm" + "github.com/bytom/vapor/netsync/peers" + "github.com/bytom/vapor/p2p" + "github.com/bytom/vapor/toolbar/precognitive/common" + "github.com/bytom/vapor/toolbar/precognitive/config" + "github.com/bytom/vapor/toolbar/precognitive/database/orm" ) func (m *monitor) upsertNode(node *config.Node) error { diff --git a/toolbar/server/display.go b/toolbar/server/display.go index caa4e564..dd1a74cb 100644 --- a/toolbar/server/display.go +++ b/toolbar/server/display.go @@ -1,7 +1,7 @@ package server import ( - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) var ( diff --git a/toolbar/server/errors.go b/toolbar/server/errors.go index 8ecfdfb3..e854d06e 100644 --- a/toolbar/server/errors.go +++ b/toolbar/server/errors.go @@ -1,7 +1,7 @@ package server import ( - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) //FormatErrResp format error response diff --git a/toolbar/server/handle.go b/toolbar/server/handle.go index b891556f..fb0bf24d 100644 --- a/toolbar/server/handle.go +++ b/toolbar/server/handle.go @@ -8,7 +8,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) func Middleware(serverInstance interface{}) gin.HandlerFunc { diff --git a/toolbar/server/pagination.go b/toolbar/server/pagination.go index 74bf2976..38b83a7e 100644 --- a/toolbar/server/pagination.go +++ b/toolbar/server/pagination.go @@ -7,7 +7,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/vapor/errors" + "github.com/bytom/vapor/errors" ) const ( diff --git a/toolbar/vote_reward/config/config.go b/toolbar/vote_reward/config/config.go index d15b3c6b..0878e449 100644 --- a/toolbar/vote_reward/config/config.go +++ b/toolbar/vote_reward/config/config.go @@ -7,7 +7,7 @@ import ( "os" "path" - "github.com/vapor/toolbar/common" + "github.com/bytom/vapor/toolbar/common" ) type Config struct { diff --git a/toolbar/vote_reward/settlementvotereward/settlementreward.go b/toolbar/vote_reward/settlementvotereward/settlementreward.go index a6fdbccf..a778738a 100644 --- a/toolbar/vote_reward/settlementvotereward/settlementreward.go +++ b/toolbar/vote_reward/settlementvotereward/settlementreward.go @@ -7,12 +7,12 @@ import ( "github.com/jinzhu/gorm" - "github.com/vapor/consensus" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/toolbar/apinode" - "github.com/vapor/toolbar/common" - "github.com/vapor/toolbar/vote_reward/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/toolbar/apinode" + "github.com/bytom/vapor/toolbar/common" + "github.com/bytom/vapor/toolbar/vote_reward/config" ) var ( diff --git a/toolbar/vote_reward/synchron/block_keeper.go b/toolbar/vote_reward/synchron/block_keeper.go index 368cb44f..e067096e 100644 --- a/toolbar/vote_reward/synchron/block_keeper.go +++ b/toolbar/vote_reward/synchron/block_keeper.go @@ -6,12 +6,12 @@ import ( "github.com/jinzhu/gorm" log "github.com/sirupsen/logrus" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/toolbar/apinode" - "github.com/vapor/toolbar/common" - "github.com/vapor/toolbar/vote_reward/config" - "github.com/vapor/toolbar/vote_reward/database/orm" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/toolbar/apinode" + "github.com/bytom/vapor/toolbar/common" + "github.com/bytom/vapor/toolbar/vote_reward/config" + "github.com/bytom/vapor/toolbar/vote_reward/database/orm" ) var ErrInconsistentDB = errors.New("inconsistent db status") diff --git a/util/util.go b/util/util.go index e77696b0..3bf0f213 100644 --- a/util/util.go +++ b/util/util.go @@ -4,9 +4,9 @@ import ( "context" jww "github.com/spf13/jwalterweatherman" - "github.com/vapor/api" - "github.com/vapor/blockchain/rpc" - "github.com/vapor/env" + "github.com/bytom/vapor/api" + "github.com/bytom/vapor/blockchain/rpc" + "github.com/bytom/vapor/env" ) const ( diff --git a/vendor/github.com/miekg/dns/dnssec_keyscan.go b/vendor/github.com/miekg/dns/dnssec_keyscan.go index ce8e28cd..aebcd1a7 100644 --- a/vendor/github.com/miekg/dns/dnssec_keyscan.go +++ b/vendor/github.com/miekg/dns/dnssec_keyscan.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "github.com/vapor/crypto/ed25519" + "github.com/bytom/vapor/crypto/ed25519" ) // NewPrivateKey returns a PrivateKey by parsing the string s. diff --git a/vendor/github.com/miekg/dns/dnssec_privkey.go b/vendor/github.com/miekg/dns/dnssec_privkey.go index daf8e01f..5f3d8492 100644 --- a/vendor/github.com/miekg/dns/dnssec_privkey.go +++ b/vendor/github.com/miekg/dns/dnssec_privkey.go @@ -8,7 +8,7 @@ import ( "math/big" "strconv" - "github.com/vapor/crypto/ed25519" + "github.com/bytom/vapor/crypto/ed25519" ) const format = "Private-key-format: v1.3\n" diff --git a/wallet/annotated.go b/wallet/annotated.go index 50746ce4..39d475fe 100644 --- a/wallet/annotated.go +++ b/wallet/annotated.go @@ -5,15 +5,15 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/account" - "github.com/vapor/asset" - "github.com/vapor/blockchain/query" - "github.com/vapor/common" - "github.com/vapor/consensus" - "github.com/vapor/consensus/segwit" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/query" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/consensus/segwit" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) // annotateTxs adds asset data to transactions diff --git a/wallet/indexer.go b/wallet/indexer.go index f107aece..d0055d43 100644 --- a/wallet/indexer.go +++ b/wallet/indexer.go @@ -8,13 +8,13 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/account" - "github.com/vapor/blockchain/query" - "github.com/vapor/consensus" - "github.com/vapor/crypto/sha3pool" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/query" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/sha3pool" + chainjson "github.com/bytom/vapor/encoding/json" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) func parseGlobalTxIdx(globalTxIdx []byte) (*bc.Hash, uint64) { diff --git a/wallet/mnemonic/mnemonic.go b/wallet/mnemonic/mnemonic.go index 851d352a..9e1bc673 100644 --- a/wallet/mnemonic/mnemonic.go +++ b/wallet/mnemonic/mnemonic.go @@ -17,7 +17,7 @@ import ( "github.com/johngb/langreg" "golang.org/x/crypto/pbkdf2" - "github.com/vapor/wallet/mnemonic/wordlists" + "github.com/bytom/vapor/wallet/mnemonic/wordlists" ) var ( diff --git a/wallet/recovery.go b/wallet/recovery.go index a2aae5ac..5458efc9 100644 --- a/wallet/recovery.go +++ b/wallet/recovery.go @@ -7,13 +7,13 @@ import ( "sync/atomic" "time" - "github.com/vapor/account" - "github.com/vapor/blockchain/signers" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) const ( diff --git a/wallet/recovery_test.go b/wallet/recovery_test.go index c4ec390e..32a0063a 100644 --- a/wallet/recovery_test.go +++ b/wallet/recovery_test.go @@ -9,18 +9,18 @@ import ( "testing" "time" - "github.com/vapor/account" - acc "github.com/vapor/account" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/blockchain/signers" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/common" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/account" + acc "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) // MockBlock mock a block diff --git a/wallet/store.go b/wallet/store.go index 90b6050c..3c45be66 100644 --- a/wallet/store.go +++ b/wallet/store.go @@ -1,10 +1,10 @@ package wallet import ( - acc "github.com/vapor/account" - "github.com/vapor/asset" - "github.com/vapor/blockchain/query" - "github.com/vapor/protocol/bc" + acc "github.com/bytom/vapor/account" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/query" + "github.com/bytom/vapor/protocol/bc" ) // WalletStore interface contains wallet storage functions. diff --git a/wallet/unconfirmed.go b/wallet/unconfirmed.go index aabf8d28..878a4eae 100644 --- a/wallet/unconfirmed.go +++ b/wallet/unconfirmed.go @@ -6,15 +6,15 @@ import ( "sort" "time" - "github.com/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc" log "github.com/sirupsen/logrus" - acc "github.com/vapor/account" - "github.com/vapor/blockchain/query" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc/types" + acc "github.com/bytom/vapor/account" + "github.com/bytom/vapor/blockchain/query" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc/types" ) const ( diff --git a/wallet/unconfirmed_test.go b/wallet/unconfirmed_test.go index 59048455..823b74c4 100644 --- a/wallet/unconfirmed_test.go +++ b/wallet/unconfirmed_test.go @@ -5,18 +5,18 @@ import ( "os" "testing" - "github.com/vapor/account" - "github.com/vapor/asset" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/blockchain/query" - "github.com/vapor/blockchain/signers" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/event" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/testutil" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/blockchain/query" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/testutil" ) func TestWalletUnconfirmedTxs(t *testing.T) { diff --git a/wallet/utxo.go b/wallet/utxo.go index a1b44fa3..278853a2 100644 --- a/wallet/utxo.go +++ b/wallet/utxo.go @@ -3,12 +3,12 @@ package wallet import ( log "github.com/sirupsen/logrus" - "github.com/vapor/account" - "github.com/vapor/consensus" - "github.com/vapor/consensus/segwit" - "github.com/vapor/crypto/sha3pool" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/consensus/segwit" + "github.com/bytom/vapor/crypto/sha3pool" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) // GetAccountUtxos return all account unspent outputs diff --git a/wallet/utxo_test.go b/wallet/utxo_test.go index 9588a040..dadd8345 100644 --- a/wallet/utxo_test.go +++ b/wallet/utxo_test.go @@ -8,12 +8,12 @@ import ( "sort" "testing" - "github.com/vapor/account" - "github.com/vapor/consensus" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/testutil" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/consensus" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" + "github.com/bytom/vapor/testutil" ) func TestGetAccountUtxos(t *testing.T) { diff --git a/wallet/wallet.go b/wallet/wallet.go index 0a955d21..739e949f 100644 --- a/wallet/wallet.go +++ b/wallet/wallet.go @@ -5,14 +5,14 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vapor/account" - "github.com/vapor/asset" - "github.com/vapor/blockchain/pseudohsm" - "github.com/vapor/errors" - "github.com/vapor/event" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/account" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/pseudohsm" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) const ( diff --git a/wallet/wallet_test.go b/wallet/wallet_test.go index 49ad6939..dfa451d1 100644 --- a/wallet/wallet_test.go +++ b/wallet/wallet_test.go @@ -12,23 +12,23 @@ import ( "testing" "time" - "github.com/vapor/account" - acc "github.com/vapor/account" - "github.com/vapor/asset" - "github.com/vapor/blockchain/query" - "github.com/vapor/blockchain/signers" - "github.com/vapor/blockchain/txbuilder" - "github.com/vapor/common" - "github.com/vapor/config" - "github.com/vapor/consensus" - "github.com/vapor/crypto/ed25519/chainkd" - "github.com/vapor/crypto/sha3pool" - dbm "github.com/vapor/database/leveldb" - "github.com/vapor/errors" - "github.com/vapor/event" - "github.com/vapor/protocol" - "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" + "github.com/bytom/vapor/account" + acc "github.com/bytom/vapor/account" + "github.com/bytom/vapor/asset" + "github.com/bytom/vapor/blockchain/query" + "github.com/bytom/vapor/blockchain/signers" + "github.com/bytom/vapor/blockchain/txbuilder" + "github.com/bytom/vapor/common" + "github.com/bytom/vapor/config" + "github.com/bytom/vapor/consensus" + "github.com/bytom/vapor/crypto/ed25519/chainkd" + "github.com/bytom/vapor/crypto/sha3pool" + dbm "github.com/bytom/vapor/database/leveldb" + "github.com/bytom/vapor/errors" + "github.com/bytom/vapor/event" + "github.com/bytom/vapor/protocol" + "github.com/bytom/vapor/protocol/bc" + "github.com/bytom/vapor/protocol/bc/types" ) func TestEncodeDecodeGlobalTxIndex(t *testing.T) { -- 2.11.0