@gearbox-protocol/sdk 11.11.0-next.2 → 11.11.1

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",

package/dist/esm/permissionless/utils/abi-decoder.js

@@ -0,0 +1,50 @@
+import {
+  decodeFunctionData
+} from "viem";
+import { json_stringify } from "../../sdk/utils/index.js";
+function decodeFunctionWithNamedArgs(abi, calldata) {
+  try {
+    const decoded = decodeFunctionData({
+      abi,
+      data: calldata
+    });
+    const abiItem = abi.find(
+      (item) => item?.name === decoded.functionName && item?.type === "function"
+    );
+    if (!abiItem) {
+      return {
+        functionName: decoded.functionName,
+        args: {},
+        originalDecoded: decoded
+      };
+    }
+    const namedArgs = {};
+    if (Array.isArray(decoded.args)) {
+      decoded.args.forEach((value, i) => {
+        const input = abiItem.inputs?.[i];
+        if (input?.name) {
+          namedArgs[input.name] = input.type.startsWith("tuple") ? json_stringify(value) : String(value);
+        }
+      });
+    } else {
+      Object.entries(decoded.args || {}).forEach(([key, value]) => {
+        const index = parseInt(key, 10);
+        if (!Number.isNaN(index) && abiItem.inputs?.[index]?.name) {
+          namedArgs[abiItem.inputs[index].name] = String(value);
+        } else {
+          namedArgs[key] = String(value);
+        }
+      });
+    }
+    return {
+      functionName: decoded.functionName,
+      args: namedArgs,
+      originalDecoded: decoded
+    };
+  } catch {
+    return null;
+  }
+}
+export {
+  decodeFunctionWithNamedArgs
+};

package/dist/esm/permissionless/utils/format.js

@@ -1,4 +1,4 @@
-import { json_parse } from "../../sdk/index.js";
+import { json_parse } from "../../sdk/utils/index.js";
 function formatBytecodeSize(size) {
   return `${(size / 1024).toFixed(2)} KB`;
 }

package/dist/esm/permissionless/utils/governance/timelock-txs.js

@@ -1,5 +1,5 @@
 import { governorAbi } from "../../../abi/governance/governor.js";
-import { createRawTx } from "../../../sdk/index.js";
+import { createRawTx } from "../../../sdk/utils/index.js";
 import { convertRawTxToSafeMultisigTx } from "./batch.js";
 function convertQueueBatchToExecuteTx(queueBatch) {
   const executionBatch = queueBatch.filter((tx) => tx.contractMethod.name === "queueTransaction").map((tx) => ({

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

@@ -1,3 +1,4 @@
+export * from "./abi-decoder.js";
 export * from "./abi-encoder.js";
 export * from "./block-utils.js";
 export * from "./create2.js";

package/dist/esm/permissionless/utils/price-update/get-price-feeds.js

@@ -1,7 +1,5 @@
-import {
-  AP_PRICE_FEED_COMPRESSOR,
-  GearboxSDK
-} from "../../../sdk/index.js";
+import { AP_PRICE_FEED_COMPRESSOR } from "../../../sdk/constants/index.js";
+import { GearboxSDK } from "../../../sdk/index.js";
 import { AddressProviderContract } from "../../bindings/index.js";
 import { Addresses } from "../../deployment/addresses.js";
 import { deepJsonParse } from "../format.js";

package/dist/esm/permissionless/utils/price-update/get-price-update-tx.js

@@ -4,9 +4,9 @@ import {
   parseAbi
 } from "viem";
 import {
-  createRawTx,
   GearboxSDK
 } from "../../../sdk/index.js";
+import { createRawTx } from "../../../sdk/utils/index.js";
 import {
   PriceFeedStoreContract
 } from "../../bindings/index.js";

package/dist/esm/permissionless/utils/price-update/get-prices.js

@@ -1,7 +1,8 @@
 import {
   multicall3Abi
 } from "viem";
-import { GearboxSDK, simulateMulticall } from "../../../sdk/index.js";
+import { GearboxSDK } from "../../../sdk/index.js";
+import { simulateMulticall } from "../../../sdk/utils/viem/index.js";
 const latestRoundDataAbi = [
   {
     inputs: [],

package/dist/esm/permissionless/utils/price-update/get-updatable-feeds.js

@@ -1,10 +1,10 @@
 import { getContract } from "viem";
 import { priceFeedCompressorAbi } from "../../../abi/compressors/priceFeedCompressor.js";
 import {
-  bytes32ToString,
   PythPriceFeed,
   RedstonePriceFeedContract
 } from "../../../sdk/index.js";
+import { bytes32ToString } from "../../../sdk/utils/index.js";
 async function getUpdatablePriceFeeds(args) {
   const { sdk, client, pfCompressor, priceFeeds } = args;
   const priceFeedCompressor = getContract({

package/dist/esm/plugins/adapters/contracts/AbstractAdapter.js

@@ -1,9 +1,9 @@
 import { BaseContract } from "../../../sdk/index.js";
 class AbstractAdapterContract extends BaseContract {
   targetContract;
-  constructor(options, args) {
+  constructor(sdk, args) {
     const { baseParams, targetContract, ...rest } = args;
-    super(options, { ...rest, ...baseParams });
+    super(sdk, { ...rest, ...baseParams });
     this.targetContract = targetContract;
   }
   get adapterType() {

package/dist/esm/plugins/adapters/contracts/AccountMigratorAdapterContract.js

@@ -2,8 +2,8 @@ import { accountMigratorAbi } from "../../../abi/AccountMigrator.js";
 import { AbstractAdapterContract } from "./AbstractAdapter.js";
 const abi = accountMigratorAbi;
 class AccountMigratorAdapterContract extends AbstractAdapterContract {
-  constructor(options, args) {
-    super(options, { ...args, abi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi });
   }
 }
 export {

package/dist/esm/plugins/adapters/contracts/BalancerV2VaultAdapterContract.js

@@ -5,8 +5,8 @@ const abi = iBalancerV2VaultAdapterAbi;
 class BalancerV2VaultAdapterContract extends AbstractAdapterContract {
   supportedPoolIds;
   poolStatuses;
-  constructor(options, args) {
-    super(options, { ...args, abi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi });
     const decoded = decodeAbiParameters(
       [
         { type: "address", name: "creditManager" },

package/dist/esm/plugins/adapters/contracts/BalancerV3RouterAdapterContract.js

@@ -4,8 +4,8 @@ import { AbstractAdapterContract } from "./AbstractAdapter.js";
 const abi = iBalancerV3RouterAdapterAbi;
 class BalancerV3RouterAdapterContract extends AbstractAdapterContract {
   allowedPools;
-  constructor(options, args) {
-    super(options, { ...args, abi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi });
     const version = Number(args.baseParams.version);
     if (version === 310) {
       const decoded = decodeAbiParameters(

package/dist/esm/plugins/adapters/contracts/BalancerV3WrapperAdapterContract.js

@@ -4,8 +4,8 @@ import { AbstractAdapterContract } from "./AbstractAdapter.js";
 const abi = iBalancerV3WrapperAdapterAbi;
 class BalancerV3WrapperAdapterContract extends AbstractAdapterContract {
   balancerPoolToken;
-  constructor(options, args) {
-    super(options, { ...args, abi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi });
     const decoded = decodeAbiParameters(
       [
         { type: "address", name: "creditManager" },

package/dist/esm/plugins/adapters/contracts/CamelotV3AdapterContract.js

@@ -4,8 +4,8 @@ import { AbstractAdapterContract } from "./AbstractAdapter.js";
 const abi = iCamelotV3AdapterAbi;
 class CamelotV3AdapterContract extends AbstractAdapterContract {
   supportedPools;
-  constructor(options, args) {
-    super(options, { ...args, abi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi });
     const decoded = decodeAbiParameters(
       [
         { type: "address", name: "creditManager" },

package/dist/esm/plugins/adapters/contracts/ConvexV1BaseRewardPoolAdapterContract.js

@@ -7,8 +7,8 @@ class ConvexV1BaseRewardPoolAdapterContract extends AbstractAdapterContract {
   stakingToken;
   stakedPhantomToken;
   extraRewards;
-  constructor(options, args) {
-    super(options, { ...args, abi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi });
     const decoded = decodeAbiParameters(
       [
         { type: "address", name: "creditManager" },