From d4326196d7c2713710f47f0b68811bf7e0f176cb Mon Sep 17 00:00:00 2001 From: Aaron Buchwald Date: Tue, 15 Sep 2020 13:13:27 -0400 Subject: Update to avalanchego v0.8.3 --- plugin/evm/block.go | 8 +++---- plugin/evm/database.go | 2 +- plugin/evm/export_tx.go | 16 +++++++------- plugin/evm/factory.go | 2 +- plugin/evm/import_tx.go | 14 ++++++------ plugin/evm/service.go | 10 ++++----- plugin/evm/static_service.go | 2 +- plugin/evm/tx.go | 16 +++++++------- plugin/evm/user.go | 6 ++--- plugin/evm/vm.go | 52 ++++++++++++++++++++++---------------------- plugin/main.go | 2 +- 11 files changed, 65 insertions(+), 65 deletions(-) (limited to 'plugin') diff --git a/plugin/evm/block.go b/plugin/evm/block.go index 97ffc18..134fa29 100644 --- a/plugin/evm/block.go +++ b/plugin/evm/block.go @@ -10,10 +10,10 @@ import ( "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/go-ethereum/rlp" - "github.com/ava-labs/avalanche-go/ids" - "github.com/ava-labs/avalanche-go/snow/choices" - "github.com/ava-labs/avalanche-go/snow/consensus/snowman" - "github.com/ava-labs/avalanche-go/vms/components/missing" + "github.com/ava-labs/avalanchego/ids" + "github.com/ava-labs/avalanchego/snow/choices" + "github.com/ava-labs/avalanchego/snow/consensus/snowman" + "github.com/ava-labs/avalanchego/vms/components/missing" ) // Block implements the snowman.Block interface diff --git a/plugin/evm/database.go b/plugin/evm/database.go index 1300bbb..aedbc9b 100644 --- a/plugin/evm/database.go +++ b/plugin/evm/database.go @@ -8,7 +8,7 @@ import ( "github.com/ava-labs/go-ethereum/ethdb" - "github.com/ava-labs/avalanche-go/database" + "github.com/ava-labs/avalanchego/database" ) var ( diff --git a/plugin/evm/export_tx.go b/plugin/evm/export_tx.go index 77f4efe..43f858c 100644 --- a/plugin/evm/export_tx.go +++ b/plugin/evm/export_tx.go @@ -10,14 +10,14 @@ import ( "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/go-ethereum/log" - "github.com/ava-labs/avalanche-go/chains/atomic" - "github.com/ava-labs/avalanche-go/database" - "github.com/ava-labs/avalanche-go/ids" - "github.com/ava-labs/avalanche-go/snow" - "github.com/ava-labs/avalanche-go/utils/crypto" - safemath "github.com/ava-labs/avalanche-go/utils/math" - "github.com/ava-labs/avalanche-go/vms/components/avax" - "github.com/ava-labs/avalanche-go/vms/secp256k1fx" + "github.com/ava-labs/avalanchego/chains/atomic" + "github.com/ava-labs/avalanchego/database" + "github.com/ava-labs/avalanchego/ids" + "github.com/ava-labs/avalanchego/snow" + "github.com/ava-labs/avalanchego/utils/crypto" + safemath "github.com/ava-labs/avalanchego/utils/math" + "github.com/ava-labs/avalanchego/vms/components/avax" + "github.com/ava-labs/avalanchego/vms/secp256k1fx" ) // UnsignedExportTx is an unsigned ExportTx diff --git a/plugin/evm/factory.go b/plugin/evm/factory.go index 4fe6047..593d85b 100644 --- a/plugin/evm/factory.go +++ b/plugin/evm/factory.go @@ -4,7 +4,7 @@ package evm import ( - "github.com/ava-labs/avalanche-go/ids" + "github.com/ava-labs/avalanchego/ids" ) // ID this VM should be referenced by diff --git a/plugin/evm/import_tx.go b/plugin/evm/import_tx.go index e09f145..c6ad2d9 100644 --- a/plugin/evm/import_tx.go +++ b/plugin/evm/import_tx.go @@ -9,13 +9,13 @@ import ( "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/avalanche-go/database" - "github.com/ava-labs/avalanche-go/ids" - "github.com/ava-labs/avalanche-go/snow" - "github.com/ava-labs/avalanche-go/utils/crypto" - "github.com/ava-labs/avalanche-go/utils/math" - "github.com/ava-labs/avalanche-go/vms/components/avax" - "github.com/ava-labs/avalanche-go/vms/secp256k1fx" + "github.com/ava-labs/avalanchego/database" + "github.com/ava-labs/avalanchego/ids" + "github.com/ava-labs/avalanchego/snow" + "github.com/ava-labs/avalanchego/utils/crypto" + "github.com/ava-labs/avalanchego/utils/math" + "github.com/ava-labs/avalanchego/vms/components/avax" + "github.com/ava-labs/avalanchego/vms/secp256k1fx" "github.com/ava-labs/go-ethereum/common" ) diff --git a/plugin/evm/service.go b/plugin/evm/service.go index 2979f46..33429b5 100644 --- a/plugin/evm/service.go +++ b/plugin/evm/service.go @@ -15,11 +15,11 @@ import ( "github.com/ava-labs/coreth" "github.com/ava-labs/coreth/core/types" - "github.com/ava-labs/avalanche-go/api" - "github.com/ava-labs/avalanche-go/utils/constants" - "github.com/ava-labs/avalanche-go/utils/crypto" - "github.com/ava-labs/avalanche-go/utils/formatting" - "github.com/ava-labs/avalanche-go/utils/json" + "github.com/ava-labs/avalanchego/api" + "github.com/ava-labs/avalanchego/utils/constants" + "github.com/ava-labs/avalanchego/utils/crypto" + "github.com/ava-labs/avalanchego/utils/formatting" + "github.com/ava-labs/avalanchego/utils/json" "github.com/ava-labs/go-ethereum/common" "github.com/ava-labs/go-ethereum/common/hexutil" ethcrypto "github.com/ava-labs/go-ethereum/crypto" diff --git a/plugin/evm/static_service.go b/plugin/evm/static_service.go index a379c44..1e48734 100644 --- a/plugin/evm/static_service.go +++ b/plugin/evm/static_service.go @@ -8,7 +8,7 @@ import ( "encoding/json" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/avalanche-go/utils/formatting" + "github.com/ava-labs/avalanchego/utils/formatting" ) // StaticService defines the static API services exposed by the evm diff --git a/plugin/evm/tx.go b/plugin/evm/tx.go index 70386dd..e573580 100644 --- a/plugin/evm/tx.go +++ b/plugin/evm/tx.go @@ -9,14 +9,14 @@ import ( "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/avalanche-go/database" - "github.com/ava-labs/avalanche-go/ids" - "github.com/ava-labs/avalanche-go/snow" - "github.com/ava-labs/avalanche-go/utils/codec" - "github.com/ava-labs/avalanche-go/utils/crypto" - "github.com/ava-labs/avalanche-go/utils/hashing" - "github.com/ava-labs/avalanche-go/vms/components/verify" - "github.com/ava-labs/avalanche-go/vms/secp256k1fx" + "github.com/ava-labs/avalanchego/database" + "github.com/ava-labs/avalanchego/ids" + "github.com/ava-labs/avalanchego/snow" + "github.com/ava-labs/avalanchego/utils/codec" + "github.com/ava-labs/avalanchego/utils/crypto" + "github.com/ava-labs/avalanchego/utils/hashing" + "github.com/ava-labs/avalanchego/vms/components/verify" + "github.com/ava-labs/avalanchego/vms/secp256k1fx" "github.com/ava-labs/go-ethereum/common" ) diff --git a/plugin/evm/user.go b/plugin/evm/user.go index 65dbe0c..cfa302b 100644 --- a/plugin/evm/user.go +++ b/plugin/evm/user.go @@ -7,9 +7,9 @@ import ( "errors" "fmt" - "github.com/ava-labs/avalanche-go/database" - "github.com/ava-labs/avalanche-go/ids" - "github.com/ava-labs/avalanche-go/utils/crypto" + "github.com/ava-labs/avalanchego/database" + "github.com/ava-labs/avalanchego/ids" + "github.com/ava-labs/avalanchego/utils/crypto" "github.com/ava-labs/go-ethereum/common" ) diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go index a1224d4..a30a58f 100644 --- a/plugin/evm/vm.go +++ b/plugin/evm/vm.go @@ -28,29 +28,29 @@ import ( ethcrypto "github.com/ava-labs/go-ethereum/crypto" - geckorpc "github.com/gorilla/rpc/v2" - - "github.com/ava-labs/avalanche-go/api/admin" - "github.com/ava-labs/avalanche-go/cache" - "github.com/ava-labs/avalanche-go/database" - "github.com/ava-labs/avalanche-go/database/prefixdb" - "github.com/ava-labs/avalanche-go/ids" - "github.com/ava-labs/avalanche-go/snow" - "github.com/ava-labs/avalanche-go/snow/choices" - "github.com/ava-labs/avalanche-go/snow/consensus/snowman" - "github.com/ava-labs/avalanche-go/utils/codec" - "github.com/ava-labs/avalanche-go/utils/constants" - "github.com/ava-labs/avalanche-go/utils/crypto" - "github.com/ava-labs/avalanche-go/utils/formatting" - "github.com/ava-labs/avalanche-go/utils/logging" - "github.com/ava-labs/avalanche-go/utils/timer" - "github.com/ava-labs/avalanche-go/utils/units" - "github.com/ava-labs/avalanche-go/utils/wrappers" - "github.com/ava-labs/avalanche-go/vms/components/avax" - "github.com/ava-labs/avalanche-go/vms/secp256k1fx" - - commonEng "github.com/ava-labs/avalanche-go/snow/engine/common" - geckojson "github.com/ava-labs/avalanche-go/utils/json" + avalancheRPC "github.com/gorilla/rpc/v2" + + "github.com/ava-labs/avalanchego/api/admin" + "github.com/ava-labs/avalanchego/cache" + "github.com/ava-labs/avalanchego/database" + "github.com/ava-labs/avalanchego/database/prefixdb" + "github.com/ava-labs/avalanchego/ids" + "github.com/ava-labs/avalanchego/snow" + "github.com/ava-labs/avalanchego/snow/choices" + "github.com/ava-labs/avalanchego/snow/consensus/snowman" + "github.com/ava-labs/avalanchego/utils/codec" + "github.com/ava-labs/avalanchego/utils/constants" + "github.com/ava-labs/avalanchego/utils/crypto" + "github.com/ava-labs/avalanchego/utils/formatting" + "github.com/ava-labs/avalanchego/utils/logging" + "github.com/ava-labs/avalanchego/utils/timer" + "github.com/ava-labs/avalanchego/utils/units" + "github.com/ava-labs/avalanchego/utils/wrappers" + "github.com/ava-labs/avalanchego/vms/components/avax" + "github.com/ava-labs/avalanchego/vms/secp256k1fx" + + commonEng "github.com/ava-labs/avalanchego/snow/engine/common" + avalancheJSON "github.com/ava-labs/avalanchego/utils/json" ) var ( @@ -504,9 +504,9 @@ func (vm *VM) LastAccepted() ids.ID { // By default the LockOption is WriteLock // [lockOption] should have either 0 or 1 elements. Elements beside the first are ignored. func newHandler(name string, service interface{}, lockOption ...commonEng.LockOption) *commonEng.HTTPHandler { - server := geckorpc.NewServer() - server.RegisterCodec(geckojson.NewCodec(), "application/json") - server.RegisterCodec(geckojson.NewCodec(), "application/json;charset=UTF-8") + server := avalancheRPC.NewServer() + server.RegisterCodec(avalancheJSON.NewCodec(), "application/json") + server.RegisterCodec(avalancheJSON.NewCodec(), "application/json;charset=UTF-8") server.RegisterService(service, name) var lock commonEng.LockOption = commonEng.WriteLock diff --git a/plugin/main.go b/plugin/main.go index 1f2f107..c79a305 100644 --- a/plugin/main.go +++ b/plugin/main.go @@ -3,7 +3,7 @@ package main import ( "github.com/hashicorp/go-plugin" - "github.com/ava-labs/avalanche-go/vms/rpcchainvm" + "github.com/ava-labs/avalanchego/vms/rpcchainvm" "github.com/ava-labs/coreth/plugin/evm" ) -- cgit v1.2.3