feat(bridge-ui): switch to using StaticJsonRpcProvider (#13482)

taikoxyz · Mar 28, 2023 · f175d39 · f175d39
1 parent 10dd522
commit f175d39
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 19 deletions.
diff --git a/packages/bridge-ui/src/App.svelte b/packages/bridge-ui/src/App.svelte
@@ -140,7 +140,7 @@
       );
       successToast('Transaction completed!');
       let s = store;
-      s = s.slice(confirmedPendingTxIndex, 0);
+      s.splice(confirmedPendingTxIndex, 1);
       pendingTransactions.set(s);
     })();
   });

diff --git a/packages/bridge-ui/src/bridge/ERC20Bridge.spec.ts b/packages/bridge-ui/src/bridge/ERC20Bridge.spec.ts
@@ -427,7 +427,7 @@ describe('bridge tests', () => {
         srcBridgeAddress: '0x',
         destBridgeAddress: '0x',
         signer: wallet,
-        destProvider: new ethers.providers.JsonRpcProvider(),
+        destProvider: new ethers.providers.StaticJsonRpcProvider(),
         srcTokenVaultAddress: '0x',
       }),
     ).rejects.toThrowError('message already processed');
@@ -462,7 +462,7 @@ describe('bridge tests', () => {
       srcBridgeAddress: '0x',
       destBridgeAddress: '0x',
       signer: wallet,
-      destProvider: new ethers.providers.JsonRpcProvider(),
+      destProvider: new ethers.providers.StaticJsonRpcProvider(),
       srcTokenVaultAddress: '0x',
     });
 

diff --git a/packages/bridge-ui/src/bridge/ETHBridge.spec.ts b/packages/bridge-ui/src/bridge/ETHBridge.spec.ts
@@ -311,7 +311,7 @@ describe('bridge tests', () => {
         srcBridgeAddress: '0x',
         destBridgeAddress: '0x',
         signer: wallet,
-        destProvider: new ethers.providers.JsonRpcProvider(),
+        destProvider: new ethers.providers.StaticJsonRpcProvider(),
         srcTokenVaultAddress: '0x',
       }),
     ).rejects.toThrowError('message already processed');
@@ -346,7 +346,7 @@ describe('bridge tests', () => {
       srcBridgeAddress: '0x',
       destBridgeAddress: '0x',
       signer: wallet,
-      destProvider: new ethers.providers.JsonRpcProvider(),
+      destProvider: new ethers.providers.StaticJsonRpcProvider(),
       srcTokenVaultAddress: '0x',
     });
 

diff --git a/packages/bridge-ui/src/components/Transaction.svelte b/packages/bridge-ui/src/components/Transaction.svelte
@@ -189,13 +189,13 @@
         providers[chains[transaction.toChainId].id],
       );
 
-      transaction.status = await contract.getMessageStatus(transaction.msgHash);
-
       if (transaction.receipt && transaction.receipt.status !== 1) {
         clearInterval(interval);
         return;
       }
 
+      transaction.status = await contract.getMessageStatus(transaction.msgHash);
+
       if (transaction.status === MessageStatus.Failed) {
         if (transaction.message?.data !== '0x') {
           const srcTokenVaultContract = new ethers.Contract(

diff --git a/packages/bridge-ui/src/proof/ProofService.spec.ts b/packages/bridge-ui/src/proof/ProofService.spec.ts
@@ -116,7 +116,7 @@ const destChain = 31336;
 const map = {
   [srcChain]: mockProvider,
   [destChain]: mockProvider,
-} as unknown as Record<string, ethers.providers.JsonRpcProvider>;
+} as unknown as Record<string, ethers.providers.StaticJsonRpcProvider>;
 
 describe('prover tests', () => {
   beforeEach(() => {

diff --git a/packages/bridge-ui/src/proof/ProofService.ts b/packages/bridge-ui/src/proof/ProofService.ts
@@ -10,9 +10,14 @@ import type {
 } from '../domain/proof';
 
 export class ProofService implements Prover {
-  private readonly providers: Record<number, ethers.providers.JsonRpcProvider>;
+  private readonly providers: Record<
+    number,
+    ethers.providers.StaticJsonRpcProvider
+  >;
 
-  constructor(providers: Record<number, ethers.providers.JsonRpcProvider>) {
+  constructor(
+    providers: Record<number, ethers.providers.StaticJsonRpcProvider>,
+  ) {
     this.providers = providers;
   }
 
@@ -29,7 +34,7 @@ export class ProofService implements Prover {
 
   private static async getBlockAndBlockHeader(
     contract: ethers.Contract,
-    provider: ethers.providers.JsonRpcProvider,
+    provider: ethers.providers.StaticJsonRpcProvider,
   ): Promise<{ block: Block; blockHeader: BlockHeader }> {
     const latestSyncedHeader = await contract.getLatestSyncedHeader();
 

diff --git a/packages/bridge-ui/src/provider/providers.ts b/packages/bridge-ui/src/provider/providers.ts
@@ -2,7 +2,16 @@ import { ethers } from 'ethers';
 import type { ChainID } from '../domain/chain';
 import { L1_CHAIN_ID, L1_RPC, L2_CHAIN_ID, L2_RPC } from '../constants/envVars';
 
-export const providers: Record<ChainID, ethers.providers.JsonRpcProvider> = {
-  [L1_CHAIN_ID]: new ethers.providers.JsonRpcProvider(L1_RPC),
-  [L2_CHAIN_ID]: new ethers.providers.JsonRpcProvider(L2_RPC),
+export const providers: Record<
+  ChainID,
+  ethers.providers.StaticJsonRpcProvider
+> = {
+  [L1_CHAIN_ID]: new ethers.providers.StaticJsonRpcProvider(
+    L1_RPC,
+    L1_CHAIN_ID,
+  ),
+  [L2_CHAIN_ID]: new ethers.providers.StaticJsonRpcProvider(
+    L2_RPC,
+    L2_CHAIN_ID,
+  ),
 };
diff --git a/packages/bridge-ui/src/relayer-api/RelayerAPIService.ts b/packages/bridge-ui/src/relayer-api/RelayerAPIService.ts
@@ -18,12 +18,15 @@ import { tokenVaults } from '../vault/tokenVaults';
 import type { ChainID } from '../domain/chain';
 
 export class RelayerAPIService implements RelayerAPI {
-  private readonly providers: Record<ChainID, ethers.providers.JsonRpcProvider>;
+  private readonly providers: Record<
+    ChainID,
+    ethers.providers.StaticJsonRpcProvider
+  >;
   private readonly baseUrl: string;
 
   constructor(
     baseUrl: string,
-    providers: Record<ChainID, ethers.providers.JsonRpcProvider>,
+    providers: Record<ChainID, ethers.providers.StaticJsonRpcProvider>,
   ) {
     this.providers = providers;
 

diff --git a/packages/bridge-ui/src/storage/StorageService.ts b/packages/bridge-ui/src/storage/StorageService.ts
@@ -10,11 +10,14 @@ import type { ChainID } from '../domain/chain';
 
 export class StorageService implements Transactioner {
   private readonly storage: Storage;
-  private readonly providers: Record<ChainID, ethers.providers.JsonRpcProvider>;
+  private readonly providers: Record<
+    ChainID,
+    ethers.providers.StaticJsonRpcProvider
+  >;
 
   constructor(
     storage: Storage,
-    providers: Record<ChainID, ethers.providers.JsonRpcProvider>,
+    providers: Record<ChainID, ethers.providers.StaticJsonRpcProvider>,
   ) {
     this.storage = storage;
     this.providers = providers;

diff --git a/packages/bridge-ui/src/utils/checkIfTokenIsDeployedCrossChain.ts b/packages/bridge-ui/src/utils/checkIfTokenIsDeployedCrossChain.ts
@@ -6,7 +6,7 @@ import type { Token } from '../domain/token';
 
 export const checkIfTokenIsDeployedCrossChain = async (
   token: Token,
-  provider: ethers.providers.JsonRpcProvider,
+  provider: ethers.providers.StaticJsonRpcProvider,
   destTokenVaultAddress: string,
   toChain: Chain,
   fromChain: Chain,