From d4326196d7c2713710f47f0b68811bf7e0f176cb Mon Sep 17 00:00:00 2001
From: Aaron Buchwald <aaron.buchwald56@gmail.com>
Date: Tue, 15 Sep 2020 13:13:27 -0400
Subject: Update to avalanchego v0.8.3
---
go.mod | 2 +-
go.sum | 10 +++++++--
main | Bin 0 -> 45160508 bytes
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 +-
14 files changed, 74 insertions(+), 68 deletions(-)
create mode 100755 main
diff --git a/go.mod b/go.mod
index 3e1b53f..ebb79cf 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/ava-labs/coreth
go 1.14
require (
- github.com/ava-labs/avalanche-go v0.8.0-beta
+ github.com/ava-labs/avalanchego v0.8.3
github.com/ava-labs/go-ethereum v1.9.3
github.com/davecgh/go-spew v1.1.1
github.com/deckarep/golang-set v1.7.1
diff --git a/go.sum b/go.sum
index 46dea35..9d5c6bb 100644
--- a/go.sum
+++ b/go.sum
@@ -21,11 +21,15 @@ github.com/aristanetworks/goarista v0.0.0-20200520141224-0f14e646773f/go.mod h1:
github.com/aristanetworks/goarista v0.0.0-20200812190859-4cb0e71f3c0e h1:tkEt0le4Lv5+VmcxZPIVSrP8LVPLhndIm/BOP7iPh/w=
github.com/aristanetworks/goarista v0.0.0-20200812190859-4cb0e71f3c0e/go.mod h1:QZe5Yh80Hp1b6JxQdpfSEEe8X7hTyTEZSosSrFf/oJE=
github.com/aristanetworks/splunk-hec-go v0.3.3/go.mod h1:1VHO9r17b0K7WmOlLb9nTk/2YanvOEnLMUgsFrxBROc=
-github.com/ava-labs/avalanche-go v0.8.0-beta h1:VdSvj5DKIdzdmK0tk8l1jQIc1m3N7KRTHXTW+9I1LfI=
github.com/ava-labs/avalanche-go v0.8.0-beta/go.mod h1:quYojL1hu0ue2glUT1ng28kADs9R94zGdEvfW0/HRg8=
-github.com/ava-labs/avalanche-go v0.8.0 h1:aAt4roNkkaQx8jgQeKDvTGqSJ2h++rilBAK/xo/uYqo=
+github.com/ava-labs/avalanchego v0.8.0-beta h1:VdSvj5DKIdzdmK0tk8l1jQIc1m3N7KRTHXTW+9I1LfI=
+github.com/ava-labs/avalanchego v0.8.0-beta/go.mod h1:quYojL1hu0ue2glUT1ng28kADs9R94zGdEvfW0/HRg8=
+github.com/ava-labs/avalanchego v0.8.0 h1:aAt4roNkkaQx8jgQeKDvTGqSJ2h++rilBAK/xo/uYqo=
+github.com/ava-labs/avalanchego v0.8.3 h1:ioc7RtSAzIv40qxHDikhqZGVxF3y+8cXeIrLpGz9jtc=
+github.com/ava-labs/avalanchego v0.8.3/go.mod h1:6zPzQv7m6vSvdKAwH+lLTga0IMd/0+HLMT5OULrpFcU=
github.com/ava-labs/coreth v0.2.5/go.mod h1:pGolKipwq5vGIY2IBBcBkMYrqniXMsS5SBn+BBi4+Js=
github.com/ava-labs/coreth v0.2.14-rc.1/go.mod h1:Zhb60GFIB7G5AnUCks0Jo4Rezx/EovL8o+z51aBF1A8=
+github.com/ava-labs/coreth v0.2.15-rc.4/go.mod h1:+sK2XGKCNA48uzeHWe4iBzmiOBYmYvnnzLtOkQeQfkk=
github.com/ava-labs/gecko v0.6.1-rc.1/go.mod h1:TT6uA1BETZpVMR0xiFtE8I5Mv4DULlS+lAL3xuYKnpA=
github.com/ava-labs/go-ethereum v1.9.3 h1:GmnMZ/dlvVAPFmWBzEpRJX49pUAymPfoASLNRJqR0AY=
github.com/ava-labs/go-ethereum v1.9.3/go.mod h1:a+agc6fXfZFsPZCylA3ry4Y8CLCqLKg3Rc23NXZ9aw8=
@@ -83,6 +87,7 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
@@ -138,6 +143,7 @@ github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0U
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd h1:rNuUHR+CvK1IS89MMtcF0EpcVMZtjKfPRp4MEmt/aTs=
github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI=
+github.com/hashicorp/go-hclog v0.14.1 h1:nQcJDQwIAGnmoUWp8ubocEX40cCml/17YkF6csQLReU=
github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
github.com/hashicorp/go-plugin v1.3.0 h1:4d/wJojzvHV1I4i/rrjVaeuyxWrLzDE1mDCyDy8fXS8=
github.com/hashicorp/go-plugin v1.3.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0=
diff --git a/main b/main
new file mode 100755
index 0000000..a91aa85
Binary files /dev/null and b/main differ
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-70-g09d2