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

package/dist/cjs/dev/create2.js

@@ -31,7 +31,7 @@ var import_actions = require("viem/actions");
 var import_sdk = require("../sdk/index.js");
 const PUBLIC_CREATE2_FACTORY = "0x4e59b44847b379578588920ca78fbf26c0b4956c";
 const DEFAULT_CREATE2_SALT = "GEARBOX";
-class Create2Deployer extends import_sdk.SDKConstruct {
+class Create2Deployer extends import_sdk.Construct {
   #walletClient;
   #logger;
   constructor(sdk, walletClient) {

package/dist/cjs/dev/mint/AbstractMinter.js

@@ -27,13 +27,11 @@ var import_sdk = require("../../sdk/index.js");
 var import_abi = require("../abi.js");
 class AbstractMinter extends import_sdk.SDKConstruct {
   anvil;
-  logger;
   name;
-  constructor(sdk, anvil, name = "Minter") {
+  constructor(sdk, anvil) {
     super(sdk);
     this.anvil = anvil;
-    this.name = name;
-    this.logger = sdk.logger?.child?.({ name }) ?? sdk.logger;
+    this.name = this.constructor.name;
   }
   async tryMint(token, dest, amount) {
     const amnt = this.fmt(token, amount);

package/dist/cjs/dev/mint/DealMinter.js

@@ -33,9 +33,6 @@ __export(DealMinter_exports, {
 module.exports = __toCommonJS(DealMinter_exports);
 var import_AbstractMinter = __toESM(require("./AbstractMinter.js"));
 class DealMinter extends import_AbstractMinter.default {
-  constructor(sdk, anvil) {
-    super(sdk, anvil, "DealMinter");
-  }
   async mint(token, dest, amount) {
     const { deal } = await import("viem-deal").catch(() => ({ deal: null }));
     if (!deal) {

package/dist/cjs/dev/mint/DirectMinter.js

@@ -34,9 +34,6 @@ module.exports = __toCommonJS(DirectMinter_exports);
 var import_viem = require("viem");
 var import_AbstractMinter = __toESM(require("./AbstractMinter.js"));
 class DirectMinter extends import_AbstractMinter.default {
-  constructor(sdk, anvil) {
-    super(sdk, anvil, "DirectMinter");
-  }
   async mint(token, dest, amount) {
     const owner = await this.getOwner(token);
     const stopImpersonating = await this.impersonateWithBalance(owner);

package/dist/cjs/dev/mint/FallbackMinter.js

@@ -35,7 +35,7 @@ var import_AbstractMinter = __toESM(require("./AbstractMinter.js"));
 class FallbackMinter extends import_AbstractMinter.default {
   #minters;
   constructor(sdk, anvil, minters) {
-    super(sdk, anvil, "FallbackMinter");
+    super(sdk, anvil);
     this.#minters = minters;
   }
   async mint(token, dest, amount) {

package/dist/cjs/dev/mint/TransferMinter.js

@@ -35,9 +35,6 @@ var import_viem = require("viem");
 var import_iERC20 = require("../../abi/iERC20.js");
 var import_AbstractMinter = __toESM(require("./AbstractMinter.js"));
 class TransferMinter extends import_AbstractMinter.default {
-  constructor(sdk, anvil) {
-    super(sdk, anvil, "TransferMinter");
-  }
   async mint(token, dest, amount) {
     const owner = await this.getOwner(token);
     const stopImpersonating = await this.impersonateWithBalance(owner);

package/dist/cjs/permissionless/bindings/address-provider.js

@@ -22,12 +22,10 @@ __export(address_provider_exports, {
 });
 module.exports = __toCommonJS(address_provider_exports);
 var import_viem = require("viem");
-var import_generated = require("../../abi/310/generated.js");
-var import_base_contract = require("./base-contract.js");
-const abi = import_generated.iAddressProviderV310Abi;
-class AddressProviderContract extends import_base_contract.BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "AddressProvider");
+var import_sdk = require("../../sdk/index.js");
+class AddressProviderContract extends import_sdk.AddressProviderV310Contract {
+  constructor(addr, client) {
+    super({ client }, addr);
   }
   async getAddressOrRevert(key, version = 0n) {
     return await this.contract.read.getAddressOrRevert([

package/dist/cjs/permissionless/bindings/bytecode-repository.js

@@ -23,13 +23,13 @@ __export(bytecode_repository_exports, {
 module.exports = __toCommonJS(bytecode_repository_exports);
 var import_viem = require("viem");
 var import_iBytecodeRepository = require("../../abi/310/iBytecodeRepository.js");
+var import_sdk = require("../../sdk/index.js");
 var import_utils = require("../utils/index.js");
 var import_literals = require("../utils/literals.js");
-var import_base_contract = require("./base-contract.js");
 const abi = import_iBytecodeRepository.iBytecodeRepositoryAbi;
-class BytecodeRepositoryContract extends import_base_contract.BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "BytecodeRepository");
+class BytecodeRepositoryContract extends import_sdk.BaseContract {
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "BytecodeRepository" });
   }
   async getBytecodeByHash(hash) {
     return await this.contract.read.getBytecode([hash]);
@@ -206,69 +206,67 @@ class BytecodeRepositoryContract extends import_base_contract.BaseContract {
   }
   parseFunctionParams(params) {
     switch (params.functionName) {
+      // TODO: simple array -> map can be removed, since this is what super.parseFunctionParams does
       case "allowSystemContract": {
         const [bytecodeHash] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           bytecodeHash
-        });
+        };
       }
       case "addAuditor": {
         const [auditor, name] = params.args;
-        return this.wrapParseCall(params, {
-          auditor,
-          name
-        });
+        return { auditor, name };
       }
       case "removeAuditor": {
         const [auditor] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           auditor
-        });
+        };
       }
       case "addPublicDomain": {
         const [domain] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           domain: (0, import_viem.hexToString)(domain, { size: 32 })
-        });
+        };
       }
       case "removePublicContractType": {
         const [contractType] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           contractType: (0, import_viem.hexToString)(contractType, { size: 32 })
-        });
+        };
       }
       case "forbidInitCode": {
         const [bytecodeHash] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           bytecodeHash
-        });
+        };
       }
       case "setTokenSpecificPostfix": {
         const [token, postfix] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           token,
           postfix: (0, import_viem.hexToString)(postfix, { size: 32 })
-        });
+        };
       }
       case "uploadBytecode": {
         const [uploadData] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           contractType: (0, import_viem.hexToString)(uploadData.contractType, { size: 32 }),
           version: uploadData.version.toString(),
           initCode: uploadData.initCode,
           author: uploadData.author,
           source: uploadData.source,
           authorSignature: uploadData.authorSignature
-        });
+        };
       }
       case "submitAuditReport": {
         const [bytecodeHash, { auditor, reportUrl, signature }] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           bytecodeHash,
           auditor,
           reportUrl,
           signature
-        });
+        };
       }
       // TODO: add all functions here!
       // case "deployContract": {
@@ -289,7 +287,7 @@ class BytecodeRepositoryContract extends import_base_contract.BaseContract {
       //   });
       // }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
   async signBytecodeHash(bytecodeHash, auditor, reportUrl, signature, sponsor) {

package/dist/cjs/permissionless/bindings/compressors/token-compressor.js

@@ -23,11 +23,11 @@ __export(token_compressor_exports, {
 module.exports = __toCommonJS(token_compressor_exports);
 var import_viem = require("viem");
 var import_tokenCompressor = require("../../../abi/compressors/tokenCompressor.js");
-var import_base_contract = require("../base-contract.js");
+var import_sdk = require("../../../sdk/index.js");
 const abi = import_tokenCompressor.tokenCompressorAbi;
-class TokenCompressorContract extends import_base_contract.BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "TokenCompressor");
+class TokenCompressorContract extends import_sdk.BaseContract {
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "TokenCompressor" });
   }
   async getTokenInfo(token) {
     const result = await this.contract.read.getTokenInfo([token]);

package/dist/cjs/permissionless/bindings/compressors/withdrawal-compressor.js

@@ -23,11 +23,11 @@ __export(withdrawal_compressor_exports, {
 module.exports = __toCommonJS(withdrawal_compressor_exports);
 var import_viem = require("viem");
 var import_withdrawalCompressor = require("../../../abi/compressors/withdrawalCompressor.js");
-var import_base_contract = require("../base-contract.js");
+var import_sdk = require("../../../sdk/index.js");
 const abi = import_withdrawalCompressor.withdrawalCompressorAbi;
-class WithdrawalCompressorContract extends import_base_contract.BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "RoutingManager");
+class WithdrawalCompressorContract extends import_sdk.BaseContract {
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "WithdrawalCompressor" });
   }
   parseFunctionParams(params) {
     const { functionName, args } = params;
@@ -35,22 +35,16 @@ class WithdrawalCompressorContract extends import_base_contract.BaseContract {
       case "setWithdrawableTypeToCompressorType": {
         const [withdrawableType, compressorType] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            withdrawableType: (0, import_viem.hexToString)(withdrawableType, {
-              size: 32
-            }),
-            compressorType: (0, import_viem.hexToString)(compressorType, {
-              size: 32
-            })
-          }
+          withdrawableType: (0, import_viem.hexToString)(withdrawableType, {
+            size: 32
+          }),
+          compressorType: (0, import_viem.hexToString)(compressorType, {
+            size: 32
+          })
         };
       }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
 }

package/dist/cjs/permissionless/bindings/cross-chain-multisig.js

@@ -23,17 +23,16 @@ __export(cross_chain_multisig_exports, {
 module.exports = __toCommonJS(cross_chain_multisig_exports);
 var import_viem = require("viem");
 var import_crossChainMultisig = require("../../abi/310/crossChainMultisig.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_utils2 = require("../utils/index.js");
+var import_utils = require("../utils/index.js");
 var import_literals = require("../utils/literals.js");
-var import_base_contract = require("./base-contract.js");
 var import_instance_manager = require("./instance-manager.js");
 var import_market_configurator_factory = require("./market-configurator-factory.js");
 const abi = import_crossChainMultisig.crossChainMultisigAbi;
-class CrossChainMultisigContract extends import_base_contract.BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "CrossChainMultisig");
+class CrossChainMultisigContract extends import_sdk.BaseContract {
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "CrossChainMultisig" });
   }
   async getExecutedBatches(fromBlock, toBlock) {
     const events = await this.getEvents("ExecuteBatch", fromBlock, toBlock);
@@ -84,7 +83,9 @@ class CrossChainMultisigContract extends import_base_contract.BaseContract {
       transactionHash,
       blockNumber,
       hash: proposalHash,
-      parsedCalls: calls.map((c) => import_base_contract.BaseContract.parseCall(c)),
+      parsedCalls: calls.map(
+        (c) => this.register.parseFunctionData(c.target, c.callData)
+      ),
       signatures
     };
   }
@@ -142,7 +143,7 @@ class CrossChainMultisigContract extends import_base_contract.BaseContract {
   //   };
   // }
   async signBatch(batchHash, signature, sponsor) {
-    const normalizedSignature = (0, import_utils2.normalizeSignature)(signature);
+    const normalizedSignature = (0, import_utils.normalizeSignature)(signature);
     const hash = await this.contract.write.signBatch(
       [batchHash, normalizedSignature],
       {
@@ -154,7 +155,7 @@ class CrossChainMultisigContract extends import_base_contract.BaseContract {
   }
   async enableRecovery(recovery, sponsor) {
     const signatures = recovery.signatures.map(
-      (s) => (0, import_utils2.normalizeSignature)(s.signature)
+      (s) => (0, import_utils.normalizeSignature)(s.signature)
     );
     return await this.contract.write.enableRecoveryMode(
       [
@@ -176,7 +177,7 @@ class CrossChainMultisigContract extends import_base_contract.BaseContract {
   async getSigners() {
     return [...await this.contract.read.getSigners()];
   }
-  decodeFunctionData(target, calldata) {
+  #decodeFunctionData(target, calldata) {
     switch (target.toLowerCase()) {
       case this.address.toLowerCase(): {
         return this.parseFunctionData(calldata);
@@ -206,42 +207,42 @@ class CrossChainMultisigContract extends import_base_contract.BaseContract {
     switch (params.functionName) {
       case "addSigner": {
         const [signer] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           signer
-        });
+        };
       }
       case "removeSigner": {
         const [signer] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           signer
-        });
+        };
       }
       case "setConfirmationThreshold": {
         const [threshold] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           threshold: threshold.toString()
-        });
+        };
       }
       case "submitBatch": {
         const [name, calls, prevHash] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           name,
-          calls: (0, import_utils.json_stringify)(
+          calls: (0, import_sdk.json_stringify)(
             calls.map(({ chainId, target, callData }) => ({
-              ...this.decodeFunctionData(target, callData),
+              ...this.#decodeFunctionData(target, callData),
               chainId: Number(chainId),
               target
             }))
           ),
           prevHash
-        });
+        };
       }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
   async validateProposalSignature(proposalHash, signature) {
-    const normalizedSignature = (0, import_utils2.normalizeSignature)(signature);
+    const normalizedSignature = (0, import_utils.normalizeSignature)(signature);
     const proposal = await this.getBatchData({ proposalHash });
     const currentPrevHash = await this.contract.read.lastBatchHash();
     if (proposal.prevHash !== currentPrevHash) {

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

@@ -21,8 +21,9 @@ __export(abstract_factory_exports, {
   AbstractFactory: () => AbstractFactory
 });
 module.exports = __toCommonJS(abstract_factory_exports);
+var import_viem = require("viem");
+var import_sdk = require("../../../sdk/index.js");
 var import_raw_tx = require("../../core/raw-tx.js");
-var import_abi_decoder = require("../../utils/abi-decoder.js");
 class AbstractFactory {
   abi;
   constructor(abi) {
@@ -38,11 +39,13 @@ class AbstractFactory {
    * @returns Decoded function name and arguments, or null if decoding fails
    */
   decodeConfig(calldata) {
-    const decoded = (0, import_abi_decoder.decodeFunctionWithNamedArgs)(this.abi, calldata);
-    if (!decoded) return null;
+    const decoded = (0, import_viem.decodeFunctionData)({
+      abi: this.abi,
+      data: calldata
+    });
     return {
       functionName: decoded.functionName,
-      args: decoded.args
+      args: (0, import_sdk.functionArgsToMap)(this.abi, decoded.functionName, decoded.args)
     };
   }
 }

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

@@ -22,11 +22,11 @@ __export(batches_chain_exports, {
 });
 module.exports = __toCommonJS(batches_chain_exports);
 var import_batchesChain = require("../../../abi/governance/batchesChain.js");
-var import_base_contract = require("../base-contract.js");
+var import_sdk = require("../../../sdk/index.js");
 const abi = import_batchesChain.batchesChainAbi;
-class BatchesChainContract extends import_base_contract.BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "BatchesChain");
+class BatchesChainContract extends import_sdk.BaseContract {
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "BatchesChain" });
   }
   createBatchOrderingTx(prevHash) {
     return this.createRawTx({

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

@@ -24,17 +24,16 @@ 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_utils2 = require("../../../sdk/utils/index.js");
-var import_utils3 = require("../../utils/index.js");
-var import_base_contract = require("../base-contract.js");
+var import_sdk = require("../../../sdk/index.js");
+var import_utils2 = require("../../utils/index.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_base_contract.BaseContract {
+class GovernorContract extends import_sdk.BaseContract {
   batchesChainContract;
-  constructor(address, client) {
-    super(abi, address, client, "Governor");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "Governor" });
     this.batchesChainContract = new import_batches_chain.BatchesChainContract(
       "0x59b2fd348e4Ade84ffEfDaf5fcdDa7276c8C5041",
       client
@@ -139,7 +138,7 @@ class GovernorContract extends import_base_contract.BaseContract {
       ).join("\n")})`
     });
   }
-  decodeFunctionData(target, calldata) {
+  #decodeFunctionData(target, calldata) {
     switch (target.toLowerCase()) {
       case this.address.toLowerCase(): {
         return this.parseFunctionData(calldata);
@@ -178,62 +177,44 @@ class GovernorContract extends import_base_contract.BaseContract {
       case "startBatch": {
         const [eta] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            eta: (0, import_utils3.formatTimestamp)(Number(eta))
-          }
+          eta: (0, import_utils2.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 {
-          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))
-          }
+          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))
         };
       }
       case "executeBatch": {
         const [txs] = args;
         return {
-          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))
-                };
-              })
-            )
-          }
+          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))
+              };
+            })
+          )
         };
       }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
 }

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_base_contract = require("../base-contract.js");
-class TimeLockContract extends import_base_contract.BaseContract {
-  constructor(address, client) {
-    super(import_iTimeLock.iTimeLockAbi, address, client, "TimeLock");
+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" });
   }
   async admin() {
     const admin = await this.client.readContract({

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

@@ -16,7 +16,6 @@ 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);
@@ -32,7 +31,6 @@ __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"),