From ec9f5bb46c4743cadb78bd36ab14a13651d72f09 Mon Sep 17 00:00:00 2001 From: liav-certora Date: Sun, 29 Dec 2024 11:24:03 +0200 Subject: [PATCH 1/6] Update blockchain_api_test.py --- Quorum/tests/blockchain_api_test.py | 1 + version | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Quorum/tests/blockchain_api_test.py b/Quorum/tests/blockchain_api_test.py index 18a5ba5..199380f 100644 --- a/Quorum/tests/blockchain_api_test.py +++ b/Quorum/tests/blockchain_api_test.py @@ -2,6 +2,7 @@ from Quorum.utils.chain_enum import Chain from Quorum.apis.block_explorers.chains_api import ChainAPI + @pytest.mark.parametrize( "chain, contract_address", [ diff --git a/version b/version index ff52ef9..cfc148e 100644 --- a/version +++ b/version @@ -1,2 +1 @@ - -20241226.145726.476558 \ No newline at end of file +20241229.112403.905307 From 86565f909fe61e6fc49c82bbe08cdf6d3506c804 Mon Sep 17 00:00:00 2001 From: liav-certora Date: Sun, 29 Dec 2024 11:32:26 +0200 Subject: [PATCH 2/6] Update CI.yml --- .github/workflows/CI.yml | 9 ++++++--- version | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c36a05a..2e20f97 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,13 +1,16 @@ name: CI on: - pull_request: - branches: - - main + pull_request_review: + types: [submitted] + # pull_request: + # branches: + # - main workflow_dispatch: jobs: Regression: + if: (github.event.review.state == 'approved') && (github.event.pull_request.base.ref == 'main') env: ETHSCAN_API_KEY: ${{ secrets.ETHSCAN_API_KEY }} QUORUM_PATH: "." diff --git a/version b/version index cfc148e..bb5ef5d 100644 --- a/version +++ b/version @@ -1 +1 @@ -20241229.112403.905307 +20241229.113226.926685 From 94678440aa3be7aedcd9ece36fb21008a9225692 Mon Sep 17 00:00:00 2001 From: liav-certora Date: Sun, 29 Dec 2024 11:44:35 +0200 Subject: [PATCH 3/6] Update AaveReportTemplate.md.j2 --- Quorum/auto_report/AaveReportTemplate.md.j2 | 2 ++ version | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Quorum/auto_report/AaveReportTemplate.md.j2 b/Quorum/auto_report/AaveReportTemplate.md.j2 index 83f8c76..182278b 100644 --- a/Quorum/auto_report/AaveReportTemplate.md.j2 +++ b/Quorum/auto_report/AaveReportTemplate.md.j2 @@ -57,3 +57,5 @@ The proposal is consistent with the description on both Snapshot and the governa * :white_check_mark: The proposal includes a proper tests suite, checking all necessary post-conditions. * :white_check_mark: BGD reviewed the payload before the proposal was submitted. * :white_check_mark: Certora reviewed the procedure followed to submit the proposal. + +FAIL \ No newline at end of file diff --git a/version b/version index bb5ef5d..1f1b019 100644 --- a/version +++ b/version @@ -1 +1 @@ -20241229.113226.926685 +20241229.114435.624429 From 42a3e4f5eabfe37da6d1412563d64e9393e85662 Mon Sep 17 00:00:00 2001 From: liav-certora Date: Sun, 29 Dec 2024 11:59:36 +0200 Subject: [PATCH 4/6] . --- .github/workflows/CI.yml | 14 ++++++++++---- Quorum/auto_report/AaveReportTemplate.md.j2 | 2 -- version | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2e20f97..2c324ed 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -3,14 +3,20 @@ name: CI on: pull_request_review: types: [submitted] - # pull_request: - # branches: - # - main + pull_request: + branches: + - main workflow_dispatch: jobs: Regression: - if: (github.event.review.state == 'approved') && (github.event.pull_request.base.ref == 'main') + if: | + ( + (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') || + github.event.pull_request.user.login == 'niv@certora.com' || + github.event.pull_request.user.login == 'liav@certora.com' + ) && + github.event.pull_request.base.ref == 'main' env: ETHSCAN_API_KEY: ${{ secrets.ETHSCAN_API_KEY }} QUORUM_PATH: "." diff --git a/Quorum/auto_report/AaveReportTemplate.md.j2 b/Quorum/auto_report/AaveReportTemplate.md.j2 index 182278b..83f8c76 100644 --- a/Quorum/auto_report/AaveReportTemplate.md.j2 +++ b/Quorum/auto_report/AaveReportTemplate.md.j2 @@ -57,5 +57,3 @@ The proposal is consistent with the description on both Snapshot and the governa * :white_check_mark: The proposal includes a proper tests suite, checking all necessary post-conditions. * :white_check_mark: BGD reviewed the payload before the proposal was submitted. * :white_check_mark: Certora reviewed the procedure followed to submit the proposal. - -FAIL \ No newline at end of file diff --git a/version b/version index 1f1b019..d4e500f 100644 --- a/version +++ b/version @@ -1 +1 @@ -20241229.114435.624429 +20241229.115936.801344 From 0c053ea53f9a06cf17143e673e657252031a38f2 Mon Sep 17 00:00:00 2001 From: liav-certora Date: Sun, 29 Dec 2024 12:07:53 +0200 Subject: [PATCH 5/6] Update CI.yml --- .github/workflows/CI.yml | 18 +++++++++++------- version | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2c324ed..c0af325 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -8,15 +8,16 @@ on: - main workflow_dispatch: + # | + # ( + # (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') || + # github.event.pull_request.user.login == 'niv@certora.com' || + # github.event.pull_request.user.login == 'liav@certora.com' + # ) && + # github.event.pull_request.base.ref == 'main' + jobs: Regression: - if: | - ( - (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') || - github.event.pull_request.user.login == 'niv@certora.com' || - github.event.pull_request.user.login == 'liav@certora.com' - ) && - github.event.pull_request.base.ref == 'main' env: ETHSCAN_API_KEY: ${{ secrets.ETHSCAN_API_KEY }} QUORUM_PATH: "." @@ -38,3 +39,6 @@ jobs: run: | pytest Quorum/tests --maxfail=1 --disable-warnings --tb=short CheckProposal --config Quorum/execution.json + + - name: Print + run: echo "${{ github.event.pull_request.user.login }}" diff --git a/version b/version index d4e500f..e4604a5 100644 --- a/version +++ b/version @@ -1 +1 @@ -20241229.115936.801344 +20241229.120754.222198 From e5507429858b664933afb06aa765d540c3a2a5ef Mon Sep 17 00:00:00 2001 From: liav-certora Date: Sun, 29 Dec 2024 12:13:39 +0200 Subject: [PATCH 6/6] Update CI.yml --- .github/workflows/CI.yml | 18 +++++++----------- version | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c0af325..fde5bcd 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -8,16 +8,15 @@ on: - main workflow_dispatch: - # | - # ( - # (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') || - # github.event.pull_request.user.login == 'niv@certora.com' || - # github.event.pull_request.user.login == 'liav@certora.com' - # ) && - # github.event.pull_request.base.ref == 'main' - jobs: Regression: + if: | + ( + (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') || + github.event.pull_request.user.login == 'nivcertora' || + github.event.pull_request.user.login == 'liav-certora' + ) && + github.event.pull_request.base.ref == 'main' env: ETHSCAN_API_KEY: ${{ secrets.ETHSCAN_API_KEY }} QUORUM_PATH: "." @@ -39,6 +38,3 @@ jobs: run: | pytest Quorum/tests --maxfail=1 --disable-warnings --tb=short CheckProposal --config Quorum/execution.json - - - name: Print - run: echo "${{ github.event.pull_request.user.login }}" diff --git a/version b/version index e4604a5..79c27b5 100644 --- a/version +++ b/version @@ -1 +1 @@ -20241229.120754.222198 +20241229.121340.274243