From c6c0b1d61d7829299b68ff3edacf46ad00354afd Mon Sep 17 00:00:00 2001 From: Dan Laine Date: Tue, 18 Jul 2023 10:02:30 -0400 Subject: [PATCH] Rename sorting method imported from avalanchego (#272) * update avalanchego version * rename sorting method import * update avalanchego dep * fix sorting method name * fix sorting method name for real --- go.mod | 2 +- go.sum | 4 ++-- plugin/evm/export_tx.go | 2 +- plugin/evm/import_tx.go | 4 ++-- scripts/versions.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index aaae726725..f534b8aaae 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/VictoriaMetrics/fastcache v1.10.0 - github.com/ava-labs/avalanchego v1.10.4 + github.com/ava-labs/avalanchego v1.10.5-rc.1 github.com/cespare/cp v0.1.0 github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 github.com/davecgh/go-spew v1.1.1 diff --git a/go.sum b/go.sum index 3ecf85cdc3..389a8f166b 100644 --- a/go.sum +++ b/go.sum @@ -65,8 +65,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/ava-labs/avalanchego v1.10.4 h1:wGldIq/zn7DTE8TvsBKq6UjyICXb9HY5joNOX73ovEU= -github.com/ava-labs/avalanchego v1.10.4/go.mod h1:lQNBWn4f27MWJGH9Jj1zOX1GlJDeHofMG/TBRaqSNSg= +github.com/ava-labs/avalanchego v1.10.5-rc.1 h1:hFgEI2y7pYUE9F7P6SsMJDpPV5Qm2faoCHIfswcYu3A= +github.com/ava-labs/avalanchego v1.10.5-rc.1/go.mod h1:azK88lcF5jwcPSp//RKUh2VncmrZZUrKu998C7no4Ys= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/plugin/evm/export_tx.go b/plugin/evm/export_tx.go index 88f1352ac9..bf0a1b2af4 100644 --- a/plugin/evm/export_tx.go +++ b/plugin/evm/export_tx.go @@ -118,7 +118,7 @@ func (utx *UnsignedExportTx) Verify( if !avax.IsSortedTransferableOutputs(utx.ExportedOutputs, Codec) { return errOutputsNotSorted } - if rules.IsApricotPhase1 && !utils.IsSortedAndUniqueSortable(utx.Ins) { + if rules.IsApricotPhase1 && !utils.IsSortedAndUnique(utx.Ins) { return errInputsNotSortedUnique } diff --git a/plugin/evm/import_tx.go b/plugin/evm/import_tx.go index 233b94e6ae..8b034182c4 100644 --- a/plugin/evm/import_tx.go +++ b/plugin/evm/import_tx.go @@ -107,12 +107,12 @@ func (utx *UnsignedImportTx) Verify( return errImportNonAVAXInputBanff } } - if !utils.IsSortedAndUniqueSortable(utx.ImportedInputs) { + if !utils.IsSortedAndUnique(utx.ImportedInputs) { return errInputsNotSortedUnique } if rules.IsApricotPhase2 { - if !utils.IsSortedAndUniqueSortable(utx.Outs) { + if !utils.IsSortedAndUnique(utx.Outs) { return errOutputsNotSortedUnique } } else if rules.IsApricotPhase1 { diff --git a/scripts/versions.sh b/scripts/versions.sh index 93e2bd5197..ea31ca7aee 100644 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash # Don't export them as they're used in the context of other calls -avalanche_version=${AVALANCHE_VERSION:-'v1.10.4'} +avalanche_version=${AVALANCHE_VERSION:-'v1.10.5-rc.1'}