feat: deployment

catalystdao · Dec 19, 2023 · 151a5f4 · 151a5f4
1 parent dfc3f17
commit 151a5f4
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 1,980 deletions.
diff --git a/evm/lib/GeneralisedIncentives b/evm/lib/GeneralisedIncentives
diff --git a/evm/poetry.lock b/evm/poetry.lock
diff --git a/evm/pyproject.toml b/evm/pyproject.toml
diff --git a/evm/script/DeployInterfaces.s.sol b/evm/script/DeployInterfaces.s.sol
@@ -72,6 +72,7 @@ contract DeployInterfaces is BaseMultiChainDeployer {
             uint256 pv_key = vm.envUint("WORMHOLE_DEPLOYER");
             vm.startBroadcast(pv_key);
 
+            require(wormholeBridge[chain] != address(0), "Contract to send messages to cannot be 0.");
             incentive = address(new IncentivizedWormholeEscrow(vm.envAddress("CATALYST_ADDRESS"), wormholeBridge[chain]));
 
             vm.stopBroadcast();
@@ -81,7 +82,8 @@ contract DeployInterfaces is BaseMultiChainDeployer {
             uint256 pv_key = vm.envUint("POLYMER_DEPLOYER");
             vm.startBroadcast(pv_key);
 
-            incentive = address(new IncentivizedPolymerEscrow(vm.envAddress("CATALYST_ADDRESS"), wormholeBridge[chain]));
+            require(polymerContract[chain] != address(0), "Contract to send messages to cannot be 0.");
+            incentive = address(new IncentivizedPolymerEscrow(vm.envAddress("CATALYST_ADDRESS"), polymerContract[chain]));
 
             vm.stopBroadcast();
             vm.startBroadcast(pk);

diff --git a/evm/script/Swap.s.sol b/evm/script/Swap.s.sol
@@ -27,8 +27,8 @@ contract Swap is Script, IMessageEscrowStructs {
         uint256 deployerPrivateKey = vm.envUint("CATALYST_DEPLOYER");
         vm.startBroadcast(deployerPrivateKey);
 
-        address fromVault = address(0x66efC14C5a8bAC9a4068248b2781B312eDfff552);
-        address toVault = address(0x66efC14C5a8bAC9a4068248b2781B312eDfff552);
+        address fromVault = address(0x40939B7a3A6F3523C38458b2E9b0181583D1f18E);
+        address toVault = address(0x40939B7a3A6F3523C38458b2E9b0181583D1f18E);
 
         // mantle
         address WGAS = ICatalystV1Vault(fromVault)._tokenIndexing(0);
@@ -41,7 +41,7 @@ contract Swap is Script, IMessageEscrowStructs {
         for (uint256 i = 0; i < n; ++i) {
             ICatalystV1Vault(fromVault).sendAsset{value: 0.1 ether}(
                 ICatalystV1Structs.RouteDescription({
-                    chainIdentifier: bytes32(uint256(5001)),
+                    chainIdentifier: bytes32(uint256(44963396551096171397160558726282299286140034337171331191205222918429706551296)),
                     toVault: abi.encodePacked(uint8(20), bytes32(0), abi.encode(toVault)),
                     toAccount: abi.encodePacked(uint8(20), bytes32(0), abi.encode(address(0x0000007aAAC54131e031b3C0D6557723f9365A5B))),
                     incentive: IncentiveDescription({

diff --git a/evm/script/config/config_interfaces.json b/evm/script/config/config_interfaces.json
@@ -27,8 +27,8 @@
   },
   "basesepolia": {
     "Polymer": {
-      "incentive": "0x000000d76e7F74E60cFAA1a885E01a8770C9E580",
-      "interface": "0xe5cFD130edbC99bd38e0B7A2E0A0Ac10dDE30B5F"
+      "incentive": "0x0000006D5B617207FFDA710ee3364FBC7e5276a8",
+      "interface": "0x05c1DA5011E22184b5d6C2f314a9908176589aF3"
     }
   },
   "mantletestnet" : {
@@ -63,8 +63,8 @@
   },
   "optimismsepolia": {
     "Polymer": {
-      "incentive": "0x000000d76e7F74E60cFAA1a885E01a8770C9E580",
-      "interface": "0xe5cFD130edbC99bd38e0B7A2E0A0Ac10dDE30B5F"
+      "incentive": "0x0000006D5B617207FFDA710ee3364FBC7e5276a8",
+      "interface": "0x05c1DA5011E22184b5d6C2f314a9908176589aF3"
     }
   },
   "bsctestnet": {

diff --git a/evm/script/config/config_vaults.json b/evm/script/config/config_vaults.json
@@ -120,8 +120,8 @@
   "Polymer-BASE-OP": {
     "cci_version": "Polymer",
     "basesepolia": {
-      "cci": "0xe5cfd130edbc99bd38e0b7a2e0a0ac10dde30b5f",
-      "address": "0x517cea700498a086c42b19067b780ad723d5929f",
+      "cci": "0x05c1da5011e22184b5d6c2f314a9908176589af3",
+      "address": "0x40939b7a3a6f3523c38458b2e9b0181583d1f18e",
       "weights": [
         1
       ],
@@ -131,8 +131,8 @@
       }
     },
     "optimismsepolia": {
-      "cci": "0xe5cfd130edbc99bd38e0b7a2e0a0ac10dde30b5f",
-      "address": "0x517cea700498a086c42b19067b780ad723d5929f",
+      "cci": "0x05c1da5011e22184b5d6c2f314a9908176589af3",
+      "address": "0x40939b7a3a6f3523c38458b2e9b0181583d1f18e",
       "weights": [
         1
       ],