Merge branch 'master' into libevm

Author: qdm12

.github/ISSUE_TEMPLATE/release_checklist.md

@@ -26,5 +26,5 @@ Link the relevant documentation PRs for this release.
 - [ ] Update AvalancheGo dependency in scripts/versions.sh for e2e tests.
 - [ ] Add new entry in compatibility.json for RPCChainVM Compatibility
 - [ ] Update AvalancheGo compatibility in README
-- [ ] Deploy to WAGMI
+- [ ] Deploy to Echo/Dispatch
 - [ ] Confirm goreleaser job has successfully generated binaries by checking the releases page

.github/workflows/bench.yml

@@ -3,15 +3,17 @@ name: Bench
 on:
   workflow_dispatch:
   pull_request:
+  merge_group:
+    types: [checks_requested]
 
 jobs:
   bench:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: "~1.22.8"
+          go-version-file: "go.mod"
       - run: go mod download
         shell: bash
       - run: ./scripts/build_bench_precompiles.sh

.github/workflows/codeql-analysis.yml

@@ -17,6 +17,8 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ master ]
+  merge_group:
+    types: [checks_requested]
   schedule:
     - cron: '44 11 * * 4'
 

.github/workflows/publish_docker.yml

@@ -8,6 +8,11 @@ on:
         default: ''
         required: false
         type: string
+      avalanche_version:
+        description: 'The SHA or tag of avalanchego to use for the base image (must be compatible with the version in go.mod)'
+        default: ''
+        required: false
+        type: string
 
   push:
     tags:
@@ -26,8 +31,9 @@ jobs:
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
-          DOCKER_REPO: "avaplatform/subnet-evm"
+          IMAGE_NAME: "avaplatform/subnet-evm"
           VM_ID: ${{ inputs.vm_id }}
           PUBLISH: 1
           PLATFORMS: "linux/amd64,linux/arm64"
+          AVALANCHE_VERSION: ${{ inputs.avalanche_version }}
         run: scripts/build_docker_image.sh

.github/workflows/release.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   release:
     # needs: [lint_test, unit_test, e2e_test, simulator_test]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Git checkout
         uses: actions/checkout@v4
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "~1.22.8"
+          go-version-file: "./subnet-evm/go.mod"
       - name: Set up arm64 cross compiler
         run: |
           sudo apt-get -y update
@@ -46,7 +46,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v3
         with:
           distribution: goreleaser
-          version: latest
+          version: v2.5.1
           args: release --clean
           workdir: ./subnet-evm/
         env:

.github/workflows/tests.yml

@@ -7,25 +7,24 @@ on:
     tags:
       - "*"
   pull_request:
-
-env:
-  min_go_version: "~1.22.8"
+  merge_group:
+    types: [checks_requested]
 
 jobs:
   lint_test:
     name: Lint
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - run: ./scripts/lint_allowed_eth_imports.sh
         shell: bash
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.min_go_version }}
+          go-version-file: "go.mod"
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.56
+          version: v1.63
           working-directory: .
           args: --timeout 10m
           skip-pkg-cache: true
@@ -46,12 +45,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-20.04, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-22.04, ubuntu-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.min_go_version }}
+          go-version-file: "go.mod"
       - name: Set timeout on Windows # Windows UT run slower and need a longer timeout
         shell: bash
         if: matrix.os == 'windows-latest'
@@ -85,7 +84,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.min_go_version }}
+          go-version-file: "go.mod"
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
@@ -126,7 +125,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.min_go_version }}
+          go-version-file: "go.mod"
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
@@ -170,7 +169,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.min_go_version }}
+          go-version-file: "go.mod"
       - name: Install AvalancheGo Release
         shell: bash
         run: BASEDIR=/tmp/e2e-test AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego ./scripts/install_avalanchego_release.sh
@@ -195,6 +194,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Install qemu (required for cross-platform builds)
+        run: |
+          sudo apt update
+          sudo apt -y install qemu-system qemu-user-static
       - name: Check image build
         shell: bash
         run: bash -x scripts/tests.build_docker_image.sh
@@ -205,7 +208,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.min_go_version }}
+          go-version-file: "go.mod"
       - name: Install AvalancheGo Release
         shell: bash
         run: BASEDIR=/tmp/e2e-test AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego ./scripts/install_avalanchego_release.sh

.golangci.yml

@@ -3,11 +3,6 @@
 run:
   timeout: 10m
   tests: true
-  # default is true. Enables skipping of directories:
-  #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
-  skip-dirs-use-default: true
-  # Include non-test files tagged as test-only.
-  # Context: https://github.com/ava-labs/avalanchego/pull/3173
 
 linters:
   disable-all: true
@@ -18,8 +13,19 @@ linters:
     - ineffassign
     - misspell
     - unconvert
+    - typecheck
     - unused
+    # - staticcheck
+    - bidichk
+    - durationcheck
+    - copyloopvar
     - whitespace
+    # - revive # only certain checks enabled
+    - durationcheck
+    - gocheckcompilerdirectives
+    - reassign
+    - mirror
+    - tenv
 
 linters-settings:
   gofmt:

Dockerfile

@@ -1,36 +1,58 @@
-# syntax=docker/dockerfile:experimental
-
 # ============= Setting up base Stage ================
 # AVALANCHEGO_NODE_IMAGE needs to identify an existing node image and should include the tag
-ARG AVALANCHEGO_NODE_IMAGE
+# This value is not intended to be used but silences a warning
+ARG AVALANCHEGO_NODE_IMAGE="invalid-image"
 
 # ============= Compilation Stage ================
-FROM golang:1.22.8-bullseye AS builder
+FROM --platform=$BUILDPLATFORM golang:1.23.6-bullseye AS builder
 
 WORKDIR /build
 
 # Copy avalanche dependencies first (intermediate docker image caching)
 # Copy avalanchego directory if present (for manual CI case, which uses local dependency)
 COPY go.mod go.sum avalanchego* ./
-
 # Download avalanche dependencies using go mod
-RUN go mod download && go mod tidy -compat=1.22
+RUN go mod download && go mod tidy
 
 # Copy the code into the container
 COPY . .
 
 # Ensure pre-existing builds are not available for inclusion in the final image
 RUN [ -d ./build ] && rm -rf ./build/* || true
 
+
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+
+# Configure a cross-compiler if the target platform differs from the build platform.
+#
+# build_env.sh is used to capture the environmental changes required by the build step since RUN
+# environment state is not otherwise persistent.
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] && [ "$BUILDPLATFORM" != "linux/arm64" ]; then \
+  apt-get update && apt-get install -y gcc-aarch64-linux-gnu && \
+  echo "export CC=aarch64-linux-gnu-gcc" > ./build_env.sh \
+  ; elif [ "$TARGETPLATFORM" = "linux/amd64" ] && [ "$BUILDPLATFORM" != "linux/amd64" ]; then \
+  apt-get update && apt-get install -y gcc-x86-64-linux-gnu && \
+  echo "export CC=x86_64-linux-gnu-gcc" > ./build_env.sh \
+  ; else \
+  echo "export CC=gcc" > ./build_env.sh \
+  ; fi
+
 # Pass in SUBNET_EVM_COMMIT as an arg to allow the build script to set this externally
 ARG SUBNET_EVM_COMMIT
 ARG CURRENT_BRANCH
 
-RUN export SUBNET_EVM_COMMIT=$SUBNET_EVM_COMMIT && export CURRENT_BRANCH=$CURRENT_BRANCH && ./scripts/build.sh build/subnet-evm
+RUN . ./build_env.sh && \
+  echo "{CC=$CC, TARGETPLATFORM=$TARGETPLATFORM, BUILDPLATFORM=$BUILDPLATFORM}" && \
+  export GOARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) && \
+  export CURRENT_BRANCH=$CURRENT_BRANCH && \
+  export SUBNET_EVM_COMMIT=$SUBNET_EVM_COMMIT && \
+  ./scripts/build.sh build/subnet-evm
 
 # ============= Cleanup Stage ================
-FROM $AVALANCHEGO_NODE_IMAGE AS builtImage
+FROM $AVALANCHEGO_NODE_IMAGE AS execution
 
 # Copy the evm binary into the correct location in the container
 ARG VM_ID=srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy
-COPY --from=builder /build/build/subnet-evm /avalanchego/build/plugins/$VM_ID
+ENV AVAGO_PLUGIN_DIR="/avalanchego/build/plugins"
+COPY --from=builder /build/build/subnet-evm $AVAGO_PLUGIN_DIR/$VM_ID

README.md

@@ -1,9 +1,9 @@
 # Subnet EVM
 
-[![Build + Test + Release](https://github.com/ava-labs/subnet-evm/actions/workflows/lint-tests-release.yml/badge.svg)](https://github.com/ava-labs/subnet-evm/actions/workflows/lint-tests-release.yml)
+[![CI](https://github.com/ava-labs/subnet-evm/actions/workflows/ci.yml/badge.svg)](https://github.com/ava-labs/subnet-evm/actions/workflows/ci.yml)
 [![CodeQL](https://github.com/ava-labs/subnet-evm/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/ava-labs/subnet-evm/actions/workflows/codeql-analysis.yml)
 
-[Avalanche](https://docs.avax.network/overview/getting-started/avalanche-platform) is a network composed of multiple blockchains.
+[Avalanche](https://docs.avax.network/avalanche-l1s) is a network composed of multiple blockchains.
 Each blockchain is an instance of a Virtual Machine (VM), much like an object in an object-oriented language is an instance of a class.
 That is, the VM defines the behavior of the blockchain.
 
@@ -18,21 +18,9 @@ The Subnet EVM runs in a separate process from the main AvalancheGo process and
 ### AvalancheGo Compatibility
 
 ```text
-[v0.6.0] [email protected] (Protocol Version: 33)
-[v0.6.1] [email protected] (Protocol Version: 33)
-[v0.6.2] [email protected] (Protocol Version: 34)
-[v0.6.3] [email protected] (Protocol Version: 35)
-[v0.6.4] [email protected] (Protocol Version: 35)
-[v0.6.5] [email protected] (Protocol Version: 35)
-[v0.6.6] [email protected] (Protocol Version: 35)
-[v0.6.7] [email protected] (Protocol Version: 35)
-[v0.6.8] [email protected] (Protocol Version: 36)
-[v0.6.9] [email protected] (Protocol Version: 37)
-[v0.6.10] [email protected] (Protocol Version: 37)
-[v0.6.11] [email protected] (Protocol Version: 37)
-[v0.6.12] [email protected]/v1.12.0 (Protocol Version: 38)
 [v0.7.0] [email protected] (Protocol Version: 38)
-[v0.7.1] [email protected] (Protocol Version: 38)
+[v0.7.1] [email protected] (Protocol Version: 39)
+[v0.7.2] [email protected]/1.13.0-fuji (Protocol Version: 39)
 ```
 
 ## API
@@ -72,7 +60,7 @@ To support these changes, there have been a number of changes to the SubnetEVM b
 
 ### Clone Subnet-evm
 
-First install Go 1.22.8 or later. Follow the instructions [here](https://go.dev/doc/install). You can verify by running `go version`.
+First install Go 1.23.6 or later. Follow the instructions [here](https://go.dev/doc/install). You can verify by running `go version`.
 
 Set `$GOPATH` environment variable properly for Go to look for Go Workspaces. Please read [this](https://go.dev/doc/code) for details. You can verify by running `echo $GOPATH`.
 
@@ -96,5 +84,5 @@ To run a local network, it is recommended to use the [avalanche-cli](https://git
 
 There are two options when using the Avalanche-CLI:
 
-1. Use an official Subnet-EVM release: https://docs.avax.network/subnets/build-first-subnet
-2. Build and deploy a locally built (and optionally modified) version of Subnet-EVM: https://docs.avax.network/subnets/create-custom-subnet
+1. Use an official Subnet-EVM release: <https://docs.avax.network/subnets/build-first-subnet>
+2. Build and deploy a locally built (and optionally modified) version of Subnet-EVM: <https://docs.avax.network/subnets/create-custom-subnet>

RELEASES.md

@@ -2,17 +2,51 @@
 
 ## Pending Release
 
-* Refactored trie_prefetcher.go to be structurally similar to upstream.
+* * IMPORTANT: `eth_getProof` calls for historical state will be rejected by default.
+  * On archive nodes (`"pruning-enabled": false`): queries for historical proofs for state older than approximately 24 hours preceding the last accepted block will be rejected by default. This can be adjusted with the new option `historical-proof-query-window` which defines the number of blocks before the last accepted block which should be accepted for state proof queries, or set to `0` to accept any block number state query (previous behavior).
+  * On `pruning` nodes: queries for proofs past the tip buffer (32 blocks) will be rejected. This is in support of moving to a path based storage scheme, which does not support historical state proofs.
+* Added `Fortuna` upgrade as optional and defaulting to a `nil` timestamp.
+
+## [v0.7.2](https://github.com/ava-labs/subnet-evm/releases/tag/v0.7.2)
+
+This version is backwards compatible to [v0.7.0](https://github.com/ava-labs/subnet-evm/releases/tag/v0.7.0). It is optional, **but strongly encouraged as it's fixing an important bug in uptime tracking.**
+
+### AvalancheGo Compatibility
+
+The plugin version is unchanged at 39 and is compatible with AvalancheGo version v1.12.2.
+
+### Updates
+
+* Fixed concurrency issue in validators/uptime manager
+* Bump golang version to v1.23.6
+* Bump golangci-lint to v1.63 and add linters
+
+## [v0.7.1](https://github.com/ava-labs/subnet-evm/releases/tag/v0.7.1)
+
+This release focuses on code quality improvements and post-Etna cleanups.
+
+### Compatibility
+
+The plugin version is **updated** to 39 and is compatible with AvalancheGo version v1.12.2.
+
+### Updates
+
+* Moved client type and structs to new `plugin/evm/client` package
+* Fixed statedb improper copy issue
+* Limited the maximum number of query-able rewardPercentile by 100 in `eth_feeHistory` API
+* Refactored `trie_prefetcher.go` to be structurally similar to upstream
+* Removed deprecated legacy gossip handler and metrics
+* Removed unnecessary locks in mempool
 
 ## [v0.7.0](https://github.com/ava-labs/subnet-evm/releases/tag/v0.7.0)
 
 ### Updates
 
-- Changed default write option from `Sync` to `NoSync` in PebbleDB
+* Changed default write option from `Sync` to `NoSync` in PebbleDB
 
 ### Fixes
 
-- Fixed database close on shutdown
+* Fixed database close on shutdown
 
 ## [v0.6.11](https://github.com/ava-labs/subnet-evm/releases/tag/v0.6.11)