mergedv0.3.5-rc.2

3 files changed, 29 insertions, 30 deletions

diff --git a/go.mod b/go.mod
index 5d6dfe9..df0881b 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.14
 
 require (
 	github.com/VictoriaMetrics/fastcache v1.5.7
-	github.com/ava-labs/avalanchego v1.0.0
+	github.com/ava-labs/avalanchego v1.0.2-rc.1
 	github.com/davecgh/go-spew v1.1.1
 	github.com/deckarep/golang-set v1.7.1
 	github.com/edsrzf/mmap-go v1.0.0
diff --git a/go.sum b/go.sum
index 81c7c0a..145ac52 100644
--- a/go.sum
+++ b/go.sum
@@ -40,9 +40,9 @@ github.com/aristanetworks/goarista v0.0.0-20200812190859-4cb0e71f3c0e/go.mod h1:
 github.com/aristanetworks/splunk-hec-go v0.3.3/go.mod h1:1VHO9r17b0K7WmOlLb9nTk/2YanvOEnLMUgsFrxBROc=
 github.com/ava-labs/avalanche-go v0.8.0-beta/go.mod h1:quYojL1hu0ue2glUT1ng28kADs9R94zGdEvfW0/HRg8=
 github.com/ava-labs/avalanchego v0.8.3/go.mod h1:6zPzQv7m6vSvdKAwH+lLTga0IMd/0+HLMT5OULrpFcU=
-github.com/ava-labs/avalanchego v1.0.0 h1:xpqiPJS4Gftm6iKrBQJX7tpU8y0QvnyAcznlqOOsriM=
-github.com/ava-labs/avalanchego v1.0.0/go.mod h1:0N34atGvJCfJaIjFkHBDG5QzqlSJlsC07/d9irZfA7Y=
 github.com/ava-labs/avalanchego v1.0.1 h1:zCJzU+HhmLWcK8uTa91S3MY8Fll2S7bmN2xvLgEhwlA=
+github.com/ava-labs/avalanchego v1.0.2-rc.1 h1:Io4Ok8jXuafnt5MYonWXw/sv9XYw2MzuwXFnJyawfWk=
+github.com/ava-labs/avalanchego v1.0.2-rc.1/go.mod h1:JAkAaaj0AlCDSnfFHZwfcEPA2Sl+fOwyLJ6veWMjQWE=
 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/coreth v0.3.4/go.mod h1:d5h8SoFyMOoFqg2gHzYgftZlKgZ1MHKKydjyq2hoABk=
diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
index 4fbfe02..f19c105 100644
--- a/plugin/evm/vm.go
+++ b/plugin/evm/vm.go
@@ -89,33 +89,32 @@ const (
 var (
 	txFee = units.MilliAvax
 
-	errEmptyBlock                      = errors.New("empty block")
-	errCreateBlock                     = errors.New("couldn't create block")
-	errUnknownBlock                    = errors.New("unknown block")
-	errBlockFrequency                  = errors.New("too frequent block issuance")
-	errUnsupportedFXs                  = errors.New("unsupported feature extensions")
-	errInvalidBlock                    = errors.New("invalid block")
-	errInvalidAddr                     = errors.New("invalid hex address")
-	errTooManyAtomicTx                 = errors.New("too many pending atomic txs")
-	errAssetIDMismatch                 = errors.New("asset IDs in the input don't match the utxo")
-	errWrongNumberOfCredentials        = errors.New("should have the same number of credentials as inputs")
-	errNoInputs                        = errors.New("tx has no inputs")
-	errNoImportInputs                  = errors.New("tx has no imported inputs")
-	errInputsNotSortedUnique           = errors.New("inputs not sorted and unique")
-	errPublicKeySignatureMismatch      = errors.New("signature doesn't match public key")
-	errSignatureInputsMismatch         = errors.New("number of inputs does not match number of signatures")
-	errUnknownAsset                    = errors.New("unknown asset ID")
-	errNoFunds                         = errors.New("no spendable funds were found")
-	errWrongChainID                    = errors.New("tx has wrong chain ID")
-	errInsufficientFunds               = errors.New("insufficient funds")
-	errNoExportOutputs                 = errors.New("tx has no export outputs")
-	errExportOutputsNotSortedAndUnique = errors.New("tx export outputs are not sorted and unique")
-	errOutputsNotSorted                = errors.New("tx outputs not sorted")
-	errNoImportOutputs                 = errors.New("tx has no outputs to import")
-	errNoExportInputs                  = errors.New("tx has no inputs to export")
-	errInputsNotSortedAndUnique        = errors.New("inputs not sorted and unique")
-	errOverflowExport                  = errors.New("overflow when computing export amount + txFee")
-	errInvalidNonce                    = errors.New("invalid nonce")
+	errEmptyBlock                 = errors.New("empty block")
+	errCreateBlock                = errors.New("couldn't create block")
+	errUnknownBlock               = errors.New("unknown block")
+	errBlockFrequency             = errors.New("too frequent block issuance")
+	errUnsupportedFXs             = errors.New("unsupported feature extensions")
+	errInvalidBlock               = errors.New("invalid block")
+	errInvalidAddr                = errors.New("invalid hex address")
+	errTooManyAtomicTx            = errors.New("too many pending atomic txs")
+	errAssetIDMismatch            = errors.New("asset IDs in the input don't match the utxo")
+	errWrongNumberOfCredentials   = errors.New("should have the same number of credentials as inputs")
+	errNoInputs                   = errors.New("tx has no inputs")
+	errNoImportInputs             = errors.New("tx has no imported inputs")
+	errInputsNotSortedUnique      = errors.New("inputs not sorted and unique")
+	errPublicKeySignatureMismatch = errors.New("signature doesn't match public key")
+	errSignatureInputsMismatch    = errors.New("number of inputs does not match number of signatures")
+	errUnknownAsset               = errors.New("unknown asset ID")
+	errNoFunds                    = errors.New("no spendable funds were found")
+	errWrongChainID               = errors.New("tx has wrong chain ID")
+	errInsufficientFunds          = errors.New("insufficient funds")
+	errNoExportOutputs            = errors.New("tx has no export outputs")
+	errOutputsNotSorted           = errors.New("tx outputs not sorted")
+	errNoImportOutputs            = errors.New("tx has no outputs to import")
+	errNoExportInputs             = errors.New("tx has no inputs to export")
+	errInputsNotSortedAndUnique   = errors.New("inputs not sorted and unique")
+	errOverflowExport             = errors.New("overflow when computing export amount + txFee")
+	errInvalidNonce               = errors.New("invalid nonce")
 )
 
 func maxDuration(x, y time.Duration) time.Duration {