Merge tag 'v1.3.0' into release/polygon-1.x-fh2.3

# Conflicts:
#	.github/workflows/govuln.yml
#	.github/workflows/release.yml
#	cmd/geth/main.go
#	core/chain_makers.go
#	core/genesis.go
#	core/state/statedb_test.go
#	core/state_processor.go
#	core/txpool/blobpool/blobpool_test.go
#	core/vm/evm.go
#	eth/api_debug_test.go
#	eth/backend.go
#	eth/tracers/internal/tracetest/calltrace_test.go
#	go.mod
#	go.sum
#	internal/ethapi/api.go
#	params/version.go
#	tests/state_test_util.go

.github/ISSUE_TEMPLATE/bug.md

@@ -20,7 +20,7 @@ Heimdall client version: [e.g. v0.2.10] <!--Can be found by running the command
 
 OS & Version: Windows / Linux / OSX
 
-Environment: Polygon Mainnet / Polygon Mumbai / Devnet
+Environment: Polygon Mainnet / Polygon Mumbai / Polygon Amoy / Devnet
 
 Type of node: Validator / Sentry / Archive
 

.github/pull_request_template.md

@@ -39,7 +39,7 @@ In case this PR includes changes that must be applied only to a subset of nodes,
 - [ ] I have added tests to CI
 - [ ] I have tested this code manually on local environment
 - [ ] I have tested this code manually on remote devnet using express-cli
-- [ ] I have tested this code manually on mumbai
+- [ ] I have tested this code manually on mumbai/amoy
 - [ ] I have created new e2e tests into express-cli
 
 ### Manual tests

.github/workflows/ci.yml

@@ -27,9 +27,9 @@ jobs:
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
 
-        - uses: actions/setup-go@v3
+        - uses: actions/setup-go@v5
           with:
-            go-version: 1.20.x
+            go-version: 1.22.x
 
         - name: Install dependencies on Linux
           if: runner.os == 'Linux'
@@ -59,9 +59,9 @@ jobs:
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
 
-        - uses: actions/setup-go@v3
+        - uses: actions/setup-go@v5
           with:
-            go-version: 1.20.x
+            go-version: 1.22.x
 
         - name: Install dependencies on Linux
           if: runner.os == 'Linux'
@@ -87,9 +87,9 @@ jobs:
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
 
-        - uses: actions/setup-go@v3
+        - uses: actions/setup-go@v5
           with:
-            go-version: 1.20.x
+            go-version: 1.22.x
 
         - name: Install dependencies on Linux
           if: runner.os == 'Linux'
@@ -138,9 +138,9 @@ jobs:
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
 
-        - uses: actions/setup-go@v3
+        - uses: actions/setup-go@v5
           with:
-            go-version: 1.20.x
+            go-version: 1.22.x
 
         - name: Install dependencies on Linux
           if: runner.os == 'Linux'
@@ -194,9 +194,9 @@ jobs:
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
 
-        - uses: actions/setup-go@v3
+        - uses: actions/setup-go@v5
           with:
-            go-version: 1.20.x
+            go-version: 1.22.x
 
         - name: Checkout matic-cli
           uses: actions/checkout@v3
@@ -248,6 +248,8 @@ jobs:
 
         - name: Run smoke tests
           run: |
+            echo "Funding ganache accounts..."
+            timeout 10m bash bor/integration-tests/fund_ganache_accounts.sh
             echo "Deposit 100 matic for each account to bor network"
             cd matic-cli/devnet/code/contracts
             npm run truffle exec scripts/deposit.js -- --network development $(jq -r .root.tokens.MaticToken contractAddresses.json) 100000000000000000000

.github/workflows/codeql.yml

@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
 

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
     name: Build Release
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.22.x]
         os: [ubuntu-20.04, macos-latest] # windows-latest
     runs-on: ${{ matrix.os }}
     steps:

.gitignore

@@ -57,3 +57,6 @@ dist
 .dccache
 
 *.csv
+logs/
+
+tests/spec-tests/

.goreleaser.yml

@@ -96,6 +96,9 @@ nfpms:
       - src: builder/files/genesis-testnet-v4.json
         dst: /etc/bor/genesis-testnet-v4.json
         type: config
+      - src: builder/files/genesis-amoy.json
+        dst: /etc/bor/genesis-amoy.json
+        type: config
       - src: builder/files/config.toml
         dst: /var/lib/bor/config.toml
         type: config
@@ -119,6 +122,7 @@ dockers:
     extra_files:
       - builder/files/genesis-mainnet-v1.json
       - builder/files/genesis-testnet-v4.json
+      - builder/files/genesis-amoy.json
 
   - image_templates:
       - 0xpolygon/{{ .ProjectName }}:{{ .Version }}-arm64
@@ -132,6 +136,7 @@ dockers:
     extra_files:
       - builder/files/genesis-mainnet-v1.json
       - builder/files/genesis-testnet-v4.json
+      - builder/files/genesis-amoy.json
 
 docker_manifests:
   - name_template: 0xpolygon/{{ .ProjectName }}:{{ .Version }}

.travis.yml

@@ -13,7 +13,7 @@ jobs:
     - stage: lint
       os: linux
       dist: bionic
-      go: 1.20.x
+      go: 1.22.x
       env:
         - lint
       git:
@@ -28,7 +28,7 @@ jobs:
       os: linux
       arch: amd64
       dist: bionic
-      go: 1.20.x
+      go: 1.22.x
       env:
         - docker
       services:
@@ -45,7 +45,7 @@ jobs:
       os: linux
       arch: arm64
       dist: bionic
-      go: 1.20.x
+      go: 1.22.x
       env:
         - docker
       services:
@@ -62,7 +62,7 @@ jobs:
       if: type = push
       os: linux
       dist: bionic
-      go: 1.20.x
+      go: 1.22.x
       env:
         - ubuntu-ppa
         - GO111MODULE=on
@@ -87,10 +87,9 @@ jobs:
       os: linux
       dist: bionic
       sudo: required
-      go: 1.20.x
+      go: 1.22.x
       env:
         - azure-linux
-        - GO111MODULE=on
       git:
         submodules: false # avoid cloning ethereum/tests
       addons:
@@ -145,7 +144,7 @@ jobs:
         - sdkmanager "platform-tools" "platforms;android-15" "platforms;android-19" "platforms;android-24" "ndk-bundle"
 
         # Install Go to allow building with
-        - curl https://dl.google.com/go/go1.20.5.linux-amd64.tar.gz | tar -xz
+        - curl https://dl.google.com/go/go1.21.4.linux-amd64.tar.gz | tar -xz
         - export PATH=`pwd`/go/bin:$PATH
         - export GOROOT=`pwd`/go
         - export GOPATH=$HOME/go
@@ -159,47 +158,51 @@ jobs:
     - stage: build
       if: type = push
       os: osx
-      go: 1.20.x
+      osx_image: xcode14.2
+      go: 1.22.x
       env:
         - azure-osx
-        - GO111MODULE=on
       git:
         submodules: false # avoid cloning ethereum/tests
       script:
         - go run build/ci.go install -dlgo
         - go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
+        - go run build/ci.go install -dlgo -arch arm64
+        - go run build/ci.go archive -arch arm64 -type tar -signer OSX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
 
     # These builders run the tests
     - stage: build
       os: linux
       arch: amd64
       dist: bionic
-      go: 1.20.x
-      env:
-        - GO111MODULE=on
+      go: 1.22.x
       script:
-        - go run build/ci.go test $TEST_PACKAGES
+        - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
     - stage: build
       if: type = pull_request
       os: linux
       arch: arm64
       dist: bionic
-      go: 1.20.x
-      env:
-        - GO111MODULE=on
+      go: 1.22.x
       script:
-        - go run build/ci.go test $TEST_PACKAGES
+        - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
+
+    - stage: build
+      os: linux
+      dist: bionic
+      go: 1.22.x
+      script:
+        - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
     # This builder does the Ubuntu PPA nightly uploads
     - stage: build
       if: type = cron || (type = push && tag ~= /^v[0-9]/)
       os: linux
       dist: bionic
-      go: 1.18.x
+      go: 1.22.x
       env:
         - ubuntu-ppa
-        - GO111MODULE=on
       git:
         submodules: false # avoid cloning ethereum/tests
       addons:
@@ -220,10 +223,9 @@ jobs:
       if: type = cron
       os: linux
       dist: bionic
-      go: 1.20.x
+      go: 1.22.x
       env:
         - azure-purge
-        - GO111MODULE=on
       git:
         submodules: false # avoid cloning ethereum/tests
       script:
@@ -234,9 +236,7 @@ jobs:
       if: type = cron
       os: linux
       dist: bionic
-      go: 1.20.x
-      env:
-        - GO111MODULE=on
+      go: 1.22.x
       script:
-        - go run build/ci.go test  -race $TEST_PACKAGES
+        - travis_wait 30 go run build/ci.go test  -race $TEST_PACKAGES
 

Dockerfile.alltools

@@ -1,5 +1,5 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.20.5-alpine as builder
+FROM golang:1.22.1-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 

Dockerfile.release

@@ -10,6 +10,7 @@ WORKDIR ${BOR_DIR}
 COPY bor /usr/bin/
 COPY builder/files/genesis-mainnet-v1.json ${BOR_DIR}
 COPY builder/files/genesis-testnet-v4.json ${BOR_DIR}
+COPY builder/files/genesis-amoy.json ${BOR_DIR}
 
 EXPOSE 8545 8546 8547 30303 30303/udp
 ENTRYPOINT ["bor"]

Makefile

@@ -65,7 +65,7 @@ test-txpool-race:
 
 test-race:
 	$(GOTEST) --timeout 15m -race -shuffle=on $(TESTALL)
-	
+
 gocovmerge-deps:
 	$(GOBUILD) -o $(GOBIN)/gocovmerge github.com/wadey/gocovmerge
 
@@ -89,7 +89,7 @@ docs:
 	$(GORUN) cmd/clidoc/main.go -d ./docs/cli
 
 clean:
-	env GO111MODULE=on go clean -cache
+	go clean -cache
 	rm -fr build/_workspace/pkg/ $(GOBIN)/*
 
 # The devtools target installs tools required for 'go generate'.
@@ -201,7 +201,7 @@ geth-windows-amd64:
 	@ls -ld $(GOBIN)/geth-windows-* | grep amd64
 
 PACKAGE_NAME          := github.com/maticnetwork/bor
-GOLANG_CROSS_VERSION  ?= v1.20.5
+GOLANG_CROSS_VERSION  ?= v1.22.1
 
 .PHONY: release-dry-run
 release-dry-run:

README.md

@@ -17,13 +17,13 @@ The easiest way to get started with bor is to install the packages using the com
 
     curl -L https://raw.githubusercontent.com/maticnetwork/install/main/bor.sh | bash -s -- v0.4.0 <network> <node_type>
 
-The network accepts `mainnet` or `mumbai` and the node type accepts `validator` or `sentry` or `archive`. The installation script does the following things:
+The network accepts `mainnet`,`amoy` or `mumbai` and the node type accepts `validator` or `sentry` or `archive`. The installation script does the following things:
 - Create a new user named `bor`.
 - Install the bor binary at `/usr/bin/bor`.
 - Dump the suitable config file (based on the network and node type provided) at `/var/lib/bor` and uses it as the home dir.
 - Create a systemd service named `bor` at `/lib/systemd/system/bor.service` which starts bor using the config file as `bor` user.
 
-The releases supports both the networks i.e. Polygon Mainnet and Mumbai (Testnet) unless explicitly specified. Before the stable release for mainnet, pre-releases will be available marked with `beta` tag for deploying on Mumbai (testnet). On sufficient testing, stable release for mainnet will be announced with a forum post.
+The releases supports both the networks i.e. Polygon Mainnet, Amoy and Mumbai (Testnet) unless explicitly specified. Before the stable release for mainnet, pre-releases will be available marked with `beta` tag for deploying on Mumbai/Amoy (testnet). On sufficient testing, stable release for mainnet will be announced with a forum post.
 
 ### Building from source