Merge pull request #542 from lidofinance/feat/v3-vote-ci

ci: add runners for core and dg tests

Author: iamnp

.github/workflows/core_tests.yml

@@ -9,6 +9,8 @@ on:
       - "feat/rc2"
       - "feat/rc1"
       - "feat/next-vote"
+      - "feat/v3-vote"
+      - "feat/v3-vote-ci"
   schedule:
     - cron: "0 0 * * TUE"
 
@@ -19,11 +21,10 @@ jobs:
     timeout-minutes: 120
 
     services:
-
       tests-runner:
-        image: ghcr.io/lidofinance/scripts:v20
+        image: ghcr.io/lidofinance/scripts:v21
         ports:
-          - 8546:8546
+          - 8545:8545
         volumes:
           - ${{ github.workspace }}:/root/scripts
         options: >-
@@ -36,23 +37,36 @@ jobs:
       - name: Run init script
         run: docker exec -e CORE_BRANCH tests-runner bash -c 'make init'
         env:
-          CORE_BRANCH: master
+          CORE_BRANCH: develop
 
       - name: Run node
-        run: docker exec -e ETH_RPC_URL --detach tests-runner bash -c 'NODE_PORT=8546 make node'
+        run: docker exec -e ETH_RPC_URL --detach tests-runner bash -c 'NODE_PORT=8545 make node'
         env:
           ETH_RPC_URL: ${{ secrets.ETH_RPC_URL }}
 
       - name: Check that the fork is ready
         shell: bash
-        run: timeout 30 bash -c 'until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done' 127.0.0.1 8546
+        run: |
+          echo "Waiting for fork node on 127.0.0.1:8545..."
+          sleep 10
+          for i in {1..30}; do
+            if (echo > /dev/tcp/127.0.0.1/8545) >/dev/null 2>&1; then
+              echo "Fork is ready ✅"
+              exit 0
+            fi
+            echo "Not ready yet... ($i/30)"
+            sleep 1
+          done
+          echo "❌ Fork was not ready after 30 seconds" >&2
+          exit 1
 
       - name: Prepare test environment with Brownie
-        run: docker exec -e GITHUB_TOKEN -e ETH_RPC_URL tests-runner bash -c 'make ci-prepare-environment'
+        run: docker exec -e GITHUB_TOKEN -e ETH_RPC_URL -e ETHERSCAN_TOKEN tests-runner bash -c 'make ci-prepare-environment'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ETHERSCAN_TOKEN: ${{ secrets.ETHERSCAN_TOKEN }}
 
       - name: Run core tests
         run: docker exec -e CORE_TESTS_TARGET_RPC_URL tests-runner bash -c 'make test-core'
         env:
-          CORE_TESTS_TARGET_RPC_URL: http://127.0.0.1:8546
+          CORE_TESTS_TARGET_RPC_URL: http://127.0.0.1:8545

.github/workflows/dual_governance_regression.yml

@@ -13,6 +13,7 @@ on:
       - "feat/rc2"
       - "feat/rc1"
       - "feat/next-vote"
+      - "feat/v3-vote-ci"
   workflow_dispatch:
 
 jobs:
@@ -26,15 +27,14 @@ jobs:
       cancel-in-progress: true
 
     env:
-      NODE_VERSION: '20'
-      PYTHON_VERSION: '3.10'
-      POETRY_VERSION: '1.8.2'
-      HARDHAT_NODE_URL: 'http://127.0.0.1:8545'
-      ANVIL_NODE_URL: 'http://127.0.0.1:8555'
+      NODE_VERSION: "20"
+      PYTHON_VERSION: "3.10"
+      POETRY_VERSION: "1.8.2"
+      HARDHAT_NODE_URL: "http://127.0.0.1:8545"
+      ANVIL_NODE_URL: "http://127.0.0.1:8555"
       CURL_PARAMS: '-X POST -H "Content-Type: application/json" -d "{\"jsonrpc\":\"2.0\",\"method\":\"eth_blockNumber\",\"params\":[],\"id\":1}"'
 
     steps:
-
       ################################################################
       # Clone repositories`
       ################################################################
@@ -50,7 +50,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: lidofinance/dual-governance
-          ref: feature/escrow-mainnet-deploy
+          ref: feature/report-simulation
           path: dual-governance
           persist-credentials: false
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -63,7 +63,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: 'yarn'
+          cache: "yarn"
           cache-dependency-path: scripts/yarn.lock
 
       - name: Install Poetry
@@ -141,11 +141,17 @@ jobs:
           done
         working-directory: scripts
 
+      - name: Import network config for brownie
+        shell: bash
+        run: poetry run brownie networks import network-config.yaml True
+        working-directory: scripts
+
       - name: Prepare test environment with Brownie
-        run: poetry run brownie run scripts/ci/prepare_environment --network mainnet-fork
+        run: poetry run brownie run scripts/ci/prepare_environment --network mfh-1
         working-directory: scripts
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ETHERSCAN_TOKEN: ${{ secrets.ETHERSCAN_TOKEN }}
 
       - name: Run regression tests
         run: npm run test:regressions -- --load-accounts

Makefile

@@ -4,6 +4,13 @@ define run_2nd_test
 	poetry run $(1)
 endef
 
+# Get the latest block number from the target RPC node to use as FORKING_BLOCK_NUMBER for core tests
+__get_rpc_latest_block_number:
+	@curl -s -X POST $(CORE_TESTS_TARGET_RPC_URL) \
+	  -H "Content-Type: application/json" \
+	  --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' \
+	  | sed -E 's/.*"result":"([^"]+)".*/\1/' \
+	  | xargs printf "%d"
 
 test:
 ifdef vote
@@ -22,6 +29,7 @@ CORE_DIR ?= lido-core
 CORE_BRANCH ?= master
 NODE_PORT ?= 8545
 SECONDARY_NETWORK ?= mfh-2
+NETWORK_STATE_FILE ?= deployed-mainnet.json
 
 test-1/2:
 	poetry run brownie test tests/[tc]*.py tests/regression/test_staking_router_stake_distribution.py --durations=20 --network mfh-1
@@ -78,9 +86,12 @@ node3:
 	npx hardhat node --fork $(ETH_RPC_URL3) --port $(NODE_PORT)
 
 test-core:
+	LATEST_BLOCK_NUMBER=$$($(MAKE) --no-print-directory __get_rpc_latest_block_number) && \
+	echo "LATEST_BLOCK_NUMBER: $$LATEST_BLOCK_NUMBER" && \
 	cd $(CORE_DIR) && \
-	FORK_RPC_URL=$(CORE_TESTS_TARGET_RPC_URL) \
 	RPC_URL=$(CORE_TESTS_TARGET_RPC_URL) \
+	NETWORK_STATE_FILE=$(NETWORK_STATE_FILE) \
+	FORKING_BLOCK_NUMBER=$$LATEST_BLOCK_NUMBER \
 	yarn test:integration
 
 slots:
@@ -92,7 +103,7 @@ slots:
 	@rm -f slots.ts
 
 ci-prepare-environment:
-	poetry run brownie run scripts/ci/prepare_environment --network $(SECONDARY_NETWORK)
+	poetry run brownie run scripts/ci/prepare_environment --network mfh-1
 
 enact-fork:
 	poetry run brownie run $(vote) start_and_execute_vote_on_fork_manual --network=mfh-1

scripts/ci/prepare_environment.py

@@ -2,16 +2,21 @@
 
 from typing import Callable, Tuple, List
 
+from tests.conftest import Helpers
+
 from utils.config import contracts, get_deployer_account
 from utils.voting import bake_vote_items
 from utils.dual_governance import process_pending_proposals
 from utils.evm_script import encode_call_script
 from utils.import_current_votes import get_vote_script_files, get_upgrade_script_files
 from utils.mainnet_fork import pass_and_exec_dao_vote
+from utils.test.governance_helpers import execute_vote_and_process_dg_proposals
 
 def main():
     process_pending_proposals()
-    execute_votings_and_process_created_proposals()
+    # TODO revert after December Aragon
+    #execute_votings_and_process_created_proposals()
+    execute_vote_and_process_dg_proposals(Helpers, -1, -1)
 
 def execute_votings_and_process_created_proposals():
     votings_in_flight = retrieve_votings_in_flight()

tests/conftest.py

@@ -129,9 +129,8 @@ def execute_votes(accounts, vote_ids, dao_voting, topup="10 ether"):
                     dao_voting.vote(vote_id, True, False, {"from": account})
 
         # wait for the vote to end
-        time_to_end = dao_voting.getVote(vote_id)["startDate"] + get_vote_duration() - chain.time()
-        if time_to_end > 0:
-            chain.sleep(time_to_end)
+        # time_to_end = dao_voting.getVote(vote_id)["startDate"] + get_vote_duration() - chain.time()
+        chain.sleep(get_vote_duration())
         chain.mine()
 
         for vote_id in vote_ids:

utils/test/governance_helpers.py

@@ -10,7 +10,7 @@ def execute_vote(helpers, vote_ids_from_env):
     else:
         start_and_execute_votes(contracts.voting, helpers)
 
-
+# TODO revert after December Aragon
 #def execute_vote_and_process_dg_proposals(helpers, vote_ids_from_env, dg_proposal_ids_from_env):
 #    if vote_ids_from_env and dg_proposal_ids_from_env:
 #        execute_vote(helpers, vote_ids_from_env)