@gearbox-protocol/deploy-tools 3.4.1-next.6 → 3.4.1-next.8

package/dist/index.mjs

@@ -6881,6 +6881,8 @@ var require_decimals = __commonJS({
       AURA: 18,
       WLD: 18,
       OP: 18,
+      osETH: 18,
+      weETH: 18,
       "3Crv": 18,
       crvFRAX: 18,
       OHMFRAXBP: 18,
@@ -6962,7 +6964,10 @@ var require_decimals = __commonJS({
       BPT_rETH_ETH: 18,
       BPT_ROAD: 18,
       BPT_WSTETH_ETH: 18,
+      ECLP_wstETH_WETH: 18,
       B_rETH_STABLE: 18,
+      weETH_rETH: 18,
+      osETH_wETH_BPT: 18,
       auraB_rETH_STABLE: 18,
       auraB_rETH_STABLE_vault: 18,
       auraBPT_rETH_ETH: 18,
@@ -7353,6 +7358,24 @@ var require_balancer = __commonJS({
         underlying: ["rETH", "WETH"],
         poolId: "0x1e19cf2d73a72ef1332c882f20534b6519be0276000200000000000000000112"
       },
+      weETH_rETH: {
+        name: "Balancer weETH/rETH Stable pool",
+        symbol: "weETH_rETH",
+        type: {
+          AllNetworks: tokenType_1.TokenType.BALANCER_LP_TOKEN
+        },
+        underlying: ["rETH", "weETH"],
+        poolId: "0x05ff47afada98a98982113758878f9a8b9fdda0a000000000000000000000645"
+      },
+      osETH_wETH_BPT: {
+        name: "Balancer osETH/WETH Stable pool",
+        symbol: "osETH_wETH_BPT",
+        type: {
+          AllNetworks: tokenType_1.TokenType.BALANCER_LP_TOKEN
+        },
+        underlying: ["WETH", "osETH"],
+        poolId: "0xdacf5fa19b1f720111609043ac67a9818262850c000000000000000000000635"
+      },
       BPT_rETH_ETH: {
         name: "BeethovenX rETH-ETH Pool",
         symbol: "BPT_rETH_ETH",
@@ -7379,6 +7402,15 @@ var require_balancer = __commonJS({
         },
         underlying: ["WETH", "OP", "USDC"],
         poolId: "0x39965c9dab5448482cf7e002f583c812ceb53046000100000000000000000003"
+      },
+      ECLP_wstETH_WETH: {
+        name: "BeethovenX ECLP wstETH-ETH Pool",
+        symbol: "ECLP_wstETH_WETH",
+        type: {
+          AllNetworks: tokenType_1.TokenType.BALANCER_LP_TOKEN
+        },
+        underlying: ["wstETH", "WETH"],
+        poolId: "0x7ca75bdea9dede97f8b13c6641b768650cb837820002000000000000000000d5"
       }
     };
     var isBalancerLPToken = (t) => typeof t === "string" && !!exports2.balancerLpTokens[t];
@@ -105858,6 +105890,16 @@ var require_normal = __commonJS({
         name: "Aura Token",
         symbol: "AURA",
         type: { AllNetworks: tokenType_1.TokenType.NORMAL_TOKEN }
+      },
+      osETH: {
+        name: "Stakewise ETH",
+        symbol: "osETH",
+        type: { AllNetworks: tokenType_1.TokenType.NORMAL_TOKEN }
+      },
+      weETH: {
+        name: "ether.fi ETH",
+        symbol: "weETH",
+        type: { AllNetworks: tokenType_1.TokenType.NORMAL_TOKEN }
       }
     };
     var isNormalToken = (t) => typeof t === "string" && !!exports2.normalTokens[t];
@@ -106041,6 +106083,8 @@ var require_token = __commonJS({
         AURA: "0xC0c293ce456fF0ED870ADd98a0828Dd4d2903DBF",
         WLD: "0x163f8C2467924be0ae7B5347228CABF260318753",
         OP: constants_1.NOT_DEPLOYED,
+        osETH: "0xf1C9acDc66974dFB6dEcB12aA385b9cD01190E38",
+        weETH: "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee",
         // CURVE LP TOKENS
         "3Crv": "0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490",
         crvFRAX: "0x3175Df0976dFA876431C2E9eE6Bc45b65d3473CC",
@@ -106113,9 +106157,12 @@ var require_token = __commonJS({
         OHM_wstETH: "0xd4f79CA0Ac83192693bce4699d0c10C66Aa6Cf0F",
         USDC_DAI_USDT: "0x79c58f70905F734641735BC61e45c19dD9Ad60bC",
         B_rETH_STABLE: "0x1E19CF2D73a72Ef1332C882F20534B6519Be0276",
+        weETH_rETH: "0x05ff47AFADa98a98982113758878F9A8B9FddA0a",
+        osETH_wETH_BPT: "0xDACf5Fa19b1f720111609043ac67A9818262850c",
         BPT_rETH_ETH: constants_1.NOT_DEPLOYED,
         BPT_WSTETH_ETH: constants_1.NOT_DEPLOYED,
         BPT_ROAD: constants_1.NOT_DEPLOYED,
+        ECLP_wstETH_WETH: constants_1.NOT_DEPLOYED,
         // AURA
         auraB_rETH_STABLE: "0x9497df26e5bD669Cb925eC68E730492b9300c482",
         auraBPT_rETH_ETH: constants_1.NOT_DEPLOYED,
@@ -106203,6 +106250,8 @@ var require_token = __commonJS({
         rETH: constants_1.NOT_DEPLOYED,
         WLD: constants_1.NOT_DEPLOYED,
         OP: constants_1.NOT_DEPLOYED,
+        osETH: constants_1.NOT_DEPLOYED,
+        weETH: constants_1.NOT_DEPLOYED,
         // REDSTONE
         SHIB: constants_1.NOT_DEPLOYED,
         // YEARN TOKENS
@@ -106280,6 +106329,9 @@ var require_token = __commonJS({
         BPT_rETH_ETH: constants_1.NOT_DEPLOYED,
         BPT_WSTETH_ETH: constants_1.NOT_DEPLOYED,
         BPT_ROAD: constants_1.NOT_DEPLOYED,
+        ECLP_wstETH_WETH: constants_1.NOT_DEPLOYED,
+        weETH_rETH: constants_1.NOT_DEPLOYED,
+        osETH_wETH_BPT: constants_1.NOT_DEPLOYED,
         // AURA
         auraB_rETH_STABLE: constants_1.NOT_DEPLOYED,
         auraBPT_rETH_ETH: constants_1.NOT_DEPLOYED,
@@ -106365,6 +106417,8 @@ var require_token = __commonJS({
         RPL: "0xC81D1F0EB955B0c020E5d5b264E1FF72c14d1401",
         APE: constants_1.NOT_DEPLOYED,
         rETH: "0x9Bcef72be871e61ED4fBbc7630889beE758eb81D",
+        osETH: constants_1.NOT_DEPLOYED,
+        weETH: constants_1.NOT_DEPLOYED,
         // REDSTONE
         SHIB: constants_1.NOT_DEPLOYED,
         // YEARN TOKENS
@@ -106439,9 +106493,12 @@ var require_token = __commonJS({
         OHM_wstETH: constants_1.NOT_DEPLOYED,
         USDC_DAI_USDT: constants_1.NOT_DEPLOYED,
         B_rETH_STABLE: constants_1.NOT_DEPLOYED,
+        weETH_rETH: constants_1.NOT_DEPLOYED,
+        osETH_wETH_BPT: constants_1.NOT_DEPLOYED,
         BPT_rETH_ETH: "0x4Fd63966879300caFafBB35D157dC5229278Ed23",
         BPT_WSTETH_ETH: "0x7B50775383d3D6f0215A8F290f2C9e2eEBBEceb2",
         BPT_ROAD: "0x39965c9dAb5448482Cf7e002F583c812Ceb53046",
+        ECLP_wstETH_WETH: "0x7Ca75bdEa9dEde97F8B13C6641B768650CB83782",
         // AURA
         auraB_rETH_STABLE: constants_1.NOT_DEPLOYED,
         auraBPT_rETH_ETH: "0x094C6846Fb2801b4753182ADFac336AAE8030A46",
@@ -107599,7 +107656,7 @@ var require_formatter2 = __commonJS({
   "../../node_modules/@gearbox-protocol/sdk-gov/lib/utils/formatter.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.fmtContract = exports2.fmtTreasury = exports2.fmtBinaryMask = exports2.getTokenSymbolOrAddress = exports2.formatBn4dig = exports2.toHumanFormat = exports2.formatBN = exports2.percentFmt = exports2.toBigInt = void 0;
+    exports2.numberWithCommas = exports2.fmtContract = exports2.fmtTreasury = exports2.fmtBinaryMask = exports2.getTokenSymbolOrAddress = exports2.formatBn4dig = exports2.toHumanFormat = exports2.formatBN = exports2.percentFmt = exports2.toBigInt = void 0;
     var contracts_1 = require_contracts();
     var utilsContracts_1 = require_utilsContracts();
     var token_1 = require_token();
@@ -107690,6 +107747,10 @@ var require_formatter2 = __commonJS({
       return contracts_1.contractsByAddress[address.toLocaleLowerCase()] ? `[${contracts_1.contractsByAddress[address.toLowerCase()]}]` : address;
     }
     exports2.fmtContract = fmtContract;
+    function numberWithCommas(x) {
+      return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+    }
+    exports2.numberWithCommas = numberWithCommas;
   }
 });
 
@@ -108295,7 +108356,7 @@ var require_chains = __commonJS({
   "../../node_modules/@gearbox-protocol/sdk-gov/lib/core/chains.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.detectNetwork = exports2.isSupportedNetwork = exports2.getNetworkType = exports2.supportedChains = exports2.CHAINS = exports2.ARBITRUM_NETWORK = exports2.HARDHAT_NETWORK = exports2.TENDERLY_NETWORK = exports2.LOCAL_NETWORK = exports2.POLYGON_NETWORK = exports2.OPTIMISM_NETWORK = exports2.GOERLI_NETWORK = exports2.MAINNET_NETWORK = void 0;
+    exports2.detectNetwork = exports2.isSupportedNetwork = exports2.getNetworkType = exports2.supportedChains = exports2.CHAINS = exports2.ARBITRUM_NETWORK = exports2.HARDHAT_NETWORK = exports2.LOCAL_NETWORK = exports2.POLYGON_NETWORK = exports2.OPTIMISM_NETWORK = exports2.GOERLI_NETWORK = exports2.MAINNET_NETWORK = void 0;
     var ethers_1 = require_lib220();
     var token_1 = require_token();
     exports2.MAINNET_NETWORK = 1;
@@ -108303,7 +108364,6 @@ var require_chains = __commonJS({
     exports2.OPTIMISM_NETWORK = 10;
     exports2.POLYGON_NETWORK = 137;
     exports2.LOCAL_NETWORK = 1337;
-    exports2.TENDERLY_NETWORK = 123456;
     exports2.HARDHAT_NETWORK = 31337;
     exports2.ARBITRUM_NETWORK = 42161;
     exports2.CHAINS = {
@@ -108311,7 +108371,6 @@ var require_chains = __commonJS({
       Arbitrum: exports2.ARBITRUM_NETWORK,
       Local: exports2.LOCAL_NETWORK,
       Hardhat: exports2.HARDHAT_NETWORK,
-      Tenderly: exports2.TENDERLY_NETWORK,
       Optimism: exports2.OPTIMISM_NETWORK,
       Polygon: exports2.POLYGON_NETWORK
     };
@@ -108320,7 +108379,6 @@ var require_chains = __commonJS({
       [exports2.CHAINS.Mainnet]: "Mainnet",
       [exports2.CHAINS.Arbitrum]: "Arbitrum",
       [exports2.CHAINS.Local]: "Mainnet",
-      [exports2.CHAINS.Tenderly]: "Mainnet",
       [exports2.CHAINS.Optimism]: "Optimism"
       // [CHAINS.Polygon]: "Polygon",
     };
@@ -109114,11 +109172,7 @@ var require_priceFeeds = __commonJS({
       SHIB: {
         Mainnet: {
           Main: {
-            type: pricefeedType_1.PriceFeedType.REDSTONE_ORACLE,
-            dataServiceId: "redstone-primary-prod",
-            dataId: "SHIB",
-            stalenessPeriod: pricefeedType_1.FOUR_MINUTES,
-            ...exports2.REDSTONE_SIGNERS,
+            type: pricefeedType_1.PriceFeedType.ZERO_ORACLE,
             trusted: false
           }
         }
@@ -109182,6 +109236,30 @@ var require_priceFeeds = __commonJS({
           }
         }
       },
+      osETH: {
+        Mainnet: {
+          Main: {
+            type: pricefeedType_1.PriceFeedType.REDSTONE_ORACLE,
+            dataServiceId: "redstone-primary-prod",
+            dataId: "osETH",
+            stalenessPeriod: pricefeedType_1.FOUR_MINUTES,
+            ...exports2.REDSTONE_SIGNERS,
+            trusted: false
+          }
+        }
+      },
+      weETH: {
+        Mainnet: {
+          Main: {
+            type: pricefeedType_1.PriceFeedType.REDSTONE_ORACLE,
+            dataServiceId: "redstone-primary-prod",
+            dataId: "weETH",
+            stalenessPeriod: pricefeedType_1.FOUR_MINUTES,
+            ...exports2.REDSTONE_SIGNERS,
+            trusted: false
+          }
+        }
+      },
       AURA: {
         Mainnet: {
           Main: {
@@ -109816,6 +109894,24 @@ var require_priceFeeds = __commonJS({
           }
         }
       },
+      weETH_rETH: {
+        AllNetworks: {
+          Main: {
+            type: pricefeedType_1.PriceFeedType.BALANCER_STABLE_LP_ORACLE,
+            assets: ["weETH", "rETH"],
+            trusted: false
+          }
+        }
+      },
+      osETH_wETH_BPT: {
+        AllNetworks: {
+          Main: {
+            type: pricefeedType_1.PriceFeedType.BALANCER_STABLE_LP_ORACLE,
+            assets: ["WETH", "osETH"],
+            trusted: false
+          }
+        }
+      },
       BPT_rETH_ETH: {
         AllNetworks: {
           Main: {
@@ -109843,6 +109939,14 @@ var require_priceFeeds = __commonJS({
           }
         }
       },
+      ECLP_wstETH_WETH: {
+        AllNetworks: {
+          Main: {
+            type: pricefeedType_1.PriceFeedType.ZERO_ORACLE,
+            trusted: true
+          }
+        }
+      },
       // GEARBOX
       dDAI: {
         Mainnet: {
@@ -116631,19 +116735,20 @@ var require_tokenData = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getConnectors = exports2.connectors = void 0;
+    var constants_1 = require_constants2();
     var token_1 = require_token();
     exports2.connectors = {
-      Mainnet: ["WETH", "DAI", "USDC", "FRAX"],
+      Mainnet: ["WETH", "DAI", "USDC", "FRAX", "rETH"],
       Arbitrum: ["WETH", "DAI", "USDC", "USDT"],
       Optimism: ["WETH", "USDC", "USDT"]
     };
     function getConnectors(networkType) {
       return exports2.connectors[networkType].map((e) => {
         const result = token_1.tokenDataByNetwork[networkType][e];
-        if (!result) {
+        if (!result || result === constants_1.NOT_DEPLOYED) {
           throw new Error(`connector token ${e} not found`);
         }
-        return result;
+        return result.toLowerCase();
       });
     }
     exports2.getConnectors = getConnectors;
@@ -323262,7 +323367,7 @@ var Verifier = class {
       }
       if (match.status) {
         const abiEncodedConstructorArguments = extractAbiEncodedConstructorArguments(creatorTxData, recompiledCreationBytecode) ?? "";
-        if (abiEncodedConstructorArguments.replace("0x", "") !== meta2.encodedConstructorArgs) {
+        if (abiEncodedConstructorArguments !== meta2.encodedConstructorArgs) {
           return {
             ...result,
             error: `Encoded constructor arguments mismatch: meta ${meta2.encodedConstructorArgs} tx ${abiEncodedConstructorArguments}`
@@ -324582,7 +324687,6 @@ import path7 from "node:path";
 import fs2 from "node:fs/promises";
 import path5 from "node:path";
 var DeployResult = class _DeployResult {
-  meta = [];
   governorBatches = [];
   routerBatches = [];
   #id;
@@ -324661,6 +324765,7 @@ var DeployResult = class _DeployResult {
       const filePath = path5.join(fullDirPath, file);
       if (file.includes(`${type}.json`)) {
         const batch = JSON.parse(await fs2.readFile(filePath, "utf8"));
+        batch.meta.name = file.replace(".json", "");
         batches.push(batch);
       }
     }
@@ -324682,12 +324787,6 @@ var MetaRepo = class {
     this.#dir = path6.resolve(opts.sandboxDir, "meta");
     this.#network = opts.network;
   }
-  addAll(metas = []) {
-    for (const m of metas) {
-      this.#meta.set(m.contractAddress.toLowerCase(), m);
-    }
-    this.#logger.trace(`loaded ${metas.length} new metafiles`);
-  }
   getMeta(address) {
     const m = this.#meta.get(address.toLowerCase());
     if (!m) {
@@ -324706,13 +324805,22 @@ var MetaRepo = class {
       sandboxDir: this.#dir
     });
     const metaRoot = path6.resolve(this.#dir, META_REPO, "deploy-state", this.#network.toLowerCase());
+    await this.loadFromDir(metaRoot);
+  }
+  /**
+   * Recursively loads all metafiles found in a dir
+   */
+  async loadFromDir(metaRoot) {
     this.#logger.debug(`Looking for metafiles in ${metaRoot}`);
     const files = await readDirectory(metaRoot);
     const before = this.#meta.size;
     for (const f of files) {
       const fname = path6.basename(f, `.json`);
       if (isAddress2(fname)) {
-        const meta2 = await readFile5(f).then(json_parse);
+        const meta2 = await readFile5(path6.resolve(metaRoot, f)).then(json_parse);
+        if (!meta2.encodedConstructorArgs.startsWith("0x")) {
+          throw new Error(`expect encodedConstructorArgs for ${fname} to start with '0x'`);
+        }
         this.#meta.set(fname.toLowerCase(), meta2);
         this.#logger.trace(`loaded meta for address ${fname}`);
       }
@@ -325057,7 +325165,7 @@ var AbstractParser = class {
   }
   #parseConstructor(address, encodedArgs, constructorFragment, comment) {
     this.logger.trace(`parsing ${comment} constructor of ${address}...`);
-    const args = AbiCoder2.defaultAbiCoder().decode(constructorFragment.inputs, "0x" + encodedArgs);
+    const args = AbiCoder2.defaultAbiCoder().decode(constructorFragment.inputs, encodedArgs.startsWith("0x") ? encodedArgs : `0x${encodedArgs}`);
     const parameters = constructorFragment.inputs.map((input, i) => ({
       name: input.name,
       type: input.type,
@@ -327065,8 +327173,8 @@ var UpdateParser = class extends ProviderBase {
       this.logger.trace(`loading deploy result from ${fullDir}`);
       const result = await DeployResult.loadFromFiles(fullDir);
       batches.push(...result.normalized());
-      this.metaRepo.addAll(result.meta);
     }
+    await this.metaRepo.loadFromDir(dir);
     if (!batches?.length) {
       throw new Error(`no batch files found in ${dir}`);
     }
@@ -328490,7 +328598,7 @@ function zeroLT() {
 }
 
 // package.json
-var version3 = "3.4.1-next.5";
+var version3 = "3.4.1-next.7";
 
 // src/index.ts
 var program2 = new Command();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "3.4.1-next.6",
+  "version": "3.4.1-next.8",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"
@@ -38,10 +38,10 @@
     "@chialab/esbuild-plugin-commonjs": "^0.18.0",
     "@ethereum-sourcify/bytecode-utils": "^1.2.1",
     "@ethereum-sourcify/lib-sourcify": "^1.4.1",
-    "@gearbox-protocol/deploy-tools-node": "3.4.1-next.6",
-    "@gearbox-protocol/deploy-tools-shared": "3.4.1-next.6",
-    "@gearbox-protocol/deploy-tools-types": "3.4.1-next.6",
-    "@gearbox-protocol/sdk-gov": "^1.24.1",
+    "@gearbox-protocol/deploy-tools-node": "3.4.1-next.8",
+    "@gearbox-protocol/deploy-tools-shared": "3.4.1-next.8",
+    "@gearbox-protocol/deploy-tools-types": "3.4.1-next.8",
+    "@gearbox-protocol/sdk-gov": "^1.28.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.10.8",
     "@types/react": "^18.2.47",