Re-deployed (and verified) StkWellHyperdrive

delvtech · Oct 17, 2024 · 7d26c2b · 7d26c2b
1 parent fe90e92
commit 7d26c2b
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 77 deletions.
diff --git a/contracts/src/instances/stk-well/StkWellConversions.sol b/contracts/src/instances/stk-well/StkWellConversions.sol
@@ -15,7 +15,7 @@ library StkWellConversions {
     /// @return The base amount.
     function convertToBase(
         uint256 _shareAmount
-    ) external pure returns (uint256) {
+    ) internal pure returns (uint256) {
         return _shareAmount;
     }
 
@@ -26,7 +26,7 @@ library StkWellConversions {
     /// @return The vault shares amount.
     function convertToShares(
         uint256 _baseAmount
-    ) external pure returns (uint256) {
+    ) internal pure returns (uint256) {
         return _baseAmount;
     }
 }
diff --git a/deployments.json b/deployments.json
@@ -1453,46 +1453,6 @@
             "address": "0xFcdaF9A4A731C24ed2E1BFd6FA918d9CF7F50137",
             "timestamp": "2024-09-23T17:24:41.079Z"
         },
-        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator_StkWellHyperdriveCoreDeployer": {
-            "contract": "StkWellHyperdriveCoreDeployer",
-            "address": "0x8d6d5d48f881bcccd6c09256724692b3a971b87b",
-            "timestamp": "2024-10-09T20:37:34.640Z"
-        },
-        "StkWellConversions": {
-            "contract": "StkWellConversions",
-            "address": "0xe670f140dedcdf142e15ce198e1a99fecd67d21c",
-            "timestamp": "2024-10-09T20:37:38.315Z"
-        },
-        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator_StkWellTarget0Deployer": {
-            "contract": "StkWellTarget0Deployer",
-            "address": "0xb8bd93848aa71887e447642299b1f2a5cf898a9b",
-            "timestamp": "2024-10-09T20:37:42.255Z"
-        },
-        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator_StkWellTarget1Deployer": {
-            "contract": "StkWellTarget1Deployer",
-            "address": "0xf74085c4404fd08e7d636f151b734a580f44100f",
-            "timestamp": "2024-10-09T20:37:46.909Z"
-        },
-        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator_StkWellTarget2Deployer": {
-            "contract": "StkWellTarget2Deployer",
-            "address": "0x57858abb2773fa20de1bac61eda8283a8b1ecea3",
-            "timestamp": "2024-10-09T20:37:50.544Z"
-        },
-        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator_StkWellTarget3Deployer": {
-            "contract": "StkWellTarget3Deployer",
-            "address": "0xea21fbc9eb872c025959d82383bc898540334484",
-            "timestamp": "2024-10-09T20:38:07.386Z"
-        },
-        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator_StkWellTarget4Deployer": {
-            "contract": "StkWellTarget4Deployer",
-            "address": "0x02d668b32fc23f223464f3daf9df6e518cf1e9ee",
-            "timestamp": "2024-10-09T20:38:12.258Z"
-        },
-        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator": {
-            "contract": "StkWellHyperdriveDeployerCoordinator",
-            "address": "0x7d78ee16d314f14e01e222ee6dd839689bd294ca",
-            "timestamp": "2024-10-09T20:38:16.484Z"
-        },
         "ElementDAO 182 Day Moonwell ETH Hyperdrive_ERC4626Target0": {
             "contract": "ERC4626Target0",
             "address": "0x6e596c06Bb5a7eaf654BA14f8352c3257dD8403c",
@@ -1523,36 +1483,6 @@
             "address": "0xceD9F810098f8329472AEFbaa1112534E96A5c7b",
             "timestamp": "2024-10-09T20:39:12.262Z"
         },
-        "ElementDAO 182 Day Moonwell StkWell Hyperdrive_StkWellTarget0": {
-            "contract": "StkWellTarget0",
-            "address": "0x387948e60f947bd9ee782e33241349bA3aE31aeC",
-            "timestamp": "2024-10-09T20:39:57.771Z"
-        },
-        "ElementDAO 182 Day Moonwell StkWell Hyperdrive_StkWellTarget1": {
-            "contract": "StkWellTarget1",
-            "address": "0x730F5A9A4649cD88a91c6B0cDc0111cd7E096eDf",
-            "timestamp": "2024-10-09T20:39:35.867Z"
-        },
-        "ElementDAO 182 Day Moonwell StkWell Hyperdrive_StkWellTarget2": {
-            "contract": "StkWellTarget2",
-            "address": "0xD00dd133937063DbA2028FAb66ebB9B764cfCA5E",
-            "timestamp": "2024-10-09T20:39:42.386Z"
-        },
-        "ElementDAO 182 Day Moonwell StkWell Hyperdrive_StkWellTarget3": {
-            "contract": "StkWellTarget3",
-            "address": "0x8cB7D92029d5369186A789c3dD69a3B4E3cb9d94",
-            "timestamp": "2024-10-09T20:39:46.388Z"
-        },
-        "ElementDAO 182 Day Moonwell StkWell Hyperdrive_StkWellTarget4": {
-            "contract": "StkWellTarget4",
-            "address": "0xf7b7cCb57e8101cd59f40aF39ceC7f9624EF4d88",
-            "timestamp": "2024-10-09T20:39:52.240Z"
-        },
-        "ElementDAO 182 Day Moonwell StkWell Hyperdrive": {
-            "contract": "StkWellHyperdrive",
-            "address": "0x1681aa2E7551343D9dd53C778A83D70243b64360",
-            "timestamp": "2024-10-09T20:39:57.249Z"
-        },
         "ElementDAO ERC4626 Hyperdrive Deployer Coordinator_ERC4626HyperdriveCoreDeployer": {
             "contract": "ERC4626HyperdriveCoreDeployer",
             "address": "0x37093f5d5af0c3e16215a055e7cfd5860e10e15d",
@@ -1677,6 +1607,71 @@
             "contract": "ERC4626Hyperdrive",
             "address": "0x034f7DB8C03fE0aBa3433952aB0fcf66e332AB72",
             "timestamp": "2024-10-17T06:45:34.532Z"
+        },
+        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator_StkWellHyperdriveCoreDeployer": {
+            "contract": "StkWellHyperdriveCoreDeployer",
+            "address": "0x52f00bd18e53134ed75073e09f48a190559a0fe2",
+            "timestamp": "2024-10-17T07:38:36.544Z"
+        },
+        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator_StkWellTarget0Deployer": {
+            "contract": "StkWellTarget0Deployer",
+            "address": "0xcec152d19982ef88e69f538f5a7d06a38ca8773e",
+            "timestamp": "2024-10-17T07:38:40.474Z"
+        },
+        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator_StkWellTarget1Deployer": {
+            "contract": "StkWellTarget1Deployer",
+            "address": "0x1a4cee4e32ea51ec7671a0fd7333ca64fbf004f0",
+            "timestamp": "2024-10-17T07:38:44.527Z"
+        },
+        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator_StkWellTarget2Deployer": {
+            "contract": "StkWellTarget2Deployer",
+            "address": "0xe299a8c26bf6a7958f1a0aa8ea6fee9b8ede1df9",
+            "timestamp": "2024-10-17T07:38:48.536Z"
+        },
+        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator_StkWellTarget3Deployer": {
+            "contract": "StkWellTarget3Deployer",
+            "address": "0x8015beb77685a583751b411f896a8aca05044aa7",
+            "timestamp": "2024-10-17T07:38:52.814Z"
+        },
+        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator_StkWellTarget4Deployer": {
+            "contract": "StkWellTarget4Deployer",
+            "address": "0x78beeccfeedb99a1a461619c84cc7be78c97de70",
+            "timestamp": "2024-10-17T07:38:56.558Z"
+        },
+        "ElementDAO Moonwell StkWell Hyperdrive Deployer Coordinator": {
+            "contract": "StkWellHyperdriveDeployerCoordinator",
+            "address": "0x948860043742b53f73742c981aebb2242ed0e707",
+            "timestamp": "2024-10-17T07:39:00.782Z"
+        },
+        "ElementDAO 182 Day Moonwell StkWell Hyperdrive_StkWellTarget0": {
+            "contract": "StkWellTarget0",
+            "address": "0x6EF7ec1cC1F7bed3b3a2461EE78b2b381dFf152C",
+            "timestamp": "2024-10-17T07:39:46.558Z"
+        },
+        "ElementDAO 182 Day Moonwell StkWell Hyperdrive_StkWellTarget1": {
+            "contract": "StkWellTarget1",
+            "address": "0xdEAC3B00E20a7bc1dee2aF459ee9a3C2e48A5F81",
+            "timestamp": "2024-10-17T07:39:24.126Z"
+        },
+        "ElementDAO 182 Day Moonwell StkWell Hyperdrive_StkWellTarget2": {
+            "contract": "StkWellTarget2",
+            "address": "0x4cB748492cc5F300abea39E327E21AA88a157a01",
+            "timestamp": "2024-10-17T07:39:33.666Z"
+        },
+        "ElementDAO 182 Day Moonwell StkWell Hyperdrive_StkWellTarget3": {
+            "contract": "StkWellTarget3",
+            "address": "0xADD2ec1A20edcd26fb18f30214f48D06d36B9c94",
+            "timestamp": "2024-10-17T07:39:38.522Z"
+        },
+        "ElementDAO 182 Day Moonwell StkWell Hyperdrive_StkWellTarget4": {
+            "contract": "StkWellTarget4",
+            "address": "0x15C4c91E7b82e725544b412e66863dBf7dc50f83",
+            "timestamp": "2024-10-17T07:39:43.192Z"
+        },
+        "ElementDAO 182 Day Moonwell StkWell Hyperdrive": {
+            "contract": "StkWellHyperdrive",
+            "address": "0x9705c9BC7E9f3da041F23033225c4967d1Aa6385",
+            "timestamp": "2024-10-17T07:39:46.321Z"
         }
     }
 }
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -14,5 +14,5 @@ config_filename="hardhat.config.${NETWORK}.ts"
 if [[ "${NETWORK}" == "hardhat" ]]; then
   config_filename="hardhat.config.ts"
 fi
-# npx hardhat deploy:hyperdrive --show-stack-traces --network ${NETWORK} --config "$config_filename"
+npx hardhat deploy:hyperdrive --show-stack-traces --network ${NETWORK} --config "$config_filename"
 npx hardhat deploy:verify --show-stack-traces --network ${NETWORK} --config "$config_filename"
diff --git a/tasks/deploy/config/base/stk-well-182day.ts b/tasks/deploy/config/base/stk-well-182day.ts
@@ -15,17 +15,17 @@ import { BASE_STK_WELL_COORDINATOR_NAME } from "./stk-well-coordinator";
 export const BASE_STK_WELL_182DAY_NAME =
     "ElementDAO 182 Day Moonwell StkWell Hyperdrive";
 
-// WELL is currently worth ~$0.03, so this is a contribution of around $80.
-const CONTRIBUTION = parseEther("2700");
+// WELL is currently worth ~$0.05, so this is a contribution of around $80.
+const CONTRIBUTION = parseEther("1500");
 
 export const BASE_STK_WELL_182DAY: HyperdriveInstanceConfig<"StkWell"> = {
     name: BASE_STK_WELL_182DAY_NAME,
     prefix: "StkWell",
     coordinatorAddress: async (hre) =>
         hre.hyperdriveDeploy.deployments.byName(BASE_STK_WELL_COORDINATOR_NAME)
             .address,
-    deploymentId: keccak256(toHex(BASE_STK_WELL_182DAY_NAME)),
-    salt: toBytes32("0x42080085"),
+    deploymentId: keccak256(toHex(BASE_STK_WELL_182DAY_NAME + "1")),
+    salt: toBytes32("0x42080086"),
     extraData: "0x",
     contribution: CONTRIBUTION,
     // NOTE: The latest variable rate on Moonwell's Staked Well market is

diff --git a/tasks/deploy/verify.ts b/tasks/deploy/verify.ts
@@ -325,6 +325,8 @@ task(
                 pathName = "ezeth-linea";
             } else if (kind == "RsETHLineaHyperdrive") {
                 pathName = "rseth-linea";
+            } else if (kind == "StkWellHyperdrive") {
+                pathName = "stk-well";
             } else {
                 pathName = instanceConfig.prefix.toLowerCase();
             }