Skip to content

Commit

Permalink
V1.5.0 (#31)
Browse files Browse the repository at this point in the history 
* Prepare for Fuji upgrade

* Update packages (#27)

* update packages

* populate base fee if non-nil

* fix more hex encoding

* 1559 debugging (#28)

* debug 1559

* fix signer parsing

* Update node + Check Construction Overhaul (#30)

* clone instead of copy

* Overhaul construction (#29)

* support additional args

* start cleanup

* making progress

* cleanup more code

* process metadata initial flow passing

* fix custom gas price flow

* test ignore multiplier

* Add test for custom fee multiplier

* test custom nonce

* nits

* fix lint

* update image to use

* nits

* increase stale depth
  • Loading branch information
@patrick-ogrady
patrick-ogrady authored Aug 18, 2021
1 parent bd212cb commit fe988f8
Show file tree
Hide file tree
Showing 16 changed files with 1,199 additions and 169 deletions.
20 changes: 4 additions & 16 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ FROM golang:1.16 AS rosetta

ARG ROSETTA_VERSION

# RUN git clone https://github.com/ava-labs/avalanche-rosetta.git \
COPY . \
RUN git clone https://github.com/ava-labs/avalanche-rosetta.git \
/go/src/github.com/ava-labs/avalanche-rosetta

WORKDIR /go/src/github.com/ava-labs/avalanche-rosetta
Expand Down Expand Up @@ -54,21 +53,10 @@ COPY --from=avalanche \
/go/src/github.com/ava-labs/avalanchego/build/avalanchego \
/app/avalanchego

# Install pre-upgrade binaries
# Install evm plugin
COPY --from=avalanche \
/go/src/github.com/ava-labs/avalanchego/build/avalanchego-preupgrade/avalanchego-process \
/app/avalanchego-preupgrade/avalanchego-process
COPY --from=avalanche \
/go/src/github.com/ava-labs/avalanchego/build/avalanchego-preupgrade/plugins/evm \
/app/avalanchego-preupgrade/plugins/evm

# Install latest binaries
COPY --from=avalanche \
/go/src/github.com/ava-labs/avalanchego/build/avalanchego-latest/avalanchego-process \
/app/avalanchego-latest/avalanchego-process
COPY --from=avalanche \
/go/src/github.com/ava-labs/avalanchego/build/avalanchego-latest/plugins/evm \
/app/avalanchego-latest/plugins/evm
/go/src/github.com/ava-labs/avalanchego/build/plugins/evm \
/app/plugins/evm

# Install rosetta server
COPY --from=rosetta \
Expand Down
8 changes: 6 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: build setup test docker-build \
.PHONY: mocks build setup test docker-build \
run-testnet run-testnet-offline run-mainnet run-mainnet-offline \
check-testnet-data check-testnet-construction \
check-mainnet-data check-mainnet-construction
Expand All @@ -11,7 +11,7 @@ DOCKER_ORG ?= avaplatform
DOCKER_IMAGE ?= ${DOCKER_ORG}/${PROJECT}
DOCKER_LABEL ?= latest
DOCKER_TAG ?= ${DOCKER_IMAGE}:${DOCKER_LABEL}
AVALANCHE_VERSION ?= v1.4.12
AVALANCHE_VERSION ?= v1.5.0

build:
go build -o ./rosetta-server ./cmd/server
Expand Down Expand Up @@ -106,3 +106,7 @@ check-mainnet-data:
# Perform the Mainnet construction check
check-mainnet-construction:
rosetta-cli check:construction --configuration-file=rosetta-cli-conf/mainnet/config.json

mocks:
rm -rf mocks;
mockery --dir client --all --case underscore --outpkg client --output mocks/client;
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ go 1.15

require (
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
github.com/ava-labs/avalanchego v1.4.12
github.com/ava-labs/coreth v0.5.7
github.com/ava-labs/avalanchego v1.4.13-rc.0.0.20210810160007-5bac885b4998
github.com/ava-labs/coreth v0.6.0-rc.0
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.3
github.com/ethereum/go-ethereum v1.10.6
github.com/go-ole/go-ole v1.2.4 // indirect
github.com/gorilla/rpc v1.2.0
github.com/mitchellh/mapstructure v1.4.0 // indirect
Expand Down
13 changes: 13 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUW
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
github.com/VictoriaMetrics/fastcache v1.5.7 h1:4y6y0G8PRzszQUYIQHHssv/jgPHAb5qQuuDNdCbyAgw=
github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6RoTu1dAWCbrk+6WsEM8=
github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o=
github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw=
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM=
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
Expand All @@ -76,8 +78,12 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj
github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
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/ava-labs/avalanchego v1.4.13-rc.0.0.20210810160007-5bac885b4998 h1:oEPSLoJkvNm0rxep/nmPhscuqbuXya73dQuLrCM4Wzk=
github.com/ava-labs/avalanchego v1.4.13-rc.0.0.20210810160007-5bac885b4998/go.mod h1:aleAWKvMQ/mblB4dXWWvlbq8787TmwR7+3WizYtogTM=
github.com/ava-labs/coreth v0.5.7 h1:qpMhmtdqM/ojk+Ocz2eES6MvIDTppTb03fgqshUxNys=
github.com/ava-labs/coreth v0.5.7/go.mod h1:z783qZcQOeDtGXz7NwuZc1eWLNKF2EhoHyUheTkJgT8=
github.com/ava-labs/coreth v0.6.0-rc.0 h1:a/YgcHIrr8yDgTN/1WuvWMyQWiI6CwH/Hk3qvXinc3o=
github.com/ava-labs/coreth v0.6.0-rc.0/go.mod h1:NpDyCJbOlBFMAFerUfRemAI+f31b3lddmwa5jolHNfk=
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=
Expand Down Expand Up @@ -199,6 +205,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
github.com/ethereum/go-ethereum v1.9.24/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM=
github.com/ethereum/go-ethereum v1.10.3 h1:SEYOYARvbWnoDl1hOSks3ZJQpRiiRJe8ubaQGJQwq0s=
github.com/ethereum/go-ethereum v1.10.3/go.mod h1:99onQmSd1GRGOziyGldI41YQb7EESX3Q4H41IfJgIQQ=
github.com/ethereum/go-ethereum v1.10.6 h1:bfx3rqWgw768vn6ioxTk8pPNe4IaRzVgRlrS35B43es=
github.com/ethereum/go-ethereum v1.10.6/go.mod h1:iY/t0vHSmaAOC+xlqvAAeHdGSWNFkfSnN0OhMTDYz90=
github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
Expand Down Expand Up @@ -366,11 +374,15 @@ github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZ
github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
github.com/holiman/uint256 v1.1.1 h1:4JywC80b+/hSfljFlEBLHrrh+CIONLDz9NuFl0af4Mw=
github.com/holiman/uint256 v1.1.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw=
github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM=
github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
github.com/huin/goupnp v1.0.1-0.20210310174557-0ca763054c88 h1:bcAj8KroPf552TScjFPIakjH2/tdIrIH8F+cc4v4SRo=
github.com/huin/goupnp v1.0.1-0.20210310174557-0ca763054c88/go.mod h1:nNs7wvRfN1eKaMknBydLNQU6146XQim8t4h+q90biWo=
github.com/huin/goupnp v1.0.1-0.20210626160114-33cdcbb30dda h1:Vofqyy/Ysqit++X33unU0Gr08b6P35hKm3juytDrBVI=
github.com/huin/goupnp v1.0.1-0.20210626160114-33cdcbb30dda/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM=
github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
Expand Down Expand Up @@ -861,6 +873,7 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988 h1:EjgCl+fVlIaPJSori0ikSz3uV0DOHKWOJFpv1sAAhBM=
golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
Expand Down
13 changes: 9 additions & 4 deletions mapper/block.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@ package mapper

import (
corethTypes "github.com/ava-labs/coreth/core/types"
"github.com/ethereum/go-ethereum/common/hexutil"
)

// BlockMetadata returns meta data for a block
func BlockMetadata(block *corethTypes.Block) map[string]interface{} {
return map[string]interface{}{
"gas_limit": block.GasLimit(),
"gas_used": block.GasUsed(),
meta := map[string]interface{}{
"gas_limit": hexutil.EncodeUint64(block.GasLimit()),
"gas_used": hexutil.EncodeUint64(block.GasUsed()),
"difficulty": block.Difficulty(),
"nonce": block.Nonce(),
"size": block.Size().String(),
"size": hexutil.EncodeUint64(uint64(block.Size())),
}
if block.BaseFee() != nil {
meta["base_fee"] = hexutil.EncodeBig(block.BaseFee())
}
return meta
}
Loading

0 comments on commit fe988f8

Please sign in to comment.