Merge branch 'feat/next-vote' into feat/vote-moves-to-archive

Author: Nikita P

.github/workflows/large_vote_ci.yml

@@ -19,7 +19,7 @@ jobs:
 
     services:
       hardhat-node:
-        image: ghcr.io/lidofinance/hardhat-node:2.22.17
+        image: ghcr.io/lidofinance/hardhat-node:2.22.19.2-shanghai
         ports:
           - 8545:8545
         env:

.github/workflows/normal_vote_ci.yml

@@ -17,7 +17,7 @@ jobs:
 
     services:
       hardhat-node:
-        image: ghcr.io/lidofinance/hardhat-node:2.22.17
+        image: ghcr.io/lidofinance/hardhat-node:2.22.19.2-shanghai
         ports:
           - 8545:8545
         env:

Dockerfile

@@ -264,15 +264,6 @@ RUN if [ "$TARGETARCH" = "arm64" ]; then \
 # compilers for amd64 will be downloaded by brownie later in this Dockerfile
 
 
-# install & configure hardhat
-RUN mkdir /root/hardhat
-WORKDIR /root/hardhat
-RUN npm install -d hardhat
-RUN npm install --save-dev @nomiclabs/hardhat-ethers ethers @nomiclabs/hardhat-waffle ethereum-waffle chai
-RUN touch hardhat.config.js
-RUN echo "/** @type import('hardhat/config').HardhatUserConfig */\nmodule.exports = {\n  solidity: \"0.8.28\",\n};" | tee -a hardhat.config.js
-
-
 # init script that runs when the container is started for the very first time
 # it will install poetry, yarn libs and init brownie networks
 WORKDIR /root/scripts
@@ -281,18 +272,7 @@ RUN echo "if [ ! -e /root/inited ]; then \n touch /root/inited \n poetry install
 RUN chmod +x /root/init.sh
 
 
-# install & configure sshd
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && \
-    apt-get install -y openssh-server && \
-    mkdir /var/run/sshd
-
-RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config && \
-    sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/' /etc/ssh/sshd_config
-RUN echo 'PermitUserEnvironment yes' >> /etc/ssh/sshd_config
-
-# set default working dir for ssh clients
+# set default working dir for tty
 RUN echo "cd /root/scripts" >> /root/.bashrc
 
 
@@ -319,9 +299,6 @@ RUN if [ "$TARGETARCH" = "arm64" ]; then /root/.solcx/solc-v0.8.24 --version | g
 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
 
-# open sshd port
-EXPOSE 22
-
 
-# start sshd, run init script, set root password for incoming connections and pass all ENV VARs from the container
-CMD ["/bin/bash", "-c", "env | grep -v 'no_proxy' >> /etc/environment && /root/init.sh && echo root:1234 | chpasswd && exec /usr/sbin/sshd -D"]
+# run init script and sleep to keep the container running
+CMD ["/bin/bash", "-c", "/root/init.sh && sleep infinity"]

README.md

@@ -35,22 +35,18 @@ cd scripts
 #### Step 3. Run the container
 Run the container in the `scripts` directory and specify the ENV VARs:
 ```shell
-docker run --name scripts -v "$(pwd)":/root/scripts -e WEB3_INFURA_PROJECT_ID -d -p 2222:22 --rm ghcr.io/lidofinance/scripts:v9
+docker run --name scripts -v "$(pwd)":/root/scripts -e WEB3_INFURA_PROJECT_ID -d --rm ghcr.io/lidofinance/scripts:v10
 
 ```
 Note: *It may take up to 1 minute for the container to initialize properly the first time.*
-#### Step 4. Now connect to the running container using SSH:
+
+#### Step 4. Now connect to the running container using tty:
 ```shell
-ssh root@localhost -p 2222 # password: 1234
+docker exec -it scripts /bin/bash
 ```
-> [!NOTE]
-> If you see a 'REMOTE HOST IDENTIFICATION HAS CHANGED' error - `ssh-keygen -R "[localhost]:2222"`
-> 
-> If you are asked 'Are you sure you want to continue connecting' - type `yes` and hit `<ENTER>`
 
 To run a Hardhat node inside a deployed Docker container:
 ```shell
-cd /root/hardhat
 npx hardhat node --fork $ETH_RPC_URL
 ```
 
@@ -65,7 +61,7 @@ docker start scripts
 
 #### How to publish a new version of Scripts Docker image to GHCR
 1. Push code changes to the repo
-2. Wait for the approvals and merge them into `master`
+2. Wait for the approvals
 3. Add a tag `vX`, where `X` is the next release number, to the commit. You can refer to the [Release](https://github.com/lidofinance/scripts/releases) page
 4. Wait for the workflow **build and push image** to finish successfully on the tagged commit
 5. In this README file, update the image version in section **Step 3. Run the container**
@@ -132,16 +128,6 @@ poetry shell
 
 #### To run a Hardhat node (preferred) instead of Ganache:
 Just use the [Dockerised Hardhat Node](https://github.com/lidofinance/hardhat-node) or alternatively run it manually:
-
-Install Hardhat and dependencies into a separate folder:
-```shell
-mkdir hardhat && cd hardhat && npm install -d hardhat && npm install --save-dev @nomiclabs/hardhat-ethers ethers @nomiclabs/hardhat-waffle ethereum-waffle chai
-```
-Init empty Hardhat project in this folder:
-```shell
-touch hardhat.config.js && echo $'/** @type import(\'hardhat/config\').HardhatUserConfig */\nmodule.exports = {\n  solidity: "0.8.28",\n};' | tee -a hardhat.config.js
-```
-Start Hardhat node in this folder:
 ```shell
 npx hardhat node --fork $ETH_RPC_URL
 ```

archive/scripts/vote_2025_03_18.py

@@ -65,15 +65,15 @@
 from utils.mainnet_fork import pass_and_exec_dao_vote
 
 
-description = """1. **Extend On-Chain Voting Duration** (Items 1-17)
+description = """1. **Extend On-Chain Voting Duration** (Items 1-17)  
 As approved on [Snapshot](https://snapshot.box/#/s:lido-snapshot.eth/proposal/0xa58da73cc4257837ae981d8ad861252f4cbbda7a173a577702f8f93561f57825):
 - **Main phase**: 48h → 72h
 - **Objection phase**: 24h → 48h
 
-To align with these changes, **GateSeal** (pausing the [WithdrawalQueue](https://etherscan.io/address/0x889edC2eDab5f40e902b864aD4d7AdE8E412F9B1) and [ValidatorExitBusOracle](https://etherscan.io/address/0x0De4Ea0184c2ad0BacA7183356Aea5B8d5Bf5c6e)) and **CSM GateSeal** (pausing the [CSModule](https://etherscan.io/address/0xdA7dE2ECdDfccC6c3AF10108Db212ACBBf9EA83F), [CSAccounting](https://etherscan.io/address/0x4d72BFF1BeaC69925F8Bd12526a39BAAb069e5Da) and [CSFeeOracle](https://etherscan.io/address/0x4D4074628678Bd302921c20573EEa1ed38DdF7FB)) will be updated with the same configuration, except for extending the duration from 6 to 11 days. The new versions will expire on **March 1, 2026**.
-**Statemind.io** audited the [initial Factory and Blueprint](https://github.com/lidofinance/audits/?tab=readme-ov-file#04-2023-statemind-gateseals-audit) and [verified](https://github.com/lidofinance/audits/blob/main/Statemind%20GateSeal%20Deployment%20Validation%2003-2025.pdf) that the updated GateSeal matches the Blueprint and has the correct parameters.
+To align with these changes, **GateSeal** (pausing the [WithdrawalQueue](https://etherscan.io/address/0x889edC2eDab5f40e902b864aD4d7AdE8E412F9B1) and [ValidatorExitBusOracle](https://etherscan.io/address/0x0De4Ea0184c2ad0BacA7183356Aea5B8d5Bf5c6e)) and **CSM GateSeal** (pausing the [CSModule](https://etherscan.io/address/0xdA7dE2ECdDfccC6c3AF10108Db212ACBBf9EA83F), [CSAccounting](https://etherscan.io/address/0x4d72BFF1BeaC69925F8Bd12526a39BAAb069e5Da), and [CSFeeOracle](https://etherscan.io/address/0x4D4074628678Bd302921c20573EEa1ed38DdF7FB)) will be updated with the same configuration, except for extending the duration from 6 to 11 days. The new versions will expire on **March 1, 2026**.
+**Statemind.io** audited the [initial Factory and Blueprint](https://github.com/lidofinance/audits/?tab=readme-ov-file#04-2023-statemind-gateseals-audit) and [verified](https://github.com/lidofinance/audits/blob/main/Statemind%20GateSeal%20Deployment%20Validation%2003-2025.pdf) that the updated GateSeal contracts match the Blueprint and have the correct parameters.
 
-2. **Deploy Easy Track Factories for Lido Ecosystem & Lido Labs BORG Foundations to streamline operational funding** (Items 18,19)
+2. **Deploy Easy Track Factories for Lido Ecosystem & Lido Labs BORG Foundations to streamline operational funding** (Items 18, 19)
 
 Snapshot proposals & contract details:
 - [Lido Ecosystem Snapshot](https://snapshot.box/#/s:lido-snapshot.eth/proposal/0x7f72f12d72643c20cd0455c603d344050248e75ed1074c8391fae4c30f09ca15) | [Configuration](https://research.lido.fi/t/establishment-of-lido-ecosystem-borg-foundation-as-a-lido-dao-adjacent-foundation/9345/15) | security limit $5M per quarter
@@ -149,7 +149,7 @@ def start_vote(tx_params: Dict[str, str], silent: bool) -> Tuple[int, Optional[T
             ),
         ),
         (
-            "6. Update the FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT parameter in the OracleDaemonConfig contract  0xbf05A929c3D7885a6aeAd833a992dA6E5ac23b09 to 0x08CA (2250 epochs)",
+            "6. Update the FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT parameter in the OracleDaemonConfig contract 0xbf05A929c3D7885a6aeAd833a992dA6E5ac23b09 to 0x08CA (2250 epochs)",
             agent_forward(
                 [
                     (
@@ -301,14 +301,14 @@ def start_vote(tx_params: Dict[str, str], silent: bool) -> Tuple[int, Optional[T
 
         # EasyTrack factories
         (
-            "18. Add an Easy Track EVM script factory 0xf2476f967C826722F5505eDfc4b2561A34033477 for funding the Lido Ecosystem BORG’s operational multisig (AllowedRecipientsRegistry 0xDAdC4C36cD8F468A398C25d0D8aaf6A928B47Ab4)",
+            "18. Add an Easy Track EVM script factory 0xf2476f967C826722F5505eDfc4b2561A34033477 for funding the Lido Ecosystem BORG Foundation’s operational multisig (AllowedRecipientsRegistry 0xDAdC4C36cD8F468A398C25d0D8aaf6A928B47Ab4)",
             add_evmscript_factory(
                 factory=ECOSYSTEM_BORG_STABLE_FACTORY,
                 permissions=create_top_up_allowed_recipient_permission(registry_address=ECOSYSTEM_BORG_STABLE_REGISTRY),
             ),
         ),
         (
-            "19. Add an Easy Track EVM script factory 0xE1f6BaBb445F809B97e3505Ea91749461050F780 for funding the Lido Labs BORG’s operational multisig (AllowedRecipientsRegistry 0x68267f3D310E9f0FF53a37c141c90B738E1133c2)",
+            "19. Add an Easy Track EVM script factory 0xE1f6BaBb445F809B97e3505Ea91749461050F780 for funding the Lido Labs BORG Foundation’s operational multisig (AllowedRecipientsRegistry 0x68267f3D310E9f0FF53a37c141c90B738E1133c2)",
             add_evmscript_factory(
                 factory=LABS_BORG_STABLE_FACTORY,
                 permissions=create_top_up_allowed_recipient_permission(registry_address=LABS_BORG_STABLE_REGISTRY),

archive/tests/test_2025_03_18.py

@@ -1,7 +1,12 @@
-from brownie import interface, convert, Contract, web3
+from brownie import interface, convert, Contract, web3, reverts, chain
 from scripts.vote_2024_03_18 import start_vote
 from utils.test.tx_tracing_helpers import *
-from utils.config import LDO_HOLDER_ADDRESS_FOR_TESTS
+from utils.evm_script import encode_call_script, EMPTY_CALLSCRIPT
+from utils.config import (
+    contracts,
+    LDO_VOTE_EXECUTORS_FOR_TESTS,
+    LDO_HOLDER_ADDRESS_FOR_TESTS,
+)
 from utils.test.event_validators.permission import (
     Permission,
     validate_permission_grant_event,
@@ -16,15 +21,18 @@
 )
 from utils.test.event_validators.voting import validate_change_vote_time_event, validate_change_objection_time_event
 from utils.test.event_validators.common import validate_events_chain
-from utils.test.easy_track_helpers import create_and_enact_payment_motion
+from utils.test.easy_track_helpers import create_and_enact_payment_motion, check_add_and_remove_recipient_with_voting
+
+from utils.voting import find_metadata_by_vote_id
+from utils.ipfs import get_lido_vote_cid_from_str
 
 # Vote duration
 NEW_VOTE_DURATION = 432000
 NEW_OBJECTION_PHASE_DURATION = 172800
 
 # Oracle daemon config
-FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT_NEW_VALUE = convert.to_bytes(2250, "bytes").hex()
-FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT_OLD_VALUE = convert.to_bytes(1350, "bytes").hex()
+FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT_NEW_VALUE = '0x' + convert.to_bytes(2250, "bytes").hex()
+FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT_OLD_VALUE = '0x' + convert.to_bytes(1350, "bytes").hex()
 
 # GateSeals
 OLD_GATE_SEAL = "0x79243345eDbe01A7E42EDfF5900156700d22611c"
@@ -92,7 +100,7 @@ def _check_no_role(contract: Contract, role: str, holder: str):
     ), f"Role {role} holder on {contract} should be {holder}"
 
 
-def test_vote(helpers, accounts, vote_ids_from_env, bypass_events_decoding, stranger):
+def test_vote(helpers, accounts, vote_ids_from_env, bypass_events_decoding, ldo_holder, stranger):
     acl = interface.ACL(ACL)
     csm = interface.CSModule(CSM)
     cs_fee_oracle = interface.CSFeeOracle(CS_FEE_ORACLE)
@@ -116,7 +124,7 @@ def test_vote(helpers, accounts, vote_ids_from_env, bypass_events_decoding, stra
 
     # Check Oracle Config state before voting
     finalization_max_negative_rebase_epoch_shift = oracle_daemon_config.get("FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT")
-    assert finalization_max_negative_rebase_epoch_shift.hex() == FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT_OLD_VALUE
+    assert finalization_max_negative_rebase_epoch_shift == FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT_OLD_VALUE
     assert not oracle_daemon_config.hasRole(
         web3.keccak(text="CONFIG_MANAGER_ROLE").hex(),
         agent.address
@@ -163,7 +171,7 @@ def test_vote(helpers, accounts, vote_ids_from_env, bypass_events_decoding, stra
 
     # Check Oracle Config updated properly
     finalization_max_negative_rebase_epoch_shift_updated = oracle_daemon_config.get("FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT")
-    assert finalization_max_negative_rebase_epoch_shift_updated.hex() == FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT_NEW_VALUE
+    assert finalization_max_negative_rebase_epoch_shift_updated == FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT_NEW_VALUE
     assert not oracle_daemon_config.hasRole(
         web3.keccak(text="CONFIG_MANAGER_ROLE").hex(),
         agent.address
@@ -206,6 +214,63 @@ def test_vote(helpers, accounts, vote_ids_from_env, bypass_events_decoding, stra
     assert new_csm_gate_seal_contract.get_expiry_timestamp() == GATE_SEAL_NEW_EXPIRY_TIMESTAMP
     assert not new_csm_gate_seal_contract.is_expired()
 
+    # Scenario test
+    print("Simulating GateSeal flow")
+    # Try to use the Old gate seal to pause the contracts
+    print("Try to use the Old gate seal to pause the contracts")
+    old_gate_seal = interface.GateSeal(OLD_GATE_SEAL)
+    with reverts(
+        "10"
+    ):  # converted into string list of sealed indexes (in sealables) in which the error occurred, in the descending order
+        interface.GateSeal(old_gate_seal).seal(sealables, {"from": GATE_SEAL_COMMITTEE})
+
+    print("Seal the contracts with the New gate seal")
+    new_gate_seal_contract.seal(sealables, {"from": GATE_SEAL_COMMITTEE})
+    print("Sealed")
+
+    expiry_timestamp = chain.time()
+    assert new_gate_seal_contract.is_expired()
+    assert new_gate_seal_contract.get_expiry_timestamp() <= expiry_timestamp
+    print("Expired")
+
+    for sealable in sealables:
+        assert interface.IPausable(sealable).isPaused()
+    print("Sealables paused")
+    chain.sleep(new_gate_seal_contract.get_seal_duration_seconds())
+    chain.mine()
+
+    for sealable in sealables:
+        assert not interface.IPausable(sealable).isPaused()
+    print(f"Sealables unpaused in {new_gate_seal_contract.get_seal_duration_seconds()}")
+
+    old_csm_gate_seal = interface.GateSeal(OLD_CSM_GATE_SEAL)
+    with reverts(
+        "210"
+    ):  # converted into string list of sealed indexes (in sealables) in which the error occurred, in the descending order
+        old_csm_gate_seal.seal(csm_sealables, {"from": CSM_GATE_SEAL_COMMITTEE})
+
+    print("Seal the contracts with the New gate seal")
+    new_csm_gate_seal_contract.seal(csm_sealables, {"from": CSM_GATE_SEAL_COMMITTEE})
+    print("Sealed")
+
+    expiry_timestamp = chain.time()
+    assert new_csm_gate_seal_contract.is_expired()
+    assert new_csm_gate_seal_contract.get_expiry_timestamp() <= expiry_timestamp
+    print("Expired")
+
+    for sealable in csm_sealables:
+        assert interface.IPausable(sealable).isPaused()
+    print("Sealables paused")
+    chain.sleep(new_csm_gate_seal_contract.get_seal_duration_seconds())
+    chain.mine()
+
+    for sealable in csm_sealables:
+        assert not interface.IPausable(sealable).isPaused()
+    print(f"Sealables unpaused in {new_csm_gate_seal_contract.get_seal_duration_seconds()}")
+
+    print("GateSeal is good to go!")
+
+
     # EasyTrack factories added check
     evm_script_factories_after = easy_track.getEVMScriptFactories()
     assert ECOSYSTEM_BORG_STABLE_FACTORY in evm_script_factories_after
@@ -214,14 +279,16 @@ def test_vote(helpers, accounts, vote_ids_from_env, bypass_events_decoding, stra
 
     ecosystem_borg_stable_factory = interface.TopUpAllowedRecipients(ECOSYSTEM_BORG_STABLE_FACTORY)
     labs_borg_stable_factory = interface.TopUpAllowedRecipients(LABS_BORG_STABLE_FACTORY)
+    ecosystem_borg_stable_registry = interface.AllowedRecipientRegistry(ECOSYSTEM_BORG_STABLE_REGISTRY)
+    labs_borg_stable_registry = interface.AllowedRecipientRegistry(LABS_BORG_STABLE_REGISTRY)
 
     for stablecoin in [DAI_TOKEN, USDT_TOKEN, USDC_TOKEN]:
         create_and_enact_payment_motion(
             easy_track=easy_track,
             trusted_caller=ecosystem_borg_stable_factory.trustedCaller(),
             factory=ecosystem_borg_stable_factory,
             token=interface.ERC20(stablecoin),
-            recievers=[Contract(interface.AllowedRecipientRegistry(ECOSYSTEM_BORG_STABLE_REGISTRY).allowedRecipients(0))],
+            recievers=[Contract(ecosystem_borg_stable_registry.allowedRecipients(0))],
             transfer_amounts=[1 * 10**6],
             stranger=stranger,
         )
@@ -230,16 +297,49 @@ def test_vote(helpers, accounts, vote_ids_from_env, bypass_events_decoding, stra
             trusted_caller=labs_borg_stable_factory.trustedCaller(),
             factory=labs_borg_stable_factory,
             token=interface.ERC20(stablecoin),
-            recievers=[Contract(interface.AllowedRecipientRegistry(LABS_BORG_STABLE_REGISTRY).allowedRecipients(0))],
+            recievers=[Contract(labs_borg_stable_registry.allowedRecipients(0))],
             transfer_amounts=[1 * 10**6],
             stranger=stranger,
         )
 
+    check_add_and_remove_recipient_with_voting(
+        ecosystem_borg_stable_registry, helpers, ldo_holder, voting
+    )
+    check_add_and_remove_recipient_with_voting(
+        labs_borg_stable_registry, helpers, ldo_holder, voting
+    )
+
+    # Voting duration check
+    new_vote_script = encode_call_script(
+        [(voting.address, voting.newVote.encode_input(EMPTY_CALLSCRIPT, "", False, False))]
+    )
+    tx = contracts.token_manager.forward(new_vote_script, tx_params)
+    test_vote_id = tx.events["StartVote"]["voteId"]
+
+    chain.sleep((3 * 24 * 60 * 60) - 60) # 1 minute before voting phase ends (end of 3rd day)
+
+    for holder_addr in LDO_VOTE_EXECUTORS_FOR_TESTS:
+        print("voting from acct:", holder_addr)
+        topup = "10 ether"
+        if accounts.at(holder_addr, force=True).balance() < topup:
+            accounts[0].transfer(holder_addr, topup)
+        account = accounts.at(holder_addr, force=True)
+        voting.vote(test_vote_id, True, False, {"from": account})
+
+    chain.sleep(2 * 24 * 60 * 60)  # 1 minute before objection phase ends (end of 5th day)
+    voting.vote(test_vote_id, False, False, {"from": ldo_holder})
+
+    chain.sleep(60) # 1 minutes to be executed
+    voting.executeVote(test_vote_id, {"from": ldo_holder})
 
     # Events check
     display_voting_events(vote_tx)
     events = group_voting_events(vote_tx)
 
+    metadata = find_metadata_by_vote_id(vote_id)
+    print('ipfs id:', get_lido_vote_cid_from_str(metadata))
+    assert get_lido_vote_cid_from_str(metadata) == "bafkreiae5ge6hszcag4cdxk3wcoqfa2ilre7rbt4f3j3eydmgip6nvvat4"
+
     assert len(events) == 19
 
     unsafely_modify_vote_time_role_permission = Permission(
@@ -323,4 +423,4 @@ def validate_config_value_updated(event: EventDict, key, value):
     _events_chain = ["LogScriptCall", "LogScriptCall", "ConfigValueUpdated", "ScriptResult"]
     validate_events_chain([e.name for e in event], _events_chain)
     assert event["ConfigValueUpdated"]["key"] == key
-    assert convert.to_bytes(event["ConfigValueUpdated"]["value"], 'bytes').hex() == value
+    assert event["ConfigValueUpdated"]["value"] == value