fix: move contractType decoding to base contract

Author: doomsower

src/base/BaseContract.ts

@@ -10,21 +10,26 @@ import type {
   Hex,
   Log,
 } from "viem";
-import { decodeFunctionData, getContract } from "viem";
+import { decodeFunctionData, getContract, isHex } from "viem";
 
 import { iVersionAbi } from "../abi";
 import { ADDRESS_0X0 } from "../constants";
 import type { GearboxSDK } from "../GearboxSDK";
 import type { BaseContractState } from "../state";
 import type { ILogger, RawTx } from "../types";
-import { childLogger, createRawTx, json_stringify } from "../utils";
+import {
+  bytes32ToString,
+  childLogger,
+  createRawTx,
+  json_stringify,
+} from "../utils";
 import type { IAddressLabeller } from "./IAddressLabeller";
 import { SDKConstruct } from "./SDKConstruct";
 
 export interface BaseContractOptions<abi extends Abi | readonly unknown[]> {
   abi: abi;
   address: Address;
-  name: string;
+  name?: string;
   version?: number;
   contractType?: string;
 }
@@ -53,9 +58,12 @@ export abstract class BaseContract<
         public: sdk.provider.publicClient,
       },
     });
-    this.name = this.#name = args.name || args.contractType || this.#address;
     this.version = args.version || 0;
-    this.contractType = args.contractType || "";
+    this.contractType = args.contractType ?? "";
+    if (isHex(this.contractType)) {
+      this.contractType = bytes32ToString(this.contractType);
+    }
+    this.name = this.#name = args.name || this.contractType || this.#address;
     this.logger = childLogger(this.name, sdk.logger);
 
     // register contract by address

src/market/pricefeeds/AbstractPriceFeed.ts

@@ -1,11 +1,10 @@
-import type { Abi, Hex } from "viem";
+import type { Abi } from "viem";
 
 import { ilpPriceFeedAbi } from "../../abi";
 import type { PriceFeedTreeNode } from "../../base";
 import { BaseContract } from "../../base";
 import type { GearboxSDK } from "../../GearboxSDK";
 import type { PriceFeedState } from "../../state";
-import { bytes32ToString } from "../../utils";
 import { PriceFeedRef } from "./PriceFeedRef";
 import type { IPriceFeedContract, PriceFeedContractType } from "./types";
 
@@ -25,23 +24,18 @@ export abstract class AbstractPriceFeedContract<
    * True if the contract deployed at this address implements IUpdatablePriceFeed interface
    */
   public readonly updatable: boolean;
-  public readonly priceFeedType: PriceFeedContractType;
   public readonly decimals: number;
   public readonly underlyingPriceFeeds: PriceFeedRef[];
   public hasLowerBoundCap = false;
 
   constructor(sdk: GearboxSDK, args: PriceFeedConstructorArgs<abi>) {
-    const priceFeedType = bytes32ToString(
-      args.baseParams.contractType as Hex,
-    ) as PriceFeedContractType;
     super(sdk, {
       abi: args.abi,
       address: args.baseParams.addr,
       name: args.name,
-      contractType: priceFeedType,
+      contractType: args.baseParams.contractType,
       version: Number(args.baseParams.version),
     });
-    this.priceFeedType = priceFeedType;
     this.decimals = args.decimals;
     this.updatable = args.updatable;
     this.underlyingPriceFeeds = args.underlyingFeeds.map(
@@ -50,6 +44,10 @@ export abstract class AbstractPriceFeedContract<
     );
   }
 
+  public get priceFeedType(): PriceFeedContractType {
+    return this.contractType as PriceFeedContractType;
+  }
+
   public abstract get state(): Omit<PriceFeedState, "stalenessPeriod">;
 
   async currentLowerBound(): Promise<bigint> {