@gearbox-protocol/sdk 14.12.0-next.3 → 14.12.0-next.30

package/dist/esm/abi/compressors/subcompressors/withdrawal/mellowWithdrawalSubcompressor.js

@@ -48,7 +48,8 @@ const mellowWithdrawalSubcompressorAbi = [
               { name: "target", type: "address", internalType: "address" },
               { name: "callData", type: "bytes", internalType: "bytes" }
             ]
-          }
+          },
+          { name: "extraData", type: "bytes", internalType: "bytes" }
         ]
       },
       {
@@ -109,6 +110,49 @@ const mellowWithdrawalSubcompressorAbi = [
     ],
     stateMutability: "view"
   },
+  {
+    type: "function",
+    name: "getWithdrawalRequestResult",
+    inputs: [
+      { name: "creditAccount", type: "address", internalType: "address" },
+      { name: "token", type: "address", internalType: "address" },
+      { name: "withdrawalToken", type: "address", internalType: "address" },
+      { name: "amount", type: "uint256", internalType: "uint256" },
+      { name: "", type: "bytes", internalType: "bytes" }
+    ],
+    outputs: [
+      {
+        name: "requestableWithdrawal",
+        type: "tuple",
+        internalType: "struct RequestableWithdrawal",
+        components: [
+          { name: "token", type: "address", internalType: "address" },
+          { name: "amountIn", type: "uint256", internalType: "uint256" },
+          {
+            name: "outputs",
+            type: "tuple[]",
+            internalType: "struct WithdrawalOutput[]",
+            components: [
+              { name: "token", type: "address", internalType: "address" },
+              { name: "isDelayed", type: "bool", internalType: "bool" },
+              { name: "amount", type: "uint256", internalType: "uint256" }
+            ]
+          },
+          {
+            name: "requestCalls",
+            type: "tuple[]",
+            internalType: "struct MultiCall[]",
+            components: [
+              { name: "target", type: "address", internalType: "address" },
+              { name: "callData", type: "bytes", internalType: "bytes" }
+            ]
+          },
+          { name: "claimableAt", type: "uint256", internalType: "uint256" }
+        ]
+      }
+    ],
+    stateMutability: "view"
+  },
   {
     type: "function",
     name: "getWithdrawalRequestResult",

package/dist/esm/abi/compressors/subcompressors/withdrawal/midasWithdrawalSubcompressor.js

@@ -48,7 +48,8 @@ const midasWithdrawalSubcompressorAbi = [
               { name: "target", type: "address", internalType: "address" },
               { name: "callData", type: "bytes", internalType: "bytes" }
             ]
-          }
+          },
+          { name: "extraData", type: "bytes", internalType: "bytes" }
         ]
       },
       {
@@ -109,6 +110,49 @@ const midasWithdrawalSubcompressorAbi = [
     ],
     stateMutability: "view"
   },
+  {
+    type: "function",
+    name: "getWithdrawalRequestResult",
+    inputs: [
+      { name: "creditAccount", type: "address", internalType: "address" },
+      { name: "token", type: "address", internalType: "address" },
+      { name: "withdrawalToken", type: "address", internalType: "address" },
+      { name: "amount", type: "uint256", internalType: "uint256" },
+      { name: "extraData", type: "bytes", internalType: "bytes" }
+    ],
+    outputs: [
+      {
+        name: "requestableWithdrawal",
+        type: "tuple",
+        internalType: "struct RequestableWithdrawal",
+        components: [
+          { name: "token", type: "address", internalType: "address" },
+          { name: "amountIn", type: "uint256", internalType: "uint256" },
+          {
+            name: "outputs",
+            type: "tuple[]",
+            internalType: "struct WithdrawalOutput[]",
+            components: [
+              { name: "token", type: "address", internalType: "address" },
+              { name: "isDelayed", type: "bool", internalType: "bool" },
+              { name: "amount", type: "uint256", internalType: "uint256" }
+            ]
+          },
+          {
+            name: "requestCalls",
+            type: "tuple[]",
+            internalType: "struct MultiCall[]",
+            components: [
+              { name: "target", type: "address", internalType: "address" },
+              { name: "callData", type: "bytes", internalType: "bytes" }
+            ]
+          },
+          { name: "claimableAt", type: "uint256", internalType: "uint256" }
+        ]
+      }
+    ],
+    stateMutability: "view"
+  },
   {
     type: "function",
     name: "getWithdrawalRequestResult",

package/dist/esm/abi/compressors/subcompressors/withdrawal/securitizeRedemptionSubcompressor.js

@@ -48,7 +48,8 @@ const securitizeRedemptionSubcompressorAbi = [
               { name: "target", type: "address", internalType: "address" },
               { name: "callData", type: "bytes", internalType: "bytes" }
             ]
-          }
+          },
+          { name: "extraData", type: "bytes", internalType: "bytes" }
         ]
       },
       {
@@ -109,6 +110,49 @@ const securitizeRedemptionSubcompressorAbi = [
     ],
     stateMutability: "view"
   },
+  {
+    type: "function",
+    name: "getWithdrawalRequestResult",
+    inputs: [
+      { name: "creditAccount", type: "address", internalType: "address" },
+      { name: "token", type: "address", internalType: "address" },
+      { name: "withdrawalToken", type: "address", internalType: "address" },
+      { name: "amount", type: "uint256", internalType: "uint256" },
+      { name: "extraData", type: "bytes", internalType: "bytes" }
+    ],
+    outputs: [
+      {
+        name: "requestableWithdrawal",
+        type: "tuple",
+        internalType: "struct RequestableWithdrawal",
+        components: [
+          { name: "token", type: "address", internalType: "address" },
+          { name: "amountIn", type: "uint256", internalType: "uint256" },
+          {
+            name: "outputs",
+            type: "tuple[]",
+            internalType: "struct WithdrawalOutput[]",
+            components: [
+              { name: "token", type: "address", internalType: "address" },
+              { name: "isDelayed", type: "bool", internalType: "bool" },
+              { name: "amount", type: "uint256", internalType: "uint256" }
+            ]
+          },
+          {
+            name: "requestCalls",
+            type: "tuple[]",
+            internalType: "struct MultiCall[]",
+            components: [
+              { name: "target", type: "address", internalType: "address" },
+              { name: "callData", type: "bytes", internalType: "bytes" }
+            ]
+          },
+          { name: "claimableAt", type: "uint256", internalType: "uint256" }
+        ]
+      }
+    ],
+    stateMutability: "view"
+  },
   {
     type: "function",
     name: "getWithdrawalRequestResult",

package/dist/esm/abi/compressors/withdrawalCompressor.js

@@ -69,7 +69,8 @@ const withdrawalCompressorAbi = [
               { name: "target", type: "address", internalType: "address" },
               { name: "callData", type: "bytes", internalType: "bytes" }
             ]
-          }
+          },
+          { name: "extraData", type: "bytes", internalType: "bytes" }
         ]
       },
       {
@@ -93,7 +94,8 @@ const withdrawalCompressorAbi = [
               { name: "amount", type: "uint256", internalType: "uint256" }
             ]
           },
-          { name: "claimableAt", type: "uint256", internalType: "uint256" }
+          { name: "claimableAt", type: "uint256", internalType: "uint256" },
+          { name: "extraData", type: "bytes", internalType: "bytes" }
         ]
       }
     ],
@@ -129,6 +131,49 @@ const withdrawalCompressorAbi = [
     ],
     stateMutability: "view"
   },
+  {
+    type: "function",
+    name: "getWithdrawalRequestResult",
+    inputs: [
+      { name: "creditAccount", type: "address", internalType: "address" },
+      { name: "token", type: "address", internalType: "address" },
+      { name: "withdrawalToken", type: "address", internalType: "address" },
+      { name: "amount", type: "uint256", internalType: "uint256" },
+      { name: "extraData", type: "bytes", internalType: "bytes" }
+    ],
+    outputs: [
+      {
+        name: "withdrawal",
+        type: "tuple",
+        internalType: "struct RequestableWithdrawal",
+        components: [
+          { name: "token", type: "address", internalType: "address" },
+          { name: "amountIn", type: "uint256", internalType: "uint256" },
+          {
+            name: "outputs",
+            type: "tuple[]",
+            internalType: "struct WithdrawalOutput[]",
+            components: [
+              { name: "token", type: "address", internalType: "address" },
+              { name: "isDelayed", type: "bool", internalType: "bool" },
+              { name: "amount", type: "uint256", internalType: "uint256" }
+            ]
+          },
+          {
+            name: "requestCalls",
+            type: "tuple[]",
+            internalType: "struct MultiCall[]",
+            components: [
+              { name: "target", type: "address", internalType: "address" },
+              { name: "callData", type: "bytes", internalType: "bytes" }
+            ]
+          },
+          { name: "claimableAt", type: "uint256", internalType: "uint256" }
+        ]
+      }
+    ],
+    stateMutability: "view"
+  },
   {
     type: "function",
     name: "getWithdrawalRequestResult",

package/dist/esm/abi/ierc4626Adapter.js

@@ -0,0 +1,240 @@
+const ierc4626AdapterAbi = [
+  {
+    type: "function",
+    inputs: [],
+    name: "asset",
+    outputs: [
+      {
+        name: "",
+        internalType: "address",
+        type: "address"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "contractType",
+    outputs: [
+      {
+        name: "",
+        internalType: "bytes32",
+        type: "bytes32"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "creditManager",
+    outputs: [
+      {
+        name: "",
+        internalType: "address",
+        type: "address"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    inputs: [
+      {
+        name: "assets",
+        internalType: "uint256",
+        type: "uint256"
+      },
+      {
+        name: "",
+        internalType: "address",
+        type: "address"
+      }
+    ],
+    name: "deposit",
+    outputs: [
+      {
+        name: "useSafePrices",
+        internalType: "bool",
+        type: "bool"
+      }
+    ],
+    stateMutability: "nonpayable"
+  },
+  {
+    type: "function",
+    inputs: [
+      {
+        name: "leftoverAmount",
+        internalType: "uint256",
+        type: "uint256"
+      }
+    ],
+    name: "depositDiff",
+    outputs: [
+      {
+        name: "useSafePrices",
+        internalType: "bool",
+        type: "bool"
+      }
+    ],
+    stateMutability: "nonpayable"
+  },
+  {
+    type: "function",
+    inputs: [
+      {
+        name: "shares",
+        internalType: "uint256",
+        type: "uint256"
+      },
+      {
+        name: "",
+        internalType: "address",
+        type: "address"
+      }
+    ],
+    name: "mint",
+    outputs: [
+      {
+        name: "useSafePrices",
+        internalType: "bool",
+        type: "bool"
+      }
+    ],
+    stateMutability: "nonpayable"
+  },
+  {
+    type: "function",
+    inputs: [
+      {
+        name: "shares",
+        internalType: "uint256",
+        type: "uint256"
+      },
+      {
+        name: "",
+        internalType: "address",
+        type: "address"
+      },
+      {
+        name: "",
+        internalType: "address",
+        type: "address"
+      }
+    ],
+    name: "redeem",
+    outputs: [
+      {
+        name: "useSafePrices",
+        internalType: "bool",
+        type: "bool"
+      }
+    ],
+    stateMutability: "nonpayable"
+  },
+  {
+    type: "function",
+    inputs: [
+      {
+        name: "leftoverAmount",
+        internalType: "uint256",
+        type: "uint256"
+      }
+    ],
+    name: "redeemDiff",
+    outputs: [
+      {
+        name: "useSafePrices",
+        internalType: "bool",
+        type: "bool"
+      }
+    ],
+    stateMutability: "nonpayable"
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "serialize",
+    outputs: [
+      {
+        name: "serializedData",
+        internalType: "bytes",
+        type: "bytes"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "targetContract",
+    outputs: [
+      {
+        name: "",
+        internalType: "address",
+        type: "address"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "vault",
+    outputs: [
+      {
+        name: "",
+        internalType: "address",
+        type: "address"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "version",
+    outputs: [
+      {
+        name: "",
+        internalType: "uint256",
+        type: "uint256"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    inputs: [
+      {
+        name: "assets",
+        internalType: "uint256",
+        type: "uint256"
+      },
+      {
+        name: "",
+        internalType: "address",
+        type: "address"
+      },
+      {
+        name: "",
+        internalType: "address",
+        type: "address"
+      }
+    ],
+    name: "withdraw",
+    outputs: [
+      {
+        name: "useSafePrices",
+        internalType: "bool",
+        type: "bool"
+      }
+    ],
+    stateMutability: "nonpayable"
+  }
+];
+export {
+  ierc4626AdapterAbi
+};

package/dist/esm/dev/AccountOpener.js

@@ -12,6 +12,7 @@ import {
   ADDRESS_0X0,
   AddressMap,
   AddressSet,
+  AssetsMap,
   childLogger,
   MAX_UINT256,
   PERCENTAGE_FACTOR,
@@ -373,7 +374,7 @@ class AccountOpener extends SDKConstruct {
   }
   async #depositIntoPools(targets) {
     this.#logger?.debug("checking and topping up pools if necessary");
-    const minAvailableByPool = {};
+    const minAvailableByPool = new AssetsMap();
     for (let i = 0; i < targets.length; i++) {
       const t = targets[i];
       const leverage = this.#getLeverage(t);
@@ -381,14 +382,14 @@ class AccountOpener extends SDKConstruct {
       const minDebt = this.#minDebtMultiplier * cm.creditFacade.minDebt / PERCENTAGE_FACTOR;
       let amount = minDebt * (leverage - PERCENTAGE_FACTOR) / PERCENTAGE_FACTOR * this.#poolDepositMultiplier / PERCENTAGE_FACTOR;
       amount = amount > cm.creditFacade.maxDebt ? cm.creditFacade.maxDebt : amount;
-      minAvailableByPool[cm.pool] = (minAvailableByPool[cm.pool] ?? 0n) + amount;
+      minAvailableByPool.inc(cm.pool, amount);
       this.#logger?.debug(
         `target #${i + 1} (${this.labelAddress(t.target)}) needs ${this.sdk.tokensMeta.formatBN(cm.underlying, amount, { symbol: true })} in pool (leverage: ${Number(leverage / PERCENTAGE_FACTOR)}%)`
       );
     }
     const deposits = [];
-    const claims = new AddressMap();
-    for (const [p, minAvailable] of Object.entries(minAvailableByPool)) {
+    const claims = new AssetsMap();
+    for (const [p, minAvailable] of minAvailableByPool.entries()) {
       const market = this.sdk.marketRegister.findByPool(p);
       const pool = market.pool.pool;
       let diff = minAvailable - pool.availableLiquidity;
@@ -405,9 +406,7 @@ class AccountOpener extends SDKConstruct {
       );
       if (diff > 0n) {
         deposits.push([pool, diff]);
-        let claim = claims.get(pool.underlying) ?? 0n;
-        claim += diff * PERCENTAGE_FACTOR / 8950n;
-        claims.upsert(pool.underlying, claim);
+        claims.inc(pool.underlying, diff * PERCENTAGE_FACTOR / 8950n);
       }
     }
     const depositor = await this.#getDepositor();
@@ -564,18 +563,14 @@ class AccountOpener extends SDKConstruct {
   async #prepareBorrower(targets) {
     const borrower = await this.#getBorrower();
     const degenNFTS = {};
-    const claims = new AddressMap();
+    const claims = new AssetsMap();
     for (const target of targets) {
       const cm = this.sdk.marketRegister.findCreditManager(
         target.creditManager
       );
-      const market = this.sdk.marketRegister.findByCreditManager(
-        target.creditManager
-      );
       const { degenNFT } = cm.creditFacade;
       const minDebt = this.#minDebtMultiplier * cm.creditFacade.minDebt / PERCENTAGE_FACTOR;
-      const claim = claims.get(cm.underlying) ?? 0n;
-      claims.upsert(cm.underlying, claim + minDebt * 11n / 10n);
+      claims.inc(cm.underlying, minDebt * 11n / 10n);
       if (isAddress(degenNFT) && degenNFT !== ADDRESS_0X0) {
         degenNFTS[degenNFT] = (degenNFTS[degenNFT] ?? 0) + 1;
       }

package/dist/esm/dev/index.js

@@ -24,6 +24,7 @@ export * from "./resilientTransport.js";
 export * from "./transports.js";
 export * from "./types.js";
 export * from "./verifyTestnet.js";
+export * from "./withdrawalUtils.js";
 export {
   isRangeError,
   logSplitterTransport