fix: only connect provider to aws signer

Author: d4mr

src/utils/account.ts

@@ -13,7 +13,6 @@ import { getSmartWallet } from "../server/utils/wallets/getSmartWallet";
 import { getChain } from "./chain";
 
 export const _accountsCache = new Map<string, Account>();
-export const _providerCache = new Map<number, providers.JsonRpcProvider>();
 
 export const getAccount = async (args: {
   chainId: number;
@@ -56,17 +55,9 @@ export const getAccount = async (args: {
       throw new Error(`Wallet type not supported: ${walletDetails.type}`);
   }
 
-  // Get chain rpc provider.
-  let provider = _providerCache.get(chainId);
-  if (!provider) {
-    const chain = await getChain(chainId);
-
-    provider = new providers.JsonRpcProvider(chain.rpc);
-    _providerCache.set(chainId, provider);
-  }
-
   // Get smart wallet if `accountAddress` is provided.
   let signer: Signer;
+
   if (accountAddress) {
     const smartWallet = await getSmartWallet({
       chainId,
@@ -78,9 +69,18 @@ export const getAccount = async (args: {
     signer = await wallet.getSigner();
   }
 
-  const connectedSigner = signer.connect(provider);
+  if (walletDetails.type === WalletType.awsKms) {
+    // Get chain rpc provider.
+    const chain = await getChain(chainId);
+    console.log("received chain in to account", chain);
+    const provider = new providers.JsonRpcProvider(chain.rpc);
+    console.log("provider in to account", provider);
+
+    signer = signer.connect(provider);
+  }
+
   const account = await ethers5Adapter.signer.fromEthers({
-    signer: connectedSigner,
+    signer,
   });
 
   // Set cache.

test/e2e/config.ts

@@ -1,6 +1,5 @@
 import assert from "assert";
-import type { Chain } from "viem";
-import { anvil } from "viem/chains";
+import { defineChain, type Chain } from "viem";
 
 assert(process.env.ENGINE_URL, "ENGINE_URL is required");
 assert(process.env.ENGINE_ACCESS_TOKEN, "ENGINE_ACCESS_TOKEN is required");
@@ -16,8 +15,23 @@ export const CONFIG: Config = {
   // USE_LOCAL_CHAIN: true,
   // CHAIN: arbitrumSepolia,
 
-  USE_LOCAL_CHAIN: true,
-  CHAIN: anvil,
+  USE_LOCAL_CHAIN: false,
+  CHAIN: defineChain({
+    id: 1993,
+    name: "B3 Sepolia Testnet",
+    testnet: true,
+    rpcUrls: {
+      default: {
+        http: ["https://sepolia.b3.fun/http"],
+        webSocket: ["wss://sepolia.b3.fun/ws"],
+      },
+    },
+    nativeCurrency: {
+      name: "Ether",
+      symbol: "ETH",
+      decimals: 18,
+    },
+  }),
 
   TRANSACTION_COUNT: 500,
   TRANSACTIONS_PER_BATCH: 100,

test/e2e/tests/setup.ts

@@ -1,11 +1,6 @@
 import { sleep } from "bun";
 import { beforeAll } from "bun:test";
-import {
-  createChain,
-  getEngineBackendWallet,
-  setWalletBalance,
-  setupEngine,
-} from "../utils/engine";
+import { createChain, setWalletBalance, setupEngine } from "../utils/engine";
 
 import type { Address } from "viem";
 import { CONFIG } from "../config";
@@ -28,11 +23,11 @@ export const setup = async (): Promise<SetupResult> => {
 
   const publicClient = setupPublicClient();
   const engine = setupEngine();
-  const backendWallet = await getEngineBackendWallet(engine);
+  // const backendWallet = await getEngineBackendWallet(engine);
   let testClient;
 
   // temporarily set to aws wallet
-  // const backendWallet = "0x7C243d1475DA6fe0eeB8d1C4Ee4510aF35cf7CD5";
+  const backendWallet = "0x7C243d1475DA6fe0eeB8d1C4Ee4510aF35cf7CD5";
 
   if (CONFIG.USE_LOCAL_CHAIN) {
     setupAnvil();