From 417b72285950781eadde8f20cc08db27e5afc7ce Mon Sep 17 00:00:00 2001 From: libotony Date: Wed, 20 Dec 2023 14:33:34 +0800 Subject: [PATCH] V2 module (#623) * update import path to v2 * update import path in source --- abi/abi.go | 2 +- abi/abi_test.go | 6 +++--- abi/event.go | 2 +- api/accounts/accounts.go | 14 +++++++------- api/accounts/accounts_test.go | 18 ++++++++--------- api/accounts/types.go | 14 +++++++------- api/api.go | 28 +++++++++++++-------------- api/blocks/blocks.go | 8 ++++---- api/blocks/blocks_test.go | 18 ++++++++--------- api/blocks/types.go | 6 +++--- api/debug/debug.go | 28 +++++++++++++-------------- api/debug/types.go | 2 +- api/events/events.go | 8 ++++---- api/events/types.go | 10 +++++----- api/node/node.go | 2 +- api/node/node_test.go | 14 +++++++------- api/node/types.go | 4 ++-- api/subscriptions/beat2_reader.go | 6 +++--- api/subscriptions/beat_reader.go | 6 +++--- api/subscriptions/block_reader.go | 4 ++-- api/subscriptions/event_reader.go | 4 ++-- api/subscriptions/pending_tx.go | 6 +++--- api/subscriptions/subscriptions.go | 12 ++++++------ api/subscriptions/transfer_reader.go | 4 ++-- api/subscriptions/types.go | 14 +++++++------- api/transactions/transactions.go | 10 +++++----- api/transactions/transactions_test.go | 18 ++++++++--------- api/transactions/types.go | 18 ++++++++--------- api/transfers/transfers.go | 10 +++++----- api/transfers/types.go | 6 +++--- bft/casts.go | 4 ++-- bft/engine.go | 16 +++++++-------- bft/engine_test.go | 12 ++++++------ bft/justifier.go | 4 ++-- bft/persist.go | 4 ++-- block/block.go | 4 ++-- block/block_test.go | 6 +++--- block/builder.go | 4 ++-- block/gas_limit.go | 2 +- block/gas_limit_test.go | 4 ++-- block/header.go | 6 +++--- block/header_test.go | 2 +- block/txs_root_features.go | 4 ++-- block/txs_root_features_test.go | 2 +- builtin/authority/authority.go | 4 ++-- builtin/authority/authority_test.go | 6 +++--- builtin/authority/types.go | 2 +- builtin/authority_native.go | 4 ++-- builtin/builtin.go | 18 ++++++++--------- builtin/contract.go | 6 +++--- builtin/energy/energy.go | 4 ++-- builtin/energy/energy_test.go | 6 +++--- builtin/energy_native.go | 4 ++-- builtin/executor_test.go | 16 +++++++-------- builtin/extension_native.go | 4 ++-- builtin/native_calls_test.go | 24 +++++++++++------------ builtin/params/params.go | 4 ++-- builtin/params/params_test.go | 6 +++--- builtin/params_native.go | 4 ++-- builtin/prototype/prototype.go | 4 ++-- builtin/prototype/prototype_test.go | 8 ++++---- builtin/prototype_native.go | 6 +++--- cache/prio_cache_test.go | 2 +- cache/rnd_cache_test.go | 2 +- chain/block_reader.go | 4 ++-- chain/block_reader_test.go | 4 ++-- chain/chain.go | 12 ++++++------ chain/chain_test.go | 8 ++++---- chain/persist.go | 8 ++++---- chain/repository.go | 12 ++++++------ chain/repository_test.go | 14 +++++++------- cmd/thor/bandwidth/bandwidth.go | 4 ++-- cmd/thor/main.go | 26 ++++++++++++------------- cmd/thor/node/master.go | 2 +- cmd/thor/node/node.go | 28 +++++++++++++-------------- cmd/thor/node/packer_loop.go | 6 +++--- cmd/thor/node/stats.go | 4 ++-- cmd/thor/node/tx_stash.go | 4 ++-- cmd/thor/node/tx_stash_test.go | 4 ++-- cmd/thor/optimizer/optimizer.go | 14 +++++++------- cmd/thor/optimizer/status.go | 2 +- cmd/thor/solo/solo.go | 22 ++++++++++----------- cmd/thor/solo/types.go | 6 +++--- cmd/thor/sync_logdb.go | 12 ++++++------ cmd/thor/utils.go | 26 ++++++++++++------------- co/goes_test.go | 2 +- co/parallel_test.go | 2 +- co/signal_test.go | 2 +- comm/announcement_loop.go | 6 +++--- comm/communicator.go | 14 +++++++------- comm/events.go | 2 +- comm/handle_rpc.go | 10 +++++----- comm/peer.go | 4 ++-- comm/proto/types.go | 6 +++--- comm/stats.go | 2 +- comm/sync.go | 8 ++++---- comm/txs_loop.go | 4 ++-- consensus/consensus.go | 16 +++++++-------- consensus/consensus_test.go | 20 +++++++++---------- consensus/validator.go | 16 +++++++-------- genesis/builder.go | 14 +++++++------- genesis/customnet.go | 8 ++++---- genesis/devnet.go | 8 ++++---- genesis/genesis.go | 10 +++++----- genesis/genesis_test.go | 8 ++++---- genesis/mainnet.go | 8 ++++---- genesis/testnet.go | 8 ++++---- go.mod | 2 +- logdb/logdb.go | 6 +++--- logdb/logdb_test.go | 8 ++++---- logdb/types.go | 8 ++++---- muxdb/internal/engine/engine.go | 2 +- muxdb/internal/engine/leveldb.go | 2 +- muxdb/internal/trie/cache.go | 2 +- muxdb/internal/trie/leaf_bank.go | 4 ++-- muxdb/internal/trie/leaf_bank_test.go | 2 +- muxdb/internal/trie/trie.go | 6 +++--- muxdb/internal/trie/trie_test.go | 6 +++--- muxdb/muxdb.go | 8 ++++---- p2psrv/server.go | 4 ++-- packer/flow.go | 12 ++++++------ packer/packer.go | 18 ++++++++--------- packer/packer_test.go | 18 ++++++++--------- poa/candidates.go | 8 ++++---- poa/proposer.go | 2 +- poa/sched.go | 2 +- poa/sched_test.go | 6 +++--- poa/sched_v2.go | 2 +- poa/sched_v2_test.go | 2 +- poa/seed.go | 6 +++--- poa/seed_test.go | 14 +++++++------- runtime/native_return_gas_test.go | 12 ++++++------ runtime/resolved_tx.go | 10 +++++----- runtime/resolved_tx_test.go | 16 +++++++-------- runtime/runtime.go | 20 +++++++++---------- runtime/runtime_test.go | 20 +++++++++---------- runtime/statedb/statedb.go | 8 ++++---- runtime/statedb/statedb_test.go | 8 ++++---- stackedmap/stackedmap_test.go | 2 +- state/account.go | 4 ++-- state/account_test.go | 4 ++-- state/cached_object.go | 4 ++-- state/cached_object_test.go | 4 ++-- state/stage.go | 2 +- state/stage_test.go | 4 ++-- state/state.go | 8 ++++---- state/state_test.go | 4 ++-- state/stater.go | 4 ++-- state/stater_test.go | 4 ++-- thor/bloom/bloom.go | 2 +- thor/bloom/bloom_test.go | 2 +- thor/bloom/legacy.go | 2 +- thor/bloom/legacy_test.go | 2 +- thor/hash.go | 2 +- thor/hash_test.go | 2 +- tracers/js/goja.go | 8 ++++---- tracers/js/tracer_test.go | 4 ++-- tracers/logger/gen_structlog.go | 2 +- tracers/logger/logger.go | 4 ++-- tracers/logger/logger_json.go | 2 +- tracers/logger/logger_test.go | 2 +- tracers/native/4byte.go | 4 ++-- tracers/native/call.go | 4 ++-- tracers/native/gen_callframe_json.go | 2 +- tracers/native/noop.go | 4 ++-- tracers/native/prestate.go | 6 +++--- tracers/tracers.go | 6 +++--- tracers/tracers_test.go | 28 +++++++++++++-------------- trie/derive_root.go | 2 +- trie/extended.go | 2 +- trie/fast_node_encoder.go | 2 +- trie/hasher.go | 4 ++-- trie/iterator.go | 2 +- trie/iterator_test.go | 2 +- trie/node.go | 4 ++-- trie/node_test.go | 2 +- trie/proof.go | 2 +- trie/proof_test.go | 2 +- trie/trie.go | 2 +- trie/trie_test.go | 2 +- tx/block_ref.go | 2 +- tx/block_ref_test.go | 4 ++-- tx/builder.go | 2 +- tx/clause.go | 2 +- tx/clause_test.go | 2 +- tx/event.go | 2 +- tx/features_test.go | 2 +- tx/receipt.go | 4 ++-- tx/receipt_test.go | 4 ++-- tx/transaction.go | 4 ++-- tx/transaction_test.go | 6 +++--- tx/transactions.go | 4 ++-- tx/transactions_test.go | 4 ++-- tx/transfer.go | 2 +- tx/work_eval.go | 2 +- txpool/blocklist.go | 2 +- txpool/tx_object.go | 12 ++++++------ txpool/tx_object_map.go | 4 ++-- txpool/tx_object_map_test.go | 6 +++--- txpool/tx_object_test.go | 14 +++++++------- txpool/tx_pool.go | 12 ++++++------ txpool/tx_pool_test.go | 14 +++++++------- vm/analysis_test.go | 2 +- vm/bn256/bn256_fast.go | 2 +- vm/bn256/bn256_slow.go | 2 +- vm/contracts.go | 6 +++--- vm/evm.go | 2 +- vm/instructions.go | 2 +- vm/instructions_test.go | 2 +- vm/patch.go | 2 +- vrf/vrf_test.go | 2 +- xenv/env.go | 12 ++++++------ 212 files changed, 729 insertions(+), 729 deletions(-) diff --git a/abi/abi.go b/abi/abi.go index 48b9a96a1..c9b7241b1 100644 --- a/abi/abi.go +++ b/abi/abi.go @@ -10,7 +10,7 @@ import ( "errors" ethabi "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // ABI holds information about methods and events of contract. diff --git a/abi/abi_test.go b/abi/abi_test.go index 8566a2448..4a90ccfb6 100644 --- a/abi/abi_test.go +++ b/abi/abi_test.go @@ -11,9 +11,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/abi" - "github.com/vechain/thor/builtin/gen" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/abi" + "github.com/vechain/thor/v2/builtin/gen" + "github.com/vechain/thor/v2/thor" ) func TestABI(t *testing.T) { diff --git a/abi/event.go b/abi/event.go index 3556d5d83..f423d694c 100644 --- a/abi/event.go +++ b/abi/event.go @@ -7,7 +7,7 @@ package abi import ( ethabi "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // Event see abi.Event in go-ethereum. diff --git a/api/accounts/accounts.go b/api/accounts/accounts.go index c8cf27ac6..8c4d130d9 100644 --- a/api/accounts/accounts.go +++ b/api/accounts/accounts.go @@ -16,13 +16,13 @@ import ( "github.com/ethereum/go-ethereum/common/math" "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/vechain/thor/api/utils" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/api/utils" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/xenv" ) type Accounts struct { diff --git a/api/accounts/accounts_test.go b/api/accounts/accounts_test.go index a77b07495..98338c83d 100644 --- a/api/accounts/accounts_test.go +++ b/api/accounts/accounts_test.go @@ -21,15 +21,15 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/gorilla/mux" "github.com/stretchr/testify/assert" - ABI "github.com/vechain/thor/abi" - "github.com/vechain/thor/api/accounts" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/packer" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + ABI "github.com/vechain/thor/v2/abi" + "github.com/vechain/thor/v2/api/accounts" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/packer" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) var sol = ` pragma solidity ^0.4.18; diff --git a/api/accounts/types.go b/api/accounts/types.go index d124f1a8c..d54b9f462 100644 --- a/api/accounts/types.go +++ b/api/accounts/types.go @@ -8,19 +8,19 @@ package accounts import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/math" - "github.com/vechain/thor/api/transactions" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/api/transactions" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/thor" ) -//Account for marshal account +// Account for marshal account type Account struct { Balance math.HexOrDecimal256 `json:"balance"` Energy math.HexOrDecimal256 `json:"energy"` HasCode bool `json:"hasCode"` } -//CallData represents contract-call body +// CallData represents contract-call body type CallData struct { Value *math.HexOrDecimal256 `json:"value"` Data string `json:"data"` @@ -89,10 +89,10 @@ type Clause struct { Data string `json:"data"` } -//Clauses array of clauses. +// Clauses array of clauses. type Clauses []Clause -//BatchCallData executes a batch of codes +// BatchCallData executes a batch of codes type BatchCallData struct { Clauses Clauses `json:"clauses"` Gas uint64 `json:"gas"` diff --git a/api/api.go b/api/api.go index 04d990d2e..7ad18d45c 100644 --- a/api/api.go +++ b/api/api.go @@ -12,20 +12,20 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" - "github.com/vechain/thor/api/accounts" - "github.com/vechain/thor/api/blocks" - "github.com/vechain/thor/api/debug" - "github.com/vechain/thor/api/doc" - "github.com/vechain/thor/api/events" - "github.com/vechain/thor/api/node" - "github.com/vechain/thor/api/subscriptions" - "github.com/vechain/thor/api/transactions" - "github.com/vechain/thor/api/transfers" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/logdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/txpool" + "github.com/vechain/thor/v2/api/accounts" + "github.com/vechain/thor/v2/api/blocks" + "github.com/vechain/thor/v2/api/debug" + "github.com/vechain/thor/v2/api/doc" + "github.com/vechain/thor/v2/api/events" + "github.com/vechain/thor/v2/api/node" + "github.com/vechain/thor/v2/api/subscriptions" + "github.com/vechain/thor/v2/api/transactions" + "github.com/vechain/thor/v2/api/transfers" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/logdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/txpool" ) // New return api router diff --git a/api/blocks/blocks.go b/api/blocks/blocks.go index 88099d7e1..280db69f6 100644 --- a/api/blocks/blocks.go +++ b/api/blocks/blocks.go @@ -12,10 +12,10 @@ import ( "github.com/ethereum/go-ethereum/common/math" "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/vechain/thor/api/utils" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/api/utils" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/thor" ) type Blocks struct { diff --git a/api/blocks/blocks_test.go b/api/blocks/blocks_test.go index 9925e73d6..941fbb1b6 100644 --- a/api/blocks/blocks_test.go +++ b/api/blocks/blocks_test.go @@ -17,15 +17,15 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/gorilla/mux" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/cmd/thor/solo" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/packer" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/cmd/thor/solo" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/packer" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) const ( diff --git a/api/blocks/types.go b/api/blocks/types.go index 74462670c..96aa2e856 100644 --- a/api/blocks/types.go +++ b/api/blocks/types.go @@ -8,9 +8,9 @@ package blocks import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/math" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) type BFTEngine interface { diff --git a/api/debug/debug.go b/api/debug/debug.go index 8c0455034..073d94baf 100644 --- a/api/debug/debug.go +++ b/api/debug/debug.go @@ -17,20 +17,20 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/vechain/thor/api/utils" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/consensus" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tracers" - "github.com/vechain/thor/tracers/logger" - "github.com/vechain/thor/trie" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/vm" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/api/utils" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/consensus" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tracers" + "github.com/vechain/thor/v2/tracers/logger" + "github.com/vechain/thor/v2/trie" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/vm" + "github.com/vechain/thor/v2/xenv" ) var devNetGenesisID = genesis.NewDevnet().ID() diff --git a/api/debug/types.go b/api/debug/types.go index 3ec05edee..b5001c30d 100644 --- a/api/debug/types.go +++ b/api/debug/types.go @@ -4,7 +4,7 @@ import ( "encoding/json" "github.com/ethereum/go-ethereum/common/math" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) type TraceClauseOption struct { diff --git a/api/events/events.go b/api/events/events.go index 9337512c2..c5f5dddd5 100644 --- a/api/events/events.go +++ b/api/events/events.go @@ -11,9 +11,9 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/vechain/thor/api/utils" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/logdb" + "github.com/vechain/thor/v2/api/utils" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/logdb" ) type Events struct { @@ -28,7 +28,7 @@ func New(repo *chain.Repository, db *logdb.LogDB) *Events { } } -//Filter query events with option +// Filter query events with option func (e *Events) filter(ctx context.Context, ef *EventFilter) ([]*FilteredEvent, error) { chain := e.repo.NewBestChain() filter, err := convertEventFilter(chain, ef) diff --git a/api/events/types.go b/api/events/types.go index 4bed87dee..790f9985d 100644 --- a/api/events/types.go +++ b/api/events/types.go @@ -10,10 +10,10 @@ import ( "math" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/logdb" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/logdb" + "github.com/vechain/thor/v2/thor" ) type LogMeta struct { @@ -41,7 +41,7 @@ type FilteredEvent struct { Meta LogMeta `json:"meta"` } -//convert a logdb.Event into a json format Event +// convert a logdb.Event into a json format Event func convertEvent(event *logdb.Event) *FilteredEvent { fe := FilteredEvent{ Address: event.Address, diff --git a/api/node/node.go b/api/node/node.go index 3c0ff2772..6e685c7b9 100644 --- a/api/node/node.go +++ b/api/node/node.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/vechain/thor/api/utils" + "github.com/vechain/thor/v2/api/utils" ) type Node struct { diff --git a/api/node/node_test.go b/api/node/node_test.go index 04c827263..59ecb0de5 100644 --- a/api/node/node_test.go +++ b/api/node/node_test.go @@ -14,13 +14,13 @@ import ( "github.com/gorilla/mux" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/api/node" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/comm" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/txpool" + "github.com/vechain/thor/v2/api/node" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/comm" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/txpool" ) var ts *httptest.Server diff --git a/api/node/types.go b/api/node/types.go index 6fc863248..bb21699cc 100644 --- a/api/node/types.go +++ b/api/node/types.go @@ -6,8 +6,8 @@ package node import ( - "github.com/vechain/thor/comm" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/comm" + "github.com/vechain/thor/v2/thor" ) type Network interface { diff --git a/api/subscriptions/beat2_reader.go b/api/subscriptions/beat2_reader.go index 50d81383a..9d1940538 100644 --- a/api/subscriptions/beat2_reader.go +++ b/api/subscriptions/beat2_reader.go @@ -9,9 +9,9 @@ import ( "bytes" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/thor/bloom" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/thor/bloom" ) type beat2Reader struct { diff --git a/api/subscriptions/beat_reader.go b/api/subscriptions/beat_reader.go index 275e00b38..ed4e77147 100644 --- a/api/subscriptions/beat_reader.go +++ b/api/subscriptions/beat_reader.go @@ -9,9 +9,9 @@ import ( "bytes" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/thor/bloom" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/thor/bloom" ) type beatReader struct { diff --git a/api/subscriptions/block_reader.go b/api/subscriptions/block_reader.go index ba7d2342f..8c1d3ba50 100644 --- a/api/subscriptions/block_reader.go +++ b/api/subscriptions/block_reader.go @@ -6,8 +6,8 @@ package subscriptions import ( - "github.com/vechain/thor/chain" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/thor" ) type blockReader struct { diff --git a/api/subscriptions/event_reader.go b/api/subscriptions/event_reader.go index 401ed231c..1329e8777 100644 --- a/api/subscriptions/event_reader.go +++ b/api/subscriptions/event_reader.go @@ -6,8 +6,8 @@ package subscriptions import ( - "github.com/vechain/thor/chain" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/thor" ) type eventReader struct { diff --git a/api/subscriptions/pending_tx.go b/api/subscriptions/pending_tx.go index 5a968ed91..d0a23c9ec 100644 --- a/api/subscriptions/pending_tx.go +++ b/api/subscriptions/pending_tx.go @@ -9,9 +9,9 @@ import ( "time" "github.com/hashicorp/golang-lru/simplelru" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/txpool" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/txpool" ) type pendingTx struct { diff --git a/api/subscriptions/subscriptions.go b/api/subscriptions/subscriptions.go index ce85c31de..ab8cda0d6 100644 --- a/api/subscriptions/subscriptions.go +++ b/api/subscriptions/subscriptions.go @@ -14,12 +14,12 @@ import ( "github.com/gorilla/websocket" "github.com/inconshreveable/log15" "github.com/pkg/errors" - "github.com/vechain/thor/api/utils" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/txpool" + "github.com/vechain/thor/v2/api/utils" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/txpool" ) const txQueueSize = 20 diff --git a/api/subscriptions/transfer_reader.go b/api/subscriptions/transfer_reader.go index b8af4c0ba..d5a0315f1 100644 --- a/api/subscriptions/transfer_reader.go +++ b/api/subscriptions/transfer_reader.go @@ -6,8 +6,8 @@ package subscriptions import ( - "github.com/vechain/thor/chain" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/thor" ) type transferReader struct { diff --git a/api/subscriptions/types.go b/api/subscriptions/types.go index 762a0bb45..8c58f4a19 100644 --- a/api/subscriptions/types.go +++ b/api/subscriptions/types.go @@ -8,13 +8,13 @@ package subscriptions import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/math" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) -//BlockMessage block piped by websocket +// BlockMessage block piped by websocket type BlockMessage struct { Number uint32 `json:"number"` ID thor.Bytes32 `json:"id"` @@ -77,7 +77,7 @@ type LogMeta struct { ClauseIndex uint32 `json:"clauseIndex"` } -//TransferMessage transfer piped by websocket +// TransferMessage transfer piped by websocket type TransferMessage struct { Sender thor.Address `json:"sender"` Recipient thor.Address `json:"recipient"` @@ -108,7 +108,7 @@ func convertTransfer(header *block.Header, tx *tx.Transaction, clauseIndex uint3 }, nil } -//EventMessage event piped by websocket +// EventMessage event piped by websocket type EventMessage struct { Address thor.Address `json:"address"` Topics []thor.Bytes32 `json:"topics"` diff --git a/api/transactions/transactions.go b/api/transactions/transactions.go index e505a6374..1f658044a 100644 --- a/api/transactions/transactions.go +++ b/api/transactions/transactions.go @@ -12,10 +12,10 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/vechain/thor/api/utils" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/txpool" + "github.com/vechain/thor/v2/api/utils" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/txpool" ) type Transactions struct { @@ -91,7 +91,7 @@ func (t *Transactions) getTransactionByID(txID thor.Bytes32, head thor.Bytes32, return convertTransaction(tx, summary.Header), nil } -//GetTransactionReceiptByID get tx's receipt +// GetTransactionReceiptByID get tx's receipt func (t *Transactions) getTransactionReceiptByID(txID thor.Bytes32, head thor.Bytes32) (*Receipt, error) { chain := t.repo.NewChain(head) tx, meta, err := chain.GetTransaction(txID) diff --git a/api/transactions/transactions_test.go b/api/transactions/transactions_test.go index 981b3d69d..d727562c7 100644 --- a/api/transactions/transactions_test.go +++ b/api/transactions/transactions_test.go @@ -20,15 +20,15 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/gorilla/mux" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/api/transactions" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/packer" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/txpool" + "github.com/vechain/thor/v2/api/transactions" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/packer" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/txpool" ) var repo *chain.Repository diff --git a/api/transactions/types.go b/api/transactions/types.go index 726918cab..34644f942 100644 --- a/api/transactions/types.go +++ b/api/transactions/types.go @@ -11,9 +11,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/block" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) // Clause for json marshal @@ -23,10 +23,10 @@ type Clause struct { Data string `json:"data"` } -//Clauses array of clauses. +// Clauses array of clauses. type Clauses []Clause -//ConvertClause convert a raw clause into a json format clause +// ConvertClause convert a raw clause into a json format clause func convertClause(c *tx.Clause) Clause { return Clause{ c.To(), @@ -45,7 +45,7 @@ func (c *Clause) String() string { c.Data) } -//Transaction transaction +// Transaction transaction type Transaction struct { ID thor.Bytes32 `json:"id"` ChainTag byte `json:"chainTag"` @@ -83,7 +83,7 @@ type rawTransaction struct { Meta *TxMeta `json:"meta"` } -//convertTransaction convert a raw transaction into a json format transaction +// convertTransaction convert a raw transaction into a json format transaction func convertTransaction(tx *tx.Transaction, header *block.Header) *Transaction { //tx origin origin, _ := tx.Origin() @@ -133,7 +133,7 @@ type ReceiptMeta struct { TxOrigin thor.Address `json:"txOrigin"` } -//Receipt for json marshal +// Receipt for json marshal type Receipt struct { GasUsed uint64 `json:"gasUsed"` GasPayer thor.Address `json:"gasPayer"` @@ -165,7 +165,7 @@ type Transfer struct { Amount *math.HexOrDecimal256 `json:"amount"` } -//ConvertReceipt convert a raw clause into a jason format clause +// ConvertReceipt convert a raw clause into a jason format clause func convertReceipt(txReceipt *tx.Receipt, header *block.Header, tx *tx.Transaction) (*Receipt, error) { reward := math.HexOrDecimal256(*txReceipt.Reward) paid := math.HexOrDecimal256(*txReceipt.Paid) diff --git a/api/transfers/transfers.go b/api/transfers/transfers.go index b4149968a..bf4fb936f 100644 --- a/api/transfers/transfers.go +++ b/api/transfers/transfers.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/vechain/thor/api/events" - "github.com/vechain/thor/api/utils" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/logdb" + "github.com/vechain/thor/v2/api/events" + "github.com/vechain/thor/v2/api/utils" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/logdb" ) type Transfers struct { @@ -29,7 +29,7 @@ func New(repo *chain.Repository, db *logdb.LogDB) *Transfers { } } -//Filter query logs with option +// Filter query logs with option func (t *Transfers) filter(ctx context.Context, filter *TransferFilter) ([]*FilteredTransfer, error) { rng, err := events.ConvertRange(t.repo.NewBestChain(), filter.Range) if err != nil { diff --git a/api/transfers/types.go b/api/transfers/types.go index b2db8df3e..29ad9b328 100644 --- a/api/transfers/types.go +++ b/api/transfers/types.go @@ -7,9 +7,9 @@ package transfers import ( "github.com/ethereum/go-ethereum/common/math" - "github.com/vechain/thor/api/events" - "github.com/vechain/thor/logdb" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/api/events" + "github.com/vechain/thor/v2/logdb" + "github.com/vechain/thor/v2/thor" ) type LogMeta struct { diff --git a/bft/casts.go b/bft/casts.go index b21c33711..30ab71727 100644 --- a/bft/casts.go +++ b/bft/casts.go @@ -8,8 +8,8 @@ import ( "bytes" "sort" - "github.com/vechain/thor/block" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/thor" ) // casts stores the master's overall casts, maintaining the map of quality to checkpoint. diff --git a/bft/engine.go b/bft/engine.go index 8602ccf51..59e25cd21 100644 --- a/bft/engine.go +++ b/bft/engine.go @@ -10,14 +10,14 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/pkg/errors" - "github.com/vechain/thor/block" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/cache" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/kv" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/cache" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/kv" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) const dataStoreName = "bft.engine" diff --git a/bft/engine_test.go b/bft/engine_test.go index b0c90d2b4..3d2eb4a3f 100644 --- a/bft/engine_test.go +++ b/bft/engine_test.go @@ -11,12 +11,12 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/packer" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/packer" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) type TestBFT struct { diff --git a/bft/justifier.go b/bft/justifier.go index 8546b685f..eb85ab4e9 100644 --- a/bft/justifier.go +++ b/bft/justifier.go @@ -5,8 +5,8 @@ package bft import ( - "github.com/vechain/thor/block" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/thor" ) // bftState is the summary of a bft round for a given head. diff --git a/bft/persist.go b/bft/persist.go index fd5c48d18..c9291b23b 100644 --- a/bft/persist.go +++ b/bft/persist.go @@ -7,8 +7,8 @@ package bft import ( "encoding/binary" - "github.com/vechain/thor/kv" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/kv" + "github.com/vechain/thor/v2/thor" ) func saveQuality(putter kv.Putter, id thor.Bytes32, quality uint32) error { diff --git a/block/block.go b/block/block.go index 7f14dc94b..29e12913f 100644 --- a/block/block.go +++ b/block/block.go @@ -11,8 +11,8 @@ import ( "sync/atomic" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/metric" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/metric" + "github.com/vechain/thor/v2/tx" ) const ( diff --git a/block/block_test.go b/block/block_test.go index 0f4d1551a..5a7912c55 100644 --- a/block/block_test.go +++ b/block/block_test.go @@ -12,9 +12,9 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/assert" - . "github.com/vechain/thor/block" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + . "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) func TestBlock(t *testing.T) { diff --git a/block/builder.go b/block/builder.go index 86eedaff4..00a24c112 100644 --- a/block/builder.go +++ b/block/builder.go @@ -6,8 +6,8 @@ package block import ( - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) // Builder to make it easy to build a block object. diff --git a/block/gas_limit.go b/block/gas_limit.go index ae9f6fe0b..5c4a5ba45 100644 --- a/block/gas_limit.go +++ b/block/gas_limit.go @@ -8,7 +8,7 @@ package block import ( "math" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // GasLimit to support block gas limit validation and adjustment. diff --git a/block/gas_limit_test.go b/block/gas_limit_test.go index 8c1373a9c..c01cb4749 100644 --- a/block/gas_limit_test.go +++ b/block/gas_limit_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/block" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/thor" ) func TestGasLimit_IsValid(t *testing.T) { diff --git a/block/header.go b/block/header.go index 7a089e0a6..b5b51b29b 100644 --- a/block/header.go +++ b/block/header.go @@ -16,9 +16,9 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/vrf" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/vrf" ) // Header contains almost all information about a block, except block body. diff --git a/block/header_test.go b/block/header_test.go index 347e95fd6..2ab93a857 100644 --- a/block/header_test.go +++ b/block/header_test.go @@ -13,7 +13,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) func TestHeader_BetterThan(t *testing.T) { diff --git a/block/txs_root_features.go b/block/txs_root_features.go index e7eed0204..3226ad8a5 100644 --- a/block/txs_root_features.go +++ b/block/txs_root_features.go @@ -9,8 +9,8 @@ import ( "io" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) type txsRootFeatures struct { diff --git a/block/txs_root_features_test.go b/block/txs_root_features_test.go index 14a29d11c..0f2d8a8bf 100644 --- a/block/txs_root_features_test.go +++ b/block/txs_root_features_test.go @@ -11,7 +11,7 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) func TestTrf(t *testing.T) { diff --git a/builtin/authority/authority.go b/builtin/authority/authority.go index a40346b15..ba801b2f3 100644 --- a/builtin/authority/authority.go +++ b/builtin/authority/authority.go @@ -9,8 +9,8 @@ import ( "math/big" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) var ( diff --git a/builtin/authority/authority_test.go b/builtin/authority/authority_test.go index b4517c89a..f21a2d19a 100644 --- a/builtin/authority/authority_test.go +++ b/builtin/authority/authority_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) func M(a ...interface{}) []interface{} { diff --git a/builtin/authority/types.go b/builtin/authority/types.go index 0eb596c58..d5bfd3824 100644 --- a/builtin/authority/types.go +++ b/builtin/authority/types.go @@ -6,7 +6,7 @@ package authority import ( - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) type ( diff --git a/builtin/authority_native.go b/builtin/authority_native.go index 573a6a538..b0e4ea43f 100644 --- a/builtin/authority_native.go +++ b/builtin/authority_native.go @@ -7,8 +7,8 @@ package builtin import ( "github.com/ethereum/go-ethereum/common" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/xenv" ) func init() { diff --git a/builtin/builtin.go b/builtin/builtin.go index b183a2305..e9d87a81e 100644 --- a/builtin/builtin.go +++ b/builtin/builtin.go @@ -7,15 +7,15 @@ package builtin import ( "github.com/pkg/errors" - "github.com/vechain/thor/abi" - "github.com/vechain/thor/builtin/authority" - "github.com/vechain/thor/builtin/energy" - "github.com/vechain/thor/builtin/gen" - "github.com/vechain/thor/builtin/params" - "github.com/vechain/thor/builtin/prototype" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/abi" + "github.com/vechain/thor/v2/builtin/authority" + "github.com/vechain/thor/v2/builtin/energy" + "github.com/vechain/thor/v2/builtin/gen" + "github.com/vechain/thor/v2/builtin/params" + "github.com/vechain/thor/v2/builtin/prototype" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/xenv" ) // Builtin contracts binding. diff --git a/builtin/contract.go b/builtin/contract.go index 05fcead24..888158bb7 100644 --- a/builtin/contract.go +++ b/builtin/contract.go @@ -9,9 +9,9 @@ import ( "encoding/hex" "github.com/pkg/errors" - "github.com/vechain/thor/abi" - "github.com/vechain/thor/builtin/gen" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/abi" + "github.com/vechain/thor/v2/builtin/gen" + "github.com/vechain/thor/v2/thor" ) type contract struct { diff --git a/builtin/energy/energy.go b/builtin/energy/energy.go index 8b1877c47..1594f3086 100644 --- a/builtin/energy/energy.go +++ b/builtin/energy/energy.go @@ -9,8 +9,8 @@ import ( "math/big" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) var ( diff --git a/builtin/energy/energy_test.go b/builtin/energy/energy_test.go index 6ab7a7d78..1c8226d56 100644 --- a/builtin/energy/energy_test.go +++ b/builtin/energy/energy_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) func M(a ...interface{}) []interface{} { diff --git a/builtin/energy_native.go b/builtin/energy_native.go index 46a9c0789..91f7a9965 100644 --- a/builtin/energy_native.go +++ b/builtin/energy_native.go @@ -9,8 +9,8 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/xenv" ) func init() { diff --git a/builtin/executor_test.go b/builtin/executor_test.go index 038187e7d..2053f15b4 100644 --- a/builtin/executor_test.go +++ b/builtin/executor_test.go @@ -13,14 +13,14 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/xenv" ) func M(a ...interface{}) []interface{} { diff --git a/builtin/extension_native.go b/builtin/extension_native.go index 60b1f54fb..470a690e5 100644 --- a/builtin/extension_native.go +++ b/builtin/extension_native.go @@ -6,8 +6,8 @@ package builtin import ( - "github.com/vechain/thor/thor" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/xenv" ) const ( diff --git a/builtin/native_calls_test.go b/builtin/native_calls_test.go index 1b128e959..48d53d3f4 100644 --- a/builtin/native_calls_test.go +++ b/builtin/native_calls_test.go @@ -17,18 +17,18 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/abi" - "github.com/vechain/thor/block" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/vm" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/abi" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/vm" + "github.com/vechain/thor/v2/xenv" ) var errReverted = vm.ErrExecutionReverted diff --git a/builtin/params/params.go b/builtin/params/params.go index 7ee12caed..c5005971c 100644 --- a/builtin/params/params.go +++ b/builtin/params/params.go @@ -9,8 +9,8 @@ import ( "math/big" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) // Params binder of `Params` contract. diff --git a/builtin/params/params_test.go b/builtin/params/params_test.go index 5c1cc400a..484442b14 100644 --- a/builtin/params/params_test.go +++ b/builtin/params/params_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) func TestParamsGetSet(t *testing.T) { diff --git a/builtin/params_native.go b/builtin/params_native.go index dd4b383dd..3d31b5f37 100644 --- a/builtin/params_native.go +++ b/builtin/params_native.go @@ -9,8 +9,8 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/xenv" ) func init() { diff --git a/builtin/prototype/prototype.go b/builtin/prototype/prototype.go index 6d688fbb4..38b1a7386 100644 --- a/builtin/prototype/prototype.go +++ b/builtin/prototype/prototype.go @@ -9,8 +9,8 @@ import ( "math/big" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) type Prototype struct { diff --git a/builtin/prototype/prototype_test.go b/builtin/prototype/prototype_test.go index d5a71fe6f..6cdf127af 100644 --- a/builtin/prototype/prototype_test.go +++ b/builtin/prototype/prototype_test.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/builtin/prototype" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/builtin/prototype" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) func M(a ...interface{}) []interface{} { diff --git a/builtin/prototype_native.go b/builtin/prototype_native.go index 03d99da3d..97e72fce1 100644 --- a/builtin/prototype_native.go +++ b/builtin/prototype_native.go @@ -9,9 +9,9 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/vechain/thor/abi" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/abi" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/xenv" ) func init() { diff --git a/cache/prio_cache_test.go b/cache/prio_cache_test.go index 818aeacb8..4ade4da03 100644 --- a/cache/prio_cache_test.go +++ b/cache/prio_cache_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/cache" + "github.com/vechain/thor/v2/cache" ) func TestPrioCacheAddRemove(t *testing.T) { diff --git a/cache/rnd_cache_test.go b/cache/rnd_cache_test.go index 1a339f2a0..fa424d80b 100644 --- a/cache/rnd_cache_test.go +++ b/cache/rnd_cache_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/cache" + "github.com/vechain/thor/v2/cache" ) func TestRandCacheAddRemove(t *testing.T) { diff --git a/chain/block_reader.go b/chain/block_reader.go index 30bcd1f4e..55f6e695d 100644 --- a/chain/block_reader.go +++ b/chain/block_reader.go @@ -6,8 +6,8 @@ package chain import ( - "github.com/vechain/thor/block" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/thor" ) // ExtendedBlock extend block.Block with the obsolete flag. diff --git a/chain/block_reader_test.go b/chain/block_reader_test.go index efa8ab55d..2253179ce 100644 --- a/chain/block_reader_test.go +++ b/chain/block_reader_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" ) func TestBlockReader(t *testing.T) { diff --git a/chain/chain.go b/chain/chain.go index 4de48185b..0ee205402 100644 --- a/chain/chain.go +++ b/chain/chain.go @@ -13,12 +13,12 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/pkg/errors" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/vechain/thor/block" - "github.com/vechain/thor/kv" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/trie" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/kv" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/trie" + "github.com/vechain/thor/v2/tx" ) const ( diff --git a/chain/chain_test.go b/chain/chain_test.go index dd943fc68..d61b38c52 100644 --- a/chain/chain_test.go +++ b/chain/chain_test.go @@ -10,10 +10,10 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) func newTx() *tx.Transaction { diff --git a/chain/persist.go b/chain/persist.go index 5a426c58d..fa1f97a9d 100644 --- a/chain/persist.go +++ b/chain/persist.go @@ -9,10 +9,10 @@ import ( "encoding/binary" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/block" - "github.com/vechain/thor/kv" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/kv" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) const ( diff --git a/chain/repository.go b/chain/repository.go index e553d8c76..a1ed0c7e2 100644 --- a/chain/repository.go +++ b/chain/repository.go @@ -11,12 +11,12 @@ import ( "github.com/pkg/errors" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/vechain/thor/block" - "github.com/vechain/thor/co" - "github.com/vechain/thor/kv" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/co" + "github.com/vechain/thor/v2/kv" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) const ( diff --git a/chain/repository_test.go b/chain/repository_test.go index 84e8e8b85..b83f0a7f1 100644 --- a/chain/repository_test.go +++ b/chain/repository_test.go @@ -10,13 +10,13 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/block" - . "github.com/vechain/thor/chain" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + . "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) func M(args ...interface{}) []interface{} { diff --git a/cmd/thor/bandwidth/bandwidth.go b/cmd/thor/bandwidth/bandwidth.go index 3f92e49d4..11324b13c 100644 --- a/cmd/thor/bandwidth/bandwidth.go +++ b/cmd/thor/bandwidth/bandwidth.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/vechain/thor/block" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/thor" ) // Bandwidth is gas per second. diff --git a/cmd/thor/main.go b/cmd/thor/main.go index fa1f1f175..f18150fc9 100644 --- a/cmd/thor/main.go +++ b/cmd/thor/main.go @@ -19,22 +19,22 @@ import ( isatty "github.com/mattn/go-isatty" "github.com/pborman/uuid" "github.com/pkg/errors" - "github.com/vechain/thor/api" - "github.com/vechain/thor/bft" - "github.com/vechain/thor/cmd/thor/node" - "github.com/vechain/thor/cmd/thor/optimizer" - "github.com/vechain/thor/cmd/thor/solo" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/logdb" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/txpool" + "github.com/vechain/thor/v2/api" + "github.com/vechain/thor/v2/bft" + "github.com/vechain/thor/v2/cmd/thor/node" + "github.com/vechain/thor/v2/cmd/thor/optimizer" + "github.com/vechain/thor/v2/cmd/thor/solo" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/logdb" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/txpool" cli "gopkg.in/urfave/cli.v1" // Force-load the tracer engines to trigger registration - _ "github.com/vechain/thor/tracers/js" - _ "github.com/vechain/thor/tracers/native" + _ "github.com/vechain/thor/v2/tracers/js" + _ "github.com/vechain/thor/v2/tracers/native" ) var ( diff --git a/cmd/thor/node/master.go b/cmd/thor/node/master.go index e059ad9d1..0726f14fc 100644 --- a/cmd/thor/node/master.go +++ b/cmd/thor/node/master.go @@ -9,7 +9,7 @@ import ( "crypto/ecdsa" "github.com/ethereum/go-ethereum/crypto" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) type Master struct { diff --git a/cmd/thor/node/node.go b/cmd/thor/node/node.go index 5c96d2f07..169439dac 100644 --- a/cmd/thor/node/node.go +++ b/cmd/thor/node/node.go @@ -19,20 +19,20 @@ import ( "github.com/inconshreveable/log15" "github.com/pkg/errors" "github.com/syndtr/goleveldb/leveldb" - "github.com/vechain/thor/bft" - "github.com/vechain/thor/block" - "github.com/vechain/thor/cache" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/cmd/thor/bandwidth" - "github.com/vechain/thor/co" - "github.com/vechain/thor/comm" - "github.com/vechain/thor/consensus" - "github.com/vechain/thor/logdb" - "github.com/vechain/thor/packer" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/txpool" + "github.com/vechain/thor/v2/bft" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/cache" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/cmd/thor/bandwidth" + "github.com/vechain/thor/v2/co" + "github.com/vechain/thor/v2/comm" + "github.com/vechain/thor/v2/consensus" + "github.com/vechain/thor/v2/logdb" + "github.com/vechain/thor/v2/packer" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/txpool" ) var log = log15.New("pkg", "node") diff --git a/cmd/thor/node/packer_loop.go b/cmd/thor/node/packer_loop.go index b690fe1e6..60730fe35 100644 --- a/cmd/thor/node/packer_loop.go +++ b/cmd/thor/node/packer_loop.go @@ -13,9 +13,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/mclock" "github.com/pkg/errors" - "github.com/vechain/thor/packer" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/packer" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) // gasLimitSoftLimit is the soft limit of the adaptive block gaslimit. diff --git a/cmd/thor/node/stats.go b/cmd/thor/node/stats.go index b9a223fee..74dd35424 100644 --- a/cmd/thor/node/stats.go +++ b/cmd/thor/node/stats.go @@ -10,8 +10,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/mclock" - "github.com/vechain/thor/block" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/thor" ) type blockStats struct { diff --git a/cmd/thor/node/tx_stash.go b/cmd/thor/node/tx_stash.go index 82b7c91d4..8db67c97f 100644 --- a/cmd/thor/node/tx_stash.go +++ b/cmd/thor/node/tx_stash.go @@ -12,8 +12,8 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) // to stash non-executable txs. diff --git a/cmd/thor/node/tx_stash_test.go b/cmd/thor/node/tx_stash_test.go index 6ef71317d..d4bb7b255 100644 --- a/cmd/thor/node/tx_stash_test.go +++ b/cmd/thor/node/tx_stash_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/tx" ) func newTx() *tx.Transaction { diff --git a/cmd/thor/optimizer/optimizer.go b/cmd/thor/optimizer/optimizer.go index 530148d0b..d8d8dd584 100644 --- a/cmd/thor/optimizer/optimizer.go +++ b/cmd/thor/optimizer/optimizer.go @@ -14,13 +14,13 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/inconshreveable/log15" "github.com/pkg/errors" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/co" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/trie" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/co" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/trie" ) var log = log15.New("pkg", "optimizer") diff --git a/cmd/thor/optimizer/status.go b/cmd/thor/optimizer/status.go index 15df1509f..8980a128e 100644 --- a/cmd/thor/optimizer/status.go +++ b/cmd/thor/optimizer/status.go @@ -8,7 +8,7 @@ package optimizer import ( "encoding/json" - "github.com/vechain/thor/kv" + "github.com/vechain/thor/v2/kv" ) type status struct { diff --git a/cmd/thor/solo/solo.go b/cmd/thor/solo/solo.go index d17595f09..07b636193 100644 --- a/cmd/thor/solo/solo.go +++ b/cmd/thor/solo/solo.go @@ -14,17 +14,17 @@ import ( "github.com/ethereum/go-ethereum/common/mclock" "github.com/inconshreveable/log15" "github.com/pkg/errors" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/cmd/thor/bandwidth" - "github.com/vechain/thor/co" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/logdb" - "github.com/vechain/thor/packer" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/txpool" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/cmd/thor/bandwidth" + "github.com/vechain/thor/v2/co" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/logdb" + "github.com/vechain/thor/v2/packer" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/txpool" ) var log = log15.New("pkg", "solo") diff --git a/cmd/thor/solo/types.go b/cmd/thor/solo/types.go index 32ee38309..a4f055122 100644 --- a/cmd/thor/solo/types.go +++ b/cmd/thor/solo/types.go @@ -6,9 +6,9 @@ package solo import ( - "github.com/vechain/thor/chain" - "github.com/vechain/thor/comm" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/comm" + "github.com/vechain/thor/v2/thor" ) // Communicator in solo is a fake one just for api handler. diff --git a/cmd/thor/sync_logdb.go b/cmd/thor/sync_logdb.go index 9343c4029..d8272bc5e 100644 --- a/cmd/thor/sync_logdb.go +++ b/cmd/thor/sync_logdb.go @@ -13,12 +13,12 @@ import ( "github.com/pkg/errors" "github.com/pmezard/go-difflib/difflib" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/co" - "github.com/vechain/thor/logdb" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/co" + "github.com/vechain/thor/v2/logdb" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/cmd/thor/utils.go b/cmd/thor/utils.go index eaf7a9d16..9765705c5 100644 --- a/cmd/thor/utils.go +++ b/cmd/thor/utils.go @@ -36,19 +36,19 @@ import ( "github.com/inconshreveable/log15" tty "github.com/mattn/go-tty" "github.com/pkg/errors" - "github.com/vechain/thor/api/doc" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/cmd/thor/node" - "github.com/vechain/thor/co" - "github.com/vechain/thor/comm" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/logdb" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/p2psrv" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/txpool" + "github.com/vechain/thor/v2/api/doc" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/cmd/thor/node" + "github.com/vechain/thor/v2/co" + "github.com/vechain/thor/v2/comm" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/logdb" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/p2psrv" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/txpool" cli "gopkg.in/urfave/cli.v1" ) diff --git a/co/goes_test.go b/co/goes_test.go index 7149ae051..d66e5c2b3 100644 --- a/co/goes_test.go +++ b/co/goes_test.go @@ -8,7 +8,7 @@ package co_test import ( "testing" - "github.com/vechain/thor/co" + "github.com/vechain/thor/v2/co" ) func TestGoes(t *testing.T) { diff --git a/co/parallel_test.go b/co/parallel_test.go index ca1b8f21c..5c056def4 100644 --- a/co/parallel_test.go +++ b/co/parallel_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/vechain/thor/co" + "github.com/vechain/thor/v2/co" ) func TestParallel(t *testing.T) { diff --git a/co/signal_test.go b/co/signal_test.go index 628d327aa..b93c4c3b8 100644 --- a/co/signal_test.go +++ b/co/signal_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/co" + "github.com/vechain/thor/v2/co" ) func TestSignal_SignalBeforeWait(t *testing.T) { diff --git a/comm/announcement_loop.go b/comm/announcement_loop.go index aa98d20ec..51b437f0e 100644 --- a/comm/announcement_loop.go +++ b/comm/announcement_loop.go @@ -8,9 +8,9 @@ package comm import ( "github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/block" - "github.com/vechain/thor/comm/proto" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/comm/proto" + "github.com/vechain/thor/v2/thor" ) type announcement struct { diff --git a/comm/communicator.go b/comm/communicator.go index 504824d61..27fcb5883 100644 --- a/comm/communicator.go +++ b/comm/communicator.go @@ -17,13 +17,13 @@ import ( "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/discv5" "github.com/inconshreveable/log15" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/co" - "github.com/vechain/thor/comm/proto" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/txpool" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/co" + "github.com/vechain/thor/v2/comm/proto" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/txpool" ) var log = log15.New("pkg", "comm") diff --git a/comm/events.go b/comm/events.go index ec240a5d2..1d5aababf 100644 --- a/comm/events.go +++ b/comm/events.go @@ -8,7 +8,7 @@ package comm import ( "context" - "github.com/vechain/thor/block" + "github.com/vechain/thor/v2/block" ) // NewBlockEvent event emitted when received block announcement. diff --git a/comm/handle_rpc.go b/comm/handle_rpc.go index 9d6b7ed73..da5b474ba 100644 --- a/comm/handle_rpc.go +++ b/comm/handle_rpc.go @@ -12,11 +12,11 @@ import ( "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/rlp" "github.com/pkg/errors" - "github.com/vechain/thor/block" - "github.com/vechain/thor/comm/proto" - "github.com/vechain/thor/metric" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/comm/proto" + "github.com/vechain/thor/v2/metric" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) // peer will be disconnected if error returned diff --git a/comm/peer.go b/comm/peer.go index a8536d22f..b5f397a84 100644 --- a/comm/peer.go +++ b/comm/peer.go @@ -15,8 +15,8 @@ import ( "github.com/ethereum/go-ethereum/p2p/discover" lru "github.com/hashicorp/golang-lru" "github.com/inconshreveable/log15" - "github.com/vechain/thor/p2psrv/rpc" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/p2psrv/rpc" + "github.com/vechain/thor/v2/thor" ) const ( diff --git a/comm/proto/types.go b/comm/proto/types.go index 42e1325b4..30eae3b33 100644 --- a/comm/proto/types.go +++ b/comm/proto/types.go @@ -9,9 +9,9 @@ import ( "context" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/block" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) type ( diff --git a/comm/stats.go b/comm/stats.go index bd84e6d21..7247a752e 100644 --- a/comm/stats.go +++ b/comm/stats.go @@ -6,7 +6,7 @@ package comm import ( - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // type Traffic struct { diff --git a/comm/sync.go b/comm/sync.go index fef9ae700..9fe69d3d8 100644 --- a/comm/sync.go +++ b/comm/sync.go @@ -11,10 +11,10 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/pkg/errors" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/co" - "github.com/vechain/thor/comm/proto" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/co" + "github.com/vechain/thor/v2/comm/proto" ) func download(_ctx context.Context, repo *chain.Repository, peer *Peer, headNum uint32, handler HandleBlockStream) error { diff --git a/comm/txs_loop.go b/comm/txs_loop.go index 45cb0fc65..093c24492 100644 --- a/comm/txs_loop.go +++ b/comm/txs_loop.go @@ -6,8 +6,8 @@ package comm import ( - "github.com/vechain/thor/comm/proto" - "github.com/vechain/thor/txpool" + "github.com/vechain/thor/v2/comm/proto" + "github.com/vechain/thor/v2/txpool" ) func (c *Communicator) txsLoop() { diff --git a/consensus/consensus.go b/consensus/consensus.go index 50403e286..8d6f7a9c3 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -10,15 +10,15 @@ import ( "fmt" "github.com/hashicorp/golang-lru/simplelru" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/poa" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/poa" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/xenv" ) // Consensus check whether the block is verified, diff --git a/consensus/consensus_test.go b/consensus/consensus_test.go index e01145aa3..c4f53323f 100644 --- a/consensus/consensus_test.go +++ b/consensus/consensus_test.go @@ -14,16 +14,16 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/block" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/packer" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/vrf" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/packer" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/vrf" ) func txBuilder(tag byte) *tx.Builder { diff --git a/consensus/validator.go b/consensus/validator.go index fc28ed600..f397e32b1 100644 --- a/consensus/validator.go +++ b/consensus/validator.go @@ -10,14 +10,14 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/vechain/thor/block" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/poa" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/poa" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/xenv" ) func (c *Consensus) validate( diff --git a/genesis/builder.go b/genesis/builder.go index 97d396cca..ea12655c1 100644 --- a/genesis/builder.go +++ b/genesis/builder.go @@ -9,13 +9,13 @@ import ( "math" "github.com/pkg/errors" - "github.com/vechain/thor/block" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/xenv" ) // Builder helper to build genesis block. diff --git a/genesis/customnet.go b/genesis/customnet.go index 8bdc6ab9d..e85b080a7 100644 --- a/genesis/customnet.go +++ b/genesis/customnet.go @@ -13,10 +13,10 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/math" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) // CustomGenesis is user customized genesis diff --git a/genesis/devnet.go b/genesis/devnet.go index e36177bb2..77798968e 100644 --- a/genesis/devnet.go +++ b/genesis/devnet.go @@ -11,10 +11,10 @@ import ( "sync/atomic" "github.com/ethereum/go-ethereum/crypto" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) // DevAccount account for development. diff --git a/genesis/genesis.go b/genesis/genesis.go index c7113e2a5..73105caa5 100644 --- a/genesis/genesis.go +++ b/genesis/genesis.go @@ -6,11 +6,11 @@ package genesis import ( - "github.com/vechain/thor/abi" - "github.com/vechain/thor/block" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/abi" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) // Genesis to build genesis block. diff --git a/genesis/genesis_test.go b/genesis/genesis_test.go index f8e65ffc2..b131af97c 100644 --- a/genesis/genesis_test.go +++ b/genesis/genesis_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) func TestTestnetGenesis(t *testing.T) { diff --git a/genesis/mainnet.go b/genesis/mainnet.go index f569289e5..b34945fdb 100644 --- a/genesis/mainnet.go +++ b/genesis/mainnet.go @@ -8,10 +8,10 @@ package genesis import ( "math/big" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) // NewMainnet create mainnet genesis. diff --git a/genesis/testnet.go b/genesis/testnet.go index cb5c31a91..eba817bac 100644 --- a/genesis/testnet.go +++ b/genesis/testnet.go @@ -8,10 +8,10 @@ package genesis import ( "math/big" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) // NewTestnet create genesis for testnet. diff --git a/go.mod b/go.mod index 4f0c4d2b4..9036a373b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/vechain/thor +module github.com/vechain/thor/v2 go 1.17 diff --git a/logdb/logdb.go b/logdb/logdb.go index 8a6ae7678..8c7de879d 100644 --- a/logdb/logdb.go +++ b/logdb/logdb.go @@ -13,9 +13,9 @@ import ( "math/big" sqlite3 "github.com/mattn/go-sqlite3" - "github.com/vechain/thor/block" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) const ( diff --git a/logdb/logdb_test.go b/logdb/logdb_test.go index 3ff5daaea..ffa2bb0d5 100644 --- a/logdb/logdb_test.go +++ b/logdb/logdb_test.go @@ -13,10 +13,10 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/block" - logdb "github.com/vechain/thor/logdb" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + logdb "github.com/vechain/thor/v2/logdb" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) func newTx() *tx.Transaction { diff --git a/logdb/types.go b/logdb/types.go index 230599a7a..5abd6572f 100644 --- a/logdb/types.go +++ b/logdb/types.go @@ -9,10 +9,10 @@ import ( "fmt" "math/big" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) -//Event represents tx.Event that can be stored in db. +// Event represents tx.Event that can be stored in db. type Event struct { BlockNumber uint32 Index uint32 @@ -26,7 +26,7 @@ type Event struct { Data []byte } -//Transfer represents tx.Transfer that can be stored in db. +// Transfer represents tx.Transfer that can be stored in db. type Transfer struct { BlockNumber uint32 Index uint32 @@ -77,7 +77,7 @@ func (c *EventCriteria) toWhereCondition() (cond string, args []interface{}) { return } -//EventFilter filter +// EventFilter filter type EventFilter struct { CriteriaSet []*EventCriteria Range *Range diff --git a/muxdb/internal/engine/engine.go b/muxdb/internal/engine/engine.go index db838221c..d7269a679 100644 --- a/muxdb/internal/engine/engine.go +++ b/muxdb/internal/engine/engine.go @@ -8,7 +8,7 @@ package engine import ( "io" - "github.com/vechain/thor/kv" + "github.com/vechain/thor/v2/kv" ) // Engine defines the interface of K-V engine. diff --git a/muxdb/internal/engine/leveldb.go b/muxdb/internal/engine/leveldb.go index f6058d918..b26d7acff 100644 --- a/muxdb/internal/engine/leveldb.go +++ b/muxdb/internal/engine/leveldb.go @@ -12,7 +12,7 @@ import ( "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/vechain/thor/kv" + "github.com/vechain/thor/v2/kv" ) var ( diff --git a/muxdb/internal/trie/cache.go b/muxdb/internal/trie/cache.go index 1d9208063..2e5c651a7 100644 --- a/muxdb/internal/trie/cache.go +++ b/muxdb/internal/trie/cache.go @@ -13,7 +13,7 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/qianbin/directcache" - "github.com/vechain/thor/trie" + "github.com/vechain/thor/v2/trie" ) // Cache is the cache layer for trie. diff --git a/muxdb/internal/trie/leaf_bank.go b/muxdb/internal/trie/leaf_bank.go index 0aaeb34c8..f088a1eb4 100644 --- a/muxdb/internal/trie/leaf_bank.go +++ b/muxdb/internal/trie/leaf_bank.go @@ -12,8 +12,8 @@ import ( "github.com/ethereum/go-ethereum/rlp" lru "github.com/hashicorp/golang-lru" "github.com/pkg/errors" - "github.com/vechain/thor/kv" - "github.com/vechain/thor/trie" + "github.com/vechain/thor/v2/kv" + "github.com/vechain/thor/v2/trie" ) const ( diff --git a/muxdb/internal/trie/leaf_bank_test.go b/muxdb/internal/trie/leaf_bank_test.go index d778f5614..a3b8ebde6 100644 --- a/muxdb/internal/trie/leaf_bank_test.go +++ b/muxdb/internal/trie/leaf_bank_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/trie" + "github.com/vechain/thor/v2/trie" ) func TestLeafbank(t *testing.T) { diff --git a/muxdb/internal/trie/trie.go b/muxdb/internal/trie/trie.go index 27e5d6d3b..9059eec37 100644 --- a/muxdb/internal/trie/trie.go +++ b/muxdb/internal/trie/trie.go @@ -10,9 +10,9 @@ import ( "github.com/inconshreveable/log15" "github.com/pkg/errors" - "github.com/vechain/thor/kv" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/trie" + "github.com/vechain/thor/v2/kv" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/trie" ) var log = log15.New("pkg", "muxdb.trie") diff --git a/muxdb/internal/trie/trie_test.go b/muxdb/internal/trie/trie_test.go index 3cda020fe..d8ce9077c 100644 --- a/muxdb/internal/trie/trie_test.go +++ b/muxdb/internal/trie/trie_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" - "github.com/vechain/thor/muxdb/internal/engine" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/trie" + "github.com/vechain/thor/v2/muxdb/internal/engine" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/trie" ) func newEngine() engine.Engine { diff --git a/muxdb/muxdb.go b/muxdb/muxdb.go index b2b402222..1b0da3971 100644 --- a/muxdb/muxdb.go +++ b/muxdb/muxdb.go @@ -16,10 +16,10 @@ import ( "github.com/syndtr/goleveldb/leveldb/filter" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/storage" - "github.com/vechain/thor/kv" - "github.com/vechain/thor/muxdb/internal/engine" - "github.com/vechain/thor/muxdb/internal/trie" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/kv" + "github.com/vechain/thor/v2/muxdb/internal/engine" + "github.com/vechain/thor/v2/muxdb/internal/trie" + "github.com/vechain/thor/v2/thor" ) const ( diff --git a/p2psrv/server.go b/p2psrv/server.go index 641e7bcec..f2f63d2e0 100644 --- a/p2psrv/server.go +++ b/p2psrv/server.go @@ -19,8 +19,8 @@ import ( "github.com/ethereum/go-ethereum/p2p/nat" "github.com/inconshreveable/log15" - "github.com/vechain/thor/cache" - "github.com/vechain/thor/co" + "github.com/vechain/thor/v2/cache" + "github.com/vechain/thor/v2/co" ) var log = log15.New("pkg", "p2psrv") diff --git a/packer/flow.go b/packer/flow.go index c9b6abb37..47bd97ae7 100644 --- a/packer/flow.go +++ b/packer/flow.go @@ -10,12 +10,12 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/pkg/errors" - "github.com/vechain/thor/block" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/vrf" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/vrf" ) // Flow the flow of packing a new block. diff --git a/packer/packer.go b/packer/packer.go index ff1c1a74a..3e2089145 100644 --- a/packer/packer.go +++ b/packer/packer.go @@ -6,15 +6,15 @@ package packer import ( - "github.com/vechain/thor/block" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/poa" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/poa" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/xenv" ) // Packer to pack txs and build new blocks. diff --git a/packer/packer_test.go b/packer/packer_test.go index a9807d030..dc3188d44 100644 --- a/packer/packer_test.go +++ b/packer/packer_test.go @@ -14,15 +14,15 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/consensus" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/packer" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/consensus" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/packer" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) func M(args ...interface{}) []interface{} { diff --git a/poa/candidates.go b/poa/candidates.go index 9cc9234f6..30864f987 100644 --- a/poa/candidates.go +++ b/poa/candidates.go @@ -1,10 +1,10 @@ package poa import ( - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/builtin/authority" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/builtin/authority" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) // Candidates holds candidates list in memory, and tends to be reused in PoA stage without querying from contract. diff --git a/poa/proposer.go b/poa/proposer.go index c9c881c47..57e9b9704 100644 --- a/poa/proposer.go +++ b/poa/proposer.go @@ -6,7 +6,7 @@ package poa import ( - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // Proposer address with status. diff --git a/poa/sched.go b/poa/sched.go index f7401978a..cd2dcd6c1 100644 --- a/poa/sched.go +++ b/poa/sched.go @@ -9,7 +9,7 @@ import ( "encoding/binary" "errors" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // Scheduler defines the interface of schedulers. diff --git a/poa/sched_test.go b/poa/sched_test.go index a4e7c97ee..0fed063e9 100644 --- a/poa/sched_test.go +++ b/poa/sched_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/block" - "github.com/vechain/thor/poa" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/poa" + "github.com/vechain/thor/v2/thor" ) var ( diff --git a/poa/sched_v2.go b/poa/sched_v2.go index 8e866be89..5cf3463e7 100644 --- a/poa/sched_v2.go +++ b/poa/sched_v2.go @@ -11,7 +11,7 @@ import ( "errors" "sort" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // SchedulerV2 to schedule the time when a proposer to produce a block. diff --git a/poa/sched_v2_test.go b/poa/sched_v2_test.go index f0d8b5304..e46534955 100644 --- a/poa/sched_v2_test.go +++ b/poa/sched_v2_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) var ( diff --git a/poa/seed.go b/poa/seed.go index d45bbfb80..4d340698e 100644 --- a/poa/seed.go +++ b/poa/seed.go @@ -6,9 +6,9 @@ package poa import ( - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/thor" ) var epochInterval uint32 = thor.SeederInterval diff --git a/poa/seed_test.go b/poa/seed_test.go index b656ecc61..2d5192173 100644 --- a/poa/seed_test.go +++ b/poa/seed_test.go @@ -12,13 +12,13 @@ import ( "testing" "github.com/ethereum/go-ethereum/crypto" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/vrf" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/vrf" ) func TestSeeder_Generate(t *testing.T) { diff --git a/runtime/native_return_gas_test.go b/runtime/native_return_gas_test.go index b0f8a9648..f9ceb15ec 100644 --- a/runtime/native_return_gas_test.go +++ b/runtime/native_return_gas_test.go @@ -5,12 +5,12 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/xenv" ) func TestNativeCallReturnGas(t *testing.T) { diff --git a/runtime/resolved_tx.go b/runtime/resolved_tx.go index 3ef651229..3c3b797b0 100644 --- a/runtime/resolved_tx.go +++ b/runtime/resolved_tx.go @@ -10,11 +10,11 @@ import ( "github.com/ethereum/go-ethereum/common/math" "github.com/pkg/errors" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/xenv" ) // ResolvedTransaction resolve the transaction according to given state. diff --git a/runtime/resolved_tx_test.go b/runtime/resolved_tx_test.go index e31e4bc3f..07c846b94 100644 --- a/runtime/resolved_tx_test.go +++ b/runtime/resolved_tx_test.go @@ -10,14 +10,14 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto/secp256k1" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) func TestResolvedTx(t *testing.T) { diff --git a/runtime/runtime.go b/runtime/runtime.go index d94e7dc18..54055b5e2 100644 --- a/runtime/runtime.go +++ b/runtime/runtime.go @@ -13,16 +13,16 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" "github.com/pkg/errors" - "github.com/vechain/thor/abi" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/runtime/statedb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - Tx "github.com/vechain/thor/tx" - "github.com/vechain/thor/vm" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/abi" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/runtime/statedb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + Tx "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/vm" + "github.com/vechain/thor/v2/xenv" ) var ( diff --git a/runtime/runtime_test.go b/runtime/runtime_test.go index a14540651..b00c8a889 100644 --- a/runtime/runtime_test.go +++ b/runtime/runtime_test.go @@ -13,16 +13,16 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/abi" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/abi" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/xenv" ) func M(a ...interface{}) []interface{} { diff --git a/runtime/statedb/statedb.go b/runtime/statedb/statedb.go index 954008333..c0f496d10 100644 --- a/runtime/statedb/statedb.go +++ b/runtime/statedb/statedb.go @@ -12,10 +12,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" lru "github.com/hashicorp/golang-lru" - "github.com/vechain/thor/stackedmap" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/stackedmap" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) var codeSizeCache, _ = lru.New(32 * 1024) diff --git a/runtime/statedb/statedb_test.go b/runtime/statedb/statedb_test.go index 4f536786f..89fd592a1 100644 --- a/runtime/statedb/statedb_test.go +++ b/runtime/statedb/statedb_test.go @@ -19,10 +19,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/runtime/statedb" - State "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/runtime/statedb" + State "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" ) func TestSnapshotRandom(t *testing.T) { diff --git a/stackedmap/stackedmap_test.go b/stackedmap/stackedmap_test.go index 11a8c8168..b3b357efa 100644 --- a/stackedmap/stackedmap_test.go +++ b/stackedmap/stackedmap_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/stackedmap" + "github.com/vechain/thor/v2/stackedmap" ) func M(a ...interface{}) []interface{} { diff --git a/state/account.go b/state/account.go index 56b526c2c..cccec7eb4 100644 --- a/state/account.go +++ b/state/account.go @@ -10,8 +10,8 @@ import ( "math/big" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/thor" ) // AccountMetadata is the account metadata. diff --git a/state/account_test.go b/state/account_test.go index b5fd47bb8..d95a281de 100644 --- a/state/account_test.go +++ b/state/account_test.go @@ -11,8 +11,8 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/thor" ) func M(a ...interface{}) []interface{} { diff --git a/state/cached_object.go b/state/cached_object.go index 7cc12f775..1c0de092b 100644 --- a/state/cached_object.go +++ b/state/cached_object.go @@ -8,8 +8,8 @@ package state import ( "github.com/ethereum/go-ethereum/rlp" lru "github.com/hashicorp/golang-lru" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/thor" ) var codeCache, _ = lru.NewARC(512) diff --git a/state/cached_object_test.go b/state/cached_object_test.go index b6cf35a60..6527bcad2 100644 --- a/state/cached_object_test.go +++ b/state/cached_object_test.go @@ -12,8 +12,8 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/thor" ) func TestCachedObject(t *testing.T) { diff --git a/state/stage.go b/state/stage.go index 04ac474d9..5fca2859f 100644 --- a/state/stage.go +++ b/state/stage.go @@ -5,7 +5,7 @@ package state -import "github.com/vechain/thor/thor" +import "github.com/vechain/thor/v2/thor" // Stage abstracts changes on the main accounts trie. type Stage struct { diff --git a/state/stage_test.go b/state/stage_test.go index 9cb8722ec..f157591fa 100644 --- a/state/stage_test.go +++ b/state/stage_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/thor" ) func TestStage(t *testing.T) { diff --git a/state/state.go b/state/state.go index 64a51d907..2dc251bf9 100644 --- a/state/state.go +++ b/state/state.go @@ -11,10 +11,10 @@ import ( "math/big" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/lowrlp" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/stackedmap" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/lowrlp" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/stackedmap" + "github.com/vechain/thor/v2/thor" ) const ( diff --git a/state/state_test.go b/state/state_test.go index ccb3f54b3..baaf586db 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -11,8 +11,8 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/thor" ) func TestStateReadWrite(t *testing.T) { diff --git a/state/stater.go b/state/stater.go index da89ae1b1..6a6e476f3 100644 --- a/state/stater.go +++ b/state/stater.go @@ -6,8 +6,8 @@ package state import ( - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/thor" ) // Stater is the state creator. diff --git a/state/stater_test.go b/state/stater_test.go index ebe40ae2d..ad0c3823c 100644 --- a/state/stater_test.go +++ b/state/stater_test.go @@ -3,8 +3,8 @@ package state import ( "testing" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/thor" ) func TestStater(t *testing.T) { diff --git a/thor/bloom/bloom.go b/thor/bloom/bloom.go index 9da5ebf05..d3856b9a6 100644 --- a/thor/bloom/bloom.go +++ b/thor/bloom/bloom.go @@ -10,7 +10,7 @@ package bloom import ( "encoding/binary" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) func distribute(hash uint32, k uint8, nBits uint32, cb func(index int, bit byte) bool) bool { diff --git a/thor/bloom/bloom_test.go b/thor/bloom/bloom_test.go index c4768ca0f..7e38b2ebb 100644 --- a/thor/bloom/bloom_test.go +++ b/thor/bloom/bloom_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/thor/bloom" + "github.com/vechain/thor/v2/thor/bloom" ) func TestBloom(t *testing.T) { diff --git a/thor/bloom/legacy.go b/thor/bloom/legacy.go index fe35700f5..8441d1b33 100644 --- a/thor/bloom/legacy.go +++ b/thor/bloom/legacy.go @@ -8,7 +8,7 @@ package bloom import ( "math" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) const ( diff --git a/thor/bloom/legacy_test.go b/thor/bloom/legacy_test.go index 80ef18660..466bbb1d3 100644 --- a/thor/bloom/legacy_test.go +++ b/thor/bloom/legacy_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/thor/bloom" + "github.com/vechain/thor/v2/thor/bloom" ) func TestLegacyBloom(t *testing.T) { diff --git a/thor/hash.go b/thor/hash.go index 60b4531b0..061ba6f11 100644 --- a/thor/hash.go +++ b/thor/hash.go @@ -10,7 +10,7 @@ import ( "io" "sync" - "github.com/vechain/thor/blake2b" + "github.com/vechain/thor/v2/blake2b" "golang.org/x/crypto/sha3" ) diff --git a/thor/hash_test.go b/thor/hash_test.go index 0633bd132..8917f1535 100644 --- a/thor/hash_test.go +++ b/thor/hash_test.go @@ -11,7 +11,7 @@ import ( "math/rand" "testing" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" "golang.org/x/crypto/sha3" ) diff --git a/tracers/js/goja.go b/tracers/js/goja.go index 0f7e8c017..86514213d 100644 --- a/tracers/js/goja.go +++ b/tracers/js/goja.go @@ -27,10 +27,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tracers" - jsassets "github.com/vechain/thor/tracers/js/internal/tracers" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tracers" + jsassets "github.com/vechain/thor/v2/tracers/js/internal/tracers" + "github.com/vechain/thor/v2/vm" ) var assetTracers = make(map[string]string) diff --git a/tracers/js/tracer_test.go b/tracers/js/tracer_test.go index b556810e0..4954a7fb1 100644 --- a/tracers/js/tracer_test.go +++ b/tracers/js/tracer_test.go @@ -27,8 +27,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/params" - "github.com/vechain/thor/tracers" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/tracers" + "github.com/vechain/thor/v2/vm" ) type account struct{} diff --git a/tracers/logger/gen_structlog.go b/tracers/logger/gen_structlog.go index 1dd1e535b..3b8b87627 100644 --- a/tracers/logger/gen_structlog.go +++ b/tracers/logger/gen_structlog.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/math" "github.com/holiman/uint256" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/vm" ) var _ = (*structLogMarshaling)(nil) diff --git a/tracers/logger/logger.go b/tracers/logger/logger.go index 5033d8233..936dbf192 100644 --- a/tracers/logger/logger.go +++ b/tracers/logger/logger.go @@ -30,8 +30,8 @@ import ( "github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/core/types" "github.com/holiman/uint256" - "github.com/vechain/thor/tracers" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/tracers" + "github.com/vechain/thor/v2/vm" ) // Storage represents a contract's storage. diff --git a/tracers/logger/logger_json.go b/tracers/logger/logger_json.go index 124561501..792f304f3 100644 --- a/tracers/logger/logger_json.go +++ b/tracers/logger/logger_json.go @@ -23,7 +23,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/vm" ) type JSONLogger struct { diff --git a/tracers/logger/logger_test.go b/tracers/logger/logger_test.go index d4c4fd6df..5381f869b 100644 --- a/tracers/logger/logger_test.go +++ b/tracers/logger/logger_test.go @@ -24,7 +24,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/params" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/vm" ) type dummyContractRef struct { diff --git a/tracers/native/4byte.go b/tracers/native/4byte.go index 8c217429a..b881b3e55 100644 --- a/tracers/native/4byte.go +++ b/tracers/native/4byte.go @@ -23,8 +23,8 @@ import ( "sync/atomic" "github.com/ethereum/go-ethereum/common" - "github.com/vechain/thor/tracers" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/tracers" + "github.com/vechain/thor/v2/vm" ) func init() { diff --git a/tracers/native/call.go b/tracers/native/call.go index 4c14926bf..203861dc8 100644 --- a/tracers/native/call.go +++ b/tracers/native/call.go @@ -24,8 +24,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/vechain/thor/tracers" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/tracers" + "github.com/vechain/thor/v2/vm" ) //go:generate go run github.com/fjl/gencodec -type callFrame -field-override callFrameMarshaling -out gen_callframe_json.go diff --git a/tracers/native/gen_callframe_json.go b/tracers/native/gen_callframe_json.go index fac5a2b9a..5df134aa5 100644 --- a/tracers/native/gen_callframe_json.go +++ b/tracers/native/gen_callframe_json.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/vm" ) var _ = (*callFrameMarshaling)(nil) diff --git a/tracers/native/noop.go b/tracers/native/noop.go index abbdcbca1..60ca8dc38 100644 --- a/tracers/native/noop.go +++ b/tracers/native/noop.go @@ -21,8 +21,8 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/vechain/thor/tracers" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/tracers" + "github.com/vechain/thor/v2/vm" ) func init() { diff --git a/tracers/native/prestate.go b/tracers/native/prestate.go index caa27752e..9f27b6231 100644 --- a/tracers/native/prestate.go +++ b/tracers/native/prestate.go @@ -24,9 +24,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tracers" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tracers" + "github.com/vechain/thor/v2/vm" ) //go:generate go run github.com/fjl/gencodec -type account -field-override accountMarshaling -out gen_account_json.go diff --git a/tracers/tracers.go b/tracers/tracers.go index 0b2c2af7f..fca5a4599 100644 --- a/tracers/tracers.go +++ b/tracers/tracers.go @@ -22,9 +22,9 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/vm" ) // Context contains some contextual infos for a transaction execution that is not diff --git a/tracers/tracers_test.go b/tracers/tracers_test.go index e53a62d79..3913eefa8 100644 --- a/tracers/tracers_test.go +++ b/tracers/tracers_test.go @@ -28,22 +28,22 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/math" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tracers" - "github.com/vechain/thor/tracers/logger" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/vm" - "github.com/vechain/thor/xenv" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tracers" + "github.com/vechain/thor/v2/tracers/logger" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/vm" + "github.com/vechain/thor/v2/xenv" // Force-load the tracer engines to trigger registration - _ "github.com/vechain/thor/tracers/js" - _ "github.com/vechain/thor/tracers/native" + _ "github.com/vechain/thor/v2/tracers/js" + _ "github.com/vechain/thor/v2/tracers/native" ) type callLog struct { diff --git a/trie/derive_root.go b/trie/derive_root.go index e276f50a6..c82cc810e 100644 --- a/trie/derive_root.go +++ b/trie/derive_root.go @@ -4,7 +4,7 @@ import ( "bytes" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // see "github.com/ethereum/go-ethereum/types/derive_sha.go" diff --git a/trie/extended.go b/trie/extended.go index 1b14a0cef..04b9de9ed 100644 --- a/trie/extended.go +++ b/trie/extended.go @@ -5,7 +5,7 @@ package trie -import "github.com/vechain/thor/thor" +import "github.com/vechain/thor/v2/thor" // ExtendedTrie is an extended Merkle Patricia Trie which supports nodes sequence number // and leaf metadata. diff --git a/trie/fast_node_encoder.go b/trie/fast_node_encoder.go index 8087768dc..42c8b61a4 100644 --- a/trie/fast_node_encoder.go +++ b/trie/fast_node_encoder.go @@ -6,7 +6,7 @@ package trie import ( - "github.com/vechain/thor/lowrlp" + "github.com/vechain/thor/v2/lowrlp" ) // implements node.encode and node.encodeTrailing diff --git a/trie/hasher.go b/trie/hasher.go index 8b2384fe1..d8127a648 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -20,8 +20,8 @@ import ( "sync" "github.com/ethereum/go-ethereum/common" - "github.com/vechain/thor/lowrlp" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/lowrlp" + "github.com/vechain/thor/v2/thor" ) type hasher struct { diff --git a/trie/iterator.go b/trie/iterator.go index 4c76bc85b..a27702f46 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,7 +21,7 @@ import ( "container/heap" "errors" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/iterator_test.go b/trie/iterator_test.go index d117f9b50..c5466db63 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -26,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethdb" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/node.go b/trie/node.go index 993838254..1d10d25f8 100644 --- a/trie/node.go +++ b/trie/node.go @@ -24,8 +24,8 @@ import ( "strings" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/lowrlp" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/lowrlp" + "github.com/vechain/thor/v2/thor" ) var NonCryptoNodeHash = thor.BytesToBytes32(bytes.Repeat([]byte{0xff}, 32)) diff --git a/trie/node_test.go b/trie/node_test.go index eee15f789..9f42b969b 100644 --- a/trie/node_test.go +++ b/trie/node_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // func TestCanUnload(t *testing.T) { diff --git a/trie/proof.go b/trie/proof.go index 2ad276845..637c5168f 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/log" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // Prove constructs a merkle proof for key. The result contains all diff --git a/trie/proof_test.go b/trie/proof_test.go index e7763c871..758658688 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -26,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethdb" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) func init() { diff --git a/trie/trie.go b/trie/trie.go index d1469b9f3..3ae134e48 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -23,7 +23,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) var ( diff --git a/trie/trie_test.go b/trie/trie_test.go index a04d6934b..006712753 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -33,7 +33,7 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) func init() { diff --git a/tx/block_ref.go b/tx/block_ref.go index 0770e3959..8a0c11e9b 100644 --- a/tx/block_ref.go +++ b/tx/block_ref.go @@ -8,7 +8,7 @@ package tx import ( "encoding/binary" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // BlockRef is block reference. diff --git a/tx/block_ref_test.go b/tx/block_ref_test.go index 30456142a..e535d76ea 100644 --- a/tx/block_ref_test.go +++ b/tx/block_ref_test.go @@ -9,10 +9,10 @@ import ( "math/rand" "testing" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/tx" ) func TestBlockRef(t *testing.T) { diff --git a/tx/builder.go b/tx/builder.go index d97989049..64f98868f 100644 --- a/tx/builder.go +++ b/tx/builder.go @@ -8,7 +8,7 @@ package tx import ( "encoding/binary" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // Builder to make it easy to build transaction. diff --git a/tx/clause.go b/tx/clause.go index 6875ffdbe..33af7433f 100644 --- a/tx/clause.go +++ b/tx/clause.go @@ -11,7 +11,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) type clauseBody struct { diff --git a/tx/clause_test.go b/tx/clause_test.go index 534e80025..9bd4bf0d3 100644 --- a/tx/clause_test.go +++ b/tx/clause_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) func TestClauseTo(t *testing.T) { diff --git a/tx/event.go b/tx/event.go index 6fba18515..c3c36b845 100644 --- a/tx/event.go +++ b/tx/event.go @@ -6,7 +6,7 @@ package tx import ( - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // Event represents a contract event log. These events are generated by the LOG opcode and diff --git a/tx/features_test.go b/tx/features_test.go index e942f04c9..272920a1b 100644 --- a/tx/features_test.go +++ b/tx/features_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/tx" ) func TestFeatures(t *testing.T) { diff --git a/tx/receipt.go b/tx/receipt.go index 053a09516..45ad952db 100644 --- a/tx/receipt.go +++ b/tx/receipt.go @@ -9,8 +9,8 @@ import ( "math/big" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/trie" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/trie" ) // Receipt represents the results of a transaction. diff --git a/tx/receipt_test.go b/tx/receipt_test.go index c8e703f6c..8b800ba08 100644 --- a/tx/receipt_test.go +++ b/tx/receipt_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/thor" - . "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/thor" + . "github.com/vechain/thor/v2/tx" ) func getMockReceipt() Receipt { diff --git a/tx/transaction.go b/tx/transaction.go index caf004991..cada51765 100644 --- a/tx/transaction.go +++ b/tx/transaction.go @@ -19,8 +19,8 @@ import ( "github.com/ethereum/go-ethereum/crypto/secp256k1" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/metric" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/metric" + "github.com/vechain/thor/v2/thor" ) var ( diff --git a/tx/transaction_test.go b/tx/transaction_test.go index 73c1234e8..50b1f0b96 100644 --- a/tx/transaction_test.go +++ b/tx/transaction_test.go @@ -13,9 +13,9 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/metric" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/metric" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) func GetMockTx() tx.Transaction { diff --git a/tx/transactions.go b/tx/transactions.go index fd3b7a1d8..35d341c74 100644 --- a/tx/transactions.go +++ b/tx/transactions.go @@ -7,8 +7,8 @@ package tx import ( "github.com/ethereum/go-ethereum/rlp" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/trie" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/trie" ) var ( diff --git a/tx/transactions_test.go b/tx/transactions_test.go index 2b89a7b39..7414a6c52 100644 --- a/tx/transactions_test.go +++ b/tx/transactions_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) func MockTransactions(n int) tx.Transactions { diff --git a/tx/transfer.go b/tx/transfer.go index 8ada08109..3724078d9 100644 --- a/tx/transfer.go +++ b/tx/transfer.go @@ -8,7 +8,7 @@ package tx import ( "math/big" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // Transfer token transfer log. diff --git a/tx/work_eval.go b/tx/work_eval.go index 024f7d0e6..c68fc874d 100644 --- a/tx/work_eval.go +++ b/tx/work_eval.go @@ -9,7 +9,7 @@ import ( "math" "math/big" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) var ( diff --git a/txpool/blocklist.go b/txpool/blocklist.go index a5829a2f3..b87238410 100644 --- a/txpool/blocklist.go +++ b/txpool/blocklist.go @@ -16,7 +16,7 @@ import ( "strings" "sync" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // blocklist is a address list contains addresses that are blocked. diff --git a/txpool/tx_object.go b/txpool/tx_object.go index 0e28e47f1..dd511cad7 100644 --- a/txpool/tx_object.go +++ b/txpool/tx_object.go @@ -11,12 +11,12 @@ import ( "time" "github.com/pkg/errors" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/runtime" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/runtime" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) type txObject struct { diff --git a/txpool/tx_object_map.go b/txpool/tx_object_map.go index 9a454cd8b..2828fd972 100644 --- a/txpool/tx_object_map.go +++ b/txpool/tx_object_map.go @@ -9,8 +9,8 @@ import ( "errors" "sync" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) // txObjectMap to maintain mapping of tx hash to tx object, and account quota. diff --git a/txpool/tx_object_map_test.go b/txpool/tx_object_map_test.go index bd6e27785..0a1f58525 100644 --- a/txpool/tx_object_map_test.go +++ b/txpool/tx_object_map_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/tx" ) func TestTxObjMap(t *testing.T) { diff --git a/txpool/tx_object_test.go b/txpool/tx_object_test.go index b38d67106..7eeede1e4 100644 --- a/txpool/tx_object_test.go +++ b/txpool/tx_object_test.go @@ -13,13 +13,13 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/block" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) func newChainRepo(db *muxdb.MuxDB) *chain.Repository { diff --git a/txpool/tx_pool.go b/txpool/tx_pool.go index f74df3f97..c8170b571 100644 --- a/txpool/tx_pool.go +++ b/txpool/tx_pool.go @@ -16,12 +16,12 @@ import ( "github.com/ethereum/go-ethereum/common/mclock" "github.com/ethereum/go-ethereum/event" "github.com/inconshreveable/log15" - "github.com/vechain/thor/builtin" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/co" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/builtin" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/co" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" ) const ( diff --git a/txpool/tx_pool_test.go b/txpool/tx_pool_test.go index 3e31ffaae..031cdb18d 100644 --- a/txpool/tx_pool_test.go +++ b/txpool/tx_pool_test.go @@ -15,13 +15,13 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/inconshreveable/log15" "github.com/stretchr/testify/assert" - "github.com/vechain/thor/block" - "github.com/vechain/thor/genesis" - "github.com/vechain/thor/muxdb" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - Tx "github.com/vechain/thor/tx" + "github.com/vechain/thor/v2/block" + "github.com/vechain/thor/v2/genesis" + "github.com/vechain/thor/v2/muxdb" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + Tx "github.com/vechain/thor/v2/tx" ) const LIMIT = 10 diff --git a/vm/analysis_test.go b/vm/analysis_test.go index 8b3ec6ddc..3d1d0478a 100644 --- a/vm/analysis_test.go +++ b/vm/analysis_test.go @@ -20,7 +20,7 @@ import ( "math/bits" "testing" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) func TestJumpDestAnalysis(t *testing.T) { diff --git a/vm/bn256/bn256_fast.go b/vm/bn256/bn256_fast.go index f4a3b6510..97da89550 100644 --- a/vm/bn256/bn256_fast.go +++ b/vm/bn256/bn256_fast.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import bn256 "github.com/vechain/thor/vm/bn256/cloudflare" +import bn256 "github.com/vechain/thor/v2/vm/bn256/cloudflare" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/vm/bn256/bn256_slow.go b/vm/bn256/bn256_slow.go index b71004275..6d1e0589e 100644 --- a/vm/bn256/bn256_slow.go +++ b/vm/bn256/bn256_slow.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import bn256 "github.com/vechain/thor/vm/bn256/google" +import bn256 "github.com/vechain/thor/v2/vm/bn256/google" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/vm/contracts.go b/vm/contracts.go index ec40bf6d2..36fa3b0f3 100644 --- a/vm/contracts.go +++ b/vm/contracts.go @@ -28,9 +28,9 @@ import ( "github.com/ethereum/go-ethereum/params" "golang.org/x/crypto/ripemd160" - "github.com/vechain/thor/blake2b" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/vm/bn256" + "github.com/vechain/thor/v2/blake2b" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/vm/bn256" ) // PrecompiledContract is the basic interface for native Go contracts. The implementation diff --git a/vm/evm.go b/vm/evm.go index 4a07acf3e..dc90009f3 100644 --- a/vm/evm.go +++ b/vm/evm.go @@ -23,7 +23,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // emptyCodeHash is used by create to ensure deployment is disallowed to already diff --git a/vm/instructions.go b/vm/instructions.go index 3045a336f..75cedb96b 100644 --- a/vm/instructions.go +++ b/vm/instructions.go @@ -24,7 +24,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) var ( diff --git a/vm/instructions_test.go b/vm/instructions_test.go index fc3b39392..e1d146828 100644 --- a/vm/instructions_test.go +++ b/vm/instructions_test.go @@ -23,7 +23,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) type twoOperandTest struct { diff --git a/vm/patch.go b/vm/patch.go index b9ba90b42..c90fc318d 100644 --- a/vm/patch.go +++ b/vm/patch.go @@ -10,7 +10,7 @@ package vm import ( "github.com/ethereum/go-ethereum/common" - "github.com/vechain/thor/thor" + "github.com/vechain/thor/v2/thor" ) // CreateAddress2 creates an ethereum address given the address bytes, initial diff --git a/vrf/vrf_test.go b/vrf/vrf_test.go index 57c6c7241..d21b8691a 100644 --- a/vrf/vrf_test.go +++ b/vrf/vrf_test.go @@ -15,7 +15,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/crypto" - "github.com/vechain/thor/vrf" + "github.com/vechain/thor/v2/vrf" ) // Case Testing cases structure. diff --git a/xenv/env.go b/xenv/env.go index 5dc31185d..d801dc38a 100644 --- a/xenv/env.go +++ b/xenv/env.go @@ -12,12 +12,12 @@ import ( "github.com/ethereum/go-ethereum/core/types" ethparams "github.com/ethereum/go-ethereum/params" "github.com/pkg/errors" - "github.com/vechain/thor/abi" - "github.com/vechain/thor/chain" - "github.com/vechain/thor/state" - "github.com/vechain/thor/thor" - "github.com/vechain/thor/tx" - "github.com/vechain/thor/vm" + "github.com/vechain/thor/v2/abi" + "github.com/vechain/thor/v2/chain" + "github.com/vechain/thor/v2/state" + "github.com/vechain/thor/v2/thor" + "github.com/vechain/thor/v2/tx" + "github.com/vechain/thor/v2/vm" ) // BlockContext block context.