Merge branch 'feat/deploy-plan' into feature/3rd-devnet-deployment

.env.example

@@ -2,8 +2,12 @@ MAINNET_RPC_URL=<your RPC url>
 HOLESKY_RPC_URL=<your Holesky RPC url>
 
 # Deploy script env vars
-ETHERSCAN_MAINNET_KEY=...
+RPC_URL=...
+ETHERSCAN_API_KEY=...
+
+DEPLOYER_ACCOUNT=...
+DEPLOYER_ADDRESS=...
+
 DEPLOY_CONFIG_FILE_NAME=deploy-config.toml # in the deploy-config folder
 DEPLOY_ARTIFACT_FILE_NAME=deploy-artifact.json # in the deploy-config folder
 TIMELOCKED_GOVERNANCE_CONFIG_FILE_NAME=tg-config.toml # in the deploy-config folder
-FROM_STEP=0

deploy-artifacts/deploy-artifact-17000-1738145124.toml

@@ -102,3 +102,6 @@ tiebreaker_sub_committees = [
     "0xd256Dc67e318c53BAD904B48EDC1baCbE211A465",
 ]
 timelock = "0x9404Fc6F57B32a01F4f8770F06B399C753519fC3"
+
+[dao_voting]
+dual_governance_activation_voting_encoded_data = "0x00000001da7d2573df555002503f29aa4003e398d28cc00f000007a4d5db2c800000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000076000000000000000000000000000000000000000000000000000000000000006fc00000001fd1e42595cec3e83239bf8dfc535250e7f48e0bc000000649d0effdb000000000000000000000000da7d2573df555002503f29aa4003e398d28cc00f0000000000000000000000003f1c547b21f65e10480de3ad8e19faac46c95034a42eee1333c0758ba72be38e728b6dadb32ea767de5b4ddbaea1dae85b1b051ffd1e42595cec3e83239bf8dfc535250e7f48e0bc000000640a8ed3db000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325d0000000000000000000000003f1c547b21f65e10480de3ad8e19faac46c95034a42eee1333c0758ba72be38e728b6dadb32ea767de5b4ddbaea1dae85b1b051ffd1e42595cec3e83239bf8dfc535250e7f48e0bc00000064afd925df000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325d0000000000000000000000003f1c547b21f65e10480de3ad8e19faac46c95034a42eee1333c0758ba72be38e728b6dadb32ea767de5b4ddbaea1dae85b1b051fe92329ec7ddb11d25e25b3c21eebf11f15eb325d000000a4d948d4680000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000001c7cc160b58f8bb0bac94b80847e2cf2800565c50000000442f2ff15d139c2898040ef16910dc9f44dc697df79363da767d8bc92f2e310312b816e46d000000000000000000000000c2764655e3fe0bd2d3c710d74fa5a89162099fd8e92329ec7ddb11d25e25b3c21eebf11f15eb325d000000a4d948d4680000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000001c7cc160b58f8bb0bac94b80847e2cf2800565c50000000442f2ff15d2fc10cc8ae19568712f7a176fb4978616a610650813c9d05326c34abb62749c7000000000000000000000000c2764655e3fe0bd2d3c710d74fa5a89162099fd8e92329ec7ddb11d25e25b3c21eebf11f15eb325d000000a4d948d4680000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000001091c0ec8b4d54a9fcb36269b5d5e5af43309e666000000442f2ff15d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000da7d2573df555002503f29aa4003e398d28cc00f091c0ec8b4d54a9fcb36269b5d5e5af43309e66600000044d547741f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325dfd1e42595cec3e83239bf8dfc535250e7f48e0bc000000640a8ed3db000000000000000000000000d5ee9991f44b36e186a658dc2a0357eccf11b69b000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325db421f7ad7646747f3051c50c0b8e2377839296cd4973e27f63821d73e390338f0f8826a574bcfdc4997939076f6d82877971feb300000044221e2efc000000000000000000000000d5ee9991f44b36e186a658dc2a0357eccf11b69b000000000000000000000000c2764655e3fe0bd2d3c710d74fa5a89162099fd8b291a7f092d5cce0a3c93ea21bda3431129db2020000020453e51f8b000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c4d948d4680000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000007c00000001c3fc22c7e0d20247b797fb6dc743bd3879217c8100000004febb0f7e3db5aba48123bb8789f6f09ec714e7082bc267470000004491f0004c00000000000000000000000000000000000000000000000000000000000070800000000000000000000000000000000000000000000000000000000000011940000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000176465736372697074696f6e5f706c616365686f6c646572000000000000000000"

deploy-artifacts/deploy-artifact-17000-1739521776-production.toml

@@ -106,4 +106,4 @@ tiebreaker_sub_committees = [
 timelock = "0xb66797d1560e646B6b0283E0F88F0c87fA98fF34"
 
 [dao_voting]
-dual_governance_activation_voting_encoded = "0x00000001da7d2573df555002503f29aa4003e398d28cc00f00000824f4b00513000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000007c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000071800000001fd1e42595cec3e83239bf8dfc535250e7f48e0bc000000640a8ed3db000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325d0000000000000000000000003f1c547b21f65e10480de3ad8e19faac46c95034a42eee1333c0758ba72be38e728b6dadb32ea767de5b4ddbaea1dae85b1b051ffd1e42595cec3e83239bf8dfc535250e7f48e0bc000000649d0effdb000000000000000000000000da7d2573df555002503f29aa4003e398d28cc00f0000000000000000000000003f1c547b21f65e10480de3ad8e19faac46c95034a42eee1333c0758ba72be38e728b6dadb32ea767de5b4ddbaea1dae85b1b051ffd1e42595cec3e83239bf8dfc535250e7f48e0bc00000064afd925df000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325d0000000000000000000000003f1c547b21f65e10480de3ad8e19faac46c95034a42eee1333c0758ba72be38e728b6dadb32ea767de5b4ddbaea1dae85b1b051fe92329ec7ddb11d25e25b3c21eebf11f15eb325d000000a4d948d4680000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000001c7cc160b58f8bb0bac94b80847e2cf2800565c50000000442f2ff15d139c2898040ef16910dc9f44dc697df79363da767d8bc92f2e310312b816e46d000000000000000000000000517c93bb27ad463fe3ad8f15dafdad56ec0beec3e92329ec7ddb11d25e25b3c21eebf11f15eb325d000000a4d948d4680000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000001c7cc160b58f8bb0bac94b80847e2cf2800565c50000000442f2ff15d2fc10cc8ae19568712f7a176fb4978616a610650813c9d05326c34abb62749c7000000000000000000000000517c93bb27ad463fe3ad8f15dafdad56ec0beec3e92329ec7ddb11d25e25b3c21eebf11f15eb325d000000a4d948d4680000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000001091c0ec8b4d54a9fcb36269b5d5e5af43309e666000000442f2ff15d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000da7d2573df555002503f29aa4003e398d28cc00f091c0ec8b4d54a9fcb36269b5d5e5af43309e66600000044d547741f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325dfd1e42595cec3e83239bf8dfc535250e7f48e0bc000000640a8ed3db0000000000000000000000003cc908b004422fd66fdb40be062bf9b0bd5bdbed000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325db421f7ad7646747f3051c50c0b8e2377839296cd4973e27f63821d73e390338f0f8826a574bcfdc4997939076f6d82877971feb300000044221e2efc0000000000000000000000003cc908b004422fd66fdb40be062bf9b0bd5bdbed000000000000000000000000517c93bb27ad463fe3ad8f15dafdad56ec0beec3fecf4634f6571da23c8f21beeea8d12788df529e00000004fc735e99e29d4d0cad66d87a054b5a93867c708000dae1e60000020453e51f8b000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c4d948d4680000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000007c00000001c3fc22c7e0d20247b797fb6dc743bd3879217c8100000004febb0f7e3db5aba48123bb8789f6f09ec714e7082bc267470000004491f0004c000000000000000000000000000000000000000000000000000000000000708000000000000000000000000000000000000000000000000000000000000119400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000027486f6c65736b79206475616c20676f7665726e616e63652075706772616465206472792d72756e00000000000000000000000000000000000000000000000000"
+dual_governance_activation_voting_calldata_provider = "0xD62837Cc18FB25791B9Cc51B1862bb8e06004204"

deploy-artifacts/deploy-artifact-17000-1739521776.toml

@@ -106,4 +106,4 @@ tiebreaker_sub_committees = [
 timelock = "0xb66797d1560e646B6b0283E0F88F0c87fA98fF34"
 
 [dao_voting]
-dual_governance_activation_voting_encoded = "0x00000001da7d2573df555002503f29aa4003e398d28cc00f00000824f4b00513000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000007c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000071800000001fd1e42595cec3e83239bf8dfc535250e7f48e0bc000000640a8ed3db000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325d0000000000000000000000003f1c547b21f65e10480de3ad8e19faac46c95034a42eee1333c0758ba72be38e728b6dadb32ea767de5b4ddbaea1dae85b1b051ffd1e42595cec3e83239bf8dfc535250e7f48e0bc000000649d0effdb000000000000000000000000da7d2573df555002503f29aa4003e398d28cc00f0000000000000000000000003f1c547b21f65e10480de3ad8e19faac46c95034a42eee1333c0758ba72be38e728b6dadb32ea767de5b4ddbaea1dae85b1b051ffd1e42595cec3e83239bf8dfc535250e7f48e0bc00000064afd925df000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325d0000000000000000000000003f1c547b21f65e10480de3ad8e19faac46c95034a42eee1333c0758ba72be38e728b6dadb32ea767de5b4ddbaea1dae85b1b051fe92329ec7ddb11d25e25b3c21eebf11f15eb325d000000a4d948d4680000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000001c7cc160b58f8bb0bac94b80847e2cf2800565c50000000442f2ff15d139c2898040ef16910dc9f44dc697df79363da767d8bc92f2e310312b816e46d000000000000000000000000517c93bb27ad463fe3ad8f15dafdad56ec0beec3e92329ec7ddb11d25e25b3c21eebf11f15eb325d000000a4d948d4680000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000001c7cc160b58f8bb0bac94b80847e2cf2800565c50000000442f2ff15d2fc10cc8ae19568712f7a176fb4978616a610650813c9d05326c34abb62749c7000000000000000000000000517c93bb27ad463fe3ad8f15dafdad56ec0beec3e92329ec7ddb11d25e25b3c21eebf11f15eb325d000000a4d948d4680000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000001091c0ec8b4d54a9fcb36269b5d5e5af43309e666000000442f2ff15d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000da7d2573df555002503f29aa4003e398d28cc00f091c0ec8b4d54a9fcb36269b5d5e5af43309e66600000044d547741f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325dfd1e42595cec3e83239bf8dfc535250e7f48e0bc000000640a8ed3db0000000000000000000000003cc908b004422fd66fdb40be062bf9b0bd5bdbed000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325db421f7ad7646747f3051c50c0b8e2377839296cd4973e27f63821d73e390338f0f8826a574bcfdc4997939076f6d82877971feb300000044221e2efc0000000000000000000000003cc908b004422fd66fdb40be062bf9b0bd5bdbed000000000000000000000000517c93bb27ad463fe3ad8f15dafdad56ec0beec3fecf4634f6571da23c8f21beeea8d12788df529e00000004fc735e99e29d4d0cad66d87a054b5a93867c708000dae1e60000020453e51f8b000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000e92329ec7ddb11d25e25b3c21eebf11f15eb325d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c4d948d4680000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000007c00000001c3fc22c7e0d20247b797fb6dc743bd3879217c8100000004febb0f7e3db5aba48123bb8789f6f09ec714e7082bc267470000004491f0004c000000000000000000000000000000000000000000000000000000000000708000000000000000000000000000000000000000000000000000000000000119400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000027486f6c65736b79206475616c20676f7665726e616e63652075706772616465206472792d72756e00000000000000000000000000000000000000000000000000"
+dual_governance_activation_voting_calldata_provider = "0xD62837Cc18FB25791B9Cc51B1862bb8e06004204"

forge-run.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -e
+
+export $(grep -v '^#' .env | xargs)
+
+SCRIPT_PATH="$1"
+shift
+
+CONTRACT_NAME=$(basename "$SCRIPT_PATH" .s.sol)
+
+args=(
+  "$SCRIPT_PATH:$CONTRACT_NAME"
+  "--rpc-url" "$RPC_URL"
+  "--etherscan-api-key" "$ETHERSCAN_API_KEY"
+  "--force"
+)
+
+if [[ -n "$DEPLOYER_ACCOUNT" ]]; then
+  args+=( "--account" "$DEPLOYER_ACCOUNT" )
+fi
+
+if [[ -n "$DEPLOYER_ADDRESS" ]]; then
+  args+=( "--sender" "$DEPLOYER_ADDRESS" )
+fi
+
+args+=( "$@" )
+
+# Run Foundry script
+
+forge script "${args[@]}"

foundry.toml

@@ -23,5 +23,5 @@ line_length = 120
 multiline_func_header = 'params_first_multi'
 
 [etherscan]
-mainnet = { key = "${ETHERSCAN_MAINNET_KEY}" }
-holesky = { key = "${ETHERSCAN_MAINNET_KEY}", chain = "17000" }
+mainnet = { key = "${ETHERSCAN_API_KEY}" }
+holesky = { key = "${ETHERSCAN_API_KEY}", chain = "17000" }

scripts/deploy/Readme.md

@@ -18,7 +18,7 @@ anvil --fork-url https://<mainnet or holesky>.infura.io/v3/<YOUR_API_KEY> --bloc
 2. Set up the required env variables in the .env file
 
     ```
-    ETHERSCAN_MAINNET_KEY=...
+    ETHERSCAN_API_KEY=...
     DEPLOY_CONFIG_FILE_NAME=... (in the `deploy-config` folder, for example: "deploy-config.toml")
     ```