@gearbox-protocol/sdk 12.9.0-txparser.1 → 12.9.0-txparser.3

package/dist/cjs/history/extractTransfers.js

@@ -75,7 +75,9 @@ function extractTransfers(logs, creditAccount, pool, creditFacade) {
     if ((0, import_viem.isAddressEqual)(from, pool) && (0, import_viem.isAddressEqual)(to, creditAccount) || (0, import_viem.isAddressEqual)(from, creditAccount) && (0, import_viem.isAddressEqual)(to, pool)) {
       continue;
     }
-    currentEntries.push({ token, amount: value, from, to });
+    if ((0, import_viem.isAddressEqual)(from, creditAccount) || (0, import_viem.isAddressEqual)(to, creditAccount)) {
+      currentEntries.push({ token, amount: value, from, to });
+    }
     if ((0, import_viem.isAddressEqual)(to, creditAccount) && !isInRange(log.logIndex, ranges)) {
       directTransfers.push({ token, from, amount: value });
     }

package/dist/cjs/history/index.js

@@ -23,16 +23,16 @@ __export(history_exports, {
   toLegacyOperations: () => import_toLegacyOperation.toLegacyOperations
 });
 module.exports = __toCommonJS(history_exports);
-__reExport(history_exports, require("./ContractRegister.js"), module.exports);
 __reExport(history_exports, require("./inner-operations.js"), module.exports);
 var import_parseCreditAccountTransaction = require("./parseCreditAccountTransaction.js");
+__reExport(history_exports, require("./populateContractsRegister.js"), module.exports);
 var import_toLegacyOperation = require("./toLegacyOperation.js");
 __reExport(history_exports, require("./types.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   parseCreditAccountTransaction,
   toLegacyOperations,
-  ...require("./ContractRegister.js"),
   ...require("./inner-operations.js"),
+  ...require("./populateContractsRegister.js"),
   ...require("./types.js")
 });

package/dist/cjs/history/populateContractsRegister.js

@@ -0,0 +1,68 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var populateContractsRegister_exports = {};
+__export(populateContractsRegister_exports, {
+  populateContractsRegister: () => populateContractsRegister
+});
+module.exports = __toCommonJS(populateContractsRegister_exports);
+var import_viem = require("viem");
+var import_createAdapter = require("../plugins/adapters/createAdapter.js");
+var import_sdk = require("../sdk/index.js");
+function populateContractsRegister(options) {
+  const { client, deployments, tokens, logger, strict } = options;
+  const register = import_sdk.ChainContractsRegister.for(client, logger);
+  for (const d of deployments) {
+    let contractType;
+    if ("contractType" in d) {
+      contractType = (0, import_viem.isHex)(d.contractType) ? (0, import_sdk.bytes32ToString)(d.contractType) : d.contractType;
+    } else {
+      contractType = [d.contractTypePrefix, d.contractTypeSuffix].filter(Boolean).join("::");
+    }
+    if (contractType === "CREDIT_FACADE" && (0, import_sdk.isV310)(d.version)) {
+      new import_sdk.CreditFacadeV310BaseContract(
+        { client: register.client, logger },
+        { addr: d.address, version: d.version, contractType }
+      );
+    } else if (contractType.startsWith("ADAPTER::")) {
+      (0, import_createAdapter.createAdapter)(
+        {
+          client: register.client,
+          logger
+        },
+        {
+          baseParams: {
+            addr: d.address,
+            version: d.version,
+            contractType
+          }
+        },
+        strict
+      );
+    }
+  }
+  const tMetas = tokens instanceof import_sdk.TokensMeta ? tokens.values() : tokens;
+  for (const t of tMetas) {
+    register.tokensMeta.upsert(t.addr, t);
+  }
+  return register;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  populateContractsRegister
+});

package/dist/cjs/plugins/adapters/createAdapter.js

@@ -21,6 +21,7 @@ __export(createAdapter_exports, {
   createAdapter: () => createAdapter
 });
 module.exports = __toCommonJS(createAdapter_exports);
+var import_viem = require("viem");
 var import_sdk = require("../../sdk/index.js");
 var import_AccountMigratorAdapterContract = require("./contracts/AccountMigratorAdapterContract.js");
 var import_InfinifiGatewayAdapterContract = require("./contracts/InfinifiGatewayAdapterContract.js");
@@ -28,9 +29,8 @@ var import_InfinifiUnwindingGatewayAdapterContract = require("./contracts/Infini
 var import_contracts = require("./contracts/index.js");
 var import_UniswapV4AdapterContract = require("./contracts/UniswapV4AdapterContract.js");
 function createAdapter(options, data, strict) {
-  const adapterType = (0, import_sdk.bytes32ToString)(
-    data.baseParams.contractType
-  );
+  const contractType = data.baseParams.contractType;
+  const adapterType = (0, import_viem.isHex)(contractType) ? (0, import_sdk.bytes32ToString)(contractType) : contractType;
   switch (adapterType) {
     case "ADAPTER::ACCOUNT_MIGRATOR":
       return new import_AccountMigratorAdapterContract.AccountMigratorAdapterContract(options, data);

package/dist/esm/history/extractTransfers.js

@@ -56,7 +56,9 @@ function extractTransfers(logs, creditAccount, pool, creditFacade) {
     if (isAddressEqual(from, pool) && isAddressEqual(to, creditAccount) || isAddressEqual(from, creditAccount) && isAddressEqual(to, pool)) {
       continue;
     }
-    currentEntries.push({ token, amount: value, from, to });
+    if (isAddressEqual(from, creditAccount) || isAddressEqual(to, creditAccount)) {
+      currentEntries.push({ token, amount: value, from, to });
+    }
     if (isAddressEqual(to, creditAccount) && !isInRange(log.logIndex, ranges)) {
       directTransfers.push({ token, from, amount: value });
     }

package/dist/esm/history/index.js

@@ -1,6 +1,6 @@
-export * from "./ContractRegister.js";
 export * from "./inner-operations.js";
 import { parseCreditAccountTransaction } from "./parseCreditAccountTransaction.js";
+export * from "./populateContractsRegister.js";
 import { toLegacyOperations } from "./toLegacyOperation.js";
 export * from "./types.js";
 export {

package/dist/esm/history/populateContractsRegister.js

@@ -0,0 +1,52 @@
+import {
+  isHex
+} from "viem";
+import { createAdapter } from "../plugins/adapters/createAdapter.js";
+import {
+  bytes32ToString,
+  ChainContractsRegister,
+  CreditFacadeV310BaseContract,
+  isV310,
+  TokensMeta
+} from "../sdk/index.js";
+function populateContractsRegister(options) {
+  const { client, deployments, tokens, logger, strict } = options;
+  const register = ChainContractsRegister.for(client, logger);
+  for (const d of deployments) {
+    let contractType;
+    if ("contractType" in d) {
+      contractType = isHex(d.contractType) ? bytes32ToString(d.contractType) : d.contractType;
+    } else {
+      contractType = [d.contractTypePrefix, d.contractTypeSuffix].filter(Boolean).join("::");
+    }
+    if (contractType === "CREDIT_FACADE" && isV310(d.version)) {
+      new CreditFacadeV310BaseContract(
+        { client: register.client, logger },
+        { addr: d.address, version: d.version, contractType }
+      );
+    } else if (contractType.startsWith("ADAPTER::")) {
+      createAdapter(
+        {
+          client: register.client,
+          logger
+        },
+        {
+          baseParams: {
+            addr: d.address,
+            version: d.version,
+            contractType
+          }
+        },
+        strict
+      );
+    }
+  }
+  const tMetas = tokens instanceof TokensMeta ? tokens.values() : tokens;
+  for (const t of tMetas) {
+    register.tokensMeta.upsert(t.addr, t);
+  }
+  return register;
+}
+export {
+  populateContractsRegister
+};

package/dist/esm/plugins/adapters/createAdapter.js

@@ -1,3 +1,4 @@
+import { isHex } from "viem";
 import { bytes32ToString } from "../../sdk/index.js";
 import { AccountMigratorAdapterContract } from "./contracts/AccountMigratorAdapterContract.js";
 import { InfinifiGatewayAdapterContract } from "./contracts/InfinifiGatewayAdapterContract.js";
@@ -47,9 +48,8 @@ import {
 } from "./contracts/index.js";
 import { UniswapV4AdapterContract } from "./contracts/UniswapV4AdapterContract.js";
 function createAdapter(options, data, strict) {
-  const adapterType = bytes32ToString(
-    data.baseParams.contractType
-  );
+  const contractType = data.baseParams.contractType;
+  const adapterType = isHex(contractType) ? bytes32ToString(contractType) : contractType;
   switch (adapterType) {
     case "ADAPTER::ACCOUNT_MIGRATOR":
       return new AccountMigratorAdapterContract(options, data);

package/dist/types/history/index.d.ts

@@ -1,6 +1,6 @@
 export type { TokenInfo } from "../plugins/adapters/types.js";
-export * from "./ContractRegister.js";
 export * from "./inner-operations.js";
 export { parseCreditAccountTransaction } from "./parseCreditAccountTransaction.js";
+export * from "./populateContractsRegister.js";
 export { toLegacyOperations } from "./toLegacyOperation.js";
 export * from "./types.js";

package/dist/types/history/populateContractsRegister.d.ts

@@ -0,0 +1,19 @@
+import { type Address, type Chain, type PublicClient, type Transport } from "viem";
+import { ChainContractsRegister, type ILogger, type TokenMetaData, TokensMeta } from "../sdk/index.js";
+export type Deployment = {
+    address: Address;
+    version: number;
+} & ({
+    contractTypePrefix: string;
+    contractTypeSuffix: string;
+} | {
+    contractType: string;
+});
+export interface PopulateContractsRegisterOptions {
+    client: PublicClient<Transport, Chain>;
+    deployments: Deployment[];
+    tokens: TokensMeta | Iterable<TokenMetaData>;
+    logger?: ILogger;
+    strict?: boolean;
+}
+export declare function populateContractsRegister(options: PopulateContractsRegisterOptions): ChainContractsRegister;

package/dist/types/plugins/adapters/contracts/AbstractAdapter.d.ts

@@ -1,10 +1,10 @@
 import { type Abi, type Address, type Hex, type PartialBy } from "viem";
-import type { ConstructOptions, ParsedCallV2, TypedVersionedAddress } from "../../../sdk/index.js";
+import type { ConstructOptions, ParsedCallV2, RelaxedBaseParams } from "../../../sdk/index.js";
 import { BaseContract } from "../../../sdk/index.js";
 import type { LegacyAdapterOperation, Transfers } from "../legacyAdapterOperations.js";
 import type { AdapterContractType, AdapterOperation, TokenTransfer } from "../types.js";
 export interface ConcreteAdapterContractOptions {
-    baseParams: TypedVersionedAddress;
+    baseParams: RelaxedBaseParams;
     targetContract?: Address;
     name?: string;
 }

package/dist/types/plugins/adapters/createAdapter.d.ts

@@ -1,7 +1,7 @@
-import type { Address } from "viem";
-import type { ConstructOptions, IBaseContract, TypedVersionedAddress } from "../../sdk/index.js";
+import { type Address } from "viem";
+import type { ConstructOptions, IBaseContract, RelaxedBaseParams } from "../../sdk/index.js";
 export interface AdapterFactoryArgs {
-    baseParams: TypedVersionedAddress;
+    baseParams: RelaxedBaseParams;
     targetContract?: Address;
 }
 export declare function createAdapter(options: ConstructOptions, data: AdapterFactoryArgs, strict?: boolean): IBaseContract;

package/dist/types/sdk/base/types.d.ts

@@ -1,5 +1,5 @@
 import type { AbiParametersToPrimitiveTypes, ExtractAbiFunction } from "abitype";
-import type { Address, Hex, PartialBy } from "viem";
+import type { Address, Hex } from "viem";
 import type { creditAccountCompressorAbi } from "../../abi/compressors/creditAccountCompressor.js";
 import type { gaugeCompressorAbi } from "../../abi/compressors/gaugeCompressor.js";
 import type { marketCompressorAbi } from "../../abi/compressors/marketCompressor.js";
@@ -12,10 +12,18 @@ export interface BaseParams {
     contractType: Hex;
     serializedParams: Hex;
 }
+export interface RelaxedBaseParams {
+    addr: Address;
+    version: number | bigint;
+    /**
+     * Hex or parsed hex32 string
+     */
+    contractType: string;
+    serializedParams?: Hex;
+}
 export interface BaseState {
     baseParams: BaseParams;
 }
-export type TypedVersionedAddress = PartialBy<BaseParams, "serializedParams">;
 export type MarketFilter = AbiParametersToPrimitiveTypes<ExtractAbiFunction<typeof marketCompressorAbi, "getMarkets">["inputs"]>[0];
 export type CreditAccountData = Unarray<AbiParametersToPrimitiveTypes<ExtractAbiFunction<typeof creditAccountCompressorAbi, "getCreditAccountData">["outputs"]>>;
 export type RewardInfo = Unarray<AbiParametersToPrimitiveTypes<ExtractAbiFunction<typeof rewardsCompressorAbi, "getRewards">["outputs"]>>;

package/dist/types/sdk/market/adapters/PlaceholderAdapterContracts.d.ts

@@ -1,10 +1,10 @@
 import type { Address } from "viem";
 import type { ConstructOptions } from "../../base/index.js";
 import { PlaceholderContract } from "../../base/index.js";
-import type { TypedVersionedAddress } from "../../index.js";
+import type { RelaxedBaseParams } from "../../index.js";
 import type { IAdapterContract } from "./types.js";
 export interface PlaceholderAdapterContractOptions {
-    baseParams: TypedVersionedAddress;
+    baseParams: RelaxedBaseParams;
     targetContract?: Address;
 }
 export declare class PlaceholderAdapterContract extends PlaceholderContract implements IAdapterContract {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "12.9.0-txparser.1",
+  "version": "12.9.0-txparser.3",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",

package/dist/cjs/history/ContractRegister.js

@@ -1,69 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var ContractRegister_exports = {};
-__export(ContractRegister_exports, {
-  ContractRegister: () => ContractRegister
-});
-module.exports = __toCommonJS(ContractRegister_exports);
-var import_sdk = require("../sdk/index.js");
-class ContractRegister {
-  #client;
-  #logger;
-  #register;
-  #factories = [];
-  constructor(client, logger) {
-    this.#client = client;
-    this.#logger = logger;
-    this.#register = import_sdk.ChainContractsRegister.for(client, logger);
-  }
-  get register() {
-    return this.#register;
-  }
-  registerFactory(factory) {
-    this.#factories.push(factory);
-  }
-  createContract(args) {
-    const { addr, version } = args;
-    const existing = this.#register.getContract(addr);
-    if (existing) {
-      return existing;
-    }
-    const contractType = (0, import_sdk.bytes32ToString)(args.contractType);
-    if (contractType === "CREDIT_FACADE" && (0, import_sdk.isV310)(version)) {
-      return new import_sdk.CreditFacadeV310BaseContract(
-        { client: this.#client, logger: this.#logger },
-        { ...args, name: `CreditFacadeV310(${addr})` }
-      );
-    }
-    for (const factory of this.#factories) {
-      const contract = factory(
-        { client: this.#client, logger: this.#logger },
-        args
-      );
-      if (contract) {
-        return contract;
-      }
-    }
-    throw new Error(`unknown contract ${contractType} v${version}`);
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ContractRegister
-});

package/dist/esm/history/ContractRegister.js

@@ -1,50 +0,0 @@
-import {
-  bytes32ToString,
-  ChainContractsRegister,
-  CreditFacadeV310BaseContract,
-  isV310
-} from "../sdk/index.js";
-class ContractRegister {
-  #client;
-  #logger;
-  #register;
-  #factories = [];
-  constructor(client, logger) {
-    this.#client = client;
-    this.#logger = logger;
-    this.#register = ChainContractsRegister.for(client, logger);
-  }
-  get register() {
-    return this.#register;
-  }
-  registerFactory(factory) {
-    this.#factories.push(factory);
-  }
-  createContract(args) {
-    const { addr, version } = args;
-    const existing = this.#register.getContract(addr);
-    if (existing) {
-      return existing;
-    }
-    const contractType = bytes32ToString(args.contractType);
-    if (contractType === "CREDIT_FACADE" && isV310(version)) {
-      return new CreditFacadeV310BaseContract(
-        { client: this.#client, logger: this.#logger },
-        { ...args, name: `CreditFacadeV310(${addr})` }
-      );
-    }
-    for (const factory of this.#factories) {
-      const contract = factory(
-        { client: this.#client, logger: this.#logger },
-        args
-      );
-      if (contract) {
-        return contract;
-      }
-    }
-    throw new Error(`unknown contract ${contractType} v${version}`);
-  }
-}
-export {
-  ContractRegister
-};

package/dist/types/history/ContractRegister.d.ts

@@ -1,11 +0,0 @@
-import type { Chain, PublicClient, Transport } from "viem";
-import type { ConstructOptions, IBaseContract, ILogger, TypedVersionedAddress } from "../sdk/index.js";
-import { ChainContractsRegister } from "../sdk/index.js";
-export type ContractFactory = (options: ConstructOptions, args: TypedVersionedAddress) => IBaseContract;
-export declare class ContractRegister {
-    #private;
-    constructor(client: PublicClient<Transport, Chain>, logger?: ILogger);
-    get register(): ChainContractsRegister;
-    registerFactory(factory: ContractFactory): void;
-    createContract(args: TypedVersionedAddress): IBaseContract;
-}