diff options
| author | Determinant <tederminant@gmail.com> | 2019-08-29 14:55:28 -0400 |
|---|---|---|
| committer | Determinant <tederminant@gmail.com> | 2019-08-29 14:55:28 -0400 |
| commit | 8c4e5b732d9584ecf9e77a4d93a987adb333d61a (patch) | |
| tree | ea84ac4cb1ed8ca1bf08525d2739776473b1666d | |
| parent | 1c1fa76addab68e04e051df3f38cce9f3bb32d98 (diff) | |
switch to ava-labs hosted geth
46 files changed, 332 insertions, 335 deletions
diff --git a/.gitmodules b/.gitmodules index 336d7f3..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "vendor/github.com/ethereum/go-ethereum"] - path = vendor/github.com/ethereum/go-ethereum - url = https://github.com/Determinant/go-ethereum diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 3890099..97b5870 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -27,16 +27,16 @@ import ( "time" "github.com/ava-labs/coreth/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/console" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/rawdb" + "github.com/ava-labs/go-ethereum/core/state" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/eth/downloader" + "github.com/ava-labs/go-ethereum/event" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/trie" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 51ca835..b3dc833 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -27,11 +27,11 @@ import ( cli "gopkg.in/urfave/cli.v1" "github.com/ava-labs/coreth/cmd/utils" - "github.com/ethereum/go-ethereum/dashboard" + "github.com/ava-labs/go-ethereum/dashboard" "github.com/ava-labs/coreth/eth" "github.com/ava-labs/coreth/node" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ava-labs/go-ethereum/params" + whisper "github.com/ava-labs/go-ethereum/whisper/whisperv6" "github.com/naoina/toml" ) diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index ab44175..57ea2c9 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -25,9 +25,9 @@ import ( "syscall" "github.com/ava-labs/coreth/cmd/utils" - "github.com/ethereum/go-ethereum/console" + "github.com/ava-labs/go-ethereum/console" "github.com/ava-labs/coreth/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index e3d7e9d..82ad47e 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -29,15 +29,15 @@ import ( "github.com/elastic/gosigar" "github.com/ava-labs/coreth/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/console" "github.com/ava-labs/coreth/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" + "github.com/ava-labs/go-ethereum/eth/downloader" + "github.com/ava-labs/go-ethereum/ethclient" "github.com/ava-labs/coreth/internal/debug" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ava-labs/go-ethereum/les" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/metrics" "github.com/ava-labs/coreth/node" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index a960147..a49f2ba 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -24,9 +24,9 @@ import ( "strings" "github.com/ava-labs/coreth/cmd/utils" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/params" + "github.com/ava-labs/go-ethereum/consensus/ethash" + "github.com/ava-labs/go-ethereum/eth" + "github.com/ava-labs/go-ethereum/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/retesteth.go b/cmd/geth/retesteth.go index 695e7df..a5bebb0 100644 --- a/cmd/geth/retesteth.go +++ b/cmd/geth/retesteth.go @@ -27,25 +27,25 @@ import ( "time" "github.com/ava-labs/coreth/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/hexutil" + "github.com/ava-labs/go-ethereum/common/math" + "github.com/ava-labs/go-ethereum/consensus" + "github.com/ava-labs/go-ethereum/consensus/ethash" + "github.com/ava-labs/go-ethereum/consensus/misc" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/rawdb" + "github.com/ava-labs/go-ethereum/core/state" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/core/vm" + "github.com/ava-labs/go-ethereum/crypto" + "github.com/ava-labs/go-ethereum/ethdb" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/node" + "github.com/ava-labs/go-ethereum/params" + "github.com/ava-labs/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/trie" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/retesteth_copypaste.go b/cmd/geth/retesteth_copypaste.go index 6061702..b48b007 100644 --- a/cmd/geth/retesteth_copypaste.go +++ b/cmd/geth/retesteth_copypaste.go @@ -19,9 +19,9 @@ package geth import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/hexutil" + "github.com/ava-labs/go-ethereum/core/types" ) // RPCTransaction represents a transaction that will serialize to the RPC representation of a transaction diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 8207d1f..cf88aec 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -27,16 +27,16 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/rawdb" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/crypto" + "github.com/ava-labs/go-ethereum/ethdb" "github.com/ava-labs/coreth/internal/debug" - "github.com/ethereum/go-ethereum/log" + "github.com/ava-labs/go-ethereum/log" "github.com/ava-labs/coreth/node" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index e5bf872..e3941e0 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/ethereum/go-ethereum/common/math" + "github.com/ava-labs/go-ethereum/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index f1c13bb..683c490 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -29,37 +29,37 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/consensus" + "github.com/ava-labs/go-ethereum/accounts" + "github.com/ava-labs/go-ethereum/accounts/keystore" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/fdlimit" + "github.com/ava-labs/go-ethereum/consensus" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" + "github.com/ava-labs/go-ethereum/consensus/clique" + "github.com/ava-labs/go-ethereum/consensus/ethash" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/vm" + "github.com/ava-labs/go-ethereum/crypto" + "github.com/ava-labs/go-ethereum/dashboard" + "github.com/ava-labs/go-ethereum/eth/downloader" + "github.com/ava-labs/go-ethereum/eth/gasprice" "github.com/ava-labs/coreth/eth" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ava-labs/go-ethereum/ethdb" "github.com/ava-labs/coreth/ethstats" - "github.com/ethereum/go-ethereum/graphql" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" + "github.com/ava-labs/go-ethereum/graphql" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/metrics" + "github.com/ava-labs/go-ethereum/metrics/influxdb" "github.com/ava-labs/coreth/miner" "github.com/ava-labs/coreth/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ava-labs/go-ethereum/p2p" + "github.com/ava-labs/go-ethereum/p2p/discv5" + "github.com/ava-labs/go-ethereum/p2p/enode" + "github.com/ava-labs/go-ethereum/p2p/nat" + "github.com/ava-labs/go-ethereum/p2p/netutil" + "github.com/ava-labs/go-ethereum/params" + "github.com/ava-labs/go-ethereum/rpc" + whisper "github.com/ava-labs/go-ethereum/whisper/whisperv6" pcsclite "github.com/gballet/go-libpcsclite" cli "gopkg.in/urfave/cli.v1" ) diff --git a/consensus/dummy/consensus.go b/consensus/dummy/consensus.go index 7700a55..791719e 100644 --- a/consensus/dummy/consensus.go +++ b/consensus/dummy/consensus.go @@ -9,13 +9,13 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/consensus" + "github.com/ava-labs/go-ethereum/core/state" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/params" + "github.com/ava-labs/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/rpc" ) type OnFinalizeCallbackType = func(chain consensus.ChainReader, header *types.Header, state *state.StateDB, txs []*types.Transaction, uncles []*types.Header) diff --git a/core/genesis.go b/core/genesis.go index b421e08..149e3d0 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -24,15 +24,15 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/core" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/hexutil" + "github.com/ava-labs/go-ethereum/core/rawdb" + "github.com/ava-labs/go-ethereum/core/state" + "github.com/ava-labs/go-ethereum/ethdb" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/params" + "github.com/ava-labs/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/core" ) var errGenesisNoConfig = errors.New("genesis has no chain configuration") diff --git a/core/mkalloc.go b/core/mkalloc.go index 5118a4f..0faf47b 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -34,8 +34,8 @@ import ( "sort" "strconv" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/rlp" ) type allocItem struct{ Addr, Balance *big.Int } @@ -8,12 +8,12 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/eth" "github.com/ava-labs/coreth/node" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/core/state" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/crypto" + "github.com/ava-labs/go-ethereum/event" + "github.com/ava-labs/go-ethereum/log" "github.com/mattn/go-isatty" ) @@ -100,9 +100,9 @@ func (self *ETHChain) GetBlockByHash(hash common.Hash) *types.Block { return self.backend.BlockChain().GetBlockByHash(hash) } -// SetHead sets the current head block to the one defined by the hash +// SetTail sets the current head block to the one defined by the hash // irrelevant what the chain contents were prior. -func (self *ETHChain) SetHead(hash common.Hash) error { +func (self *ETHChain) SetTail(hash common.Hash) error { return self.backend.BlockChain().FastSyncCommitHead(hash) } @@ -28,16 +28,16 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/hexutil" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/rawdb" + "github.com/ava-labs/go-ethereum/core/state" + "github.com/ava-labs/go-ethereum/core/types" "github.com/ava-labs/coreth/internal/ethapi" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/ava-labs/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index 69904a7..7befd96 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -21,21 +21,21 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/accounts" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/math" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/bloombits" + "github.com/ava-labs/go-ethereum/core/rawdb" + "github.com/ava-labs/go-ethereum/core/state" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/core/vm" + "github.com/ava-labs/go-ethereum/eth/downloader" + "github.com/ava-labs/go-ethereum/eth/gasprice" + "github.com/ava-labs/go-ethereum/ethdb" + "github.com/ava-labs/go-ethereum/event" + "github.com/ava-labs/go-ethereum/params" + "github.com/ava-labs/go-ethereum/rpc" ) // EthAPIBackend implements ethapi.Backend for full nodes diff --git a/eth/api_tracer.go b/eth/api_tracer.go index db9c1fc..618e7c8 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -28,19 +28,19 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/hexutil" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/rawdb" + "github.com/ava-labs/go-ethereum/core/state" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/core/vm" + "github.com/ava-labs/go-ethereum/eth/tracers" "github.com/ava-labs/coreth/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/trie" ) const ( diff --git a/eth/backend.go b/eth/backend.go index 1beca28..5fb5728 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -30,29 +30,29 @@ import ( "github.com/ava-labs/coreth/internal/ethapi" "github.com/ava-labs/coreth/miner" "github.com/ava-labs/coreth/node" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/accounts" + "github.com/ava-labs/go-ethereum/accounts/abi/bind" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/hexutil" + "github.com/ava-labs/go-ethereum/consensus" + "github.com/ava-labs/go-ethereum/consensus/clique" + "github.com/ava-labs/go-ethereum/consensus/ethash" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/bloombits" + "github.com/ava-labs/go-ethereum/core/rawdb" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/core/vm" + "github.com/ava-labs/go-ethereum/eth/downloader" + "github.com/ava-labs/go-ethereum/eth/filters" + "github.com/ava-labs/go-ethereum/eth/gasprice" + "github.com/ava-labs/go-ethereum/ethdb" + "github.com/ava-labs/go-ethereum/event" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/p2p" + "github.com/ava-labs/go-ethereum/p2p/enr" + "github.com/ava-labs/go-ethereum/params" + "github.com/ava-labs/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/rpc" ) type LesServer interface { diff --git a/eth/bloombits.go b/eth/bloombits.go index 9a31997..0119fad 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -20,13 +20,13 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/bitutil" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/bloombits" + "github.com/ava-labs/go-ethereum/core/rawdb" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/ethdb" ) const ( diff --git a/eth/config.go b/eth/config.go index b2f6fd4..a84f5af 100644 --- a/eth/config.go +++ b/eth/config.go @@ -24,14 +24,14 @@ import ( "runtime" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" + "github.com/ava-labs/go-ethereum/common/hexutil" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/consensus/ethash" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/eth/downloader" + "github.com/ava-labs/go-ethereum/eth/gasprice" "github.com/ava-labs/coreth/miner" - "github.com/ethereum/go-ethereum/params" + "github.com/ava-labs/go-ethereum/params" ) // DefaultConfig contains default settings for use on the Ethereum main net. diff --git a/eth/enr_entry.go b/eth/enr_entry.go index d9e7b95..d50328c 100644 --- a/eth/enr_entry.go +++ b/eth/enr_entry.go @@ -17,10 +17,10 @@ package eth import ( - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/forkid" + "github.com/ava-labs/go-ethereum/p2p/enode" + "github.com/ava-labs/go-ethereum/rlp" ) // ethEntry is the "eth" ENR entry which advertises eth protocol diff --git a/eth/gen_config.go b/eth/gen_config.go index b4020bf..7d54b6b 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -6,13 +6,13 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/consensus/ethash" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/eth/downloader" + "github.com/ava-labs/go-ethereum/eth/gasprice" "github.com/ava-labs/coreth/miner" - "github.com/ethereum/go-ethereum/params" + "github.com/ava-labs/go-ethereum/params" ) // MarshalTOML marshals as TOML. diff --git a/eth/handler.go b/eth/handler.go index 4ce2d1c..3e47b20 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -26,20 +26,20 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/fetcher" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/consensus" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/eth/downloader" + "github.com/ava-labs/go-ethereum/eth/fetcher" + "github.com/ava-labs/go-ethereum/ethdb" + "github.com/ava-labs/go-ethereum/event" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/p2p" + "github.com/ava-labs/go-ethereum/p2p/enode" + "github.com/ava-labs/go-ethereum/params" + "github.com/ava-labs/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/trie" ) const ( diff --git a/eth/metrics.go b/eth/metrics.go index 0533a2a..0729c44 100644 --- a/eth/metrics.go +++ b/eth/metrics.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "github.com/ava-labs/go-ethereum/metrics" + "github.com/ava-labs/go-ethereum/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index 814c787..9ce569c 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -24,10 +24,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/p2p" + "github.com/ava-labs/go-ethereum/rlp" ) var ( diff --git a/eth/protocol.go b/eth/protocol.go index de0c979..b60905f 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -21,11 +21,11 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/event" + "github.com/ava-labs/go-ethereum/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/sync.go b/eth/sync.go index 9e180ee..6f067a3 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/eth/downloader" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/p2p/enode" ) const ( diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index 94e7b39..c7b0383 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,17 +30,17 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/mclock" + "github.com/ava-labs/go-ethereum/consensus" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/types" "github.com/ava-labs/coreth/eth" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/event" + "github.com/ava-labs/go-ethereum/les" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/p2p" + "github.com/ava-labs/go-ethereum/rpc" "github.com/gorilla/websocket" ) diff --git a/examples/counter/main.go b/examples/counter/main.go index e7961e5..221291a 100644 --- a/examples/counter/main.go +++ b/examples/counter/main.go @@ -6,13 +6,13 @@ import ( "fmt" "github.com/ava-labs/coreth" "github.com/ava-labs/coreth/eth" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/compiler" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/compiler" + "github.com/ava-labs/go-ethereum/common/hexutil" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/params" "go/build" "math/big" "os" diff --git a/examples/payments/main.go b/examples/payments/main.go index db43319..0a69061 100644 --- a/examples/payments/main.go +++ b/examples/payments/main.go @@ -11,12 +11,12 @@ import ( //"encoding/hex" "github.com/ava-labs/coreth" "github.com/ava-labs/coreth/eth" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/hexutil" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/params" ) func checkError(err error) { diff --git a/internal/debug/api.go b/internal/debug/api.go index 86a4218..7fba1ee 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -34,7 +34,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ava-labs/go-ethereum/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 46c8fe9..3247ace 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,9 +24,9 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/exp" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/metrics" + "github.com/ava-labs/go-ethereum/metrics/exp" "github.com/fjl/memsize/memsizeui" colorable "github.com/mattn/go-colorable" "github.com/mattn/go-isatty" diff --git a/internal/debug/trace.go b/internal/debug/trace.go index cab5dea..898a1d7 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -23,7 +23,7 @@ import ( "os" "runtime/trace" - "github.com/ethereum/go-ethereum/log" + "github.com/ava-labs/go-ethereum/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 61ddff6..ab96ae1 100644 --- a/internal/ethapi/addrlock.go +++ b/internal/ethapi/addrlock.go @@ -19,7 +19,7 @@ package ethapi import ( "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 05204e5..767209f 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -26,24 +26,24 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/accounts" + "github.com/ava-labs/go-ethereum/accounts/keystore" + "github.com/ava-labs/go-ethereum/accounts/scwallet" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/hexutil" + "github.com/ava-labs/go-ethereum/common/math" + "github.com/ava-labs/go-ethereum/consensus/clique" + "github.com/ava-labs/go-ethereum/consensus/ethash" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/rawdb" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/core/vm" + "github.com/ava-labs/go-ethereum/crypto" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/p2p" + "github.com/ava-labs/go-ethereum/params" + "github.com/ava-labs/go-ethereum/rlp" + "github.com/ava-labs/go-ethereum/rpc" "github.com/tyler-smith/go-bip39" ) diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index 06c6db3..9ef3ea0 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -21,18 +21,18 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/accounts" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/bloombits" + "github.com/ava-labs/go-ethereum/core/state" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/core/vm" + "github.com/ava-labs/go-ethereum/eth/downloader" + "github.com/ava-labs/go-ethereum/ethdb" + "github.com/ava-labs/go-ethereum/event" + "github.com/ava-labs/go-ethereum/params" + "github.com/ava-labs/go-ethereum/rpc" ) // Backend interface provides the common API services (that are provided by diff --git a/miner/miner.go b/miner/miner.go index e4ff64c..51cded2 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -22,14 +22,14 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/common/hexutil" + "github.com/ava-labs/go-ethereum/consensus" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/state" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/event" + "github.com/ava-labs/go-ethereum/params" ) // Backend wraps all methods required for mining. diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 3a176e8..7e3c6a2 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -20,9 +20,9 @@ import ( "container/ring" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/log" ) // chainRetriever is used by the unconfirmed block set to verify whether a previously diff --git a/miner/worker.go b/miner/worker.go index 80fef3a..ec34bdf 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -29,15 +29,15 @@ import ( //"fmt" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/consensus" + "github.com/ava-labs/go-ethereum/consensus/misc" + "github.com/ava-labs/go-ethereum/core" + "github.com/ava-labs/go-ethereum/core/state" + "github.com/ava-labs/go-ethereum/core/types" + "github.com/ava-labs/go-ethereum/event" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/params" ) const ( diff --git a/node/api.go b/node/api.go index 66cd1dd..a6348ce 100644 --- a/node/api.go +++ b/node/api.go @@ -21,11 +21,11 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/common/hexutil" + "github.com/ava-labs/go-ethereum/crypto" + "github.com/ava-labs/go-ethereum/p2p" + "github.com/ava-labs/go-ethereum/p2p/enode" + "github.com/ava-labs/go-ethereum/rpc" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/node/config.go b/node/config.go index 1905ac7..73704a8 100644 --- a/node/config.go +++ b/node/config.go @@ -26,17 +26,17 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/external" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/accounts" + "github.com/ava-labs/go-ethereum/accounts/external" + "github.com/ava-labs/go-ethereum/accounts/keystore" + "github.com/ava-labs/go-ethereum/accounts/scwallet" + "github.com/ava-labs/go-ethereum/accounts/usbwallet" + "github.com/ava-labs/go-ethereum/common" + "github.com/ava-labs/go-ethereum/crypto" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/p2p" + "github.com/ava-labs/go-ethereum/p2p/enode" + "github.com/ava-labs/go-ethereum/rpc" ) const ( diff --git a/node/defaults.go b/node/defaults.go index f84a5d5..69299a7 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,9 +22,9 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/p2p" + "github.com/ava-labs/go-ethereum/p2p/nat" + "github.com/ava-labs/go-ethereum/rpc" ) const ( diff --git a/node/node.go b/node/node.go index decf567..e65fc79 100644 --- a/node/node.go +++ b/node/node.go @@ -27,13 +27,13 @@ import ( "sync" "github.com/ava-labs/coreth/internal/debug" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/accounts" + "github.com/ava-labs/go-ethereum/core/rawdb" + "github.com/ava-labs/go-ethereum/ethdb" + "github.com/ava-labs/go-ethereum/event" + "github.com/ava-labs/go-ethereum/log" + "github.com/ava-labs/go-ethereum/p2p" + "github.com/ava-labs/go-ethereum/rpc" "github.com/prometheus/tsdb/fileutil" ) diff --git a/node/service.go b/node/service.go index 9f54ba4..f72ac54 100644 --- a/node/service.go +++ b/node/service.go @@ -20,12 +20,12 @@ import ( "path/filepath" "reflect" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ava-labs/go-ethereum/accounts" + "github.com/ava-labs/go-ethereum/core/rawdb" + "github.com/ava-labs/go-ethereum/ethdb" + "github.com/ava-labs/go-ethereum/event" + "github.com/ava-labs/go-ethereum/p2p" + "github.com/ava-labs/go-ethereum/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/vendor/github.com/ethereum/go-ethereum b/vendor/github.com/ethereum/go-ethereum deleted file mode 160000 -Subproject c9cdf144d55f6bbd75314e812eeefc18d7e8c40 |