From c309199852319f7596d69f68afff1bb68358f6d5 Mon Sep 17 00:00:00 2001
From: Alexander <git@lindgren.xyz>
Date: Fri, 17 May 2024 15:00:28 +0200
Subject: [PATCH] feat: new salts

---
 evm/.env.example                         |  2 +-
 evm/lib/GeneralisedIncentives            |  2 +-
 evm/script/DeployContracts.s.sol         | 10 +++++-----
 evm/script/TimeLock.s.sol                |  3 ++-
 evm/script/config/config_contracts.json  | 16 ++++++++--------
 evm/script/config/config_interfaces.json | 24 ++++++++++++++----------
 6 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/evm/.env.example b/evm/.env.example
index a4f6f517..40728a5a 100644
--- a/evm/.env.example
+++ b/evm/.env.example
@@ -1,4 +1,4 @@
-CATALYST_ADDRESS="0x0000007aAAC54131e031b3C0D6557723f9365A5B"
+CATALYST_ADDRESS="0x00000000042A0e90f74f036587d7912EA32EF5cC"
 ROUTER_DEPLOYER=
 DEPLOYER_PK=
 
diff --git a/evm/lib/GeneralisedIncentives b/evm/lib/GeneralisedIncentives
index ac8754bf..8ede6a34 160000
--- a/evm/lib/GeneralisedIncentives
+++ b/evm/lib/GeneralisedIncentives
@@ -1 +1 @@
-Subproject commit ac8754bf028560885d8dff37101f2bca2cf11570
+Subproject commit 8ede6a3427a706cfafbfc51c576ba1690a3e6dda
diff --git a/evm/script/DeployContracts.s.sol b/evm/script/DeployContracts.s.sol
index 5062ff19..2eaab8ae 100644
--- a/evm/script/DeployContracts.s.sol
+++ b/evm/script/DeployContracts.s.sol
@@ -98,13 +98,13 @@ contract DeployContracts is Script {
 
         admin = admin_;
 
-        deployFactory(bytes32(uint256(251)));
+        deployFactory(bytes32(0xe810ad7329bc18a3661da69243c260bddf93c02cb86f51d82cef8f77664b1dc1));
 
-        deploy_volatile_mathlib(bytes32(uint256(251)));
-        deploy_amplified_mathlib(bytes32(uint256(251)));
+        deploy_volatile_mathlib(bytes32(0xeadb0c4c623a1504e49ea876afaf2e1a24a663e81e05ac04fc82ab1a53974533));
+        deploy_amplified_mathlib(bytes32(0x178f2263b6b48c743c92919210db1f9ffdd16b679f9a49a60db831ee745c1b53));
 
-        deploy_volatile_template(bytes32(uint256(251)));
-        deploy_amplified_template(bytes32(uint256(251)));
+        deploy_volatile_template(bytes32(0xab571b0631b64d37caa8e7d85912d505bf434d66e2b9df4088447821dac531d8));
+        deploy_amplified_template(bytes32(0x4aa36fb7e5e332061b6ad20a3b0de53dd4cf41391c9bf553367ba5165b60c5cd));
     }
 }
 
diff --git a/evm/script/TimeLock.s.sol b/evm/script/TimeLock.s.sol
index dc63f137..34abbe97 100644
--- a/evm/script/TimeLock.s.sol
+++ b/evm/script/TimeLock.s.sol
@@ -12,6 +12,7 @@ contract DeployTimelock is BaseMultiChainDeployer {
     uint256 MIN_DELAY = 1 days;
     
     function _deployTimelockController(bytes32 salt, uint256 minDelay, address[] memory proposers, address[] memory executors, address admin) internal returns(TimelockController) {
+        vm.broadcast();
         return new TimelockController{salt: salt}(minDelay, proposers, executors, admin);
     }
 
@@ -28,7 +29,7 @@ contract DeployTimelock is BaseMultiChainDeployer {
     function run() public {
         bytes32 salt = bytes32(0x67e6613ce8cbbe2cbdf83a49a42f7506ba4f34ef5ce61e83c3935e85cac6a4a6);
         address initalProposer = address(0xE759cBa7dE5bF6E024BcbdD01941fc3b1713D2FC);
-        deployTimelockController(salt, initalProposer);
+        deployTimelockController(salt, initalProposer); // 0x00000000042A0e90f74f036587d7912EA32EF5cC
     }
 }
 
diff --git a/evm/script/config/config_contracts.json b/evm/script/config/config_contracts.json
index af13195a..4f3f03c6 100644
--- a/evm/script/config/config_contracts.json
+++ b/evm/script/config/config_contracts.json
@@ -1,14 +1,14 @@
 {
   "contracts": {
-    "amplified_mathlib": "0xBB5a61795DF139d79818A34B350e64DAF5ABA263",
-    "amplified_template": "0x227eDab609f7369291290e4f8bfB1Ab5ab09C4BD",
-    "factory": "0xa957Ab873c06933b389D32a58131f13e60E488c5",
-    "volatile_mathlib": "0x8a550acf727f484d93B1b18A6Fc87cE9081cE260",
-    "volatile_template": "0x6E288f366141CbbabeEB8F3d8efc2eE9D28c1fF2"
+    "amplified_mathlib": "0x0000005243d4f6c3123F922eb3A1B832E171F972",
+    "amplified_template": "0x00000000b02189eA1fB645bD0127f23B65aE8D1E",
+    "factory": "0x00000000bA0074B396954A4d17293BFcD818215C",
+    "volatile_mathlib": "0x0000007A30bD219B5B7FDcaA8a47784F301505C4",
+    "volatile_template": "0x0000000004B96454e2d7890E6dd8448E511250b1"
   },
   "registry": {
-    "describer": "0x5514d9b55CdCbA70A6aF19Ca1E3443b1abEa104A",
-    "describer_registry": "0x56dCAa213D0da8dC0eb21ac71fB63EF28D497fd8",
-    "lens": "0x7E511493d23c0ad9dc1a6137D24BE5aa273773eE"
+    "describer": "0x02C76C5E0D6F84CEdcDA11c20E982A1939d1de3E",
+    "describer_registry": "0xe4D78617900e4c2241ccA45FFe0aA1F3A37B5164",
+    "lens": "0xAfdF93959eeE61Fc7AB577d3D26e840FA21CD7c9"
   }
 }
\ No newline at end of file
diff --git a/evm/script/config/config_interfaces.json b/evm/script/config/config_interfaces.json
index cfd17dc7..7e62e878 100644
--- a/evm/script/config/config_interfaces.json
+++ b/evm/script/config/config_interfaces.json
@@ -1,24 +1,28 @@
 {
   "Wormhole": {
     "mumbai": {
-      "interface": "0x74e46a8113F2E06db0e07D592F6Cf5B1A59756EE",
-      "escrow": "0xFb4B1475e61642b3930d762B66d9DD4E08B14367"
+      "interface": "0x0000000000000000000000000000000000000000",
+      "escrow": "0x0000000000000000000000000000000000000000"
     },
     "sepolia": {
-      "interface": "0x169e7E77E463FfE86b30Afd1605A09A632BeA5B0",
-      "escrow": "0x45C140Dd2526E4bfD1c2A5Bb0Aa6aA1DB00b1744"
+      "interface": "0x0000000000000000000000000000000000000000",
+      "escrow": "0x0000000000000000000000000000000000000000"
     },
     "basesepolia": {
-      "interface": "0xa71ae9298Ba6DD5f2Aa96415bC1eC33e62980751",
-      "escrow": "0xEA2F1d38e31fBE501c0b42BA25E217a47132D8fa"
+      "interface": "0x0000000000000000000000000000000000000000",
+      "escrow": "0x0000000000000000000000000000000000000000"
     },
     "arbitrumsepolia": {
-      "interface": "0xf779D8e1B07F1e3dF141A81c4f1f7D65c0A38611",
-      "escrow": "0xdF25f1BdE09Cee5ac1e6ef8dFA7113addBd58B28"
+      "interface": "0x0000000000000000000000000000000000000000",
+      "escrow": "0x0000000000000000000000000000000000000000"
     },
     "optimismsepolia": {
-      "interface": "0x2603e874D589373A0c4766808B93e3D4b63164C8",
-      "escrow": "0xbDFD9163d8Cee1368698B023369f9A5Fd319A40F"
+      "interface": "0x0000000000000000000000000000000000000000",
+      "escrow": "0x0000000000000000000000000000000000000000"
+    },
+    "blasttestnet": {
+      "interface": "0x0000000000000000000000000000000000000000",
+      "escrow": "0x0000000000000000000000000000000000000000"
     }
   },
   "Polymer": {