@gearbox-protocol/sdk 11.9.0-next.2 → 11.9.0

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

@@ -24,16 +24,17 @@ module.exports = __toCommonJS(governor_exports);
 var import_viem = require("viem");
 var import_utils = require("viem/utils");
 var import_governor = require("../../../abi/governance/governor.js");
-var import_sdk = require("../../../sdk/index.js");
-var import_utils2 = require("../../utils/index.js");
+var import_utils2 = require("../../../sdk/utils/index.js");
+var import_utils3 = require("../../utils/index.js");
+var import_base_contract = require("../base-contract.js");
 var import_market_configurator = require("../market-configurator.js");
 var import_treasury_splitter = require("../treasury-splitter.js");
 var import_batches_chain = require("./batches-chain.js");
 const abi = import_governor.governorAbi;
-class GovernorContract extends import_sdk.BaseContract {
+class GovernorContract extends import_base_contract.BaseContract {
   batchesChainContract;
-  constructor(addr, client) {
-    super({ client }, { abi, addr, name: "Governor" });
+  constructor(address, client) {
+    super(abi, address, client, "Governor");
     this.batchesChainContract = new import_batches_chain.BatchesChainContract(
       "0x59b2fd348e4Ade84ffEfDaf5fcdDa7276c8C5041",
       client
@@ -138,7 +139,7 @@ class GovernorContract extends import_sdk.BaseContract {
       ).join("\n")})`
     });
   }
-  #decodeFunctionData(target, calldata) {
+  decodeFunctionData(target, calldata) {
     switch (target.toLowerCase()) {
       case this.address.toLowerCase(): {
         return this.parseFunctionData(calldata);
@@ -177,44 +178,62 @@ class GovernorContract extends import_sdk.BaseContract {
       case "startBatch": {
         const [eta] = args;
         return {
-          eta: (0, import_utils2.formatTimestamp)(Number(eta))
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            eta: (0, import_utils3.formatTimestamp)(Number(eta))
+          }
         };
       }
       case "queueTransaction": {
         const [target, value, signature, data, eta] = args;
         const calldata = (0, import_viem.keccak256)((0, import_viem.toBytes)(signature)).slice(0, 10) + data.slice(2);
         return {
-          target,
-          value: (0, import_viem.formatEther)(value),
-          signature,
-          data: (0, import_sdk.json_stringify)(
-            this.#decodeFunctionData(target, calldata)?.args ?? calldata
-          ),
-          eta: (0, import_utils2.formatTimestamp)(Number(eta))
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            target,
+            value: (0, import_viem.formatEther)(value),
+            signature,
+            data: (0, import_utils2.json_stringify)(
+              this.decodeFunctionData(target, calldata)?.args ?? calldata
+            ),
+            eta: (0, import_utils3.formatTimestamp)(Number(eta))
+          }
         };
       }
       case "executeBatch": {
         const [txs] = args;
         return {
-          txs: (0, import_sdk.json_stringify)(
-            txs.map((tx) => {
-              const { target, value, signature, data, eta } = tx;
-              const calldata = (0, import_viem.keccak256)((0, import_viem.toBytes)(signature)).slice(0, 10) + data.slice(2);
-              return {
-                target,
-                value: (0, import_viem.formatEther)(value),
-                signature,
-                data: (0, import_sdk.json_stringify)(
-                  this.#decodeFunctionData(target, calldata)?.args ?? calldata
-                ),
-                eta: (0, import_utils2.formatTimestamp)(Number(eta))
-              };
-            })
-          )
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            txs: (0, import_utils2.json_stringify)(
+              txs.map((tx) => {
+                const { target, value, signature, data, eta } = tx;
+                const calldata = (0, import_viem.keccak256)((0, import_viem.toBytes)(signature)).slice(0, 10) + data.slice(2);
+                return {
+                  target,
+                  value: (0, import_viem.formatEther)(value),
+                  signature,
+                  data: (0, import_utils2.json_stringify)(
+                    this.decodeFunctionData(target, calldata)?.args ?? calldata
+                  ),
+                  eta: (0, import_utils3.formatTimestamp)(Number(eta))
+                };
+              })
+            )
+          }
         };
       }
       default:
-        return super.parseFunctionParams(params);
+        return void 0;
     }
   }
 }

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

@@ -22,10 +22,10 @@ __export(timelock_exports, {
 });
 module.exports = __toCommonJS(timelock_exports);
 var import_iTimeLock = require("../../../abi/governance/iTimeLock.js");
-var import_sdk = require("../../../sdk/index.js");
-class TimeLockContract extends import_sdk.BaseContract {
-  constructor(addr, client) {
-    super({ client }, { abi: import_iTimeLock.iTimeLockAbi, addr, name: "TimeLock" });
+var import_base_contract = require("../base-contract.js");
+class TimeLockContract extends import_base_contract.BaseContract {
+  constructor(address, client) {
+    super(import_iTimeLock.iTimeLockAbi, address, client, "TimeLock");
   }
   async admin() {
     const admin = await this.client.readContract({

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

@@ -16,6 +16,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var bindings_exports = {};
 module.exports = __toCommonJS(bindings_exports);
 __reExport(bindings_exports, require("./address-provider.js"), module.exports);
+__reExport(bindings_exports, require("./base-contract.js"), module.exports);
 __reExport(bindings_exports, require("./bytecode-repository.js"), module.exports);
 __reExport(bindings_exports, require("./compressors/index.js"), module.exports);
 __reExport(bindings_exports, require("./cross-chain-multisig.js"), module.exports);
@@ -31,6 +32,7 @@ __reExport(bindings_exports, require("./types.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./address-provider.js"),
+  ...require("./base-contract.js"),
   ...require("./bytecode-repository.js"),
   ...require("./compressors/index.js"),
   ...require("./cross-chain-multisig.js"),

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

@@ -30,19 +30,20 @@ var import_mellow4626Worker = require("../../abi/router/mellow4626Worker.js");
 var import_pendleRouterWorker = require("../../abi/router/pendleRouterWorker.js");
 var import_uniswapV3Worker = require("../../abi/router/uniswapV3Worker.js");
 var import_uniswapV4Worker = require("../../abi/router/uniswapV4Worker.js");
-var import_sdk = require("../../sdk/index.js");
+var import_utils = require("../../sdk/utils/index.js");
 var import_addresses = require("../deployment/addresses.js");
+var import_base_contract = require("./base-contract.js");
 var import_compressors = require("./compressors/index.js");
 var import_price_feed_store = require("./price-feed-store.js");
 var import_router = require("./router/index.js");
 var import_treasury_splitter = require("./treasury-splitter.js");
 const abi = import_instanceManager.instanceManagerAbi;
-class InstanceManagerContract extends import_sdk.BaseContract {
-  constructor(addr, client) {
-    super({ client }, { abi, addr, name: "InstanceManager" });
+class InstanceManagerContract extends import_base_contract.BaseContract {
+  constructor(address, client) {
+    super(abi, address, client, "InstanceManager");
   }
   // TODO:
-  #decodeFunctionData(target, calldata) {
+  decodeFunctionData(target, calldata) {
     switch (target.toLowerCase()) {
       case this.address.toLowerCase(): {
         return this.parseFunctionData(calldata);
@@ -54,9 +55,11 @@ class InstanceManagerContract extends import_sdk.BaseContract {
       default: {
         try {
           let parsedData;
-          const router = new import_sdk.BaseContract(
-            { client: this.client },
-            { abi: import_gearboxRouter.gearboxRouterAbi, addr: target, name: "GearboxRouter" }
+          const router = new import_base_contract.BaseContract(
+            import_gearboxRouter.gearboxRouterAbi,
+            target,
+            this.client,
+            "GearboxRouter"
           );
           parsedData = router.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
@@ -70,57 +73,61 @@ class InstanceManagerContract extends import_sdk.BaseContract {
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
-          const camelotV3Worker = new import_sdk.BaseContract(
-            { client: this.client },
-            { abi: import_camelotV3Worker.camelotV3WorkerAbi, addr: target, name: "CamelotV3Worker" }
+          const camelotV3Worker = new import_base_contract.BaseContract(
+            import_camelotV3Worker.camelotV3WorkerAbi,
+            target,
+            this.client,
+            "CamelotV3Worker"
           );
           parsedData = camelotV3Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
-          const erc4626Worker = new import_sdk.BaseContract(
-            { client: this.client },
-            { abi: import_erc4626Worker.erc4626WorkerAbi, addr: target, name: "ERC4626Worker" }
+          const erc4626Worker = new import_base_contract.BaseContract(
+            import_erc4626Worker.erc4626WorkerAbi,
+            target,
+            this.client,
+            "ERC4626Worker"
           );
           parsedData = erc4626Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
-          const mellow4626Worker = new import_sdk.BaseContract(
-            { client: this.client },
-            {
-              abi: import_mellow4626Worker.mellow4626WorkerAbi,
-              addr: target,
-              name: "Mellow4626Worker"
-            }
+          const mellow4626Worker = new import_base_contract.BaseContract(
+            import_mellow4626Worker.mellow4626WorkerAbi,
+            target,
+            this.client,
+            "Mellow4626Worker"
           );
           parsedData = mellow4626Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
-          const pendleRouterWorker = new import_sdk.BaseContract(
-            { client: this.client },
-            {
-              abi: import_pendleRouterWorker.pendleRouterWorkerAbi,
-              addr: target,
-              name: "PendleRouterWorker"
-            }
+          const pendleRouterWorker = new import_base_contract.BaseContract(
+            import_pendleRouterWorker.pendleRouterWorkerAbi,
+            target,
+            this.client,
+            "PendleRouterWorker"
           );
           parsedData = pendleRouterWorker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
-          const uniswapV3Worker = new import_sdk.BaseContract(
-            { client: this.client },
-            { abi: import_uniswapV3Worker.uniswapV3WorkerAbi, addr: target, name: "UniswapV3Worker" }
+          const uniswapV3Worker = new import_base_contract.BaseContract(
+            import_uniswapV3Worker.uniswapV3WorkerAbi,
+            target,
+            this.client,
+            "UniswapV3Worker"
           );
           parsedData = uniswapV3Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
-          const uniswapV4Worker = new import_sdk.BaseContract(
-            { client: this.client },
-            { abi: import_uniswapV4Worker.uniswapV4WorkerAbi, addr: target, name: "UniswapV4Worker" }
+          const uniswapV4Worker = new import_base_contract.BaseContract(
+            import_uniswapV4Worker.uniswapV4WorkerAbi,
+            target,
+            this.client,
+            "UniswapV4Worker"
           );
           parsedData = uniswapV4Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
@@ -145,23 +152,29 @@ class InstanceManagerContract extends import_sdk.BaseContract {
     switch (params.functionName) {
       case "configureGlobal": {
         const [target, data] = params.args;
-        const nestedCall = this.register.parseFunctionData(target, data);
+        const nestedCall = import_base_contract.BaseContract.parse(target, data);
         return {
-          ...nestedCall.args,
+          ...nestedCall,
           label: `${nestedCall.label} via instanceManager`,
           target: this.address
         };
       }
       case "configureLocal": {
         const [target, data] = params.args;
-        const decoded = this.#decodeFunctionData(target, data);
-        return decoded ? {
-          target,
-          functionName: decoded.functionName,
-          data: (0, import_sdk.json_stringify)(decoded.args)
-        } : {
-          target,
-          data
+        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: (0, import_utils.json_stringify)(decoded.args)
+          } : {
+            target,
+            data
+          }
         };
       }
       case "configureTreasury": {
@@ -179,42 +192,48 @@ class InstanceManagerContract extends import_sdk.BaseContract {
         } catch {
           decoded = void 0;
         }
-        return decoded ? {
-          target,
-          functionName: decoded.functionName,
-          data: (0, import_sdk.json_stringify)(decoded.args)
-        } : {
-          target,
-          data
+        return {
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName: params.functionName,
+          args: decoded ? {
+            target,
+            functionName: decoded.functionName,
+            data: (0, import_utils.json_stringify)(decoded.args)
+          } : {
+            target,
+            data
+          }
         };
       }
       case "activate": {
         const [instanceOwner, treasury, weth, gear] = params.args;
-        return {
+        return this.wrapParseCall(params, {
           instanceOwner,
           treasury,
           weth,
           gear
-        };
+        });
       }
       case "deploySystemContract": {
         const [contractType, version, saveVersion] = params.args;
-        return {
+        return this.wrapParseCall(params, {
           contractType: (0, import_viem.hexToString)(contractType, { size: 32 }),
           version: version.toString(),
           saveVersion: saveVersion ? "true" : "false"
-        };
+        });
       }
       case "setGlobalAddress": {
         const [key, address, saveVersion] = params.args;
-        return {
+        return this.wrapParseCall(params, {
           key,
           address,
           saveVersion: saveVersion ? "true" : "false"
-        };
+        });
       }
       default:
-        return super.parseFunctionParams(params);
+        return void 0;
     }
   }
   async isActivated() {

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

@@ -22,11 +22,11 @@ __export(market_configurator_factory_exports, {
 });
 module.exports = __toCommonJS(market_configurator_factory_exports);
 var import_iMarketConfiguratorFactory = require("../../abi/310/iMarketConfiguratorFactory.js");
-var import_sdk = require("../../sdk/index.js");
+var import_base_contract = require("./base-contract.js");
 const abi = import_iMarketConfiguratorFactory.iMarketConfiguratorFactoryAbi;
-class MarketConfiguratorFactoryContract extends import_sdk.BaseContract {
-  constructor(addr, client) {
-    super({ client }, { abi, addr, name: "MarketConfiguratorFactory" });
+class MarketConfiguratorFactoryContract extends import_base_contract.BaseContract {
+  constructor(address, client) {
+    super(abi, address, client, "MarketConfiguratorFactory");
   }
   createMarketConfiguratorTx(args) {
     return this.createRawTx({