fix chain ID

onflow · Feb 7, 2025 · b9c932f · b9c932f
1 parent ade3a6b
commit b9c932f
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 181 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/fcl-ethereum-provider/src/rpc/handlers/eth-chain-id.test.ts b/packages/fcl-ethereum-provider/src/rpc/handlers/eth-chain-id.test.ts
@@ -1,4 +1,4 @@
-import {formatChainId} from "../../util/eth"
+import {NetworkManager} from "../../network/network-manager"
 import {ethChainId} from "./eth-chain-id"
 
 jest.mock("../../util/eth", () => ({
@@ -13,7 +13,7 @@ describe("eth_chainId handler", () => {
     }
     networkManagerMock.getChainId.mockResolvedValue(747)
 
-    const chainId = await ethChainId(networkManagerMock as any)()
+    const chainId = await ethChainId(networkManagerMock as any)
 
     expect(chainId).toEqual("0x747")
     expect(networkManagerMock.getChainId).toHaveBeenCalled()
@@ -22,10 +22,10 @@ describe("eth_chainId handler", () => {
   test("should throw an error if no chain id is available", async () => {
     const networkManagerMock = {
       getChainId: jest.fn(),
-    }
+    } as unknown as jest.Mocked<NetworkManager>
     networkManagerMock.getChainId.mockResolvedValue(null)
 
-    await expect(ethChainId(networkManagerMock as any)()).rejects.toThrow(
+    await expect(ethChainId(networkManagerMock)).rejects.toThrow(
       "No active chain"
     )
     expect(networkManagerMock.getChainId).toHaveBeenCalled()

diff --git a/packages/fcl-ethereum-provider/src/rpc/handlers/eth-chain-id.ts b/packages/fcl-ethereum-provider/src/rpc/handlers/eth-chain-id.ts
@@ -1,12 +1,10 @@
 import {NetworkManager} from "../../network/network-manager"
 import {formatChainId} from "../../util/eth"
 
-export function ethChainId(networkManager: NetworkManager) {
-  return async function () {
-    const chainId = await networkManager.getChainId()
-    if (!chainId) {
-      throw new Error("No active chain")
-    }
-    return formatChainId(chainId)
+export async function ethChainId(networkManager: NetworkManager) {
+  const chainId = await networkManager.getChainId()
+  if (!chainId) {
+    throw new Error("No active chain")
   }
+  return formatChainId(chainId)
 }
diff --git a/packages/fcl-ethereum-provider/src/rpc/rpc-processor.ts b/packages/fcl-ethereum-provider/src/rpc/rpc-processor.ts
@@ -88,7 +88,7 @@ export class RpcProcessor {
           const switchParams = params[0] as SwitchEthereumChainParams
           return await this.networkManager.switchChain(switchParams)
         case "eth_chainId":
-          return ethChainId(this.networkManager)
+          return await ethChainId(this.networkManager)
         default:
           return await this.gateway.request({
             chainId,