@gearbox-protocol/sdk 11.12.0 → 12.0.0-next.2

package/dist/esm/permissionless/bindings/factory/abstract-factory.js

@@ -1,5 +1,8 @@
+import {
+  decodeFunctionData
+} from "viem";
+import { functionArgsToMap } from "../../../sdk/index.js";
 import { createCallData } from "../../core/raw-tx.js";
-import { decodeFunctionWithNamedArgs } from "../../utils/abi-decoder.js";
 class AbstractFactory {
   abi;
   constructor(abi) {
@@ -15,11 +18,13 @@ class AbstractFactory {
    * @returns Decoded function name and arguments, or null if decoding fails
    */
   decodeConfig(calldata) {
-    const decoded = decodeFunctionWithNamedArgs(this.abi, calldata);
-    if (!decoded) return null;
+    const decoded = decodeFunctionData({
+      abi: this.abi,
+      data: calldata
+    });
     return {
       functionName: decoded.functionName,
-      args: decoded.args
+      args: functionArgsToMap(this.abi, decoded.functionName, decoded.args)
     };
   }
 }

package/dist/esm/permissionless/bindings/governance/batches-chain.js

@@ -1,9 +1,9 @@
 import { batchesChainAbi } from "../../../abi/governance/batchesChain.js";
-import { BaseContract } from "../base-contract.js";
+import { BaseContract } from "../../../sdk/index.js";
 const abi = batchesChainAbi;
 class BatchesChainContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "BatchesChain");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "BatchesChain" });
   }
   createBatchOrderingTx(prevHash) {
     return this.createRawTx({

package/dist/esm/permissionless/bindings/governance/governor.js

@@ -6,17 +6,16 @@ import {
 } from "viem";
 import { formatAbiItem } from "viem/utils";
 import { governorAbi } from "../../../abi/governance/governor.js";
-import { json_stringify } from "../../../sdk/utils/index.js";
+import { BaseContract, json_stringify } from "../../../sdk/index.js";
 import { formatTimestamp } from "../../utils/index.js";
-import { BaseContract } from "../base-contract.js";
 import { MarketConfiguratorContract } from "../market-configurator.js";
 import { TreasurySplitterContract } from "../treasury-splitter.js";
 import { BatchesChainContract } from "./batches-chain.js";
 const abi = governorAbi;
 class GovernorContract extends BaseContract {
   batchesChainContract;
-  constructor(address, client) {
-    super(abi, address, client, "Governor");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "Governor" });
     this.batchesChainContract = new BatchesChainContract(
       "0x59b2fd348e4Ade84ffEfDaf5fcdDa7276c8C5041",
       client
@@ -121,7 +120,7 @@ class GovernorContract extends BaseContract {
       ).join("\n")})`
     });
   }
-  decodeFunctionData(target, calldata) {
+  #decodeFunctionData(target, calldata) {
     switch (target.toLowerCase()) {
       case this.address.toLowerCase(): {
         return this.parseFunctionData(calldata);
@@ -160,62 +159,44 @@ class GovernorContract extends BaseContract {
       case "startBatch": {
         const [eta] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            eta: formatTimestamp(Number(eta))
-          }
+          eta: formatTimestamp(Number(eta))
         };
       }
       case "queueTransaction": {
         const [target, value, signature, data, eta] = args;
         const calldata = keccak256(toBytes(signature)).slice(0, 10) + data.slice(2);
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            target,
-            value: formatEther(value),
-            signature,
-            data: json_stringify(
-              this.decodeFunctionData(target, calldata)?.args ?? calldata
-            ),
-            eta: formatTimestamp(Number(eta))
-          }
+          target,
+          value: formatEther(value),
+          signature,
+          data: json_stringify(
+            this.#decodeFunctionData(target, calldata)?.args ?? calldata
+          ),
+          eta: formatTimestamp(Number(eta))
         };
       }
       case "executeBatch": {
         const [txs] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            txs: json_stringify(
-              txs.map((tx) => {
-                const { target, value, signature, data, eta } = tx;
-                const calldata = keccak256(toBytes(signature)).slice(0, 10) + data.slice(2);
-                return {
-                  target,
-                  value: formatEther(value),
-                  signature,
-                  data: json_stringify(
-                    this.decodeFunctionData(target, calldata)?.args ?? calldata
-                  ),
-                  eta: formatTimestamp(Number(eta))
-                };
-              })
-            )
-          }
+          txs: json_stringify(
+            txs.map((tx) => {
+              const { target, value, signature, data, eta } = tx;
+              const calldata = keccak256(toBytes(signature)).slice(0, 10) + data.slice(2);
+              return {
+                target,
+                value: formatEther(value),
+                signature,
+                data: json_stringify(
+                  this.#decodeFunctionData(target, calldata)?.args ?? calldata
+                ),
+                eta: formatTimestamp(Number(eta))
+              };
+            })
+          )
         };
       }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
 }

package/dist/esm/permissionless/bindings/governance/timelock.js

@@ -1,8 +1,8 @@
 import { iTimeLockAbi } from "../../../abi/governance/iTimeLock.js";
-import { BaseContract } from "../base-contract.js";
+import { BaseContract } from "../../../sdk/index.js";
 class TimeLockContract extends BaseContract {
-  constructor(address, client) {
-    super(iTimeLockAbi, address, client, "TimeLock");
+  constructor(addr, client) {
+    super({ client }, { abi: iTimeLockAbi, addr, name: "TimeLock" });
   }
   async admin() {
     const admin = await this.client.readContract({

package/dist/esm/permissionless/bindings/index.js

@@ -1,5 +1,4 @@
 export * from "./address-provider.js";
-export * from "./base-contract.js";
 export * from "./bytecode-repository.js";
 export * from "./compressors/index.js";
 export * from "./cross-chain-multisig.js";

package/dist/esm/permissionless/bindings/instance-manager.js

@@ -10,20 +10,22 @@ import { mellow4626WorkerAbi } from "../../abi/router/mellow4626Worker.js";
 import { pendleRouterWorkerAbi } from "../../abi/router/pendleRouterWorker.js";
 import { uniswapV3WorkerAbi } from "../../abi/router/uniswapV3Worker.js";
 import { uniswapV4WorkerAbi } from "../../abi/router/uniswapV4Worker.js";
-import { json_stringify } from "../../sdk/utils/index.js";
+import {
+  BaseContract,
+  json_stringify
+} from "../../sdk/index.js";
 import { Addresses } from "../deployment/addresses.js";
-import { BaseContract } from "./base-contract.js";
 import { WithdrawalCompressorContract } from "./compressors/index.js";
 import { PriceFeedStoreContract } from "./price-feed-store.js";
 import { RoutingManagerContract } from "./router/index.js";
 import { TreasurySplitterContract } from "./treasury-splitter.js";
 const abi = instanceManagerAbi;
 class InstanceManagerContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "InstanceManager");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "InstanceManager" });
   }
   // TODO:
-  decodeFunctionData(target, calldata) {
+  #decodeFunctionData(target, calldata) {
     switch (target.toLowerCase()) {
       case this.address.toLowerCase(): {
         return this.parseFunctionData(calldata);
@@ -36,10 +38,8 @@ class InstanceManagerContract extends BaseContract {
         try {
           let parsedData;
           const router = new BaseContract(
-            gearboxRouterAbi,
-            target,
-            this.client,
-            "GearboxRouter"
+            { client: this.client },
+            { abi: gearboxRouterAbi, addr: target, name: "GearboxRouter" }
           );
           parsedData = router.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
@@ -54,60 +54,56 @@ class InstanceManagerContract extends BaseContract {
             return parsedData;
           }
           const camelotV3Worker = new BaseContract(
-            camelotV3WorkerAbi,
-            target,
-            this.client,
-            "CamelotV3Worker"
+            { client: this.client },
+            { abi: camelotV3WorkerAbi, addr: target, name: "CamelotV3Worker" }
           );
           parsedData = camelotV3Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
           const erc4626Worker = new BaseContract(
-            erc4626WorkerAbi,
-            target,
-            this.client,
-            "ERC4626Worker"
+            { client: this.client },
+            { abi: erc4626WorkerAbi, addr: target, name: "ERC4626Worker" }
           );
           parsedData = erc4626Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
           const mellow4626Worker = new BaseContract(
-            mellow4626WorkerAbi,
-            target,
-            this.client,
-            "Mellow4626Worker"
+            { client: this.client },
+            {
+              abi: mellow4626WorkerAbi,
+              addr: target,
+              name: "Mellow4626Worker"
+            }
           );
           parsedData = mellow4626Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
           const pendleRouterWorker = new BaseContract(
-            pendleRouterWorkerAbi,
-            target,
-            this.client,
-            "PendleRouterWorker"
+            { client: this.client },
+            {
+              abi: pendleRouterWorkerAbi,
+              addr: target,
+              name: "PendleRouterWorker"
+            }
           );
           parsedData = pendleRouterWorker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
           const uniswapV3Worker = new BaseContract(
-            uniswapV3WorkerAbi,
-            target,
-            this.client,
-            "UniswapV3Worker"
+            { client: this.client },
+            { abi: uniswapV3WorkerAbi, addr: target, name: "UniswapV3Worker" }
           );
           parsedData = uniswapV3Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
           const uniswapV4Worker = new BaseContract(
-            uniswapV4WorkerAbi,
-            target,
-            this.client,
-            "UniswapV4Worker"
+            { client: this.client },
+            { abi: uniswapV4WorkerAbi, addr: target, name: "UniswapV4Worker" }
           );
           parsedData = uniswapV4Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
@@ -132,29 +128,23 @@ class InstanceManagerContract extends BaseContract {
     switch (params.functionName) {
       case "configureGlobal": {
         const [target, data] = params.args;
-        const nestedCall = BaseContract.parse(target, data);
+        const nestedCall = this.register.parseFunctionData(target, data);
         return {
-          ...nestedCall,
+          ...nestedCall.args,
           label: `${nestedCall.label} via instanceManager`,
           target: this.address
         };
       }
       case "configureLocal": {
         const [target, data] = params.args;
-        const decoded = this.decodeFunctionData(target, data);
-        return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName: params.functionName,
-          args: decoded ? {
-            target,
-            functionName: decoded.functionName,
-            data: json_stringify(decoded.args)
-          } : {
-            target,
-            data
-          }
+        const decoded = this.#decodeFunctionData(target, data);
+        return decoded ? {
+          target,
+          functionName: decoded.functionName,
+          data: json_stringify(decoded.args)
+        } : {
+          target,
+          data
         };
       }
       case "configureTreasury": {
@@ -172,48 +162,42 @@ class InstanceManagerContract extends BaseContract {
         } catch {
           decoded = void 0;
         }
-        return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName: params.functionName,
-          args: decoded ? {
-            target,
-            functionName: decoded.functionName,
-            data: json_stringify(decoded.args)
-          } : {
-            target,
-            data
-          }
+        return decoded ? {
+          target,
+          functionName: decoded.functionName,
+          data: json_stringify(decoded.args)
+        } : {
+          target,
+          data
         };
       }
       case "activate": {
         const [instanceOwner, treasury, weth, gear] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           instanceOwner,
           treasury,
           weth,
           gear
-        });
+        };
       }
       case "deploySystemContract": {
         const [contractType, version, saveVersion] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           contractType: hexToString(contractType, { size: 32 }),
           version: version.toString(),
           saveVersion: saveVersion ? "true" : "false"
-        });
+        };
       }
       case "setGlobalAddress": {
         const [key, address, saveVersion] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           key,
           address,
           saveVersion: saveVersion ? "true" : "false"
-        });
+        };
       }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
   async isActivated() {

package/dist/esm/permissionless/bindings/market-configurator-factory.js

@@ -1,9 +1,9 @@
 import { iMarketConfiguratorFactoryAbi } from "../../abi/310/iMarketConfiguratorFactory.js";
-import { BaseContract } from "./base-contract.js";
+import { BaseContract } from "../../sdk/index.js";
 const abi = iMarketConfiguratorFactoryAbi;
 class MarketConfiguratorFactoryContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "MarketConfiguratorFactory");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "MarketConfiguratorFactory" });
   }
   createMarketConfiguratorTx(args) {
     return this.createRawTx({