From 2d3c5b7efe81d4d94d87b0f54e78e04cb94e709f Mon Sep 17 00:00:00 2001 From: Patrick O'Grady Date: Tue, 21 Dec 2021 11:44:05 -0600 Subject: [PATCH] AvalancheGo@v1.7.3 (#64) * update versions * update C-Chain config * go mod tidy * new version of coreth * fix atomic txs --- Makefile | 2 +- docker/entrypoint.sh | 7 +------ go.mod | 4 ++-- go.sum | 12 +++++------- mapper/transaction.go | 3 +-- service/rosetta.go | 4 ++-- 6 files changed, 12 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index b37e93a1..65a3d146 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ DOCKER_ORG ?= avaplatform DOCKER_IMAGE ?= ${DOCKER_ORG}/${PROJECT} DOCKER_LABEL ?= latest DOCKER_TAG ?= ${DOCKER_IMAGE}:${DOCKER_LABEL} -AVALANCHE_VERSION ?= v1.7.2 +AVALANCHE_VERSION ?= v1.7.3 build: go build -o ./rosetta-server ./cmd/server diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 6e82289d..f2be2766 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -25,14 +25,9 @@ cat < /app/configs/chains/C/config.json { "snowman-api-enabled": false, "coreth-admin-api-enabled": false, - "net-api-enabled": true, "rpc-gas-cap": 2500000000, "rpc-tx-fee-cap": 100, - "eth-api-enabled": true, - "personal-api-enabled": false, - "tx-pool-api-enabled": true, - "debug-api-enabled": true, - "web3-api-enabled": true, + "eth-apis": ["internal-public-eth","internal-public-blockchain","internal-public-transaction-pool","internal-public-tx-pool","internal-public-debug","internal-private-debug","debug-tracer","web3","public-eth","public-eth-filter","public-debug","private-debug","net"], "pruning-enabled": false } EOF diff --git a/go.mod b/go.mod index 899f800d..0b6a2351 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.16 require ( github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect - github.com/ava-labs/avalanchego v1.7.2 - github.com/ava-labs/coreth v0.8.2-rc.0 + github.com/ava-labs/avalanchego v1.7.3 + github.com/ava-labs/coreth v0.8.3-rc.2 github.com/coinbase/rosetta-sdk-go v0.6.5 github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0 // indirect github.com/ethereum/go-ethereum v1.10.12 diff --git a/go.sum b/go.sum index 5bb86767..655ce2f7 100644 --- a/go.sum +++ b/go.sum @@ -74,11 +74,10 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5 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/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/ava-labs/avalanchego v1.7.1/go.mod h1:jwfTpP+SB9AZVnHBuh3/d2WNbsIgGwUpqOfOgtEkelk= -github.com/ava-labs/avalanchego v1.7.2 h1:FLlldL4+GVv7lhGsk92giUBeY+sYuCw21T/Z2BKpE94= -github.com/ava-labs/avalanchego v1.7.2/go.mod h1:jwfTpP+SB9AZVnHBuh3/d2WNbsIgGwUpqOfOgtEkelk= -github.com/ava-labs/coreth v0.8.2-rc.0 h1:B1YuHNY3MeK0QfYWy67wlfoAct5xPXVnvbBPcjLhYlQ= -github.com/ava-labs/coreth v0.8.2-rc.0/go.mod h1:N3+QxOXfZYZo0mU5hwcrEYLTj+c1zY7LjXg+6NMq5rk= +github.com/ava-labs/avalanchego v1.7.3 h1:ry+D4AUBTdQqbgYU9RDE5/WW4byXk+SLASvxT6TiluY= +github.com/ava-labs/avalanchego v1.7.3/go.mod h1:YPIP9GyzXKjscsWlvbPWvV0TQcgV+0t8rMe8sLvc0xQ= +github.com/ava-labs/coreth v0.8.3-rc.2 h1:GRhUWu0yrIY79FwdB7xeRSa/YQR4sfbUDuz7K34wJvQ= +github.com/ava-labs/coreth v0.8.3-rc.2/go.mod h1:DnjBx3HhuiD1h879aE5iRjh9kfNupptROxL5ipoLxn4= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= @@ -353,12 +352,11 @@ github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE= github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-plugin v1.3.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0= +github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= diff --git a/mapper/transaction.go b/mapper/transaction.go index 52547220..20eaf00e 100644 --- a/mapper/transaction.go +++ b/mapper/transaction.go @@ -236,8 +236,7 @@ func CrossChainTransactions( return transactions, nil } - atomicTxs, err := evm.ExtractAtomicTxs(extra, block.Time() >= ap5Activation) - + atomicTxs, err := evm.ExtractAtomicTxs(extra, block.Time() >= ap5Activation, codecManager) if err != nil { return nil, err } diff --git a/service/rosetta.go b/service/rosetta.go index c5be91c9..b687377b 100644 --- a/service/rosetta.go +++ b/service/rosetta.go @@ -1,7 +1,7 @@ package service const ( - NodeVersion = "1.7.2" - MiddlewareVersion = "0.0.25" + NodeVersion = "1.7.3" + MiddlewareVersion = "0.0.26" BlockchainName = "Avalanche" )