Merge pull request #295 from ava-labs/bump-avalanchego-v1.4.12

go.mod

@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	github.com/VictoriaMetrics/fastcache v1.5.7
-	github.com/ava-labs/avalanchego v1.4.12-rc.1
+	github.com/ava-labs/avalanchego v1.4.12
 	github.com/btcsuite/btcd v0.21.0-beta // indirect
 	github.com/cespare/cp v0.1.0
 	github.com/davecgh/go-spew v1.1.1

go.sum

@@ -60,10 +60,8 @@ github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VT
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/ava-labs/avalanchego v1.4.12-rc.0 h1:byUeto1Q9cfxkM8Cb0+dNo6fq2uZR+9MGYEM6YhvqxY=
-github.com/ava-labs/avalanchego v1.4.12-rc.0/go.mod h1:aleAWKvMQ/mblB4dXWWvlbq8787TmwR7+3WizYtogTM=
-github.com/ava-labs/avalanchego v1.4.12-rc.1 h1:S1d9s6U53uXszX7uwM+IB6zrv9JiCe7MJRXs2TM8jTs=
-github.com/ava-labs/avalanchego v1.4.12-rc.1/go.mod h1:aleAWKvMQ/mblB4dXWWvlbq8787TmwR7+3WizYtogTM=
+github.com/ava-labs/avalanchego v1.4.12 h1:nFvjWoBd6CBk90OGreIEUekxTt0x+U17s79bWi/1Ego=
+github.com/ava-labs/avalanchego v1.4.12/go.mod h1:aleAWKvMQ/mblB4dXWWvlbq8787TmwR7+3WizYtogTM=
 github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo=
 github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y=
 github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo=

plugin/evm/client.go

@@ -34,7 +34,7 @@ func NewCChainClient(uri string, requestTimeout time.Duration) *Client {
 // IssueTx issues a transaction to a node and returns the TxID
 func (c *Client) IssueTx(txBytes []byte) (ids.ID, error) {
 	res := &api.JSONTxID{}
-	txStr, err := formatting.Encode(formatting.Hex, txBytes)
+	txStr, err := formatting.EncodeWithChecksum(formatting.Hex, txBytes)
 	if err != nil {
 		return res.TxID, fmt.Errorf("problem hex encoding bytes: %w", err)
 	}

plugin/evm/service.go

@@ -146,7 +146,7 @@ func (service *AvaxAPI) ExportKey(r *http.Request, args *ExportKeyArgs, reply *E
 	if err != nil {
 		return fmt.Errorf("problem retrieving private key: %w", err)
 	}
-	encodedKey, err := formatting.Encode(formatting.CB58, sk.Bytes())
+	encodedKey, err := formatting.EncodeWithChecksum(formatting.CB58, sk.Bytes())
 	if err != nil {
 		return fmt.Errorf("problem encoding bytes as cb58: %w", err)
 	}
@@ -398,7 +398,7 @@ func (service *AvaxAPI) GetUTXOs(r *http.Request, args *api.GetUTXOsArgs, reply
 		if err != nil {
 			return fmt.Errorf("problem marshalling UTXO: %w", err)
 		}
-		str, err := formatting.Encode(args.Encoding, b)
+		str, err := formatting.EncodeWithChecksum(args.Encoding, b)
 		if err != nil {
 			return fmt.Errorf("problem encoding utxo: %w", err)
 		}
@@ -500,7 +500,7 @@ func (service *AvaxAPI) GetAtomicTx(r *http.Request, args *api.GetTxArgs, reply
 		return fmt.Errorf("could not find tx %s", args.TxID)
 	}
 
-	txBytes, err := formatting.Encode(args.Encoding, tx.Bytes())
+	txBytes, err := formatting.EncodeWithChecksum(args.Encoding, tx.Bytes())
 	if err != nil {
 		return err
 	}

plugin/evm/static_service.go

@@ -27,7 +27,7 @@ func (*StaticService) BuildGenesis(_ context.Context, args *core.Genesis) (*Buil
 	if err != nil {
 		return nil, err
 	}
-	bytesStr, err := formatting.Encode(formatting.Hex, bytes)
+	bytesStr, err := formatting.EncodeWithChecksum(formatting.Hex, bytes)
 	if err != nil {
 		return nil, err
 	}

scripts/versions.sh

@@ -3,4 +3,4 @@
 # Set up the versions to be used
 coreth_version=${CORETH_VERSION:-'v0.5.7'}
 # Don't export them as they're used in the context of other calls
-avalanche_version=${AVALANCHE_VERSION:-'v1.4.12-rc.1'}
+avalanche_version=${AVALANCHE_VERSION:-'v1.4.12'}