@gearbox-protocol/sdk 11.11.3 → 12.0.0-next.1

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

@@ -1,8 +1,5 @@
 import AbstractMinter from "./AbstractMinter.js";
 class DealMinter extends AbstractMinter {
-  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/esm/dev/mint/DirectMinter.js

@@ -1,9 +1,6 @@
 import { parseAbi } from "viem";
 import AbstractMinter from "./AbstractMinter.js";
 class DirectMinter extends AbstractMinter {
-  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/esm/dev/mint/FallbackMinter.js

@@ -2,7 +2,7 @@ import AbstractMinter from "./AbstractMinter.js";
 class FallbackMinter extends AbstractMinter {
   #minters;
   constructor(sdk, anvil, minters) {
-    super(sdk, anvil, "FallbackMinter");
+    super(sdk, anvil);
     this.#minters = minters;
   }
   async mint(token, dest, amount) {

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

@@ -2,9 +2,6 @@ import { parseAbi } from "viem";
 import { ierc20Abi } from "../../abi/iERC20.js";
 import AbstractMinter from "./AbstractMinter.js";
 class TransferMinter extends AbstractMinter {
-  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/esm/permissionless/bindings/address-provider.js

@@ -1,10 +1,10 @@
-import { stringToHex } from "viem";
-import { iAddressProviderV310Abi } from "../../abi/310/generated.js";
-import { BaseContract } from "./base-contract.js";
-const abi = iAddressProviderV310Abi;
-class AddressProviderContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "AddressProvider");
+import {
+  stringToHex
+} from "viem";
+import { AddressProviderV310Contract } from "../../sdk/index.js";
+class AddressProviderContract extends AddressProviderV310Contract {
+  constructor(addr, client) {
+    super({ client }, addr);
   }
   async getAddressOrRevert(key, version = 0n) {
     return await this.contract.read.getAddressOrRevert([

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

@@ -6,13 +6,13 @@ import {
   stringToHex
 } from "viem";
 import { iBytecodeRepositoryAbi } from "../../abi/310/iBytecodeRepository.js";
+import { BaseContract } from "../../sdk/index.js";
 import { normalizeSignature } from "../utils/index.js";
 import { BYTECODE_REPOSITORY } from "../utils/literals.js";
-import { BaseContract } from "./base-contract.js";
 const abi = iBytecodeRepositoryAbi;
 class BytecodeRepositoryContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "BytecodeRepository");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "BytecodeRepository" });
   }
   async getBytecodeByHash(hash) {
     return await this.contract.read.getBytecode([hash]);
@@ -189,69 +189,67 @@ class BytecodeRepositoryContract extends 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: hexToString(domain, { size: 32 })
-        });
+        };
       }
       case "removePublicContractType": {
         const [contractType] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           contractType: 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: hexToString(postfix, { size: 32 })
-        });
+        };
       }
       case "uploadBytecode": {
         const [uploadData] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           contractType: 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": {
@@ -272,7 +270,7 @@ class BytecodeRepositoryContract extends BaseContract {
       //   });
       // }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
   async signBytecodeHash(bytecodeHash, auditor, reportUrl, signature, sponsor) {

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

@@ -3,11 +3,11 @@ import {
   parseAbi
 } from "viem";
 import { tokenCompressorAbi } from "../../../abi/compressors/tokenCompressor.js";
-import { BaseContract } from "../base-contract.js";
+import { BaseContract } from "../../../sdk/index.js";
 const abi = tokenCompressorAbi;
 class TokenCompressorContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "TokenCompressor");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "TokenCompressor" });
   }
   async getTokenInfo(token) {
     const result = await this.contract.read.getTokenInfo([token]);

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

@@ -2,11 +2,11 @@ import {
   hexToString
 } from "viem";
 import { withdrawalCompressorAbi } from "../../../abi/compressors/withdrawalCompressor.js";
-import { BaseContract } from "../base-contract.js";
+import { BaseContract } from "../../../sdk/index.js";
 const abi = withdrawalCompressorAbi;
 class WithdrawalCompressorContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "RoutingManager");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "WithdrawalCompressor" });
   }
   parseFunctionParams(params) {
     const { functionName, args } = params;
@@ -14,22 +14,16 @@ class WithdrawalCompressorContract extends BaseContract {
       case "setWithdrawableTypeToCompressorType": {
         const [withdrawableType, compressorType] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            withdrawableType: hexToString(withdrawableType, {
-              size: 32
-            }),
-            compressorType: hexToString(compressorType, {
-              size: 32
-            })
-          }
+          withdrawableType: hexToString(withdrawableType, {
+            size: 32
+          }),
+          compressorType: hexToString(compressorType, {
+            size: 32
+          })
         };
       }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
 }

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

@@ -5,17 +5,19 @@ import {
   zeroAddress
 } from "viem";
 import { crossChainMultisigAbi } from "../../abi/310/crossChainMultisig.js";
-import { json_stringify } from "../../sdk/utils/index.js";
+import {
+  BaseContract,
+  json_stringify
+} from "../../sdk/index.js";
 import { Addresses } from "../deployment/addresses.js";
 import { normalizeSignature } from "../utils/index.js";
 import { CROSS_CHAIN_MULTISIG } from "../utils/literals.js";
-import { BaseContract } from "./base-contract.js";
 import { InstanceManagerContract } from "./instance-manager.js";
 import { MarketConfiguratorFactoryContract } from "./market-configurator-factory.js";
 const abi = crossChainMultisigAbi;
 class CrossChainMultisigContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "CrossChainMultisig");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "CrossChainMultisig" });
   }
   async getExecutedBatches(fromBlock, toBlock) {
     const events = await this.getEvents("ExecuteBatch", fromBlock, toBlock);
@@ -66,7 +68,9 @@ class CrossChainMultisigContract extends BaseContract {
       transactionHash,
       blockNumber,
       hash: proposalHash,
-      parsedCalls: calls.map((c) => BaseContract.parseCall(c)),
+      parsedCalls: calls.map(
+        (c) => this.register.parseFunctionData(c.target, c.callData)
+      ),
       signatures
     };
   }
@@ -158,7 +162,7 @@ class CrossChainMultisigContract extends 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);
@@ -188,38 +192,38 @@ class CrossChainMultisigContract extends 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: 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) {

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

@@ -1,5 +1,8 @@
+import {
+  decodeFunctionData
+} from "viem";
+import { functionArgsToMap } from "../../../sdk/index.js";
 import { createCallData } from "../../core/raw-tx.js";
-import { decodeFunctionWithNamedArgs } from "../../utils/abi-decoder.js";
 class AbstractFactory {
   abi;
   constructor(abi) {
@@ -15,11 +18,13 @@ class AbstractFactory {
    * @returns Decoded function name and arguments, or null if decoding fails
    */
   decodeConfig(calldata) {
-    const decoded = decodeFunctionWithNamedArgs(this.abi, calldata);
-    if (!decoded) return null;
+    const decoded = decodeFunctionData({
+      abi: this.abi,
+      data: calldata
+    });
     return {
       functionName: decoded.functionName,
-      args: decoded.args
+      args: functionArgsToMap(this.abi, decoded.functionName, decoded.args)
     };
   }
 }

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

@@ -1,9 +1,9 @@
 import { batchesChainAbi } from "../../../abi/governance/batchesChain.js";
-import { BaseContract } from "../base-contract.js";
+import { BaseContract } from "../../../sdk/index.js";
 const abi = batchesChainAbi;
 class BatchesChainContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "BatchesChain");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "BatchesChain" });
   }
   createBatchOrderingTx(prevHash) {
     return this.createRawTx({

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

@@ -6,17 +6,16 @@ import {
 } from "viem";
 import { formatAbiItem } from "viem/utils";
 import { governorAbi } from "../../../abi/governance/governor.js";
-import { json_stringify } from "../../../sdk/utils/index.js";
+import { BaseContract, json_stringify } from "../../../sdk/index.js";
 import { formatTimestamp } from "../../utils/index.js";
-import { BaseContract } from "../base-contract.js";
 import { MarketConfiguratorContract } from "../market-configurator.js";
 import { TreasurySplitterContract } from "../treasury-splitter.js";
 import { BatchesChainContract } from "./batches-chain.js";
 const abi = governorAbi;
 class GovernorContract extends BaseContract {
   batchesChainContract;
-  constructor(address, client) {
-    super(abi, address, client, "Governor");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "Governor" });
     this.batchesChainContract = new BatchesChainContract(
       "0x59b2fd348e4Ade84ffEfDaf5fcdDa7276c8C5041",
       client
@@ -121,7 +120,7 @@ class GovernorContract extends BaseContract {
       ).join("\n")})`
     });
   }
-  decodeFunctionData(target, calldata) {
+  #decodeFunctionData(target, calldata) {
     switch (target.toLowerCase()) {
       case this.address.toLowerCase(): {
         return this.parseFunctionData(calldata);
@@ -160,62 +159,44 @@ class GovernorContract extends BaseContract {
       case "startBatch": {
         const [eta] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            eta: formatTimestamp(Number(eta))
-          }
+          eta: formatTimestamp(Number(eta))
         };
       }
       case "queueTransaction": {
         const [target, value, signature, data, eta] = args;
         const calldata = keccak256(toBytes(signature)).slice(0, 10) + data.slice(2);
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            target,
-            value: formatEther(value),
-            signature,
-            data: json_stringify(
-              this.decodeFunctionData(target, calldata)?.args ?? calldata
-            ),
-            eta: formatTimestamp(Number(eta))
-          }
+          target,
+          value: formatEther(value),
+          signature,
+          data: json_stringify(
+            this.#decodeFunctionData(target, calldata)?.args ?? calldata
+          ),
+          eta: formatTimestamp(Number(eta))
         };
       }
       case "executeBatch": {
         const [txs] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            txs: json_stringify(
-              txs.map((tx) => {
-                const { target, value, signature, data, eta } = tx;
-                const calldata = keccak256(toBytes(signature)).slice(0, 10) + data.slice(2);
-                return {
-                  target,
-                  value: formatEther(value),
-                  signature,
-                  data: json_stringify(
-                    this.decodeFunctionData(target, calldata)?.args ?? calldata
-                  ),
-                  eta: formatTimestamp(Number(eta))
-                };
-              })
-            )
-          }
+          txs: json_stringify(
+            txs.map((tx) => {
+              const { target, value, signature, data, eta } = tx;
+              const calldata = keccak256(toBytes(signature)).slice(0, 10) + data.slice(2);
+              return {
+                target,
+                value: formatEther(value),
+                signature,
+                data: json_stringify(
+                  this.#decodeFunctionData(target, calldata)?.args ?? calldata
+                ),
+                eta: formatTimestamp(Number(eta))
+              };
+            })
+          )
         };
       }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
 }

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

@@ -1,8 +1,8 @@
 import { iTimeLockAbi } from "../../../abi/governance/iTimeLock.js";
-import { BaseContract } from "../base-contract.js";
+import { BaseContract } from "../../../sdk/index.js";
 class TimeLockContract extends BaseContract {
-  constructor(address, client) {
-    super(iTimeLockAbi, address, client, "TimeLock");
+  constructor(addr, client) {
+    super({ client }, { abi: iTimeLockAbi, addr, name: "TimeLock" });
   }
   async admin() {
     const admin = await this.client.readContract({

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

@@ -1,5 +1,4 @@
 export * from "./address-provider.js";
-export * from "./base-contract.js";
 export * from "./bytecode-repository.js";
 export * from "./compressors/index.js";
 export * from "./cross-chain-multisig.js";