Merge commit 'da15fcff06bb547f963f6db29f07ae889e7a11d2' into feat/evm…

…-optimized-stack
Ethernal-Tech · Apr 2, 2024 · 6a1aa16 · 6a1aa16
2 parents 8ca41b1 + da15fcf
commit 6a1aa16
Show file tree

Hide file tree

Showing 28 changed files with 256 additions and 258 deletions.
diff --git a/.github/workflows/benchmark-test.yml b/.github/workflows/benchmark-test.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Run Go Test
         run: make benchmark-test
       - name: Run Go Test Failed

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Build Blade
         run: go build -o blade -tags netgo -ldflags="-s -w -X \"github.com/${GITHUB_REPOSITORY}/versioning.Version=${GITHUB_REF_NAME}\" -X \"github.com/${GITHUB_REPOSITORY}/versioning.Commit=${GITHUB_SHA}\"" && tar -czvf blade.tar.gz blade
         env:
@@ -45,7 +45,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Reproduce builds
         continue-on-error: true
         run: |

diff --git a/.github/workflows/e2e-legacy-test.yml b/.github/workflows/e2e-legacy-test.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Run tests
         run: make test-e2e-legacy
       - name: Run tests failed

diff --git a/.github/workflows/e2e-polybft-test.yml b/.github/workflows/e2e-polybft-test.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
           check-latest: true
       - name: Generate OpenSSL certificate
         run: openssl req -x509 -out localhost.crt -keyout localhost.key   -newkey rsa:2048 -nodes -sha256   -subj '/CN=localhost' -extensions EXT -config <(printf "[dn]\nCN=localhost\n[req]\ndistinguished_name = dn\n[EXT]\nsubjectAltName=DNS:localhost\nkeyUsage=digitalSignature\nextendedKeyUsage=serverAuth")

diff --git a/.github/workflows/fuzz-test.yml b/.github/workflows/fuzz-test.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Run Fuzz Test
         run: make fuzz-test
       - name: Run fuzz tests failed

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
           cache: false
       - name: Lint
         uses: golangci/golangci-lint-action@v4.0.0

diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml
@@ -97,6 +97,9 @@ on: # yamllint disable-line rule:truthy
       iterations:
         description: "Number Of Transactions"
         value: ${{ jobs.load_test_scenario.outputs.iterations }}
+      dropped_iterations:
+        description: "Number Of Dropped Transactions"
+        value: ${{ jobs.load_test_scenario.outputs.dropped_iterations }}
       block:
         description: "Block Number"
         value: ${{ jobs.load_test_scenario.outputs.block }}
@@ -187,6 +190,7 @@ jobs:
       tps_avg: ${{ steps.load_test_results.outputs.tps_avg }}
       tps_max: ${{ steps.load_test_results.outputs.tps_max }}
       iterations: ${{ steps.load_test_results.outputs.iterations }}
+      dropped_iterations: ${{ steps.load_test_results.outputs.dropped_iterations }}
       block: ${{ steps.load_test_results.outputs.block }}
       ttm: ${{ steps.load_test_results.outputs.ttm }}
       gas_avg: ${{ steps.load_test_results.outputs.gas_avg }}
@@ -201,6 +205,7 @@ jobs:
           echo "tps_avg=$(cat summary.json | jq -r '.metrics.ethereum_tps.values.avg')" >> $GITHUB_OUTPUT
           echo "tps_max=$(cat summary.json | jq -r '.metrics.ethereum_tps.values.max')" >> $GITHUB_OUTPUT
           echo "iterations=$(cat summary.json | jq -r '.metrics.iterations.values.count')" >> $GITHUB_OUTPUT
+          echo "dropped_iterations=$(cat summary.json | jq -r '.metrics.dropped_iterations.values.count')" >> $GITHUB_OUTPUT
           echo "block=$(cat summary.json | jq -r '.metrics.ethereum_block.values.count')" >> $GITHUB_OUTPUT
           echo "ttm=$(cat summary.json | jq -r '.metrics.ethereum_time_to_mine.values.avg')" >> $GITHUB_OUTPUT
           echo "gas_avg=$(cat summary.json | jq -r '.metrics.ethereum_gas_used.values.avg')" >> $GITHUB_OUTPUT
@@ -236,6 +241,7 @@ jobs:
       tps_avg: ${{ needs.load_test_scenario.outputs.tps_avg }}
       tps_max: ${{ needs.load_test_scenario.outputs.tps_max }}
       iterations: ${{ needs.load_test_scenario.outputs.iterations }}
+      dropped_iterations: ${{ needs.load_test_scenario.outputs.dropped_iterations }}
       block: ${{ needs.load_test_scenario.outputs.block }}
       ttm: ${{ needs.load_test_scenario.outputs.ttm }}
       gas_avg: ${{ needs.load_test_scenario.outputs.gas_avg }}

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -48,8 +48,8 @@ jobs:
       block_time: "2"
       max_slots: "276480"
       max_enqueued: "276480"
-      is_london_fork_active: false
-      is_bridge_active: true
+      is_london_fork_active: true
+      is_bridge_active: false
       notification: false
     secrets:
       AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
@@ -125,8 +125,8 @@ jobs:
       block_time: "2"
       max_slots: "276480"
       max_enqueued: "276480"
-      is_london_fork_active: false
-      is_bridge_active: true
+      is_london_fork_active: true
+      is_bridge_active: false
       logs: true
       build_blade_output: ${{ needs.ci.outputs.build-blade }}
       lint_output: ${{ needs.ci.outputs.lint }}
@@ -153,9 +153,16 @@ jobs:
     with:
       environment: nightly
       scenario: EOA
+      timeout: "1800s"
+      rate: "3000"
+      timeUnit: "1s"
+      duration: "10m"
+      preAllocatedVUs: "60"
+      maxVUs: "60"
       tps_avg: ${{ needs.load_test_multiple_eoa.outputs.tps_avg }}
       tps_max: ${{ needs.load_test_multiple_eoa.outputs.tps_max }}
       iterations: ${{ needs.load_test_multiple_eoa.outputs.iterations }}
+      dropped_iterations: ${{ needs.load_test_multiple_eoa.outputs.dropped_iterations }}
       block: ${{ needs.load_test_multiple_eoa.outputs.block }}
       ttm: ${{ needs.load_test_multiple_eoa.outputs.ttm }}
       gas_avg: ${{ needs.load_test_multiple_eoa.outputs.gas_avg }}
@@ -170,9 +177,16 @@ jobs:
     with:
       environment: nightly
       scenario: ERC20
+      timeout: "1800s"
+      rate: "1500"
+      timeUnit: "1s"
+      duration: "10m"
+      preAllocatedVUs: "60"
+      maxVUs: "60"
       tps_avg: ${{ needs.load_test_multiple_erc20.outputs.tps_avg }}
       tps_max: ${{ needs.load_test_multiple_erc20.outputs.tps_max }}
       iterations: ${{ needs.load_test_multiple_erc20.outputs.iterations }}
+      dropped_iterations: ${{ needs.load_test_multiple_erc20.outputs.dropped_iterations }}
       block: ${{ needs.load_test_multiple_erc20.outputs.block }}
       ttm: ${{ needs.load_test_multiple_erc20.outputs.ttm }}
       gas_avg: ${{ needs.load_test_multiple_erc20.outputs.gas_avg }}

diff --git a/.github/workflows/notification-load-test.yml b/.github/workflows/notification-load-test.yml
@@ -47,6 +47,10 @@ on: # yamllint disable-line rule:truthy
         description: "Number Of Transactions"
         type: string
         required: true
+      dropped_iterations:
+        description: "Number Of Dropped Transactions"
+        type: string
+        required: true
       block:
         description: "Block Number"
         type: string
@@ -191,6 +195,10 @@ jobs:
                       "type": "mrkdwn",
                       "text": "*Transactions*\n${{ inputs.iterations }}"
                     },
+                    {
+                      "type": "mrkdwn",
+                      "text": "*Dropped Transactions*\n${{ inputs.dropped_iterations }}"
+                    },
                     {
                       "type": "mrkdwn",
                       "text": "*Block Number*\n${{ inputs.block }}"

diff --git a/.github/workflows/property-polybft-test.yml b/.github/workflows/property-polybft-test.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Run tests
         run: make test-property-polybft
       - name: Run tests failed

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Prepare
         id: prepare
         run: |
@@ -53,7 +53,7 @@ jobs:
           		--clean --skip-validate
         env:
           PACKAGE_NAME: github.com/${GITHUB_REPOSITORY}
-          GOLANG_CROSS_VERSION: v1.20.5
+          GOLANG_CROSS_VERSION: v1.21.6
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VERSION: ${{ steps.prepare.outputs.tag_name }}
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install Dependencies
         run: ./setup-ci.sh
       - name: Run Go Test

diff --git a/docker/README.md b/docker/README.md
@@ -9,7 +9,7 @@
 
 When deploying with `polybft` consensus, there are some additional dependencies:
 
-* [go 1.20.x](https://go.dev/dl/)
+* [go 1.21.x](https://go.dev/dl/)
 
 ## Local development
 

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine AS builder
+FROM golang:1.21-alpine AS builder
 
 RUN apk add make git