fix: pass account address instead of wallet client

Author: doomsower

src/GearboxSDK.ts

@@ -28,6 +28,10 @@ import { AddressMap, formatBN } from "./utils";
 import { createAnvilClient } from "./utils/viem";
 
 export interface SDKAttachOptions {
+  /**
+   * Account address for contract write simulations
+   */
+  account?: Address;
   /**
    * RPC URL to use
    */

src/accounts/CreditAccountsService.ts

@@ -1,4 +1,4 @@
-import type { Address, ContractFunctionArgs, WalletClient } from "viem";
+import type { Address, ContractFunctionArgs } from "viem";
 import { decodeFunctionData, encodeFunctionData } from "viem";
 
 import {
@@ -41,14 +41,12 @@ export interface CreditAccountFilter {
 
 export class CreditAccountsService extends SDKConstruct {
   #compressor: Address;
-  #wallet: WalletClient;
 
-  constructor(sdk: GearboxSDK, wallet: WalletClient) {
+  constructor(sdk: GearboxSDK) {
     super(sdk);
     this.#compressor = sdk.addressProvider.getLatestVersion(
       AP_CREDIT_ACCOUNT_COMPRESSOR,
     );
-    this.#wallet = wallet;
   }
 
   /**
@@ -81,7 +79,8 @@ export class CreditAccountsService extends SDKConstruct {
     // if (this.provider.testnet && priceUpdateTxs.length > 0) {
     //   await this.provider.warpSafe(timestamp);
     // }
-    const resp = await simulateMulticall(this.#wallet, {
+    const resp = await simulateMulticall(this.provider.publicClient, {
+      account: this.provider.account,
       contracts: [
         ...priceUpdateTxs.map(rawTxToMulticallPriceUpdate),
         {
@@ -166,7 +165,7 @@ export class CreditAccountsService extends SDKConstruct {
    */
   public async fullyLiquidate(
     account: CreditAccountData,
-    to: Address,
+    to?: Address,
     slippage = 50n,
   ): Promise<RawTx> {
     const cm = this.sdk.marketRegister.findCreditManager(account.creditManager);
@@ -183,11 +182,15 @@ export class CreditAccountsService extends SDKConstruct {
       cm.creditFacade.address,
       priceUpdates,
     );
+    const recipient = to ?? this.sdk.provider.account;
+    if (!recipient) {
+      throw new Error("liquidate account: assets recipient not specied");
+    }
     return cm.creditFacade.createRawTx({
       functionName: "liquidateCreditAccount",
       args: [
         account.creditAccount,
-        to,
+        recipient,
         [...priceUpdateCalls, ...preview.calls],
       ],
     });
@@ -206,15 +209,19 @@ export class CreditAccountsService extends SDKConstruct {
     operation: "close" | "zeroDebt",
     ca: CreditAccountData,
     assetsToKeep: Address[],
-    to: Address,
+    to?: Address,
     slippage = 50n,
   ): Promise<RawTx> {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    const recipient = to ?? this.sdk.provider.account;
+    if (!recipient) {
+      throw new Error("close account: assets recipient not specied");
+    }
     const calls = await this.#prepareCloseCreditAccount(
       ca,
       cm,
       assetsToKeep,
-      to,
+      recipient,
       slippage,
     );
     return cm.creditFacade.createRawTx({
@@ -236,7 +243,8 @@ export class CreditAccountsService extends SDKConstruct {
     args: GetCreditAccountsArgs;
   }): Promise<[accounts: CreditAccountData[], newOffset: bigint]> {
     if (priceUpdateTxs?.length) {
-      const resp = await simulateMulticall(this.#wallet, {
+      const resp = await simulateMulticall(this.provider.publicClient, {
+        account: this.provider.account,
         contracts: [
           ...priceUpdateTxs.map(rawTxToMulticallPriceUpdate),
           {

src/chain/Provider.ts

@@ -1,4 +1,4 @@
-import type { Chain, PublicClient } from "viem";
+import type { Address, Chain, PublicClient } from "viem";
 import { createPublicClient, defineChain, http } from "viem";
 
 import { AddressLabeller } from "../base/AddressLabeller";
@@ -7,21 +7,39 @@ import type { NetworkType } from "./chains";
 import { chains } from "./chains";
 
 export interface ProviderOptions {
+  /**
+   * Account address for contract write simulations
+   */
+  account?: Address;
+  /**
+   * RPC URL to use
+   */
   rpcURL: string;
+  /**
+   * RPC client timeout in milliseconds
+   */
   timeout?: number;
+  /**
+   * Chain Id needs to be set, because we sometimemes use forked testnets with different chain ids
+   */
   chainId: number;
+  /**
+   * NetworkType needs to be set, because we sometimemes use forked testnets with different chain ids
+   */
   networkType: NetworkType;
 }
 
 export class Provider {
+  public readonly account?: Address;
   public readonly chainId: number;
   public readonly chain: Chain;
   public readonly networkType: NetworkType;
   public readonly publicClient: PublicClient;
   public readonly addressLabels: IAddressLabeller;
 
   constructor(opts: ProviderOptions) {
-    const { chainId, networkType, rpcURL, timeout = 120_000 } = opts;
+    const { account, chainId, networkType, rpcURL, timeout = 120_000 } = opts;
+    this.account = account;
     this.chainId = chainId;
     this.networkType = networkType;
 

src/utils/viem/simulateMulticall.ts

@@ -39,7 +39,7 @@ export type MulticallParameters<
   } = {},
 > = Pick<
   CallParameters,
-  "blockNumber" | "blockTag" | "stateOverride" | "gas"
+  "blockNumber" | "blockTag" | "stateOverride" | "gas" | "account"
 > & {
   allowFailure?: allowFailure | boolean | undefined;
   batchSize?: number | undefined;
@@ -85,13 +85,14 @@ export async function simulateMulticall<
   parameters: MulticallParameters<contracts, allowFailure>,
 ): Promise<MulticallReturnType<contracts, allowFailure>> {
   const {
+    account,
     allowFailure = true,
     batchSize: batchSize_,
     blockNumber,
     blockTag,
+    gas,
     multicallAddress: multicallAddress_,
     stateOverride,
-    gas,
   } = parameters;
   const contracts = parameters.contracts as ContractFunctionParameters[];
 
@@ -179,6 +180,7 @@ export async function simulateMulticall<
         simulateContract,
         "simulateContract",
       )({
+        account,
         abi: multicall3Abi,
         address: multicallAddress!,
         args: [calls],