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

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

@@ -30,20 +30,19 @@ 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_utils = require("../../sdk/utils/index.js");
+var import_sdk = require("../../sdk/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_base_contract.BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "InstanceManager");
+class InstanceManagerContract extends import_sdk.BaseContract {
+  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);
@@ -55,11 +54,9 @@ class InstanceManagerContract extends import_base_contract.BaseContract {
       default: {
         try {
           let parsedData;
-          const router = new import_base_contract.BaseContract(
-            import_gearboxRouter.gearboxRouterAbi,
-            target,
-            this.client,
-            "GearboxRouter"
+          const router = new import_sdk.BaseContract(
+            { client: this.client },
+            { abi: import_gearboxRouter.gearboxRouterAbi, addr: target, name: "GearboxRouter" }
           );
           parsedData = router.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
@@ -73,61 +70,57 @@ class InstanceManagerContract extends import_base_contract.BaseContract {
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
-          const camelotV3Worker = new import_base_contract.BaseContract(
-            import_camelotV3Worker.camelotV3WorkerAbi,
-            target,
-            this.client,
-            "CamelotV3Worker"
+          const camelotV3Worker = new import_sdk.BaseContract(
+            { client: this.client },
+            { abi: import_camelotV3Worker.camelotV3WorkerAbi, addr: target, name: "CamelotV3Worker" }
           );
           parsedData = camelotV3Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
-          const erc4626Worker = new import_base_contract.BaseContract(
-            import_erc4626Worker.erc4626WorkerAbi,
-            target,
-            this.client,
-            "ERC4626Worker"
+          const erc4626Worker = new import_sdk.BaseContract(
+            { client: this.client },
+            { abi: import_erc4626Worker.erc4626WorkerAbi, addr: target, name: "ERC4626Worker" }
           );
           parsedData = erc4626Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
-          const mellow4626Worker = new import_base_contract.BaseContract(
-            import_mellow4626Worker.mellow4626WorkerAbi,
-            target,
-            this.client,
-            "Mellow4626Worker"
+          const mellow4626Worker = new import_sdk.BaseContract(
+            { client: this.client },
+            {
+              abi: import_mellow4626Worker.mellow4626WorkerAbi,
+              addr: target,
+              name: "Mellow4626Worker"
+            }
           );
           parsedData = mellow4626Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
-          const pendleRouterWorker = new import_base_contract.BaseContract(
-            import_pendleRouterWorker.pendleRouterWorkerAbi,
-            target,
-            this.client,
-            "PendleRouterWorker"
+          const pendleRouterWorker = new import_sdk.BaseContract(
+            { client: this.client },
+            {
+              abi: import_pendleRouterWorker.pendleRouterWorkerAbi,
+              addr: target,
+              name: "PendleRouterWorker"
+            }
           );
           parsedData = pendleRouterWorker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
-          const uniswapV3Worker = new import_base_contract.BaseContract(
-            import_uniswapV3Worker.uniswapV3WorkerAbi,
-            target,
-            this.client,
-            "UniswapV3Worker"
+          const uniswapV3Worker = new import_sdk.BaseContract(
+            { client: this.client },
+            { abi: import_uniswapV3Worker.uniswapV3WorkerAbi, addr: target, name: "UniswapV3Worker" }
           );
           parsedData = uniswapV3Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
             return parsedData;
           }
-          const uniswapV4Worker = new import_base_contract.BaseContract(
-            import_uniswapV4Worker.uniswapV4WorkerAbi,
-            target,
-            this.client,
-            "UniswapV4Worker"
+          const uniswapV4Worker = new import_sdk.BaseContract(
+            { client: this.client },
+            { abi: import_uniswapV4Worker.uniswapV4WorkerAbi, addr: target, name: "UniswapV4Worker" }
           );
           parsedData = uniswapV4Worker.parseFunctionData(calldata);
           if (!parsedData.functionName.startsWith("Unknown function")) {
@@ -152,29 +145,23 @@ class InstanceManagerContract extends import_base_contract.BaseContract {
     switch (params.functionName) {
       case "configureGlobal": {
         const [target, data] = params.args;
-        const nestedCall = import_base_contract.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: (0, import_utils.json_stringify)(decoded.args)
-          } : {
-            target,
-            data
-          }
+        const decoded = this.#decodeFunctionData(target, data);
+        return decoded ? {
+          target,
+          functionName: decoded.functionName,
+          data: (0, import_sdk.json_stringify)(decoded.args)
+        } : {
+          target,
+          data
         };
       }
       case "configureTreasury": {
@@ -192,48 +179,42 @@ class InstanceManagerContract extends import_base_contract.BaseContract {
         } catch {
           decoded = void 0;
         }
-        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
-          }
+        return decoded ? {
+          target,
+          functionName: decoded.functionName,
+          data: (0, import_sdk.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: (0, import_viem.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/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_base_contract = require("./base-contract.js");
+var import_sdk = require("../../sdk/index.js");
 const abi = import_iMarketConfiguratorFactory.iMarketConfiguratorFactoryAbi;
-class MarketConfiguratorFactoryContract extends import_base_contract.BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "MarketConfiguratorFactory");
+class MarketConfiguratorFactoryContract extends import_sdk.BaseContract {
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "MarketConfiguratorFactory" });
   }
   createMarketConfiguratorTx(args) {
     return this.createRawTx({

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

@@ -24,21 +24,21 @@ module.exports = __toCommonJS(market_configurator_exports);
 var import_viem = require("viem");
 var import_creditSuiteParams = require("../../abi/310/configure/creditSuiteParams.js");
 var import_generated = require("../../abi/310/generated.js");
-var import_utils = require("../../sdk/utils/index.js");
+var import_sdk = require("../../sdk/index.js");
 var import_plugins = require("../plugins/index.js");
 var import_create2 = require("../utils/create2.js");
-var import_utils2 = require("../utils/index.js");
+var import_utils = require("../utils/index.js");
 var import_credit_factory = require("./factory/credit-factory.js");
 var import_pool_factory = require("./factory/pool-factory.js");
 var import_price_oracle_factory = require("./factory/price-oracle-factory.js");
 var import_index = require("./index.js");
 const abi = import_generated.iMarketConfiguratorV310Abi;
-class MarketConfiguratorContract extends import_index.BaseContract {
+class MarketConfiguratorContract extends import_sdk.BaseContract {
   creditFactory;
   poolFactory;
   priceOracleFactory;
-  constructor(address, client) {
-    super(abi, address, client, "MarketConfigurator");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "MarketConfigurator" });
     this.creditFactory = new import_credit_factory.CreditFactory();
     this.poolFactory = new import_pool_factory.PoolFactory();
     this.priceOracleFactory = new import_price_oracle_factory.PriceOracleFactory();
@@ -196,13 +196,13 @@ class MarketConfiguratorContract extends import_index.BaseContract {
       [
         {
           maxEnabledTokens: args.params.maxEnabledTokens,
-          feeInterest: (0, import_utils2.convertPercent)(args.params.feeInterest),
-          feeLiquidation: (0, import_utils2.convertPercent)(args.params.feeLiquidation),
-          liquidationPremium: (0, import_utils2.convertPercent)(args.params.feeLiquidationPremium),
-          feeLiquidationExpired: (0, import_utils2.convertPercent)(
+          feeInterest: (0, import_utils.convertPercent)(args.params.feeInterest),
+          feeLiquidation: (0, import_utils.convertPercent)(args.params.feeLiquidation),
+          liquidationPremium: (0, import_utils.convertPercent)(args.params.feeLiquidationPremium),
+          feeLiquidationExpired: (0, import_utils.convertPercent)(
             args.params.feeLiquidationExpired
           ),
-          liquidationPremiumExpired: (0, import_utils2.convertPercent)(
+          liquidationPremiumExpired: (0, import_utils.convertPercent)(
             args.params.feeLiquidationPremiumExpired
           ),
           minDebt: args.params.minDebt,
@@ -550,32 +550,26 @@ class MarketConfiguratorContract extends import_index.BaseContract {
           lossPolicyParams.constructorParams
         );
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            minorVersion: minorVersion.toString(),
-            underlying,
-            name,
-            symbol,
-            interestRateModelParams: (0, import_utils.json_stringify)({
-              postfix: irmParsedPostfix,
-              salt: interestRateModelParams.salt,
-              constructorParams: irmParsedParams
-            }),
-            rateKeeperParams: (0, import_utils.json_stringify)({
-              postfix: rateKeeperParsedPostfix,
-              salt: rateKeeperParams.salt,
-              constructorParams: rateKeeperParsedParams
-            }),
-            lossPolicyParams: (0, import_utils.json_stringify)({
-              postfix: lossPolicyParsedPostfix,
-              salt: lossPolicyParams.salt,
-              constructorParams: lossPolicyParsedParams
-            }),
-            underlyingPriceFeed
-          }
+          minorVersion: minorVersion.toString(),
+          underlying,
+          name,
+          symbol,
+          interestRateModelParams: (0, import_sdk.json_stringify)({
+            postfix: irmParsedPostfix,
+            salt: interestRateModelParams.salt,
+            constructorParams: irmParsedParams
+          }),
+          rateKeeperParams: (0, import_sdk.json_stringify)({
+            postfix: rateKeeperParsedPostfix,
+            salt: rateKeeperParams.salt,
+            constructorParams: rateKeeperParsedParams
+          }),
+          lossPolicyParams: (0, import_sdk.json_stringify)({
+            postfix: lossPolicyParsedPostfix,
+            salt: lossPolicyParams.salt,
+            constructorParams: lossPolicyParsedParams
+          }),
+          underlyingPriceFeed
         };
       }
       case "createCreditSuite": {
@@ -586,33 +580,27 @@ class MarketConfiguratorContract extends import_index.BaseContract {
         );
         const accountFactoryParams = decoded[0].accountFactoryParams;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            minorVersion: minorVersion.toString(),
-            pool,
-            creditSuiteParams: (0, import_utils.json_stringify)({
-              ...decoded[0],
-              minDebt: decoded[0].minDebt.toString(),
-              maxDebt: decoded[0].maxDebt.toString(),
-              accountFactoryParams: {
-                postfix: (0, import_viem.hexToString)(accountFactoryParams.postfix).replace(
-                  /\0/g,
-                  ""
-                ),
-                salt: accountFactoryParams.salt,
-                // TODO: tmp solution, move AccountFactory decoding to plugins
-                constructorParams: {
-                  addressProvider: (0, import_viem.decodeAbiParameters)(
-                    [{ type: "address" }],
-                    accountFactoryParams.constructorParams
-                  )[0]
-                }
+          minorVersion: minorVersion.toString(),
+          pool,
+          creditSuiteParams: (0, import_sdk.json_stringify)({
+            ...decoded[0],
+            minDebt: decoded[0].minDebt.toString(),
+            maxDebt: decoded[0].maxDebt.toString(),
+            accountFactoryParams: {
+              postfix: (0, import_viem.hexToString)(accountFactoryParams.postfix).replace(
+                /\0/g,
+                ""
+              ),
+              salt: accountFactoryParams.salt,
+              // TODO: tmp solution, move AccountFactory decoding to plugins
+              constructorParams: {
+                addressProvider: (0, import_viem.decodeAbiParameters)(
+                  [{ type: "address" }],
+                  accountFactoryParams.constructorParams
+                )[0]
               }
-            })
-          }
+            }
+          })
         };
       }
       case "configurePriceOracle": {
@@ -620,25 +608,13 @@ class MarketConfiguratorContract extends import_index.BaseContract {
         const decoded = this.priceOracleFactory.decodeConfig(config);
         if (decoded) {
           return {
-            chainId: 0,
-            target: this.address,
-            label: this.name,
-            functionName,
-            args: {
-              pool,
-              data: (0, import_utils.json_stringify)(decoded)
-            }
+            pool,
+            data: (0, import_sdk.json_stringify)(decoded)
           };
         }
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            pool,
-            config
-          }
+          pool,
+          config
         };
       }
       case "configurePool": {
@@ -646,25 +622,13 @@ class MarketConfiguratorContract extends import_index.BaseContract {
         const decoded = this.poolFactory.decodeConfig(calldata);
         if (decoded) {
           return {
-            chainId: 0,
-            target: this.address,
-            label: this.name,
-            functionName,
-            args: {
-              pool,
-              data: (0, import_utils.json_stringify)(decoded)
-            }
+            pool,
+            data: (0, import_sdk.json_stringify)(decoded)
           };
         }
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            pool,
-            calldata
-          }
+          pool,
+          calldata
         };
       }
       case "configureCreditSuite": {
@@ -672,81 +636,45 @@ class MarketConfiguratorContract extends import_index.BaseContract {
         const decoded = this.creditFactory.decodeConfig(calldata);
         if (decoded) {
           return {
-            chainId: 0,
-            target: this.address,
-            label: this.name,
-            functionName,
-            args: {
-              creditManager,
-              data: (0, import_utils.json_stringify)(decoded)
-            }
+            creditManager,
+            data: (0, import_sdk.json_stringify)(decoded)
           };
         }
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            creditManager,
-            calldata
-          }
+          creditManager,
+          calldata
         };
       }
       case "updateInterestRateModel": {
         const [pool, deployParams] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            pool,
-            deployParams: (0, import_utils.json_stringify)(deployParams)
-          }
+          pool,
+          deployParams: (0, import_sdk.json_stringify)(deployParams)
         };
       }
       case "updateRateKeeper": {
         const [pool, deployParams] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            pool,
-            deployParams: (0, import_utils.json_stringify)(deployParams)
-          }
+          pool,
+          deployParams: (0, import_sdk.json_stringify)(deployParams)
         };
       }
       case "updateLossPolicy": {
         const [pool, deployParams] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            pool,
-            deployParams: (0, import_utils.json_stringify)(deployParams)
-          }
+          pool,
+          deployParams: (0, import_sdk.json_stringify)(deployParams)
         };
       }
       case "grantRole": {
         const [role, address] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            address,
-            role: (0, import_viem.hexToString)(role, { size: 32 })
-          }
+          address,
+          role: (0, import_viem.hexToString)(role, { size: 32 })
         };
       }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
   //

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

@@ -23,16 +23,13 @@ __export(price_feed_store_exports, {
 module.exports = __toCommonJS(price_feed_store_exports);
 var import_viem = require("viem");
 var import_iPriceFeedStore = require("../../abi/310/iPriceFeedStore.js");
-var import_utils = require("../../sdk/utils/index.js");
-var import_utils2 = require("../utils/index.js");
-var import_base_contract = require("./base-contract.js");
+var import_sdk = require("../../sdk/index.js");
+var import_utils = require("../utils/index.js");
 var import_pricefeeds = require("./pricefeeds/index.js");
 const abi = import_iPriceFeedStore.iPriceFeedStoreAbi;
-class PriceFeedStoreContract extends import_base_contract.BaseContract {
-  chainId;
-  constructor(address, client, chainId = 1) {
-    super(abi, address, client, "PriceFeedStore");
-    this.chainId = chainId;
+class PriceFeedStoreContract extends import_sdk.BaseContract {
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "PriceFeedStore" });
   }
   async getZeroPriceFeed() {
     const result = await this.contract.read.zeroPriceFeed();
@@ -126,7 +123,7 @@ class PriceFeedStoreContract extends import_base_contract.BaseContract {
   }
   getEIP712Domain(chainId) {
     return {
-      name: import_utils2.PRICE_FEED_STORE,
+      name: import_utils.PRICE_FEED_STORE,
       version: "310",
       chainId: chainId ?? this.chainId,
       verifyingContract: this.address
@@ -376,16 +373,10 @@ class PriceFeedStoreContract extends import_base_contract.BaseContract {
             });
           }
         }
-        return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName: params.functionName,
-          args: { calls: (0, import_utils.json_stringify)(calls) }
-        };
+        return { calls: (0, import_sdk.json_stringify)(calls) };
       }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
 }

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

@@ -23,11 +23,11 @@ __export(routing_manager_exports, {
 module.exports = __toCommonJS(routing_manager_exports);
 var import_viem = require("viem");
 var import_routingManager = require("../../../abi/router/routingManager.js");
-var import_base_contract = require("../base-contract.js");
+var import_sdk = require("../../../sdk/index.js");
 const abi = import_routingManager.routingManagerAbi;
-class RoutingManagerContract extends import_base_contract.BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "RoutingManager");
+class RoutingManagerContract extends import_sdk.BaseContract {
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "RoutingManager" });
   }
   parseFunctionParams(params) {
     const { functionName, args } = params;
@@ -35,20 +35,14 @@ class RoutingManagerContract extends import_base_contract.BaseContract {
       case "setAdapterToWorkerType": {
         const [adapterType, workerType] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            adapterType: (0, import_viem.hexToString)(adapterType, {
-              size: 32
-            }),
-            workerType: (0, import_viem.hexToString)(workerType, { size: 32 })
-          }
+          adapterType: (0, import_viem.hexToString)(adapterType, {
+            size: 32
+          }),
+          workerType: (0, import_viem.hexToString)(workerType, { size: 32 })
         };
       }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
 }