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

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

@@ -10,22 +10,20 @@ 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 {
-  BaseContract,
-  json_stringify
-} from "../../sdk/index.js";
+import { json_stringify } from "../../sdk/utils/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(addr, client) {
-    super({ client }, { abi, addr, name: "InstanceManager" });
+  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);
@@ -38,8 +36,10 @@ class InstanceManagerContract extends BaseContract {
         try {
           let parsedData;
           const router = new BaseContract(
-            { client: this.client },
-            { abi: gearboxRouterAbi, addr: target, name: "GearboxRouter" }
+            gearboxRouterAbi,
+            target,
+            this.client,
+            "GearboxRouter"
           );
           parsedData = router.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
@@ -54,56 +54,60 @@ class InstanceManagerContract extends BaseContract {
             return parsedData;
           }
           const camelotV3Worker = new BaseContract(
-            { client: this.client },
-            { abi: camelotV3WorkerAbi, addr: target, name: "CamelotV3Worker" }
+            camelotV3WorkerAbi,
+            target,
+            this.client,
+            "CamelotV3Worker"
           );
           parsedData = camelotV3Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
           const erc4626Worker = new BaseContract(
-            { client: this.client },
-            { abi: erc4626WorkerAbi, addr: target, name: "ERC4626Worker" }
+            erc4626WorkerAbi,
+            target,
+            this.client,
+            "ERC4626Worker"
           );
           parsedData = erc4626Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
           const mellow4626Worker = new BaseContract(
-            { client: this.client },
-            {
-              abi: mellow4626WorkerAbi,
-              addr: target,
-              name: "Mellow4626Worker"
-            }
+            mellow4626WorkerAbi,
+            target,
+            this.client,
+            "Mellow4626Worker"
           );
           parsedData = mellow4626Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
           const pendleRouterWorker = new BaseContract(
-            { client: this.client },
-            {
-              abi: pendleRouterWorkerAbi,
-              addr: target,
-              name: "PendleRouterWorker"
-            }
+            pendleRouterWorkerAbi,
+            target,
+            this.client,
+            "PendleRouterWorker"
           );
           parsedData = pendleRouterWorker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
           const uniswapV3Worker = new BaseContract(
-            { client: this.client },
-            { abi: uniswapV3WorkerAbi, addr: target, name: "UniswapV3Worker" }
+            uniswapV3WorkerAbi,
+            target,
+            this.client,
+            "UniswapV3Worker"
           );
           parsedData = uniswapV3Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
           const uniswapV4Worker = new BaseContract(
-            { client: this.client },
-            { abi: uniswapV4WorkerAbi, addr: target, name: "UniswapV4Worker" }
+            uniswapV4WorkerAbi,
+            target,
+            this.client,
+            "UniswapV4Worker"
           );
           parsedData = uniswapV4Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
@@ -128,23 +132,29 @@ class InstanceManagerContract extends BaseContract {
     switch (params.functionName) {
       case "configureGlobal": {
         const [target, data] = params.args;
-        const nestedCall = this.register.parseFunctionData(target, data);
+        const nestedCall = 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: 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: json_stringify(decoded.args)
+          } : {
+            target,
+            data
+          }
         };
       }
       case "configureTreasury": {
@@ -162,42 +172,48 @@ class InstanceManagerContract extends BaseContract {
         } catch {
           decoded = void 0;
         }
-        return decoded ? {
-          target,
-          functionName: decoded.functionName,
-          data: 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: 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: 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/esm/permissionless/bindings/market-configurator-factory.js

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

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

@@ -15,7 +15,7 @@ import {
   creditManagerParamsAbi
 } from "../../abi/310/configure/creditSuiteParams.js";
 import { iMarketConfiguratorV310Abi } from "../../abi/310/generated.js";
-import { BaseContract, json_stringify } from "../../sdk/index.js";
+import { json_stringify } from "../../sdk/utils/index.js";
 import {
   parseIrmDeployParams,
   parseLossPolicyDeployParams,
@@ -26,14 +26,14 @@ import { convertPercent } from "../utils/index.js";
 import { CreditFactory } from "./factory/credit-factory.js";
 import { PoolFactory } from "./factory/pool-factory.js";
 import { PriceOracleFactory } from "./factory/price-oracle-factory.js";
-import { AddressProviderContract } from "./index.js";
+import { AddressProviderContract, BaseContract } from "./index.js";
 const abi = iMarketConfiguratorV310Abi;
 class MarketConfiguratorContract extends BaseContract {
   creditFactory;
   poolFactory;
   priceOracleFactory;
-  constructor(addr, client) {
-    super({ client }, { abi, addr, name: "MarketConfigurator" });
+  constructor(address, client) {
+    super(abi, address, client, "MarketConfigurator");
     this.creditFactory = new CreditFactory();
     this.poolFactory = new PoolFactory();
     this.priceOracleFactory = new PriceOracleFactory();
@@ -545,26 +545,32 @@ class MarketConfiguratorContract extends BaseContract {
           lossPolicyParams.constructorParams
         );
         return {
-          minorVersion: minorVersion.toString(),
-          underlying,
-          name,
-          symbol,
-          interestRateModelParams: json_stringify({
-            postfix: irmParsedPostfix,
-            salt: interestRateModelParams.salt,
-            constructorParams: irmParsedParams
-          }),
-          rateKeeperParams: json_stringify({
-            postfix: rateKeeperParsedPostfix,
-            salt: rateKeeperParams.salt,
-            constructorParams: rateKeeperParsedParams
-          }),
-          lossPolicyParams: json_stringify({
-            postfix: lossPolicyParsedPostfix,
-            salt: lossPolicyParams.salt,
-            constructorParams: lossPolicyParsedParams
-          }),
-          underlyingPriceFeed
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            minorVersion: minorVersion.toString(),
+            underlying,
+            name,
+            symbol,
+            interestRateModelParams: json_stringify({
+              postfix: irmParsedPostfix,
+              salt: interestRateModelParams.salt,
+              constructorParams: irmParsedParams
+            }),
+            rateKeeperParams: json_stringify({
+              postfix: rateKeeperParsedPostfix,
+              salt: rateKeeperParams.salt,
+              constructorParams: rateKeeperParsedParams
+            }),
+            lossPolicyParams: json_stringify({
+              postfix: lossPolicyParsedPostfix,
+              salt: lossPolicyParams.salt,
+              constructorParams: lossPolicyParsedParams
+            }),
+            underlyingPriceFeed
+          }
         };
       }
       case "createCreditSuite": {
@@ -575,27 +581,33 @@ class MarketConfiguratorContract extends BaseContract {
         );
         const accountFactoryParams = decoded[0].accountFactoryParams;
         return {
-          minorVersion: minorVersion.toString(),
-          pool,
-          creditSuiteParams: json_stringify({
-            ...decoded[0],
-            minDebt: decoded[0].minDebt.toString(),
-            maxDebt: decoded[0].maxDebt.toString(),
-            accountFactoryParams: {
-              postfix: hexToString(accountFactoryParams.postfix).replace(
-                /\0/g,
-                ""
-              ),
-              salt: accountFactoryParams.salt,
-              // TODO: tmp solution, move AccountFactory decoding to plugins
-              constructorParams: {
-                addressProvider: decodeAbiParameters(
-                  [{ type: "address" }],
-                  accountFactoryParams.constructorParams
-                )[0]
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            minorVersion: minorVersion.toString(),
+            pool,
+            creditSuiteParams: json_stringify({
+              ...decoded[0],
+              minDebt: decoded[0].minDebt.toString(),
+              maxDebt: decoded[0].maxDebt.toString(),
+              accountFactoryParams: {
+                postfix: hexToString(accountFactoryParams.postfix).replace(
+                  /\0/g,
+                  ""
+                ),
+                salt: accountFactoryParams.salt,
+                // TODO: tmp solution, move AccountFactory decoding to plugins
+                constructorParams: {
+                  addressProvider: decodeAbiParameters(
+                    [{ type: "address" }],
+                    accountFactoryParams.constructorParams
+                  )[0]
+                }
               }
-            }
-          })
+            })
+          }
         };
       }
       case "configurePriceOracle": {
@@ -603,13 +615,25 @@ class MarketConfiguratorContract extends BaseContract {
         const decoded = this.priceOracleFactory.decodeConfig(config);
         if (decoded) {
           return {
-            pool,
-            data: json_stringify(decoded)
+            chainId: 0,
+            target: this.address,
+            label: this.name,
+            functionName,
+            args: {
+              pool,
+              data: json_stringify(decoded)
+            }
           };
         }
         return {
-          pool,
-          config
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            pool,
+            config
+          }
         };
       }
       case "configurePool": {
@@ -617,13 +641,25 @@ class MarketConfiguratorContract extends BaseContract {
         const decoded = this.poolFactory.decodeConfig(calldata);
         if (decoded) {
           return {
-            pool,
-            data: json_stringify(decoded)
+            chainId: 0,
+            target: this.address,
+            label: this.name,
+            functionName,
+            args: {
+              pool,
+              data: json_stringify(decoded)
+            }
           };
         }
         return {
-          pool,
-          calldata
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            pool,
+            calldata
+          }
         };
       }
       case "configureCreditSuite": {
@@ -631,45 +667,81 @@ class MarketConfiguratorContract extends BaseContract {
         const decoded = this.creditFactory.decodeConfig(calldata);
         if (decoded) {
           return {
-            creditManager,
-            data: json_stringify(decoded)
+            chainId: 0,
+            target: this.address,
+            label: this.name,
+            functionName,
+            args: {
+              creditManager,
+              data: json_stringify(decoded)
+            }
           };
         }
         return {
-          creditManager,
-          calldata
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            creditManager,
+            calldata
+          }
         };
       }
       case "updateInterestRateModel": {
         const [pool, deployParams] = args;
         return {
-          pool,
-          deployParams: json_stringify(deployParams)
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            pool,
+            deployParams: json_stringify(deployParams)
+          }
         };
       }
       case "updateRateKeeper": {
         const [pool, deployParams] = args;
         return {
-          pool,
-          deployParams: json_stringify(deployParams)
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            pool,
+            deployParams: json_stringify(deployParams)
+          }
         };
       }
       case "updateLossPolicy": {
         const [pool, deployParams] = args;
         return {
-          pool,
-          deployParams: json_stringify(deployParams)
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            pool,
+            deployParams: json_stringify(deployParams)
+          }
         };
       }
       case "grantRole": {
         const [role, address] = args;
         return {
-          address,
-          role: hexToString(role, { size: 32 })
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            address,
+            role: hexToString(role, { size: 32 })
+          }
         };
       }
       default:
-        return super.parseFunctionParams(params);
+        return void 0;
     }
   }
   //

package/dist/esm/permissionless/bindings/price-feed-store.js

@@ -5,16 +5,16 @@ import {
   recoverTypedDataAddress
 } from "viem";
 import { iPriceFeedStoreAbi } from "../../abi/310/iPriceFeedStore.js";
-import {
-  BaseContract,
-  json_stringify
-} from "../../sdk/index.js";
+import { json_stringify } from "../../sdk/utils/index.js";
 import { PRICE_FEED_STORE } from "../utils/index.js";
+import { BaseContract } from "./base-contract.js";
 import { priceFeedSetupParams } from "./pricefeeds/index.js";
 const abi = iPriceFeedStoreAbi;
 class PriceFeedStoreContract extends BaseContract {
-  constructor(addr, client) {
-    super({ client }, { abi, addr, name: "PriceFeedStore" });
+  chainId;
+  constructor(address, client, chainId = 1) {
+    super(abi, address, client, "PriceFeedStore");
+    this.chainId = chainId;
   }
   async getZeroPriceFeed() {
     const result = await this.contract.read.zeroPriceFeed();
@@ -358,10 +358,16 @@ class PriceFeedStoreContract extends BaseContract {
             });
           }
         }
-        return { calls: json_stringify(calls) };
+        return {
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName: params.functionName,
+          args: { calls: json_stringify(calls) }
+        };
       }
       default:
-        return super.parseFunctionParams(params);
+        return void 0;
     }
   }
 }

package/dist/esm/permissionless/bindings/router/routing-manager.js

@@ -2,11 +2,11 @@ import {
   hexToString
 } from "viem";
 import { routingManagerAbi } from "../../../abi/router/routingManager.js";
-import { BaseContract } from "../../../sdk/index.js";
+import { BaseContract } from "../base-contract.js";
 const abi = routingManagerAbi;
 class RoutingManagerContract extends BaseContract {
-  constructor(addr, client) {
-    super({ client }, { abi, addr, name: "RoutingManager" });
+  constructor(address, client) {
+    super(abi, address, client, "RoutingManager");
   }
   parseFunctionParams(params) {
     const { functionName, args } = params;
@@ -14,14 +14,20 @@ class RoutingManagerContract extends BaseContract {
       case "setAdapterToWorkerType": {
         const [adapterType, workerType] = args;
         return {
-          adapterType: hexToString(adapterType, {
-            size: 32
-          }),
-          workerType: hexToString(workerType, { size: 32 })
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            adapterType: hexToString(adapterType, {
+              size: 32
+            }),
+            workerType: hexToString(workerType, { size: 32 })
+          }
         };
       }
       default:
-        return super.parseFunctionParams(params);
+        return void 0;
     }
   }
 }

package/dist/esm/permissionless/bindings/treasury-splitter.js

@@ -1,12 +1,10 @@
-import {
-  decodeFunctionData
-} from "viem";
 import { ITreasurySplitterAbi } from "../../abi/310/iTreasurySplitter.js";
-import { BaseContract } from "../../sdk/index.js";
+import { decodeFunctionWithNamedArgs } from "../utils/abi-decoder.js";
+import { BaseContract } from "./base-contract.js";
 const abi = ITreasurySplitterAbi;
 class TreasurySplitterContract extends BaseContract {
-  constructor(addr, client) {
-    super({ client }, { abi, addr, name: "TreasurySplitter" });
+  constructor(address, client) {
+    super(abi, address, client, "TreasurySplitter");
   }
   async defaultSplit() {
     return await this.contract.read.defaultSplit();
@@ -73,25 +71,34 @@ class TreasurySplitterContract extends BaseContract {
       case "distribute": {
         const [token] = args;
         return {
-          token
+          chainId: 0,
+          target: this.address,
+          label: this.name,
+          functionName,
+          args: {
+            token
+          }
         };
       }
       case "configure": {
         const [callData] = args;
-        const decoded = decodeFunctionData({
-          abi,
-          data: callData
-        });
+        const decoded = decodeFunctionWithNamedArgs(abi, callData);
         if (decoded) {
           return {
-            functionName: decoded.functionName,
-            ...super.parseFunctionParams(params)
+            chainId: 0,
+            target: this.address,
+            label: this.name,
+            functionName,
+            args: {
+              functionName: decoded.functionName,
+              ...decoded.args
+            }
           };
         }
-        return super.parseFunctionParams(params);
+        return void 0;
       }
       default:
-        return super.parseFunctionParams(params);
+        return void 0;
     }
   }
 }

package/dist/esm/permissionless/core/raw-tx.js

@@ -1,4 +1,4 @@
-import { createRawTx } from "../../sdk/index.js";
+import { createRawTx } from "../../sdk/utils/index.js";
 function createCallData(_abi, parameters) {
   const tx = createRawTx(
     "0x0000000000000000000000000000000000000000",