Merge pull request #529 from lidofinance/feat/v3-vote

feat: V3 voting

Author: iamnp

.github/workflows/core_tests.yml

@@ -9,6 +9,7 @@ on:
       - "feat/rc2"
       - "feat/rc1"
       - "feat/next-vote"
+      - "feat/v3-vote"
   schedule:
     - cron: "0 0 * * TUE"
 
@@ -19,11 +20,10 @@ jobs:
     timeout-minutes: 120
 
     services:
-
       tests-runner:
-        image: ghcr.io/lidofinance/scripts:v19
+        image: ghcr.io/lidofinance/scripts:v21
         ports:
-          - 8546:8546
+          - 8545:8545
         volumes:
           - ${{ github.workspace }}:/root/scripts
         options: >-
@@ -36,23 +36,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"
   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

.github/workflows/normal_vote_ci.yml

@@ -13,7 +13,7 @@ jobs:
   run-tests-normal-1:
     name: Brownie fork NORMAL tests 1
     runs-on: "ubuntu-latest"
-    timeout-minutes: 100
+    timeout-minutes: 150
 
     services:
       hardhat-node:
@@ -37,7 +37,7 @@ jobs:
   run-tests-normal-2:
     name: Brownie fork NORMAL tests 2
     runs-on: "ubuntu-latest"
-    timeout-minutes: 100
+    timeout-minutes: 150
 
     services:
       hardhat-node:

Dockerfile

@@ -233,6 +233,40 @@ RUN if [ "$TARGETARCH" = "arm64" ]; then \
       git clean -d -x -f; \
     fi
 
+RUN if [ "$TARGETARCH" = "arm64" ]; then \
+      # build solc-v0.8.25
+      git checkout v0.8.25; \
+      # the compiler throws warnings when compiling this version, and the warnings are treated as errors.
+      # we disable treating the warnings as errors, unless the build doesn't succeed
+      grep -rl '\-Werror' ./cmake/EthCompilerSettings.cmake | xargs sed -i 's/\-Werror/\-Wno\-error/g'; \
+      # there is no sudo in the container, but we are under root so we do not need it
+      grep -rl 'sudo make install' ./scripts/build.sh | xargs sed -i 's/sudo make install/make install/g'; \
+      # build solc faster
+      grep -rl 'make -j2' ./scripts/build.sh | xargs sed -i 's/make -j2/make -j4/g'; \
+      ./scripts/build.sh; \
+      mv /usr/local/bin/solc /root/.solcx/solc-v0.8.25; \
+      git checkout .; \
+      git checkout develop; \
+      git clean -d -x -f; \
+    fi
+
+RUN if [ "$TARGETARCH" = "arm64" ]; then \
+      # build solc-v0.8.21
+      git checkout v0.8.21; \
+      # the compiler throws warnings when compiling this version, and the warnings are treated as errors.
+      # we disable treating the warnings as errors, unless the build doesn't succeed
+      grep -rl '\-Werror' ./cmake/EthCompilerSettings.cmake | xargs sed -i 's/\-Werror/\-Wno\-error/g'; \
+      # there is no sudo in the container, but we are under root so we do not need it
+      grep -rl 'sudo make install' ./scripts/build.sh | xargs sed -i 's/sudo make install/make install/g'; \
+      # build solc faster
+      grep -rl 'make -j2' ./scripts/build.sh | xargs sed -i 's/make -j2/make -j4/g'; \
+      ./scripts/build.sh; \
+      mv /usr/local/bin/solc /root/.solcx/solc-v0.8.21; \
+      git checkout .; \
+      git checkout develop; \
+      git clean -d -x -f; \
+    fi
+
 RUN if [ "$TARGETARCH" = "arm64" ]; then \
      # build solc-v0.6.11
      git checkout v0.6.11; \
@@ -303,6 +337,8 @@ RUN if [ "$TARGETARCH" = "arm64" ]; then /root/.solcx/solc-v0.7.6 --version | gr
 RUN if [ "$TARGETARCH" = "arm64" ]; then /root/.solcx/solc-v0.8.15 --version | grep 'Version: 0.8.15+commit.e14f2714' || (echo "Incorrect solc-v0.8.15 version" && exit 1) fi
 RUN if [ "$TARGETARCH" = "arm64" ]; then /root/.solcx/solc-v0.8.19 --version | grep 'Version: 0.8.19+commit.7dd6d404' || (echo "Incorrect solc-v0.8.19 version" && exit 1) fi
 RUN if [ "$TARGETARCH" = "arm64" ]; then /root/.solcx/solc-v0.8.24 --version | grep 'Version: 0.8.24+commit.e11b9ed9' || (echo "Incorrect solc-v0.8.24 version" && exit 1) fi
+RUN if [ "$TARGETARCH" = "arm64" ]; then /root/.solcx/solc-v0.8.25 --version | grep 'Version: 0.8.25+commit.b61c2a91' || (echo "Incorrect solc-v0.8.25 version" && exit 1) fi
+RUN if [ "$TARGETARCH" = "arm64" ]; then /root/.solcx/solc-v0.8.21 --version | grep 'Version: 0.8.21+commit.d9974bed' || (echo "Incorrect solc-v0.8.21 version" && exit 1) fi
 RUN if [ "$TARGETARCH" = "arm64" ]; then /root/.solcx/solc-v0.6.11 --version | grep 'Version: 0.6.11+commit.5ef660b1' || (echo "Incorrect solc-v0.6.11 version" && exit 1) fi
 RUN if [ "$TARGETARCH" = "arm64" ]; then /root/.vvm/vyper-0.3.7 --version | grep '0.3.7+' || (echo "Incorrect vyper-0.3.7 version" && exit 1) fi
 

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

README.md

@@ -49,7 +49,7 @@ _*may be optionally set when running tests asynchronously to reduce the risk of
 Run the container in the `scripts` directory and specify the ENV VARs:
 
 ```shell
-docker run --name scripts -v "$(pwd)":/root/scripts -e ETH_RPC_URL -e ETH_RPC_URL2 -e ETH_RPC_URL3 -e PINATA_CLOUD_TOKEN -e DEPLOYER -e ETHERSCAN_TOKEN -e ETHERSCAN_TOKEN2 -e ETHERSCAN_TOKEN3 -d ghcr.io/lidofinance/scripts:v19
+docker run --name scripts -v "$(pwd)":/root/scripts -e ETH_RPC_URL -e ETH_RPC_URL2 -e PINATA_CLOUD_TOKEN -e DEPLOYER -e ETHERSCAN_TOKEN -e ETHERSCAN_TOKEN2 -p 8545:8545 -d ghcr.io/lidofinance/scripts:v21
 ```
 
 #### Step 4. Initialize container

configs/config_mainnet.py

@@ -108,7 +108,7 @@
 
 # LidoLocator
 LIDO_LOCATOR = "0xC1d0b3DE6792Bf6b4b37EccdcC24e45978Cfd2Eb"
-LIDO_LOCATOR_IMPL = "0x2C298963FB763f74765829722a1ebe0784f4F5Cf"
+LIDO_LOCATOR_IMPL = "0x2f8779042EFaEd4c53db2Ce293eB6B3f7096C72d"
 
 # Other upgrade addresses
 LIDO_V2_UPGRADE_TEMPLATE = "0xa818fF9EC93122Bf9401ab4340C42De638CD600a"
@@ -121,7 +121,7 @@
 WITHDRAWAL_CREDENTIALS = "0x010000000000000000000000b9d7934878b5fb9610b3fe8a5e441e8fad7e293f"
 
 # Lido
-LIDO_IMPL = "0x17144556fd3424EDC8Fc8A4C940B2D04936d17eb"
+LIDO_IMPL = "0x6ca84080381E43938476814be61B779A8bB6a600"
 # see Lido's proxy appId()
 LIDO_ARAGON_APP_ID = "0x3ca7c3e38968823ccb4c78ea688df41356f182ae1d159e4ee608d30d68cef320"
 LIDO_MAX_STAKE_LIMIT_ETH = 150_000
@@ -172,7 +172,7 @@
     "0x637572617465642d6f6e636861696e2d76310000000000000000000000000000"
 )
 SIMPLE_DVT_VERSION = 4
-SIMPLE_DVT_MODULE_PRIORITY_EXIT_SHARE_THRESHOLD = 444
+SIMPLE_DVT_MODULE_PRIORITY_EXIT_SHARE_THRESHOLD = 478
 SIMPLE_DVT_MODULE_MAX_DEPOSITS_PER_BLOCK = 150
 SIMPLE_DVT_MODULE_MIN_DEPOSITS_BLOCK_DISTANCE = 25
 
@@ -201,7 +201,7 @@
 EXIT_EVENTS_LOOKBACK_WINDOW_IN_SLOTS = 14 * 7200  # 14 days
 
 # OracleReportSanityChecker
-ORACLE_REPORT_SANITY_CHECKER = "0x6232397ebac4f5772e53285B26c47914E9461E75"
+ORACLE_REPORT_SANITY_CHECKER = "0xf1647c86E6D7959f638DD9CE1d90e2F3C9503129"
 APPEARED_VALIDATORS_PER_DAY_LIMIT = 1800
 EXITED_VALIDATORS_PER_DAY_LIMIT = 3600
 ANNUAL_BALANCE_INCREASE_BP_LIMIT = 1000  # 10%
@@ -216,7 +216,7 @@
 CL_BALANCE_ORACLES_ERROR_UPPER_BP_LIMIT = 50
 
 # Burner
-BURNER = "0xD15a672319Cf0352560eE76d9e89eAB0889046D3"
+BURNER = "0xE76c52750019b80B43E36DF30bf4060EB73F573a"
 TOTAL_NON_COVER_SHARES_BURNT = 32145684728326685744
 TOTAL_COVER_SHARES_BURNT = 0
 
@@ -239,11 +239,11 @@
 # AccountingOracle
 # and its corresponding HashConsensus
 ACCOUNTING_ORACLE = "0x852deD011285fe67063a08005c71a85690503Cee"
-ACCOUNTING_ORACLE_IMPL = "0xE9906E543274cebcd335d2C560094089e9547e8d"
+ACCOUNTING_ORACLE_IMPL = "0x1455B96780A93e08abFE41243Db92E2fCbb0141c"
 HASH_CONSENSUS_FOR_AO = "0xD624B08C83bAECF0807Dd2c6880C3154a5F0B288"
 AO_EPOCHS_PER_FRAME = 225
 AO_FAST_LANE_LENGTH_SLOTS = 100
-AO_CONSENSUS_VERSION = 4
+AO_CONSENSUS_VERSION = 5
 
 # ValidatorsExitBusOracle
 VALIDATORS_EXIT_BUS_ORACLE = "0x0De4Ea0184c2ad0BacA7183356Aea5B8d5Bf5c6e"
@@ -364,7 +364,7 @@
 OBOL_LIDO_SPLIT_IMPL = "0x2fB59065F049e0D0E3180C6312FA0FeB5Bbf0FE3"
 
 # Ethereum Part for Optimism bridge
-L1_TOKEN_RATE_NOTIFIER = "0xe6793B9e4FbA7DE0ee833F9D02bba7DB5EB27823"
+L1_TOKEN_RATE_NOTIFIER = "0x25e35855783bec3E49355a29e110f02Ed8b05ba9"
 L1_OPTIMISM_TOKEN_RATE_PUSHER = "0xd54c1c6413caac3477AC14b2a80D5398E3c32FfE"
 L1_OPTIMISM_TOKENS_BRIDGE = "0x76943C0D61395d8F2edF9060e1533529cAe05dE6"
 L1_OPTIMISM_TOKENS_BRIDGE_IMPL = "0x29C5c51A031165CE62F964966A6399b81165EFA4"
@@ -522,3 +522,15 @@
         "WITHDRAWAL_BLOCKERS": (WITHDRAWAL_QUEUE, VALIDATORS_EXIT_BUS_ORACLE, TRIGGERABLE_WITHDRAWALS_GATEWAY),
     }
 }
+
+# Lido V3 - stVaults
+VAULT_HUB = "0x1d201BE093d847f6446530Efb0E8Fb426d176709"
+ACCOUNTING = "0x23ED611be0e1a820978875C0122F92260804cdDf"
+ACCOUNTING_IMPL = "0xd43a3E984071F40d5d840f60708Af0e9526785df"
+OPERATOR_GRID = "0xC69685E89Cefc327b43B7234AC646451B27c544d"
+LAZY_ORACLE = "0x5DB427080200c235F2Ae8Cd17A7be87921f7AD6c"
+PREDEPOSIT_GUARANTEE = "0xF4bF42c6D6A0E38825785048124DBAD6c9eaaac3"
+VAULTS_ADAPTER = "0xe2DE6d2DefF15588a71849c0429101F8ca9FB14D"
+GATE_SEAL_V3 = "0x881dAd714679A6FeaA636446A0499101375A365c"
+
+INITIAL_MAX_EXTERNAL_RATIO_BP = 300 # 3%