Merge pull request #1787 from 0xPolygon/v2.3.0-candidate

Merge V2.3.0 candidate

Author: cffls

.github/workflows/go.yml

@@ -52,7 +52,7 @@ jobs:
         uses: actions/checkout@v5
         with:
           repository: 0xPolygon/kurtosis-pos
-          ref: v1.1.4
+          ref: v1.1.11
           path: kurtosis-pos
 
       - name: Pre kurtosis run
@@ -83,7 +83,16 @@ jobs:
         run: kurtosis enclave inspect ${{ env.ENCLAVE_NAME }}
 
       - name: Test state syncs
-        run: kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "bats --filter-tags pos,bridge,l1,l2 --recursive tests/"
+        run: kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "bats --filter 'bridge MATIC/POL, ERC20, and ERC721 from L1 to L2 and confirm L2 balances increased' tests/pos/bridge.bats"
+
+      - name: Run RPC tests
+        run: |
+          export RPC_URL=$(kurtosis port print ${{ env.ENCLAVE_NAME }} l2-el-1-bor-heimdall-v2-validator rpc)
+          export PRIV_KEY="0xd40311b5a5ca5eaeb48dfba5403bde4993ece8eccf4190e98e19fcd4754260ea"
+
+          cd pos-workflows/tests/rpc_tests
+          go mod tidy
+          go run . --priv-key "$PRIV_KEY" --rpc-url "$RPC_URL" --log-req-res true
 
       - name: Run smoke tests (Checkpoints and Milestones)
         run: bash ./pos-workflows/tests/kurtosis_smoke_test.sh

.github/workflows/kurtosis-e2e.yml

@@ -0,0 +1,103 @@
+name: Stateless Sync Tests
+
+on:
+  push:
+    branches:
+      - 'master'
+      - 'develop'
+  pull_request:
+    branches:
+      - 'master'
+      - 'develop'
+    types: [opened, synchronize]
+
+concurrency:
+  group: stateless-sync-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  ENCLAVE_NAME: kurtosis-stateless-e2e
+
+jobs:
+  e2e-tests:
+    name: E2E Tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+
+    steps:
+      # This is needed because the job fails with "System.IO.IOException: No space left on device".
+      - name: Free disk space
+        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # 2023/10/19
+        with:
+          tool-cache: true
+
+      - name: Install dependencies on Linux
+        if: runner.os == 'Linux'
+        run: sudo apt update && sudo apt install build-essential
+
+      - name: Checkout bor
+        uses: actions/checkout@v5
+        with:
+          path: bor
+
+      - name: Checkout heimdall-v2
+        uses: actions/checkout@v5
+        with:
+          repository: 0xPolygon/heimdall-v2
+          ref: develop
+          path: heimdall-v2
+
+      - name: Checkout pos-workflows
+        uses: actions/checkout@v5
+        with:
+          repository: 0xPolygon/pos-workflows
+          ref: main
+          path: pos-workflows
+
+      - name: Checkout kurtosis-pos
+        uses: actions/checkout@v5
+        with:
+          repository: 0xPolygon/kurtosis-pos
+          ref: stateless
+          path: kurtosis-pos
+
+      - name: Pre kurtosis run
+        uses: ./pos-workflows/.github/actions/kurtosis-pre-run
+        with:
+          docker_username: ${{ secrets.DOCKERHUB }}
+          docker_token: ${{ secrets.DOCKERHUB_KEY }}
+
+      - name: Build bor docker image
+        run: |
+          cd bor
+          docker build -t bor:local --file Dockerfile .
+
+      - name: Build heimdall-v2 docker image
+        run: |
+          cd heimdall-v2
+          docker build -t heimdall-v2:local --file Dockerfile .
+
+      - name: Copy kurtosis config
+        run: cp ./pos-workflows/.github/configs/kurtosis-stateless-e2e.yml ./kurtosis-pos/kurtosis-stateless-e2e.yml
+
+      - name: Kurtosis run
+        run: |
+          cd kurtosis-pos
+          kurtosis run --args-file=kurtosis-stateless-e2e.yml --enclave ${{ env.ENCLAVE_NAME }} .
+
+      - name: Inspect enclave
+        run: kurtosis enclave inspect ${{ env.ENCLAVE_NAME }}
+
+      - name: Run stateless sync tests
+        run: |
+          cd pos-workflows
+          bash tests/stateless_tests/kurtosis_stateless_test.sh
+
+      - name: Test state syncs (post VeBlop HF)
+        run: kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "bats --filter 'bridge MATIC/POL, ERC20, and ERC721 from L1 to L2 and confirm L2 balances increased' tests/pos/bridge.bats"
+
+      - name: Post kurtosis run
+        if: always()
+        uses: ./pos-workflows/.github/actions/kurtosis-post-run
+        with:
+          enclave_name: ${{ env.ENCLAVE_NAME }}

.github/workflows/kurtosis-stateless-e2e.yml

@@ -57,7 +57,6 @@ linters:
       - std-error-handling
     rules:
       - linters:
-          - deadcode
           - staticcheck
         path: crypto/bn256/cloudflare/optate.go
       - linters:

.golangci.yml

@@ -36,4 +36,4 @@ COPY --from=builder ${BOR_DIR}/build/bin/bor /usr/bin/
 
 EXPOSE 8545 8546 8547 30303 30303/udp
 
-ENTRYPOINT ["bor"]
+ENTRYPOINT ["bor"]

Dockerfile

@@ -34,6 +34,7 @@ protoc:
 	protoc --go_out=. --go-grpc_out=. ./internal/cli/server/proto/*.proto
 
 generate-mocks:
+	go generate ./internal/ethapi
 	go generate ./consensus/bor
 	go generate ./eth/filters
 	go generate ./ethdb

Makefile

@@ -130,7 +130,7 @@ func (b *SimulatedBackend) Commit() common.Hash {
 	b.mu.Lock()
 	defer b.mu.Unlock()
 
-	if _, err := b.blockchain.InsertChain([]*types.Block{b.pendingBlock}); err != nil {
+	if _, err := b.blockchain.InsertChain([]*types.Block{b.pendingBlock}, false); err != nil {
 		panic(err) // This cannot happen unless the simulator is wrong, fail in that case
 	}
 	blockHash := b.pendingBlock.Hash()

accounts/abi/bind/backends/simulated.go

@@ -48,7 +48,7 @@ func TestSimulatedBackend(t *testing.T) {
 	)...)
 	var gasLimit uint64 = 8000029
 
-	key, _ := crypto.GenerateKey() // nolint: gosec
+	key, _ := crypto.GenerateKey() // nolint:gosec
 	auth, _ := bind.NewKeyedTransactorWithChainID(key, big.NewInt(1337))
 	genAlloc := make(types.GenesisAlloc)
 	genAlloc[auth.From] = types.Account{Balance: big.NewInt(9223372036854775807)}

accounts/abi/bind/backends/simulated_test.go

@@ -55,7 +55,7 @@ func TestKeyEncryptDecrypt(t *testing.T) {
 			t.Errorf("test %d: key address mismatch: have %x, want %x", i, key.Address, address)
 		}
 		// Recrypt with a new password and start over
-		password += "new data appended" // nolint: gosec
+		password += "new data appended" // nolint:gosec
 		if keyjson, err = EncryptKey(key, password, veryLightScryptN, veryLightScryptP); err != nil {
 			t.Errorf("test %d: failed to re-encrypt key %v", i, err)
 		}

accounts/keystore/passphrase_test.go

@@ -17,6 +17,7 @@ syncmode = "full"
 # snapshot = true
 # "bor.logs" = false
 # ethstats = ""
+# witnessprotocol = false
 # devfakeauthor = false
 # ["eth.requiredblocks"]