fix(safe): use Client provider for reads and Safe gas estimation

src/eoa/eoa.ts

@@ -111,6 +111,7 @@ export class EOA {
       requiredFee: validatedPayload.requiredFee,
       chainId: this.chainId,
       signer: this.signer,
+      provider: this.provider,
     });
   }
 
@@ -158,6 +159,7 @@ export class EOA {
       deposits: validatedPayload.deposits,
       batchDepositContractAddress: chainConfig.BATCH_DEPOSIT_CONTRACT.address,
       signer: this.signer,
+      provider: this.provider,
     });
   }
 }

src/eoa/eoaHelpers.ts

@@ -1,5 +1,5 @@
 import { ETHER_TO_GWEI } from '../constants.js';
-import { type SignerType } from '../types.js';
+import { type SignerType, type ProviderType } from '../types.js';
 import { Contract, type JsonRpcSigner } from 'ethers';
 import { BatchDepositContract } from '../abi/BatchDeposit.js';
 import { SignerRequiredError } from '../errors.js';
@@ -12,13 +12,16 @@ import {
 // tx.wait() hangs forever (the hash never appears on-chain). Contract-wallet
 // signers submit unchecked and resolve via the Safe's ExecutionSuccess log.
 // This is the first dereference on both write flows, so it guards the signer.
-const isSafeLikeSigner = async (signer: SignerType): Promise<boolean> => {
+const isSafeLikeSigner = async (
+  signer: SignerType,
+  provider?: ProviderType | null,
+): Promise<boolean> => {
   if (!signer) {
     throw new SignerRequiredError('submitEOATransaction');
   }
   return (
     'sendUncheckedTransaction' in signer &&
-    (await isContractWalletSigner(signer))
+    (await isContractWalletSigner(signer, provider))
   );
 };
 
@@ -33,6 +36,7 @@ export async function submitEOAWithdrawalRequest({
   requiredFee,
   chainId,
   signer,
+  provider,
 }: {
   pubkey: string;
   allocation: number;
@@ -41,6 +45,7 @@ export async function submitEOAWithdrawalRequest({
   requiredFee: string;
   chainId: number;
   signer: SignerType;
+  provider?: ProviderType | null;
 }): Promise<{ txHash: string | null }> {
   if (!withdrawalAddress) {
     throw new Error('No withdrawal address provided');
@@ -52,12 +57,13 @@ export async function submitEOAWithdrawalRequest({
   const amountInGwei = BigInt(Math.floor(Number(allocation) * ETHER_TO_GWEI));
   const data = `0x${pubkey.slice(2)}${amountInGwei.toString(16).padStart(16, '0')}`;
 
-  if (await isSafeLikeSigner(signer)) {
+  if (await isSafeLikeSigner(signer, provider)) {
     const txHash = await submitViaContractWalletAndWait({
       signer: signer as JsonRpcSigner,
       to: withdrawalContractAddress,
       data,
       value: BigInt(requiredFee),
+      provider,
     });
     return { txHash };
   }
@@ -81,6 +87,7 @@ export async function submitEOABatchDeposit({
   deposits,
   batchDepositContractAddress,
   signer,
+  provider,
 }: {
   deposits: Array<{
     pubkey: string;
@@ -91,6 +98,7 @@ export async function submitEOABatchDeposit({
   }>;
   batchDepositContractAddress: string;
   signer: SignerType;
+  provider?: ProviderType | null;
 }): Promise<{ txHashes: string[] }> {
   if (!deposits || deposits.length === 0) {
     throw new Error('No deposits provided');
@@ -103,7 +111,7 @@ export async function submitEOABatchDeposit({
     signer,
   );
 
-  const useContractWallet = await isSafeLikeSigner(signer);
+  const useContractWallet = await isSafeLikeSigner(signer, provider);
 
   const BATCH_SIZE = 500;
   const txHashes: string[] = [];
@@ -137,6 +145,7 @@ export async function submitEOABatchDeposit({
             [depositData],
           ),
           value: totalValue,
+          provider,
         });
         txHashes.push(txHash);
         continue;

src/index.ts

@@ -343,19 +343,19 @@ export class Client extends Base {
 
     const checkSplitMainAddress = await isContractAvailable(
       chainConfig.SPLITMAIN_CONTRACT.address,
-      this.signer.provider as ProviderType,
+      this.provider as ProviderType,
       chainConfig.SPLITMAIN_CONTRACT.bytecode,
     );
 
     const checkMulticall3Address = await isContractAvailable(
       chainConfig.MULTICALL3_CONTRACT.address,
-      this.signer.provider as ProviderType,
+      this.provider as ProviderType,
       chainConfig.MULTICALL3_CONTRACT.bytecode,
     );
 
     const checkOWRFactoryAddress = await isContractAvailable(
       chainConfig.OWR_FACTORY_CONTRACT.address,
-      this.signer.provider as ProviderType,
+      this.provider as ProviderType,
       chainConfig.OWR_FACTORY_CONTRACT.bytecode,
     );
 
@@ -388,11 +388,12 @@ export class Client extends Base {
       chainId: this.chainId,
       distributorFee: validatedPayload.distributorFee,
       controllerAddress: validatedPayload.controllerAddress,
+      provider: this.provider,
     });
 
     const isSplitterDeployed = await isContractAvailable(
       predictedSplitterAddress,
-      this.signer.provider as ProviderType,
+      this.provider as ProviderType,
     );
 
     const { withdrawal_address, fee_recipient_address } =
@@ -478,7 +479,7 @@ export class Client extends Base {
 
     const checkSplitMainAddress = await isContractAvailable(
       chainConfig.SPLITMAIN_CONTRACT.address,
-      this.signer.provider as ProviderType,
+      this.provider as ProviderType,
       chainConfig.SPLITMAIN_CONTRACT.bytecode,
     );
 
@@ -507,11 +508,12 @@ export class Client extends Base {
       chainId: this.chainId,
       distributorFee: validatedPayload.distributorFee,
       controllerAddress: validatedPayload.controllerAddress,
+      provider: this.provider,
     });
 
     const isSplitterDeployed = await isContractAvailable(
       predictedSplitterAddress,
-      this.signer.provider as ProviderType,
+      this.provider as ProviderType,
     );
 
     if (!isSplitterDeployed) {
@@ -561,7 +563,11 @@ export class Client extends Base {
     }
 
     const signer = this.signer;
-    return await getOWRTranches({ owrAddress, signer });
+    return await getOWRTranches({
+      owrAddress,
+      signer,
+      provider: this.provider,
+    });
   }
 
   /**