From 33b69f7994bb2efa322dd8bc6f813946beccc8c9 Mon Sep 17 00:00:00 2001
From: gs8nrv <55771972+GuillaumeNervoXS@users.noreply.github.com>
Date: Wed, 24 Jan 2024 11:37:39 +0100
Subject: [PATCH] feat: script to check roles on all contracts

* ground work to check roles on all Angle contracts

* first draft log roles

* draft log roles

* v1 Check roles working

* almost complete full script testing access control

* fix minor sidechains bugs

* script final version and all chain in one call

* feat: create test layerzero cross chain setup

* chore: doublon contract name

* fix: compilation

* fix: @sogipec comment
---
 .gitmodules                                   |   3 +
 helpers/common.sh                             |  83 +++
 helpers/createProposal.sh                     |  90 +--
 helpers/fork.sh                               |  44 +-
 helpers/runScript.sh                          | 108 ++++
 lib/angle-router                              |   1 +
 package.json                                  |   3 +-
 remappings.txt                                |   1 +
 scripts/Constants.s.sol                       |  43 +-
 scripts/Interfaces.s.sol                      |  73 ++-
 scripts/Simulate.s.sol                        |  11 +-
 scripts/Utils.s.sol                           |  52 +-
 scripts/interaction/CheckRoles.s.sol          | 593 ++++++++++++++++++
 scripts/proposals/Wrapper.s.sol               |  41 +-
 scripts/proposals/payload.json                |  66 +-
 .../timelock/SetMinDelayTimelock.s.sol        |   4 +-
 .../timelock/SetMinDelayTimelockTest.t.sol    |   2 +-
 test/unit/Simulate.t.sol                      |   2 +-
 utils/contractAddress.js                      |  53 +-
 utils/getAllContracts.js                      |  41 ++
 20 files changed, 1068 insertions(+), 246 deletions(-)
 create mode 100644 helpers/common.sh
 create mode 100644 helpers/runScript.sh
 create mode 160000 lib/angle-router
 create mode 100644 scripts/interaction/CheckRoles.s.sol
 create mode 100644 utils/getAllContracts.js

diff --git a/.gitmodules b/.gitmodules
index 6cc88ab..66a28e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -23,6 +23,9 @@
 [submodule "lib/borrow-contracts"]
 	path = lib/borrow-contracts
 	url = https://github.com/AngleProtocol/borrow-contracts
+[submodule "lib/angle-router"]
+	path = lib/angle-router
+	url = https://github.com/AngleProtocol/angle-router
 [submodule "lib/new-oz"]
 	path = lib/new-oz
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
diff --git a/helpers/common.sh b/helpers/common.sh
new file mode 100644
index 0000000..7d28f4c
--- /dev/null
+++ b/helpers/common.sh
@@ -0,0 +1,83 @@
+function chain_to_uri {
+  chain=$1
+
+  case $chain in
+    "1")
+      echo $ETH_NODE_URI_MAINNET
+      ;;
+    "2")
+      echo $ETH_NODE_URI_ARBITRUM
+      ;;
+    "3")
+      echo $ETH_NODE_URI_POLYGON
+      ;;
+    "4")
+      echo $ETH_NODE_URI_GNOSIS
+      ;;
+    "5")
+      echo $ETH_NODE_URI_AVALANCHE
+      ;;
+    "6")
+      echo $ETH_NODE_URI_BASE
+      ;;
+    "7")
+        echo $ETH_NODE_URI_BSC
+        ;;
+    "8")
+        echo $ETH_NODE_URI_CELO
+        ;;
+    "9")
+        echo $ETH_NODE_URI_POLYGON_ZKEVM
+        ;;
+    "10")
+        echo $ETH_NODE_URI_OPTIMISM
+        ;;
+    "11")
+        echo $ETH_NODE_URI_LINEA
+        ;;
+    *)
+      ;;
+  esac
+}
+
+function chain_to_chainId {
+  chain=$1
+
+  case $chain in
+    "1")
+      echo "1"
+      ;;
+    "2")
+      echo "42161"
+      ;;
+    "3")
+      echo "137"
+      ;;
+    "4")
+      echo "100"
+      ;;
+    "5")
+      echo "43114"
+      ;;
+    "6")
+      echo "8453"
+      ;;
+    "7")
+        echo "56"
+        ;;
+    "8")
+        echo "42220"
+        ;;
+    "9")
+        echo "1101"
+        ;;
+    "10")
+        echo "10"
+        ;;
+    "11")
+        echo "59144"
+        ;;
+    *)
+      ;;
+  esac
+}
\ No newline at end of file
diff --git a/helpers/createProposal.sh b/helpers/createProposal.sh
index 81d2e27..861041b 100644
--- a/helpers/createProposal.sh
+++ b/helpers/createProposal.sh
@@ -1,88 +1,6 @@
 #! /bin/bash
 
-function chain_to_uri {
-  chain=$1
-
-  case $chain in
-    "1")
-      echo $ETH_NODE_URI_MAINNET
-      ;;
-    "2")
-      echo $ETH_NODE_URI_ARBITRUM
-      ;;
-    "3")
-      echo $ETH_NODE_URI_POLYGON
-      ;;
-    "4")
-      echo $ETH_NODE_URI_GNOSIS
-      ;;
-    "5")
-      echo $ETH_NODE_URI_AVALANCHE
-      ;;
-    "6")
-      echo $ETH_NODE_URI_BASE
-      ;;
-    "7")
-        echo $ETH_NODE_URI_BSC
-        ;;
-    "8")
-        echo $ETH_NODE_URI_CELO
-        ;;
-    "9")
-        echo $ETH_NODE_URI_POLYGON_ZKEVM
-        ;;
-    "10")
-        echo $ETH_NODE_URI_OPTIMISM
-        ;;
-    "11")
-        echo $ETH_NODE_URI_LINEA
-        ;;
-    *)
-      ;;
-  esac
-}
-
-function chain_to_chainId {
-  chain=$1
-
-  case $chain in
-    "1")
-      echo "1"
-      ;;
-    "2")
-      echo "42161"
-      ;;
-    "3")
-      echo "137"
-      ;;
-    "4")
-      echo "100"
-      ;;
-    "5")
-      echo "43114"
-      ;;
-    "6")
-      echo "8453"
-      ;;
-    "7")
-        echo "56"
-        ;;
-    "8")
-        echo "42220"
-        ;;
-    "9")
-        echo "1101"
-        ;;
-    "10")
-        echo "10"
-        ;;
-    "11")
-        echo "59144"
-        ;;
-    *)
-      ;;
-  esac
-}
+source helpers/common.sh
 
 function usage {
   echo "bash createProposal.sh <script> <chain>"
@@ -146,6 +64,7 @@ function main {
         echo "- 9: Polygon ZkEvm"
         echo "- 10: Optimism"
         echo "- 11: Linea"
+        echo "- 100: All"
 
         read chains
 
@@ -157,6 +76,11 @@ function main {
 
     mainnet_uri=$(chain_to_uri 1)
 
+    if [[ "$chains" == "100" ]]; then
+        # If user entered 100 (All), loop from 1 to 11 and add all chains
+        chains="1,2,3,4,5,6,7,8,9,10,11"
+    fi
+
     chainIds=""
     for chain in $(echo $chains | sed "s/,/ /g")
     do
diff --git a/helpers/fork.sh b/helpers/fork.sh
index 4adf53a..f173a3e 100644
--- a/helpers/fork.sh
+++ b/helpers/fork.sh
@@ -1,46 +1,6 @@
 #! /bin/bash
 
-function option_to_uri {
-  option=$1
-
-  case $option in
-    "1")
-      echo $ETH_NODE_URI_MAINNET
-      ;;
-    "2")
-      echo $ETH_NODE_URI_ARBITRUM
-      ;;
-    "3")
-      echo $ETH_NODE_URI_POLYGON
-      ;;
-    "4")
-      echo $ETH_NODE_URI_GNOSIS
-      ;;
-    "5")
-      echo $ETH_NODE_URI_AVALANCHE
-      ;;
-    "6")
-      echo $ETH_NODE_URI_BASE
-      ;;
-    "7")
-        echo $ETH_NODE_URI_BSC
-        ;;
-    "8")
-        echo $ETH_NODE_URI_CELO
-        ;;
-    "9")
-        echo $ETH_NODE_URI_POLYGON_ZKEVM
-        ;;
-    "10")
-        echo $ETH_NODE_URI_OPTIMISM
-        ;;
-    "11")
-        echo $ETH_NODE_URI_LINEA
-        ;;
-    *)
-      ;;
-  esac
-}
+source helpers/common.sh
 
 function main {
     if [ ! -f .env ]; then
@@ -64,7 +24,7 @@ function main {
 
     read option
 
-    uri=$(option_to_uri $option)
+    uri=$(chain_to_uri $option)
     if [ -z "$uri" ]; then
         echo "Unknown network"
         exit 1
diff --git a/helpers/runScript.sh b/helpers/runScript.sh
new file mode 100644
index 0000000..3dd6057
--- /dev/null
+++ b/helpers/runScript.sh
@@ -0,0 +1,108 @@
+#! /bin/bash
+
+source helpers/common.sh
+
+
+function usage {
+  echo "bash runScript.sh <script> <chain>"
+  echo ""
+  echo -e "script: path to the script to run"
+  echo -e "chain: chain(s) to run the script on (separate with commas)"
+  echo -e "\t1: Ethereum Mainnet"
+  echo -e "\t2: Arbitrum"
+  echo -e "\t3: Polygon"
+  echo -e "\t4: Gnosis"
+  echo -e "\t5: Avalanche"
+  echo -e "\t6: Base"
+  echo -e "\t7: Binance Smart Chain"
+  echo -e "\t8: Celo"
+  echo -e "\t9: Polygon ZkEvm"
+  echo -e "\t10: Optimism"
+  echo -e "\t11: Linea"
+  echo -e "\t12: All"
+  echo ""
+}
+
+function main {
+    command=false
+    if [[ $# -ne 2 && $# -ne 0 ]]; then
+        usage
+        exit 1
+    fi
+    if [ $# -eq 2 ]; then
+        script=$1
+        chains=$2
+        command=true
+    fi
+
+    if [ ! -f .env ]; then
+        echo ".env not found!"
+        exit 1
+    fi
+    source .env
+
+    if [ $command != true ]; then
+        echo ""
+        echo "What script would you like to run ?"
+
+        read script
+
+        if [ -z "$script" ]; then
+            echo "No script provided"
+            exit 1
+        fi
+
+        echo ""
+
+        echo "Which chain(s) would you like to run the script on ? (separate with commas)"
+        echo "- 1: Ethereum Mainnet"
+        echo "- 2: Arbitrum"
+        echo "- 3: Polygon"
+        echo "- 4: Gnosis"
+        echo "- 5: Avalanche"
+        echo "- 6: Base"
+        echo "- 7: Binance Smart Chain"
+        echo "- 8: Celo"
+        echo "- 9: Polygon ZkEvm"
+        echo "- 10: Optimism"
+        echo "- 11: Linea"
+        echo "- 12: All"
+
+        read chains
+
+        if [ -z "$chains" ]; then
+            echo "No chain provided"
+            exit 1
+        fi
+    fi
+
+    mainnet_uri=$(chain_to_uri 1)
+
+    if [[ "$chains" == "12" ]]; then
+        # If user entered 12 (All), loop from 1 to 11 and add all chains
+        chains="1,2,3,4,5,6,7,8,9,10,11"
+    fi
+
+    chainIds=""
+    for chain in $(echo $chains | sed "s/,/ /g")
+    do
+        if [[ -z $chainIds ]]; then
+            chainIds="$(chain_to_chainId $chain)"
+        else
+            chainIds="$chainIds,$(chain_to_chainId $chain)"
+        fi
+    done
+
+    echo ""
+    echo "Running on chains $chainIds"
+
+    export CHAIN_IDS=$chainIds
+    FOUNDRY_PROFILE=dev forge script $script
+
+    if [ $? -ne 0 ]; then
+        echo ""
+        echo "Script failed"
+    fi
+}
+
+main $@
diff --git a/lib/angle-router b/lib/angle-router
new file mode 160000
index 0000000..0cccd23
--- /dev/null
+++ b/lib/angle-router
@@ -0,0 +1 @@
+Subproject commit 0cccd2321a92e178963995be4aaf569d5c675d9f
diff --git a/package.json b/package.json
index 6dc45c7..1596d60 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "gas": "yarn test --gas-report",
     "fork": "bash helpers/fork.sh",
     "run": "docker run -it --rm -v $(pwd):/app -w /app ghcr.io/foundry-rs/foundry sh",
-    "script:fork": "source .env && forge script --skip test --fork-url fork --broadcast -vvvv",
+    "script:fork": "FOUNDRY_PROFILE=dev forge script --skip test --fork-url fork --broadcast -vvvv",
     "test:unit": "forge test -vvv --gas-report --match-path \"test/unit/**/*.sol\"",
     "test:invariant": "forge test -vvv --gas-report --match-path \"test/invariant/**/*.sol\"",
     "test:fuzz": "forge test -vvv --gas-report --match-path \"test/fuzz/**/*.sol\"",
@@ -22,6 +22,7 @@
     "slither": "slither .",
     "lcov:clean": "lcov --remove lcov.info -o lcov.info 'test/**' 'scripts/**' 'contracts/transmuter/configs/**' 'contracts/utils/**'",
     "lcov:generate-html": "genhtml lcov.info --output=coverage",
+    "run:script": "bash helpers/runScript.sh",
     "size": "forge build --skip test --sizes",
     "size:dev": "FOUNDRY_PROFILE=dev forge build --skip test --sizes",
     "prettier": "prettier --write '**/*.sol'",
diff --git a/remappings.txt b/remappings.txt
index aa04ca4..8eeb861 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -6,6 +6,7 @@ lz/=lib/solidity-examples/contracts
 stringutils/=lib/solidity-stringutils
 borrow/=lib/borrow-contracts/contracts
 transmuter/=lib/angle-transmuter/contracts
+router/=lib/angle-router/contracts
 contracts/=contracts
 test/=test
 @openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts
diff --git a/scripts/Constants.s.sol b/scripts/Constants.s.sol
index b178774..8cb1e92 100644
--- a/scripts/Constants.s.sol
+++ b/scripts/Constants.s.sol
@@ -15,25 +15,39 @@ import { AngleGovernor } from "contracts/AngleGovernor.sol";
 import "./Interfaces.s.sol";
 
 enum ContractType {
-    Timelock,
-    ProposalSender,
-    Governor,
-    ProposalReceiver,
-    TreasuryAgEUR,
-    StEUR,
-    TransmuterAgEUR,
+    AgEUR,
+    AgUSD,
+    AgEURLZ,
+    AgUSDLZ,
+    Angle,
+    AngleLZ,
+    AngleDistributor,
+    AngleMiddleman,
+    AngleRouter,
     CoreBorrow,
+    CoreMerkl,
+    DistributionCreator,
+    Distributor,
+    FeeDistributor,
+    GaugeController,
+    Governor,
     GovernorMultisig,
     GuardianMultisig,
+    MerklMiddleman,
+    ProposalReceiver,
+    ProposalSender,
     ProxyAdmin,
-    Angle,
-    veANGLE,
     SmartWalletWhitelist,
-    veBoostProxy,
-    GaugeController,
-    AngleDistributor,
-    AngleMiddleman,
-    FeeDistributor
+    StEUR,
+    StUSD,
+    Timelock,
+    TransmuterAgEUR,
+    TransmuterAgUSD,
+    TreasuryAgEUR,
+    TreasuryAgUSD,
+    veANGLE,
+    veBoost,
+    veBoostProxy
 }
 
 struct SubCall {
@@ -60,6 +74,7 @@ uint256 constant CHAIN_ARBITRUM = 42161;
 uint256 constant CHAIN_AVALANCHE = 43114;
 uint256 constant CHAIN_OPTIMISM = 10;
 uint256 constant CHAIN_POLYGON = 137;
+uint256 constant CHAIN_FANTOM = 250;
 uint256 constant CHAIN_GNOSIS = 100;
 uint256 constant CHAIN_BNB = 56;
 uint256 constant CHAIN_CELO = 42220;
diff --git a/scripts/Interfaces.s.sol b/scripts/Interfaces.s.sol
index ab800ff..aad308f 100644
--- a/scripts/Interfaces.s.sol
+++ b/scripts/Interfaces.s.sol
@@ -1,5 +1,24 @@
 pragma solidity ^0.8.19;
 
+import { IAccessControl } from "oz/access/IAccessControl.sol";
+import { IAccessControlManager } from "interfaces/IAccessControlManager.sol";
+
+interface IAccessControlCore {
+    function core() external returns (address);
+}
+
+interface IAccessControlViewVyper {
+    function admin() external returns (address);
+
+    function future_admin() external returns (address);
+}
+
+interface IAccessControlWriteVyper {
+    function commit_transfer_ownership(address newAdmin) external;
+
+    function apply_transfer_ownership() external;
+}
+
 interface IVaultManagerGovernance {
     function setUint64(uint64 param, bytes32 what) external;
 
@@ -10,50 +29,52 @@ interface ISavings {
     function setRate(uint208 newRate) external;
 
     function rate() external view returns (uint208);
+
+    function accessControlManager() external view returns (address);
 }
 
 interface IAngle {
     function setMinter(address minter) external;
+
+    function minter() external returns (address);
 }
 
-interface IVeAngle {
-    function commit_transfer_ownership(address newAdmin) external;
+interface IVeAngle is IAccessControlViewVyper, IAccessControlWriteVyper {}
 
-    function apply_transfer_ownership() external;
-}
+interface IGaugeController is IAccessControlViewVyper, IAccessControlWriteVyper {}
 
-interface IGaugeController {
-    function commit_transfer_ownership(address newAdmin) external;
+interface ILiquidityGauge is IAccessControlViewVyper, IAccessControlWriteVyper {}
 
-    function apply_transfer_ownership() external;
-}
+interface IVeBoostProxy is IAccessControlViewVyper, IAccessControlWriteVyper {}
 
-interface ILiquidityGauge {
-    function commit_transfer_ownership(address newAdmin) external;
+interface ISmartWalletWhitelist is IAccessControlViewVyper, IAccessControlWriteVyper {}
 
-    function apply_transfer_ownership() external;
-}
+interface IFeeDistributor is IAccessControlWriteVyper {}
 
-interface IVeBoost {
-    function commit_transfer_ownership(address newAdmin) external;
+interface IGenericAccessControl is IAccessControl, IAccessControlCore, IAccessControlViewVyper {
+    function owner() external returns (address);
 
-    function apply_transfer_ownership() external;
-}
+    function isMinter(address account) external view returns (bool);
 
-interface IVeBoostProxy {
-    function commit_admin(address newAdmin) external;
+    function minter() external view returns (address);
 
-    function apply_transfer_ownership() external;
-}
+    function treasury() external view returns (address);
+
+    function coreBorrow() external view returns (address);
 
-interface ISmartWalletWhitelist {
-    function commitAdmin(address newAdmin) external;
+    function isTrusted(address caller) external view returns (bool);
 
-    function applyAdmin() external;
+    function trusted(address caller) external view returns (uint256);
+
+    function accessControlManager() external view returns (address);
 }
 
-interface IFeeDistributor {
-    function commit_admin(address newAdmin) external;
+interface ILayerZeroBridge {
+    function canonicalToken() external view returns (address);
+
+    function coreBorrow() external view returns (address);
+
+    function treasury() external view returns (address);
 
-    function accept_admin() external;
+    function lzEndpoint() external view returns (address);
 }
diff --git a/scripts/Simulate.s.sol b/scripts/Simulate.s.sol
index 35178ac..2c032e8 100644
--- a/scripts/Simulate.s.sol
+++ b/scripts/Simulate.s.sol
@@ -9,14 +9,13 @@ contract Simulate is Script {
 
     function run() external {
         // TODO replace with your inputs
-        address sender = address(0x0274a704a6D9129F90A62dDC6f6024b33EcDad36);
-        address contractAddress = address(0x3Ef3D8bA38EBe18DB133cEc108f4D14CE00Dd9Ae);
+        address sender = address(0xcC617C6f9725eACC993ac626C7efC6B96476916E);
+        address contractAddress = address(0x748bA9Cd5a5DDba5ABA70a4aC861b2413dCa4436);
         // remove the 0x
-        bytes
-            memory data = hex"71ee95c0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000274a704a6d9129f90a62ddc6f6024b33ecdad3600000000000000000000000000000000000000000000000000000000000000010000000000000000000000001f9840a85d5af5bf1d1762f925bdaddc4201f984000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000427abf85e5d121ac000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000811e1782af6373843046497b3be2c5b25f13037b02c218c5a1a5be24666434d169ca949b7c3d8c763a566075f024a19b4565aba390e00f197fff97adb2f9ef8b0eee43dfe473f564bbd71b106e37928d4f052afe2abf8a42e5f07aded57af2766943bc7bedecf531200d4ca454185d135e6933aa3cff5c53a55f45033135d3a01aae71a2ff3d1e34342bdb86d6348a9da5c8384085f743bb2451aa846b5f667690ccb7b7b1fe363d3e286addaaff93de4a258308fae35fb008580bc25873284f63b37592378acc9f27d211017550c57ae97d0e9cc944d3f90bf54147a69fedeed81940d2088ad7b84767ae8569a9202e23aa0f8204a30b365916d5cefb60c1dfe";
+        bytes memory data = hex"00";
 
-        vm.prank(sender);
-        (bool success, ) = contractAddress.call(data);
+        vm.prank(sender, sender);
+        (bool success, ) = contractAddress.call{ value: 0.6 ether }(data);
         if (!success) revert WrongCall();
     }
 }
diff --git a/scripts/Utils.s.sol b/scripts/Utils.s.sol
index 69ad2c2..8a6292d 100644
--- a/scripts/Utils.s.sol
+++ b/scripts/Utils.s.sol
@@ -82,31 +82,57 @@ contract Utils is Script {
         return ILayerZeroEndpoint(address(bytes20(res)));
     }
 
+    function _getALLContracts(uint256 chainId) internal returns (address[] memory allContracts) {
+        string[] memory cmd = new string[](3);
+        cmd[0] = "node";
+        cmd[1] = "utils/getAllContracts.js";
+        cmd[2] = vm.toString(chainId);
+
+        bytes memory res = vm.ffi(cmd);
+        // When process exit code is 1, it will return an empty bytes "0x"
+        if (res.length == 0) revert("Chain not supported");
+        allContracts = abi.decode(res, (address[]));
+    }
+
     function _chainToContract(uint256 chainId, ContractType name) internal returns (address) {
         string[] memory cmd = new string[](4);
         cmd[0] = "node";
         cmd[1] = "utils/contractAddress.js";
         cmd[2] = vm.toString(chainId);
 
-        if (name == ContractType.Timelock) cmd[3] = "timelock";
+        if (name == ContractType.AgEUR) cmd[3] = "agEUR";
+        else if (name == ContractType.AgUSD) cmd[3] = "agUSD";
+        else if (name == ContractType.AgEURLZ) cmd[3] = "agEURLz";
+        else if (name == ContractType.AgUSDLZ) cmd[3] = "agUSDLz";
+        else if (name == ContractType.Angle) cmd[3] = "angle";
+        else if (name == ContractType.AngleLZ) cmd[3] = "angleLz";
+        else if (name == ContractType.AngleDistributor) cmd[3] = "angleDistributor";
+        else if (name == ContractType.AngleMiddleman) cmd[3] = "angleMiddleman";
+        else if (name == ContractType.AngleRouter) cmd[3] = "angleRouter";
+        else if (name == ContractType.CoreBorrow) cmd[3] = "coreBorrow";
+        else if (name == ContractType.CoreMerkl) cmd[3] = "coreMerkl";
+        else if (name == ContractType.DistributionCreator) cmd[3] = "distributionCreator";
+        else if (name == ContractType.Distributor) cmd[3] = "distributor";
+        else if (name == ContractType.FeeDistributor) cmd[3] = "feeDistributor";
+        else if (name == ContractType.GaugeController) cmd[3] = "gaugeController";
+        else if (name == ContractType.Governor) cmd[3] = "governor";
+        else if (name == ContractType.GovernorMultisig) cmd[3] = "governorMultisig";
+        else if (name == ContractType.GuardianMultisig) cmd[3] = "guardianMultisig";
+        else if (name == ContractType.MerklMiddleman) cmd[3] = "merklMiddleman";
         else if (name == ContractType.ProposalReceiver) cmd[3] = "proposalReceiver";
         else if (name == ContractType.ProposalSender) cmd[3] = "proposalSender";
-        else if (name == ContractType.Governor) cmd[3] = "governor";
-        else if (name == ContractType.TreasuryAgEUR) cmd[3] = "treasury";
+        else if (name == ContractType.ProxyAdmin) cmd[3] = "proxyAdmin";
+        else if (name == ContractType.SmartWalletWhitelist) cmd[3] = "smartWalletWhitelist";
         else if (name == ContractType.StEUR) cmd[3] = "stEUR";
+        else if (name == ContractType.StUSD) cmd[3] = "stUSD";
+        else if (name == ContractType.Timelock) cmd[3] = "timelock";
         else if (name == ContractType.TransmuterAgEUR) cmd[3] = "transmuterAgEUR";
-        else if (name == ContractType.CoreBorrow) cmd[3] = "coreBorrow";
-        else if (name == ContractType.GovernorMultisig) cmd[3] = "governorMultisig";
-        else if (name == ContractType.GuardianMultisig) cmd[3] = "guardian";
-        else if (name == ContractType.ProxyAdmin) cmd[3] = "proxyAdmin";
-        else if (name == ContractType.Angle) cmd[3] = "angle";
+        else if (name == ContractType.TransmuterAgUSD) cmd[3] = "transmuterAgUSD";
+        else if (name == ContractType.TreasuryAgEUR) cmd[3] = "treasuryAgEUR";
+        else if (name == ContractType.TreasuryAgUSD) cmd[3] = "treasuryAgUSD";
         else if (name == ContractType.veANGLE) cmd[3] = "veANGLE";
-        else if (name == ContractType.SmartWalletWhitelist) cmd[3] = "smartWalletWhitelist";
+        else if (name == ContractType.veBoost) cmd[3] = "veBoost";
         else if (name == ContractType.veBoostProxy) cmd[3] = "veBoostProxy";
-        else if (name == ContractType.GaugeController) cmd[3] = "gaugeController";
-        else if (name == ContractType.AngleDistributor) cmd[3] = "angleDistributor";
-        else if (name == ContractType.AngleMiddleman) cmd[3] = "angleMiddleman";
-        else if (name == ContractType.FeeDistributor) cmd[3] = "feeDistributor";
         else revert("contract not supported");
 
         bytes memory res = vm.ffi(cmd);
diff --git a/scripts/interaction/CheckRoles.s.sol b/scripts/interaction/CheckRoles.s.sol
new file mode 100644
index 0000000..16343e3
--- /dev/null
+++ b/scripts/interaction/CheckRoles.s.sol
@@ -0,0 +1,593 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity ^0.8.19;
+
+import { console } from "forge-std/console.sol";
+import { IVaultManager } from "borrow/interfaces/IVaultManager.sol";
+import { ITreasury } from "borrow/interfaces/ITreasury.sol";
+import { IAgToken } from "borrow/interfaces/IAgToken.sol";
+import { IERC721Metadata } from "oz/token/ERC721/extensions/IERC721Metadata.sol";
+import { IAccessControl } from "oz/access/IAccessControl.sol";
+import { ProposalReceiver } from "contracts/ProposalReceiver.sol";
+import { ProposalSender } from "contracts/ProposalSender.sol";
+import { TimelockControllerWithCounter } from "contracts/TimelockControllerWithCounter.sol";
+import { Utils } from "../Utils.s.sol";
+import "../Constants.s.sol";
+
+contract CheckRoles is Utils {
+    address constant oldDeployer = 0xfdA462548Ce04282f4B6D6619823a7C64Fdc0185;
+    address constant oldKeeper = 0xcC617C6f9725eACC993ac626C7efC6B96476916E;
+    address constant oldKeeperPolygon = 0x5EB715d601C2F27f83Cb554b6B36e047822fB70a;
+    address constant oldKeeperPolygon2 = 0xEd42E58A303E20523A695CB31ac31df26C50397B;
+    address constant merklKeeper = 0x435046800Fb9149eE65159721A92cB7d50a7534b;
+    address constant tmpCoreBorrowUSD = 0x3fc5a1bd4d0A435c55374208A6A81535A1923039;
+    string constant angleLZ = "Angle LZ";
+
+    bytes32 public constant GUARDIAN_ROLE = keccak256("GUARDIAN_ROLE");
+    bytes32 public constant GOVERNOR_ROLE = keccak256("GOVERNOR_ROLE");
+    bytes32 public constant FLASHLOANER_TREASURY_ROLE = keccak256("FLASHLOANER_TREASURY_ROLE");
+    bytes32 public constant TIMELOCK_ADMIN_ROLE = keccak256("TIMELOCK_ADMIN_ROLE");
+    bytes32 public constant PROPOSER_ROLE = keccak256("PROPOSER_ROLE");
+    bytes32 public constant EXECUTOR_ROLE = keccak256("EXECUTOR_ROLE");
+    bytes32 public constant CANCELLER_ROLE = keccak256("CANCELLER_ROLE");
+    bytes32 public constant KEEPER_ROLE = keccak256("KEEPER_ROLE");
+    bytes32 public constant DISTRIBUTOR_ROLE = keccak256("DISTRIBUTOR_ROLE");
+    bytes32 public constant DEFAULT_ADMIN_ROLE = 0x00;
+
+    address[] public allContracts;
+
+    // TODO also check that all proxy contracts have been initialized
+    function run() external {
+        vm.label(oldDeployer, "Old Deployer");
+        vm.label(oldKeeper, "Old Keeper");
+        vm.label(oldKeeperPolygon, "Old Keeper Polygon");
+        vm.label(oldKeeperPolygon2, "Old Keeper Polygon 2");
+        vm.label(merklKeeper, "Merkl Keeper");
+
+        uint256[] memory chainIds = vm.envUint("CHAIN_IDS", ",");
+        for (uint256 i = 0; i < chainIds.length; i++) {
+            console.log("############  Chain ID: ", chainIds[i], " ############");
+            _checkRoles(chainIds[i]);
+        }
+    }
+
+    function _checkRoles(uint256 chainId) public {
+        vm.selectFork(forkIdentifier[chainId]);
+
+        allContracts = _getALLContracts(chainId);
+        // Address to check roles for
+        uint256 nbrActors = chainId == CHAIN_ETHEREUM ? 11 : 10;
+        address[] memory listAddressToCheck = new address[](nbrActors);
+
+        {
+            address govMultisig = _chainToContract(chainId, ContractType.GovernorMultisig);
+            address guardianMultisig = _chainToContract(chainId, ContractType.GuardianMultisig);
+            address timelock = _chainToContract(chainId, ContractType.Timelock);
+            address coreBorrow = _chainToContract(chainId, ContractType.CoreBorrow);
+            address proxyAdmin = _chainToContract(chainId, ContractType.ProxyAdmin);
+
+            vm.label(govMultisig, "Governor Multisig");
+            vm.label(guardianMultisig, "Guardian Multisig");
+            vm.label(timelock, "Timelock");
+            vm.label(coreBorrow, "Core Borrow");
+            vm.label(proxyAdmin, "Proxy Admin");
+
+            listAddressToCheck[0] = oldDeployer;
+            listAddressToCheck[1] = oldKeeper;
+            listAddressToCheck[2] = oldKeeperPolygon;
+            listAddressToCheck[3] = oldKeeperPolygon2;
+            listAddressToCheck[4] = merklKeeper;
+            listAddressToCheck[5] = govMultisig;
+            listAddressToCheck[6] = guardianMultisig;
+            listAddressToCheck[7] = timelock;
+            listAddressToCheck[8] = coreBorrow;
+            listAddressToCheck[9] = proxyAdmin;
+            if (chainId == CHAIN_ETHEREUM) listAddressToCheck[10] = _chainToContract(chainId, ContractType.Governor);
+        }
+
+        {
+            // It would be better with a try catch but I don't know how why it doesn't work
+            if (chainId == CHAIN_ETHEREUM) {
+                // Contract to check roles on
+                ITransmuter transmuterEUR = ITransmuter(_chainToContract(chainId, ContractType.TransmuterAgEUR));
+                ITransmuter transmuterUSD = ITransmuter(_chainToContract(chainId, ContractType.TransmuterAgUSD));
+                IAngle angle = IAngle(_chainToContract(chainId, ContractType.Angle));
+                ProposalSender proposalSender = ProposalSender(
+                    payable(_chainToContract(chainId, ContractType.ProposalSender))
+                );
+                IGaugeController gaugeController = IGaugeController(
+                    _chainToContract(chainId, ContractType.GaugeController)
+                );
+                ISmartWalletWhitelist smartWalletWhitelist = ISmartWalletWhitelist(
+                    _chainToContract(chainId, ContractType.SmartWalletWhitelist)
+                );
+                IVeAngle veAngle = IVeAngle(_chainToContract(chainId, ContractType.veANGLE));
+                IVeBoostProxy veBoostProxy = IVeBoostProxy(_chainToContract(chainId, ContractType.veBoostProxy));
+                IGenericAccessControl merklMiddleman = IGenericAccessControl(
+                    _chainToContract(chainId, ContractType.MerklMiddleman)
+                );
+
+                if (!_authorizedCore(chainId, address(transmuterEUR.accessControlManager())))
+                    console.log(
+                        "Transmuter EUR - wrong access control manager: ",
+                        address(transmuterEUR.accessControlManager())
+                    );
+                if (!_authorizedCore(chainId, address(transmuterUSD.accessControlManager())))
+                    console.log(
+                        "Transmuter USD - wrong access control manager: ",
+                        address(transmuterUSD.accessControlManager())
+                    );
+                if (!_authorizedMinter(chainId, angle.minter())) console.log("Angle - minter role: ", angle.minter());
+                if (!_authorizedOwner(chainId, proposalSender.owner()))
+                    console.log("Proposal Sender - owner: ", proposalSender.owner());
+                if (!_authorizedCoreMerkl(chainId, address(merklMiddleman.accessControlManager())))
+                    console.log(
+                        "Merkl Middleman - wrong access control manager: ",
+                        address(merklMiddleman.accessControlManager())
+                    );
+                if (!_authorizedOwner(chainId, gaugeController.admin()))
+                    console.log("Gauge Controller - admin role: ", gaugeController.admin());
+                if (!_authorizedOwner(chainId, gaugeController.future_admin()))
+                    console.log("Gauge Controller - future admin role: ", gaugeController.future_admin());
+                if (!_authorizedOwner(chainId, smartWalletWhitelist.admin()))
+                    console.log("Smart Wallet Whitelist - admin: ", smartWalletWhitelist.admin());
+                if (!_authorizedOwner(chainId, smartWalletWhitelist.future_admin()))
+                    console.log("Smart Wallet Whitelist - future admin: ", smartWalletWhitelist.future_admin());
+                if (!_authorizedOwner(chainId, veAngle.admin())) console.log("veANGLE - admin: ", veAngle.admin());
+                if (!_authorizedOwner(chainId, veAngle.future_admin()))
+                    console.log("veANGLE - future admin: ", veAngle.future_admin());
+                if (!_authorizedOwner(chainId, veBoostProxy.admin()))
+                    console.log("veBoostProxy - admin: ", veBoostProxy.admin());
+                if (!_authorizedOwner(chainId, veBoostProxy.future_admin()))
+                    console.log("veBoostProxy - future admin: ", veBoostProxy.future_admin());
+            } else {
+                ProposalReceiver proposalReceiver = ProposalReceiver(
+                    payable(_chainToContract(chainId, ContractType.ProposalReceiver))
+                );
+                if (!_authorizedOwner(chainId, proposalReceiver.owner()))
+                    console.log("Proposal Receiver - owner: ", proposalReceiver.owner());
+            }
+
+            if (_isCoreChain(chainId)) {
+                IAccessControlCore angleRouter = IAccessControlCore(
+                    _chainToContract(chainId, ContractType.AngleRouter)
+                );
+                if (!_authorizedCore(chainId, angleRouter.core()))
+                    console.log("Angle Router - core: ", angleRouter.core());
+            }
+
+            if (_isAngleDeployed(chainId) && chainId != CHAIN_POLYGON)
+                _checkOnLZToken(
+                    chainId,
+                    ILayerZeroBridge(_chainToContract(chainId, ContractType.AngleLZ)),
+                    angleLZ,
+                    ContractType.Angle,
+                    ContractType.TreasuryAgEUR
+                );
+
+            if (_isMerklDeployed(chainId)) {
+                IAccessControlCore distributionCreator = IAccessControlCore(
+                    _chainToContract(chainId, ContractType.DistributionCreator)
+                );
+                IAccessControlCore distributor = IAccessControlCore(
+                    _chainToContract(chainId, ContractType.Distributor)
+                );
+                if (!_authorizedCoreMerkl(chainId, address(distributionCreator.core())))
+                    console.log("Distribution creator - wrong core: ", distributionCreator.core());
+                if (!_authorizedCoreMerkl(chainId, address(distributor.core())))
+                    console.log("Distributor - wrong core: ", distributor.core());
+            }
+
+            if (_isSavingsDeployed(chainId)) {
+                ISavings stEUR = ISavings(_chainToContract(chainId, ContractType.StEUR));
+                ISavings stUSD = ISavings(_chainToContract(chainId, ContractType.StUSD));
+                if (!_authorizedCore(chainId, address(stEUR.accessControlManager())))
+                    console.log("StEUR - wrong access control manager: ", stEUR.accessControlManager());
+                if (!_authorizedCore(chainId, address(stUSD.accessControlManager())))
+                    console.log("StUSD - wrong access control manager: ", stUSD.accessControlManager());
+            }
+
+            ProxyAdmin proxyAdmin = ProxyAdmin(_chainToContract(chainId, ContractType.ProxyAdmin));
+
+            if (!_authorizedProxyAdminOwner(chainId, proxyAdmin.owner()))
+                console.log("Proxy Admin - owner: ", proxyAdmin.owner());
+            _checkOnLZToken(
+                chainId,
+                ILayerZeroBridge(_chainToContract(chainId, ContractType.AgEURLZ)),
+                "AgEUR LZ",
+                ContractType.AgEUR,
+                ContractType.TreasuryAgEUR
+            );
+            _checkOnLZToken(
+                chainId,
+                ILayerZeroBridge(_chainToContract(chainId, ContractType.AgUSDLZ)),
+                "AgUSD LZ",
+                ContractType.AgUSD,
+                ContractType.TreasuryAgUSD
+            );
+            _checkVaultManagers(chainId, ContractType.TreasuryAgEUR);
+            _checkVaultManagers(chainId, ContractType.TreasuryAgUSD);
+
+            if (_revertOnWrongFunctioCall(chainId))
+                for (uint256 i = 0; i < allContracts.length; i++)
+                    _checkGlobalAccessControl(chainId, IGenericAccessControl(allContracts[i]));
+        }
+
+        // Contract to check roles on
+        IAgToken agEUR = IAgToken(_chainToContract(chainId, ContractType.AgEUR));
+        IAgToken agUSD = IAgToken(_chainToContract(chainId, ContractType.AgUSD));
+        CoreBorrow core = CoreBorrow(_chainToContract(chainId, ContractType.CoreBorrow));
+        TimelockControllerWithCounter timelock = TimelockControllerWithCounter(
+            payable(_chainToContract(chainId, ContractType.Timelock))
+        );
+        for (uint256 i = 0; i < listAddressToCheck.length; i++) {
+            address actor = listAddressToCheck[i];
+            console.log("======== Actor: ", actor, " =========");
+
+            if (agEUR.isMinter(actor) && !_authorizedMinter(chainId, actor)) console.log("AgEUR - minter role");
+            if (agUSD.isMinter(actor) && !_authorizedMinter(chainId, actor)) console.log("AgUSD - minter role");
+            if (core.hasRole(GOVERNOR_ROLE, actor) && !_authorizedGovernor(chainId, actor))
+                console.log("Core Borrow - governor role");
+            if (core.hasRole(GUARDIAN_ROLE, actor) && !_authorizedGuardian(chainId, actor))
+                console.log("Core Borrow - guardian role");
+            if (core.hasRole(FLASHLOANER_TREASURY_ROLE, actor) && !_authorizedFlashloaner(chainId, actor))
+                console.log("Core Borrow - flashloan role");
+            if (timelock.hasRole(PROPOSER_ROLE, actor) && !_authorizedProposer(chainId, actor))
+                console.log("Timelock - proposer role");
+            if (timelock.hasRole(CANCELLER_ROLE, actor) && !_authorizedCanceller(chainId, actor))
+                console.log("Timelock - canceller role");
+            if (timelock.hasRole(EXECUTOR_ROLE, actor) && !_authorizedExecutor(chainId, actor))
+                console.log("Timelock - executor role");
+            if (timelock.hasRole(DEFAULT_ADMIN_ROLE, actor) && !_authorizeDefaultAdmin(chainId, actor))
+                console.log("Timelock - default admin role");
+
+            if (_revertOnWrongFunctioCall(chainId))
+                for (uint256 j = 0; j < allContracts.length; j++)
+                    _checkAddressAccessControl(chainId, IGenericAccessControl(allContracts[j]), actor);
+
+            if (_isMerklDeployed(chainId)) {
+                CoreBorrow coreMerkl = CoreBorrow(_chainToContract(chainId, ContractType.CoreMerkl));
+                if (coreMerkl.hasRole(GOVERNOR_ROLE, actor) && !_authorizedGovernor(chainId, actor))
+                    console.log("Core Merkl - governor role");
+                if (coreMerkl.hasRole(GUARDIAN_ROLE, actor) && !_authorizedGuardian(chainId, actor))
+                    console.log("Core Merkl - guardian role");
+                // No one should have this role
+                if (coreMerkl.hasRole(FLASHLOANER_TREASURY_ROLE, actor)) console.log("Core Merkl - flashloan role");
+            }
+
+            if (chainId == CHAIN_ETHEREUM) {
+                IAccessControl angleDistributor = IAccessControl(
+                    _chainToContract(chainId, ContractType.AngleDistributor)
+                );
+                if (angleDistributor.hasRole(GOVERNOR_ROLE, actor) && !_authorizedGovernor(chainId, actor))
+                    console.log("Angle distributor - governor role");
+                if (angleDistributor.hasRole(GUARDIAN_ROLE, actor) && !_authorizedGuardian(chainId, actor))
+                    console.log("Angle distributor - guardian role");
+            }
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                                                        CHECKS                                                      
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
+
+    function _checkOnLZToken(
+        uint256 chainId,
+        ILayerZeroBridge token,
+        string memory nameToken,
+        ContractType contractType,
+        ContractType contractTypeTreasury
+    ) internal returns (bool) {
+        if (token.canonicalToken() != _chainToContract(chainId, contractType))
+            console.log(string.concat(nameToken, "  - wrong canonical token: ", vm.toString(token.canonicalToken())));
+        if (contractType == ContractType.Angle) {
+            if (!_authorizedCore(chainId, token.coreBorrow()))
+                console.log(string.concat(nameToken, "  - wrong core borrow: ", vm.toString(token.coreBorrow())));
+        } else {
+            if (token.treasury() != _chainToContract(chainId, contractTypeTreasury))
+                console.log(string.concat(nameToken, "  - wrong treasury: ", vm.toString(token.treasury())));
+        }
+        if (token.lzEndpoint() != address(lzEndPoint(chainId)))
+            console.log(string.concat(nameToken, "  - wrong endpoint: ", vm.toString(address(token.lzEndpoint()))));
+    }
+
+    function _checkVaultManagers(uint256 chainId, ContractType treasuryType) internal {
+        ITreasury treasury = ITreasury(_chainToContract(chainId, treasuryType));
+        uint256 i;
+        while (true) {
+            try treasury.vaultManagerList(i) returns (address vault) {
+                if (address(IVaultManager(vault).treasury()) != address(treasury))
+                    console.log(
+                        string.concat(
+                            IERC721Metadata(vault).name(),
+                            "Vault Manager - wrong treasury: ",
+                            vm.toString(address(treasury))
+                        )
+                    );
+                i++;
+            } catch {
+                break;
+            }
+        }
+    }
+
+    function _checkGlobalAccessControl(uint256 chainId, IGenericAccessControl contractToCheck) public {
+        try contractToCheck.owner() returns (address owner) {
+            if (!_authorizedOwner(chainId, owner))
+                console.log(vm.toString(address(contractToCheck)), " owner: ", owner);
+        } catch {}
+        try contractToCheck.minter() returns (address minter) {
+            if (!_authorizedOwner(chainId, minter))
+                console.log(vm.toString(address(contractToCheck)), " minter: ", minter);
+        } catch {}
+        try contractToCheck.treasury() returns (address treasury) {
+            if (!_authorizedTreasury(chainId, treasury))
+                console.log(vm.toString(address(contractToCheck)), " treasury: ", treasury);
+        } catch {}
+        try contractToCheck.coreBorrow() returns (address coreBorrow) {
+            if (!_authorizedCore(chainId, coreBorrow))
+                console.log(vm.toString(address(contractToCheck)), " core borrow: ", coreBorrow);
+        } catch {}
+        try contractToCheck.core() returns (address coreBorrow) {
+            if (!_authorizedCore(chainId, coreBorrow))
+                console.log(vm.toString(address(contractToCheck)), " core borrow: ", coreBorrow);
+        } catch {}
+        try contractToCheck.admin() returns (address admin) {
+            if (!_authorizedOwner(chainId, admin))
+                console.log(vm.toString(address(contractToCheck)), " admin: ", admin);
+        } catch {}
+        try contractToCheck.future_admin() returns (address future_admin) {
+            if (!_authorizedOwner(chainId, future_admin))
+                console.log(vm.toString(address(contractToCheck)), " future admin: ", future_admin);
+        } catch {}
+    }
+
+    function _checkAddressAccessControl(
+        uint256 chainId,
+        IGenericAccessControl contractToCheck,
+        address addressToCheck
+    ) public {
+        try contractToCheck.isMinter(addressToCheck) returns (bool isMinter) {
+            if (isMinter && !_authorizedMinter(chainId, addressToCheck))
+                console.log(vm.toString(address(contractToCheck)), " minter: ");
+        } catch {}
+        try contractToCheck.isTrusted(addressToCheck) returns (bool isTrusted) {
+            if (isTrusted && !_authorizedTrusted(chainId, addressToCheck))
+                console.log(vm.toString(address(contractToCheck)), " trusted: ");
+        } catch {}
+        try contractToCheck.trusted(addressToCheck) returns (uint256 isTrusted) {
+            if (isTrusted > 0 && !_authorizedTrusted(chainId, addressToCheck))
+                console.log(vm.toString(address(contractToCheck)), " trusted: ");
+        } catch {}
+        bytes32[] memory listRoles = _listRoles();
+        for (uint256 i = 0; i < listRoles.length; i++) {
+            try contractToCheck.hasRole(listRoles[i], addressToCheck) returns (bool hasRole) {
+                if (hasRole && !_mapCheckRoles(i, chainId, addressToCheck))
+                    console.log(vm.toString(address(contractToCheck)), " have role: ", _nameRoles(i));
+            } catch {}
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                                                       CONSTANTS                                                    
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
+
+    function _listRoles() internal pure returns (bytes32[] memory listRoles) {
+        listRoles = new bytes32[](10);
+        listRoles[0] = GOVERNOR_ROLE;
+        listRoles[1] = GUARDIAN_ROLE;
+        listRoles[2] = FLASHLOANER_TREASURY_ROLE;
+        listRoles[3] = TIMELOCK_ADMIN_ROLE;
+        listRoles[4] = PROPOSER_ROLE;
+        listRoles[5] = EXECUTOR_ROLE;
+        listRoles[6] = CANCELLER_ROLE;
+        listRoles[7] = KEEPER_ROLE;
+        listRoles[8] = DISTRIBUTOR_ROLE;
+        listRoles[9] = DEFAULT_ADMIN_ROLE;
+    }
+
+    function _nameRoles(uint256 index) internal pure returns (string memory nameRole) {
+        if (index == 0) return "GOVERNOR";
+        if (index == 1) return "GUARDIAN";
+        if (index == 2) return "FLASHLOANER_TREASURY";
+        if (index == 3) return "TIMELOCK_ADMIN";
+        if (index == 4) return "PROPOSER";
+        if (index == 5) return "EXECUTOR";
+        if (index == 6) return "CANCELLER";
+        if (index == 7) return "KEEPER";
+        if (index == 8) return "DISTRIBUTOR";
+        if (index == 9) return "DEFAULT_ADMIN";
+    }
+
+    function _mapCheckRoles(uint256 index, uint256 chainId, address addressToCheck) internal returns (bool) {
+        if (index == 0) return _authorizedGovernor(chainId, addressToCheck);
+        if (index == 1) return _authorizedGuardian(chainId, addressToCheck);
+        if (index == 2) return _authorizedFlashloaner(chainId, addressToCheck);
+        if (index == 3) return _authorizedTimelockAdmin(chainId, addressToCheck);
+        if (index == 4) return _authorizedProposer(chainId, addressToCheck);
+        if (index == 5) return _authorizedExecutor(chainId, addressToCheck);
+        if (index == 6) return _authorizedCanceller(chainId, addressToCheck);
+        if (index == 7) return _authorizedKeeper(chainId, addressToCheck);
+        if (index == 8) return _authorizedDistributor(chainId, addressToCheck);
+        if (index == 9) return _authorizeDefaultAdmin(chainId, addressToCheck);
+    }
+
+    function _isCoreChain(uint256 chainId) internal pure returns (bool) {
+        return
+            chainId == CHAIN_ETHEREUM ||
+            chainId == CHAIN_ARBITRUM ||
+            chainId == CHAIN_AVALANCHE ||
+            chainId == CHAIN_OPTIMISM ||
+            chainId == CHAIN_POLYGON ||
+            chainId == CHAIN_GNOSIS;
+    }
+
+    function _isAngleDeployed(uint256 chainId) internal pure returns (bool) {
+        return
+            chainId == CHAIN_ETHEREUM ||
+            chainId == CHAIN_ARBITRUM ||
+            chainId == CHAIN_AURORA ||
+            chainId == CHAIN_AVALANCHE ||
+            chainId == CHAIN_BNB ||
+            chainId == CHAIN_FANTOM ||
+            chainId == CHAIN_OPTIMISM ||
+            chainId == CHAIN_POLYGON;
+    }
+
+    function _isMerklDeployed(uint256 chainId) internal pure returns (bool) {
+        return
+            chainId == CHAIN_ETHEREUM ||
+            chainId == CHAIN_ARBITRUM ||
+            chainId == CHAIN_AVALANCHE ||
+            chainId == CHAIN_BASE ||
+            chainId == CHAIN_BNB ||
+            chainId == CHAIN_GNOSIS ||
+            chainId == CHAIN_LINEA ||
+            chainId == CHAIN_MANTLE ||
+            chainId == CHAIN_OPTIMISM ||
+            chainId == CHAIN_POLYGON ||
+            chainId == CHAIN_POLYGONZKEVM;
+    }
+
+    function _isSavingsDeployed(uint256 chainId) internal pure returns (bool) {
+        return
+            chainId == CHAIN_ETHEREUM ||
+            chainId == CHAIN_ARBITRUM ||
+            chainId == CHAIN_AVALANCHE ||
+            chainId == CHAIN_BASE ||
+            chainId == CHAIN_BNB ||
+            chainId == CHAIN_CELO ||
+            chainId == CHAIN_GNOSIS ||
+            chainId == CHAIN_OPTIMISM ||
+            chainId == CHAIN_POLYGON ||
+            chainId == CHAIN_POLYGONZKEVM;
+    }
+
+    function _revertOnWrongFunctioCall(uint256 chainId) internal pure returns (bool) {
+        return chainId != CHAIN_CELO;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                                                        HELPERS                                                     
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
+
+    function _authorizedOwner(uint256 chainId, address owner) internal returns (bool) {
+        return
+            owner == address(0) ||
+            owner == _chainToContract(chainId, ContractType.GovernorMultisig) ||
+            // owner == _chainToContract(chainId, ContractType.GuardianMultisig) ||
+            owner == _chainToContract(chainId, ContractType.Timelock) ||
+            owner == _chainToContract(chainId, ContractType.CoreBorrow) ||
+            owner == _chainToContract(chainId, ContractType.ProxyAdmin) ||
+            ((chainId == CHAIN_SOURCE) ? owner == _chainToContract(chainId, ContractType.Governor) : false);
+    }
+
+    function _authorizedGovernor(uint256 chainId, address governor) internal returns (bool) {
+        return
+            governor == address(0) ||
+            governor == _chainToContract(chainId, ContractType.GovernorMultisig) ||
+            governor == _chainToContract(chainId, ContractType.Timelock) ||
+            governor == _chainToContract(chainId, ContractType.CoreBorrow) ||
+            governor == _chainToContract(chainId, ContractType.ProxyAdmin) ||
+            ((chainId == CHAIN_SOURCE) ? governor == _chainToContract(chainId, ContractType.Governor) : false);
+    }
+
+    function _authorizedGuardian(uint256 chainId, address guardian) internal returns (bool) {
+        return
+            guardian == address(0) ||
+            guardian == _chainToContract(chainId, ContractType.GovernorMultisig) ||
+            guardian == _chainToContract(chainId, ContractType.GuardianMultisig) ||
+            guardian == _chainToContract(chainId, ContractType.Timelock) ||
+            guardian == _chainToContract(chainId, ContractType.CoreBorrow) ||
+            guardian == _chainToContract(chainId, ContractType.ProxyAdmin) ||
+            ((chainId == CHAIN_SOURCE) ? guardian == _chainToContract(chainId, ContractType.Governor) : false);
+    }
+
+    /// @notice Vault Managers are also minter
+    function _authorizedMinter(uint256 chainId, address minter) internal returns (bool) {
+        return
+            minter == address(0) ||
+            minter == _chainToContract(chainId, ContractType.GovernorMultisig) ||
+            minter == _chainToContract(chainId, ContractType.Timelock);
+    }
+
+    function _authorizedCore(uint256 chainId, address core) internal returns (bool) {
+        // TODO remove tmp core when USD linked to real one
+        return core == _chainToContract(chainId, ContractType.CoreBorrow) || core == tmpCoreBorrowUSD;
+    }
+
+    function _authorizedCoreMerkl(uint256 chainId, address core) internal returns (bool) {
+        return core == _chainToContract(chainId, ContractType.CoreMerkl);
+    }
+
+    // TODO need to be fine grained for multiple stablecoins
+    function _authorizedFlashloaner(uint256 chainId, address loaner) internal returns (bool) {
+        return
+            loaner == address(0) ||
+            loaner == _chainToContract(chainId, ContractType.TreasuryAgEUR) ||
+            loaner == _chainToContract(chainId, ContractType.TreasuryAgUSD);
+    }
+
+    function _authorizedProposer(uint256 chainId, address proposer) internal returns (bool) {
+        return
+            (chainId == CHAIN_SOURCE)
+                ? proposer == _chainToContract(chainId, ContractType.Governor)
+                : proposer == _chainToContract(chainId, ContractType.ProposalReceiver);
+    }
+
+    function _authorizedExecutor(uint256 chainId, address executor) internal returns (bool) {
+        return executor == _chainToContract(chainId, ContractType.GuardianMultisig);
+    }
+
+    function _authorizedCanceller(uint256 chainId, address canceller) internal returns (bool) {
+        return canceller == _chainToContract(chainId, ContractType.GuardianMultisig);
+    }
+
+    function _authorizedTimelockAdmin(uint256 chainId, address admin) internal returns (bool) {
+        return false;
+    }
+
+    function _authorizeDefaultAdmin(uint256 chainId, address admin) internal returns (bool) {
+        return false;
+    }
+
+    function _authorizedKeeper(uint256 chainId, address keeper) internal returns (bool) {
+        // return (
+        //     (chainId == CHAIN_POLYGON)
+        //         ? (keeper == oldKeeperPolygon || keeper == oldKeeperPolygon2)
+        //         : keeper == oldKeeper
+        // );
+        return false;
+    }
+
+    function _authorizedTrusted(uint256 chainId, address trusted) internal returns (bool) {
+        return
+            trusted == _chainToContract(chainId, ContractType.GovernorMultisig) ||
+            trusted == _chainToContract(chainId, ContractType.GuardianMultisig) ||
+            trusted == _chainToContract(chainId, ContractType.Timelock) ||
+            trusted == _chainToContract(chainId, ContractType.CoreBorrow) ||
+            trusted == _chainToContract(chainId, ContractType.ProxyAdmin) ||
+            // trusted == oldDeployer ||
+            // trusted == oldKeeper ||
+            // trusted == oldKeeperPolygon ||
+            // trusted == oldKeeperPolygon2 ||
+            // trusted == merklKeeper ||
+            ((chainId == CHAIN_SOURCE) ? trusted == _chainToContract(chainId, ContractType.Governor) : false);
+    }
+
+    function _authorizedDistributor(uint256 chainId, address distributor) internal returns (bool) {
+        return
+            (chainId == CHAIN_ETHEREUM)
+                ? distributor == _chainToContract(chainId, ContractType.AngleDistributor)
+                : false;
+    }
+
+    function _authorizedProxyAdminOwner(uint256 chainId, address owner) internal returns (bool) {
+        return owner == _chainToContract(chainId, ContractType.GovernorMultisig);
+    }
+
+    function _authorizedTreasury(uint256 chainId, address treasury) internal returns (bool) {
+        return
+            treasury == _chainToContract(chainId, ContractType.TreasuryAgEUR) ||
+            treasury == _chainToContract(chainId, ContractType.TreasuryAgUSD);
+    }
+}
diff --git a/scripts/proposals/Wrapper.s.sol b/scripts/proposals/Wrapper.s.sol
index 5a0b713..9b0f6a8 100644
--- a/scripts/proposals/Wrapper.s.sol
+++ b/scripts/proposals/Wrapper.s.sol
@@ -4,6 +4,18 @@ pragma solidity ^0.8.20;
 import "../Utils.s.sol";
 
 contract Wrapper is Utils {
+    uint256 public constant LZ_VALUE_ARBITRUM = 0.05 ether;
+    uint256 public constant LZ_VALUE_AVALANCHE = 0.05 ether;
+    uint256 public constant LZ_VALUE_ETHEREUM = 0.1 ether;
+    uint256 public constant LZ_VALUE_OPTIMISM = 0.05 ether;
+    uint256 public constant LZ_VALUE_POLYGON = 0.05 ether;
+    uint256 public constant LZ_VALUE_GNOSIS = 0.05 ether;
+    uint256 public constant LZ_VALUE_BNB = 0.05 ether;
+    uint256 public constant LZ_VALUE_CELO = 0.05 ether;
+    uint256 public constant LZ_VALUE_POLYGONZKEVM = 0.05 ether;
+    uint256 public constant LZ_VALUE_BASE = 0.05 ether;
+    uint256 public constant LZ_VALUE_LINEA = 0.05 ether;
+
     function wrapTimelock(
         uint256 chainId,
         SubCall[] memory p
@@ -165,12 +177,13 @@ contract Wrapper is Utils {
                     _chainToContract(CHAIN_SOURCE, ContractType.ProposalSender)
                 );
                 targets[finalPropLength] = address(proposalSender);
-                values[finalPropLength] = 0.1 ether;
+                values[finalPropLength] = _getLZGasEstimate(chainId);
                 chainIds[finalPropLength] = chainId;
                 calldatas[finalPropLength] = abi.encodeWithSelector(
                     ProposalSender.execute.selector,
                     getLZChainId(chainId),
                     abi.encode(batchTargets, batchValues, new string[](1), batchCalldatas),
+                    // TODO make a better estimate of the gas required on detination chain 300000
                     abi.encodePacked(uint16(1), uint256(300000))
                 );
                 finalPropLength += 1;
@@ -183,4 +196,30 @@ contract Wrapper is Utils {
             mstore(calldatas, finalPropLength)
         }
     }
+
+    // TODO make a better estimate (based on `quote_fee`)
+    function _getLZGasEstimate(uint256 chainId) internal pure returns (uint256 value) {
+        value = chainId == CHAIN_ARBITRUM ? LZ_VALUE_ARBITRUM : chainId == CHAIN_AVALANCHE
+            ? LZ_VALUE_AVALANCHE
+            : chainId == CHAIN_ETHEREUM
+            ? LZ_VALUE_ETHEREUM
+            : chainId == CHAIN_OPTIMISM
+            ? LZ_VALUE_OPTIMISM
+            : chainId == CHAIN_POLYGON
+            ? LZ_VALUE_POLYGON
+            : chainId == CHAIN_GNOSIS
+            ? LZ_VALUE_GNOSIS
+            : chainId == CHAIN_BNB
+            ? LZ_VALUE_BNB
+            : chainId == CHAIN_CELO
+            ? LZ_VALUE_CELO
+            : chainId == CHAIN_POLYGONZKEVM
+            ? LZ_VALUE_POLYGONZKEVM
+            : chainId == CHAIN_BASE
+            ? LZ_VALUE_BASE
+            : chainId == CHAIN_LINEA
+            ? LZ_VALUE_LINEA
+            : 0;
+        if (value == 0) revert("Invalid chainId");
+    }
 }
diff --git a/scripts/proposals/payload.json b/scripts/proposals/payload.json
index fa6b66b..39f8220 100644
--- a/scripts/proposals/payload.json
+++ b/scripts/proposals/payload.json
@@ -1,32 +1,35 @@
 {
   "calldatas": {
-    "0": "0xa6c3d165000000000000000000000000000000000000000000000000000000000000006e00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000014cda39b74054effb230156f21b334e50295ca8df4000000000000000000000000",
-    "1": "0xa6c3d165000000000000000000000000000000000000000000000000000000000000006d000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000142c159fcb745570de3ecd934cab92ae3085d19c04000000000000000000000000",
-    "2": "0xa6c3d1650000000000000000000000000000000000000000000000000000000000000091000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000144d9a15925f972bc4d45233132efd0fb498836cfc000000000000000000000000",
-    "3": "0xa6c3d165000000000000000000000000000000000000000000000000000000000000006a000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000140750b6fdada48057dbc7103e1e9286f00f997d81000000000000000000000000",
-    "4": "0xa6c3d16500000000000000000000000000000000000000000000000000000000000000b800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000014892bf71463bd9fa57f3c2266ab74dbe1b96decea000000000000000000000000",
-    "5": "0xa6c3d165000000000000000000000000000000000000000000000000000000000000006600000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000014b9807831b01ecb7b20d9fbe2b5454d066cd2de8e000000000000000000000000",
-    "6": "0xa6c3d165000000000000000000000000000000000000000000000000000000000000007d00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000014456f478a7210e0dc35ed67a5fec1d86cdcdabd6b000000000000000000000000",
-    "7": "0xa6c3d165000000000000000000000000000000000000000000000000000000000000009e0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001492d84b0687361cd0753e95f5a8746fbaf42e9135000000000000000000000000",
-    "8": "0xa6c3d165000000000000000000000000000000000000000000000000000000000000006f00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000014d6788102627462d1a679282e726125ccdebab514000000000000000000000000",
-    "9": "0xa6c3d16500000000000000000000000000000000000000000000000000000000000000b7000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000144a44f77978daa3e92eb3d97210bd11645cf935ab000000000000000000000000"
+    "0": "0x01d5062a00000000000000000000000009d81464c7293c774203e46e3c921559c8e9d53f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d62353000000000000000000000000000000000000000000000000000000000001517f00000000000000000000000000000000000000000000000000000000",
+    "1": "0xbb5a944f000000000000000000000000000000000000000000000000000000000000006e000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003800000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000169487a55de79476125a56b07c36ca8dbf37a3730000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a000000000000000000000000169487a55de79476125a56b07c36ca8dbf37a373000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d62353000000000000000000000000000000000000000000000000000000000001517f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000100000000000000000000000000000000000000000000000000000000000493e0000000000000000000000000000000000000000000000000000000000000",
+    "10": "0xbb5a944f00000000000000000000000000000000000000000000000000000000000000b7000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003800000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000d23b51d6f2cb3ec7ca9599d4332a2f10c3cfdf850000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a000000000000000000000000d23b51d6f2cb3ec7ca9599d4332a2f10c3cfdf85000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d62353000000000000000000000000000000000000000000000000000000000001517f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000100000000000000000000000000000000000000000000000000000000000493e0000000000000000000000000000000000000000000000000000000000000",
+    "2": "0xbb5a944f000000000000000000000000000000000000000000000000000000000000006d000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003800000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000c24766a56732b85eee5a383ed6614abd34fb6310000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a0000000000000000000000000c24766a56732b85eee5a383ed6614abd34fb631000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d62353000000000000000000000000000000000000000000000000000000000001517f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000100000000000000000000000000000000000000000000000000000000000493e0000000000000000000000000000000000000000000000000000000000000",
+    "3": "0xbb5a944f0000000000000000000000000000000000000000000000000000000000000091000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003800000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000b2ea590fcea142dcceaeb3912da4c1df721848ef0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a000000000000000000000000b2ea590fcea142dcceaeb3912da4c1df721848ef000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d62353000000000000000000000000000000000000000000000000000000000001517f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000100000000000000000000000000000000000000000000000000000000000493e0000000000000000000000000000000000000000000000000000000000000",
+    "4": "0xbb5a944f000000000000000000000000000000000000000000000000000000000000006a000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003800000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000000010000000000000000000000007f27082eabdddc9dc3cc6632c9f594d210b9d43c0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a0000000000000000000000007f27082eabdddc9dc3cc6632c9f594d210b9d43c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d62353000000000000000000000000000000000000000000000000000000000001517f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000100000000000000000000000000000000000000000000000000000000000493e0000000000000000000000000000000000000000000000000000000000000",
+    "5": "0xbb5a944f00000000000000000000000000000000000000000000000000000000000000b8000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003800000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000f868da244c17cf0e288ae4a92c8636f072a7bae30000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a000000000000000000000000f868da244c17cf0e288ae4a92c8636f072a7bae3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d62353000000000000000000000000000000000000000000000000000000000001517f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000100000000000000000000000000000000000000000000000000000000000493e0000000000000000000000000000000000000000000000000000000000000",
+    "6": "0xbb5a944f0000000000000000000000000000000000000000000000000000000000000066000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003800000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c9025cef778a8032a689ac52798c66939c17c22f0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a000000000000000000000000c9025cef778a8032a689ac52798c66939c17c22f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d62353000000000000000000000000000000000000000000000000000000000001517f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000100000000000000000000000000000000000000000000000000000000000493e0000000000000000000000000000000000000000000000000000000000000",
+    "7": "0xbb5a944f000000000000000000000000000000000000000000000000000000000000007d000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003800000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000000010000000000000000000000009b3c71edeb2e965d043e546d01323690a3101dc60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a0000000000000000000000009b3c71edeb2e965d043e546d01323690a3101dc6000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d62353000000000000000000000000000000000000000000000000000000000001517f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000100000000000000000000000000000000000000000000000000000000000493e0000000000000000000000000000000000000000000000000000000000000",
+    "8": "0xbb5a944f000000000000000000000000000000000000000000000000000000000000009e000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003800000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c1f9266c6d3389e981639ee873121199a7acdb8f0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a000000000000000000000000c1f9266c6d3389e981639ee873121199a7acdb8f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d62353000000000000000000000000000000000000000000000000000000000001517f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000100000000000000000000000000000000000000000000000000000000000493e0000000000000000000000000000000000000000000000000000000000000",
+    "9": "0xbb5a944f000000000000000000000000000000000000000000000000000000000000006f000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003800000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000343902fe4d72e24b29f22d787b2e54eeea5e82270000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000012401d5062a000000000000000000000000343902fe4d72e24b29f22d787b2e54eeea5e8227000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000002464d62353000000000000000000000000000000000000000000000000000000000001517f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000100000000000000000000000000000000000000000000000000000000000493e0000000000000000000000000000000000000000000000000000000000000"
   },
   "chainIds": {
-    "0": 42161,
-    "1": 137,
-    "2": 100,
-    "3": 43114,
-    "4": 8453,
-    "5": 56,
-    "6": 42220,
-    "7": 1101,
-    "8": 10,
-    "9": 59144
+    "0": 1,
+    "1": 42161,
+    "10": 59144,
+    "2": 137,
+    "3": 100,
+    "4": 43114,
+    "5": 8453,
+    "6": 56,
+    "7": 42220,
+    "8": 1101,
+    "9": 10
   },
-  "description": "ipfs://QmRSdyuXeemVEn97RPRSiit6UEUonvwVr9we7bEe2w8v2E",
+  "description": "ipfs://QmaWGR4XjsXHfaPxRB3UUX8DML56sg9dZLFCuvgpXzMiPC",
   "targets": {
-    "0": "0x896D64B4B7265273dDCD00808f3579563f9790A8",
+    "0": "0x09D81464c7293C774203E46E3C921559c8E9D53f",
     "1": "0x896D64B4B7265273dDCD00808f3579563f9790A8",
+    "10": "0x896D64B4B7265273dDCD00808f3579563f9790A8",
     "2": "0x896D64B4B7265273dDCD00808f3579563f9790A8",
     "3": "0x896D64B4B7265273dDCD00808f3579563f9790A8",
     "4": "0x896D64B4B7265273dDCD00808f3579563f9790A8",
@@ -38,14 +41,15 @@
   },
   "values": {
     "0": 0,
-    "1": 0,
-    "2": 0,
-    "3": 0,
-    "4": 0,
-    "5": 0,
-    "6": 0,
-    "7": 0,
-    "8": 0,
-    "9": 0
+    "1": 50000000000000000,
+    "10": 50000000000000000,
+    "2": 50000000000000000,
+    "3": 50000000000000000,
+    "4": 50000000000000000,
+    "5": 50000000000000000,
+    "6": 50000000000000000,
+    "7": 50000000000000000,
+    "8": 50000000000000000,
+    "9": 50000000000000000
   }
 }
\ No newline at end of file
diff --git a/scripts/proposals/timelock/SetMinDelayTimelock.s.sol b/scripts/proposals/timelock/SetMinDelayTimelock.s.sol
index 30c4f8f..c5ebad3 100644
--- a/scripts/proposals/timelock/SetMinDelayTimelock.s.sol
+++ b/scripts/proposals/timelock/SetMinDelayTimelock.s.sol
@@ -22,10 +22,10 @@ contract SetMinDelayTimelock is Wrapper {
 
     function run() external {
         uint256[] memory chainIds = vm.envUint("CHAIN_IDS", ",");
-        string memory description = "Set min delay for timelock";
+        string memory description = "ipfs://QmaWGR4XjsXHfaPxRB3UUX8DML56sg9dZLFCuvgpXzMiPC";
 
         /** TODO  complete */
-        uint256 minDelay = uint256(1 weeks);
+        uint256 minDelay = uint256(1 days) - 1;
         /** END  complete */
 
         for (uint256 i = 0; i < chainIds.length; i++) {
diff --git a/test/scripts/timelock/SetMinDelayTimelockTest.t.sol b/test/scripts/timelock/SetMinDelayTimelockTest.t.sol
index fa9913d..4a6e78f 100644
--- a/test/scripts/timelock/SetMinDelayTimelockTest.t.sol
+++ b/test/scripts/timelock/SetMinDelayTimelockTest.t.sol
@@ -11,7 +11,7 @@ import { ProposalSender } from "contracts/ProposalSender.sol";
 contract SetMinDelayTimelockTest is ScriptHelpers {
     using stdJson for string;
 
-    uint256 constant newMinDelay = uint256(1 weeks);
+    uint256 constant newMinDelay = uint256(1 days) - 1;
 
     function setUp() public override {
         super.setUp();
diff --git a/test/unit/Simulate.t.sol b/test/unit/Simulate.t.sol
index dabc965..98c720f 100644
--- a/test/unit/Simulate.t.sol
+++ b/test/unit/Simulate.t.sol
@@ -20,7 +20,7 @@ import "stringutils/strings.sol";
 import "../Constants.t.sol";
 
 //solhint-disable
-contract Simulate is SimulationSetup {
+contract ProposalSimulateTest is SimulationSetup {
     function test_Simulate() public {
         (SubCall[] memory p, string memory description) = proposal.proposal();
         (address[] memory targets, uint256[] memory values, bytes[] memory calldatas) = wrap(p);
diff --git a/utils/contractAddress.js b/utils/contractAddress.js
index 1ca6422..71bbc26 100644
--- a/utils/contractAddress.js
+++ b/utils/contractAddress.js
@@ -20,38 +20,41 @@ const parsedInput = Number(chainInput);
 
 let contract
 
-if(contracTtype == "governor") contract =  registry(parsedInput)?.AngleGovernor;
+if(contracTtype == "agEUR") contract = registry(parsedInput)?.agEUR?.AgToken;
+else if(contracTtype == "agUSD") contract = registry(parsedInput)?.agUSD?.AgToken;
+else if(contracTtype == "agEURLz") contract = registry(parsedInput)?.agEUR?.bridges.LayerZero;
+else if(contracTtype == "agUSDLz") contract = registry(parsedInput)?.agUSD?.bridges.LayerZero;
+else if(contracTtype == "angle") contract = registry(parsedInput)?.ANGLE;
+else if(contracTtype == "angleLz") contract = registry(parsedInput)?.bridges.LayerZero;
+else if(contracTtype == "angleDistributor") contract = registry(parsedInput)?.AngleDistributor;
+else if(contracTtype == "angleMiddleman") contract = registry(parsedInput)?.Middleman;
+else if(contracTtype == "angleRouter") contract = registry(parsedInput)?.AngleRouterV2;
+else if(contracTtype == "coreBorrow") contract = registry(parsedInput)?.CoreBorrow;
+else if(contracTtype == "coreMerkl") contract = registry(parsedInput)?.Merkl?.CoreMerkl;
+else if(contracTtype == "distributionCreator") contract = registry(parsedInput)?.Merkl?.DistributionCreator;
+else if(contracTtype == "distributor") contract = registry(parsedInput)?.Merkl?.Distributor;
+else if(contracTtype == "feeDistributor") contract = registry(parsedInput)?.FeeDistributor_sanUSDC_EUR;
+else if(contracTtype == "gaugeController") contract = registry(parsedInput)?.GaugeController;
+else if(contracTtype == "governor") contract =  registry(parsedInput)?.AngleGovernor;
+else if(contracTtype == "governorMultisig") contract = registry(parsedInput)?.Governor;
+else if(contracTtype == "guardianMultisig") contract =  registry(parsedInput)?.Guardian;
+else if(contracTtype == "merklMiddleman") contract = registry(parsedInput)?.MerklGaugeMiddleman;
 else if(contracTtype == "proposalReceiver")  contract = registry(parsedInput)?.ProposalReceiver;
-else if(contracTtype == "timelock") contract = registry(parsedInput)?.Timelock;
 else if(contracTtype == "proposalSender") contract = registry(parsedInput)?.ProposalSender;
-else if(contracTtype == "guardian") contract =  registry(parsedInput)?.Guardian;
-else if(contracTtype == "treasury") contract = registry(parsedInput)?.agEUR?.Treasury;
+else if(contracTtype == "proxyAdmin") contract = registry(parsedInput)?.ProxyAdmin;
+else if(contracTtype == "smartWalletWhitelist") contract = registry(parsedInput)?.SmartWalletWhitelist;
 else if(contracTtype == "stEUR") contract = registry(parsedInput)?.agEUR?.Savings;
+else if(contracTtype == "stUSD") contract = registry(parsedInput)?.agUSD?.Savings;
+else if(contracTtype == "timelock") contract = registry(parsedInput)?.Timelock;
 else if(contracTtype == "transmuterAgEUR") contract = registry(parsedInput)?.agEUR?.Transmuter;
-else if(contracTtype == "coreBorrow") contract = registry(parsedInput)?.CoreBorrow;
-else if(contracTtype == "governorMultisig") contract = registry(parsedInput)?.Governor;
-else if(contracTtype == "proxyAdmin") contract = registry(parsedInput)?.ProxyAdmin;
-else if(contracTtype == "angle") contract = registry(parsedInput)?.ANGLE;
+else if(contracTtype == "transmuterAgUSD") contract = registry(parsedInput)?.agUSD?.Transmuter;
+else if(contracTtype == "treasuryAgEUR") contract = registry(parsedInput)?.agEUR?.Treasury;
+else if(contracTtype == "treasuryAgUSD") contract = registry(parsedInput)?.agUSD?.Treasury;
 else if(contracTtype == "veANGLE") contract = registry(parsedInput)?.veANGLE;
-else if(contracTtype == "smartWalletWhitelist") contract = registry(parsedInput)?.SmartWalletWhitelist;
+else if(contracTtype == "veBoost") contract = registry(parsedInput)?.veBoost;
 else if(contracTtype == "veBoostProxy") contract = registry(parsedInput)?.veBoostProxy;
-else if(contracTtype == "gaugeController") contract = registry(parsedInput)?.GaugeController;
-else if(contracTtype == "angleDistributor") contract = registry(parsedInput)?.AngleDistributor;
-else if(contracTtype == "angleMiddleman") contract = registry(parsedInput)?.Middleman;
-else if(contracTtype == "feeDistributor") contract = registry(parsedInput)?.FeeDistributor_sanUSDC_EUR;
 
 if(!contract) process.exit(1);
 // Call the function with the input
 const result = ethers.utils.getAddress(contract)?.toString()?.slice(2);
-console.log(result);
-
-// let result;
-// if(contracTtype == "governor") result = ethers.utils.getAddress(registry(parsedInput).AngleGovernor).toString().slice(2);
-// else if(contracTtype == "proposalReceiver") result = ethers.utils.getAddress(registry(parsedInput).ProposalReceiver).toString().slice(2);
-// else if(contracTtype == "timelock") result = ethers.utils.getAddress(registry(parsedInput).Timelock).toString().slice(2);
-// else if(contracTtype == "proposalSender") result = ethers.utils.getAddress(registry(parsedInput).ProposalSender).toString().slice(2);
-// else {
-//   console.error('Please provide a correct contract type as an argument.');
-//   process.exit(1);
-// }
-// console.log(result);
\ No newline at end of file
+console.log(result);
\ No newline at end of file
diff --git a/utils/getAllContracts.js b/utils/getAllContracts.js
new file mode 100644
index 0000000..027461e
--- /dev/null
+++ b/utils/getAllContracts.js
@@ -0,0 +1,41 @@
+const { registry } = require('@angleprotocol/sdk');
+const { ethers } = require('ethers');
+
+// Ensure an argument has been provided
+if (process.argv.length < 3) {
+  console.error('Please provide a chain input as an argument.');
+  process.exit(1);
+}
+
+// Get the argument from the command line input
+// process.argv[0] is the node command
+// process.argv[1] is the path to the runner.js file
+// process.argv[2] is the first argument provided by the user
+const chainInput = process.argv[2];
+
+// Try to parse the input as a number if possible
+if(isNaN(Number(chainInput))) process.exit(1);
+const parsedInput = Number(chainInput);
+
+// Function to get all addresses from the registry
+function getAllAddresses(registry) {
+  let addresses = [];
+
+  for (let key in registry) {
+    if (typeof registry[key] === 'object' && registry[key] !== null) {
+      // If the value is a nested object, recursively get addresses
+      addresses = addresses.concat(getAllAddresses(registry[key]));
+    } else {
+      // If the value is not an object, assume it's an address and add to the list
+      addresses.push(ethers.utils.getAddress(registry[key])?.toString());
+    }
+  }
+
+  return addresses;
+}
+
+// Call the function with the registry
+let allAddresses = getAllAddresses(registry(parsedInput));
+allAddresses = [...new Set(allAddresses)];
+const encodedAddresses = ethers.utils.defaultAbiCoder.encode(['address[]'], [allAddresses]);
+console.log(encodedAddresses);
\ No newline at end of file