From 0e9b12201b0408d9f5fb289fd6e06e7296b5386a Mon Sep 17 00:00:00 2001 From: Samuel Burnham <45365069+samuelburnham@users.noreply.github.com> Date: Tue, 6 Feb 2024 12:20:40 -0500 Subject: [PATCH] ci: Port changes from `main` --- .github/workflows/ci.yml | 51 +++++-------------------------- .github/workflows/end2end.yml | 18 ++++++++--- src/Utilities.sol | 4 +-- test/pp-spartan-step5-tests.t.sol | 7 +++-- 4 files changed, 25 insertions(+), 55 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 132126b..cd6cf2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,57 +1,15 @@ -name: Run tests +name: Run unit tests on: - push: pull_request: types: [opened, synchronize, reopened, ready_for_review] merge_group: workflow_dispatch: jobs: - integration-tests-e2e: - name: E2E verification - # Run on merge_group and workflow_dispatch only - if: (github.event_name != 'push' && github.event_name != 'pull_request') || github.event.action == 'enqueued' - runs-on: [self-hosted] - env: - ANVIL_PRIVATE_KEY: ${{secrets.ANVIL_PRIVATE_KEY}} - ANVIL_URL: ${{secrets.ANVIL_RPC_URL}} - strategy: - fail-fast: true - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 - with: - version: nightly - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - - name: Deploy main contract - run: | - echo "CONTRACT_ADDRESS=$(forge script script/Deployment.s.sol:NovaVerifierDeployer --fork-url $ANVIL_URL --private-key $ANVIL_PRIVATE_KEY --broadcast --non-interactive | sed -n 's/.*Contract Address: //p' | tail -1)" >> $GITHUB_OUTPUT - id: deployment - - - name: Load proof and public parameters - run: | - python loader.py pp-verifier-key.json pp-compressed-snark.json ${{steps.deployment.outputs.CONTRACT_ADDRESS}} $ANVIL_URL $ANVIL_PRIVATE_KEY - - - name: Check proof verification status - run: | - [[ $(cast call ${{steps.deployment.outputs.CONTRACT_ADDRESS}} "verify(uint32,uint256[],uint256[],bool)(bool)" "3" "[1]" "[0]" "true" --private-key $ANVIL_PRIVATE_KEY --rpc-url $ANVIL_URL) == true ]] && exit 0 || exit 1 - unit-tests: - strategy: - fail-fast: true - name: Unit Tests - runs-on: [self-hosted] + runs-on: buildjet-16vcpu-ubuntu-2204 steps: - uses: actions/checkout@v4 with: @@ -62,6 +20,11 @@ jobs: with: python-version: 3.8 + - name: Install Foundry + uses: foundry-rs/foundry-toolchain@v1 + with: + version: nightly + - name: Check formatting run: | forge fmt --check diff --git a/.github/workflows/end2end.yml b/.github/workflows/end2end.yml index 790c74d..64fbc13 100644 --- a/.github/workflows/end2end.yml +++ b/.github/workflows/end2end.yml @@ -1,4 +1,5 @@ -# Run integration tests when a maintainer comments `!test` on a PR +# Run integration tests when a maintainer comments `!test` on a PR to feature branch +# Fails when base branch is `main`, as it doesn't support e2e tests name: End to end integration tests on: @@ -11,17 +12,24 @@ env: jobs: integration-tests-e2e: - strategy: - fail-fast: true - name: E2E verification - runs-on: [self-hosted] + runs-on: buildjet-16vcpu-ubuntu-2204 if: github.event.issue.pull_request && github.event.issue.state == 'open' && contains(github.event.comment.body, '!test') && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') steps: + - uses: xt0rted/pull-request-comment-branch@v2 + id: comment-branch + + - name: Exit if base branch is `main` + if: ${{ steps.comment-branch.outputs.base_ref == 'main' }} + run: | + echo "Cannot run end2end integration tests on PR targeting `main`" + exit 1 + continue-on-error: false + - uses: actions/checkout@v4 with: submodules: recursive diff --git a/src/Utilities.sol b/src/Utilities.sol index 034b557..d0c4414 100644 --- a/src/Utilities.sol +++ b/src/Utilities.sol @@ -291,9 +291,7 @@ library PolyLib { } uint256 coeff_index = 0; - uint256[] memory coeffs = new uint256[]( - poly.coeffs_except_linear_term.length + 1 - ); + uint256[] memory coeffs = new uint256[](poly.coeffs_except_linear_term.length + 1); coeffs[coeff_index] = poly.coeffs_except_linear_term[0]; coeff_index++; coeffs[coeff_index] = linear_term; diff --git a/test/pp-spartan-step5-tests.t.sol b/test/pp-spartan-step5-tests.t.sol index 2b5269f..dbf4844 100644 --- a/test/pp-spartan-step5-tests.t.sol +++ b/test/pp-spartan-step5-tests.t.sol @@ -460,9 +460,10 @@ contract PpSpartanStep5Computations is Test { uint256[] memory eval_output_arr ) private pure returns (uint256[] memory) { uint256 index = 0; - uint256[] memory eval_vec = - new uint256[](eval_left_arr.length + eval_right_arr.length + eval_output_arr.length + eval_A_B_C_z.length + evals_E.length + evals_val.length); - + uint256[] memory eval_vec = new uint256[]( + eval_left_arr.length + eval_right_arr.length + eval_output_arr.length + eval_A_B_C_z.length + evals_E.length + + evals_val.length + ); for (uint256 i = 0; i < eval_A_B_C_z.length; i++) { eval_vec[index] = eval_A_B_C_z[i]; index++;