feat: refac provider to be multichain

ubiquity · Jan 31, 2025 · ab6147c · ab6147c
1 parent 3719405
commit ab6147c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -4,7 +4,7 @@
   "ignorePaths": ["**/*.json", "**/*.css", "node_modules", "**/*.log"],
   "useGitignore": true,
   "language": "en",
-  "words": ["dataurl", "UUSD", "UBQ", "outdir", "servedir", "reown", "appkit", "proxiable", "TYPEHASH", "twap", "chainlink"],
+  "words": ["dataurl", "UUSD", "UBQ", "outdir", "servedir", "reown", "appkit", "proxiable", "TYPEHASH", "twap", "chainlink", "lusd", "caip"],
   "dictionaries": ["typescript", "node", "software-terms"],
   "import": ["@cspell/dict-typescript/cspell-ext.json", "@cspell/dict-node/cspell-ext.json", "@cspell/dict-software-terms"],
   "ignoreRegExpList": ["[0-9a-fA-F]{6}"]

diff --git a/src/main.ts b/src/main.ts
@@ -1,7 +1,7 @@
 import "./router";
 import { createAppKit } from "@reown/appkit";
 import { Ethers5Adapter } from "@reown/appkit-adapter-ethers5";
-import { mainnet } from "@reown/appkit/networks";
+import { anvil, mainnet } from "@reown/appkit/networks";
 import { ethers } from "ethers";
 import { setupContracts } from "./contracts";
 import { handleRouting } from "./router";
@@ -25,16 +25,14 @@ const metadata = {
   icons: ["https://avatars.githubusercontent.com/u/76412717"],
 };
 
-// create provider & signer for Ethereum mainnet
-export const provider = new ethers.providers.JsonRpcProvider("https://eth.llamarpc.com");
-export let userSigner: ethers.Signer;
-
-// setup contract instances
-export const { dollarContract, governanceContract, diamondContract, twapOracleContract, lusdFeedContract } = setupContracts(provider);
+const rpcPerChainId: { [key: string]: string } = {
+  "1": "https://eth.llamarpc.com",
+  "31337": "http://localhost:8545",
+}
 
 export const appState = createAppKit({
   adapters: [new Ethers5Adapter()],
-  networks: [mainnet],
+  networks: [mainnet, anvil],
   defaultNetwork: mainnet,
   metadata,
   projectId,
@@ -43,11 +41,26 @@ export const appState = createAppKit({
   },
 });
 
+export const getNetworkId = () => appState.getCaipNetworkId()?.toString();
+
+// create provider & signer for Ethereum mainnet
+export const provider = () => {
+  const networkId = getNetworkId();
+  if (!networkId) {
+    throw new Error("Network ID not found");
+  }
+  return new ethers.providers.JsonRpcProvider(rpcPerChainId[networkId]);
+};
+export let userSigner: ethers.Signer;
+
+// setup contract instances
+export const { dollarContract, governanceContract, diamondContract, twapOracleContract, lusdFeedContract } = setupContracts(provider());
+
 async function waitForConnection() {
   return new Promise<void>((resolve) => {
     const interval = setInterval(() => {
       if (appState.getIsConnectedState()) {
-        userSigner = provider.getSigner(appState.getAddress());
+        userSigner = provider().getSigner(appState.getAddress());
         console.log(`User connected: ${appState.getAddress()}`);
         clearInterval(interval);
         resolve();
@@ -80,7 +93,7 @@ async function updatePrices() {
 
 export async function mainModule() {
   try {
-    console.log("Provider:", provider);
+    console.log("Provider:", provider());
 
     console.log("Waiting for user connection...");
     void waitForConnection();

diff --git a/src/pages/redeem.ts b/src/pages/redeem.ts
@@ -319,12 +319,12 @@ async function linkRedeemButton(collateralOptions: CollateralOption[]) {
 
         // Wait for 2 blocks before initiating the collection
         await new Promise((resolve) => {
-          const startBlock = provider.blockNumber;
+          const startBlock = provider().blockNumber;
 
           const checkBlock = () => {
             void (async () => {
-              const currentBlock = await provider.getBlockNumber();
-              if (currentBlock >= startBlock + 2) {
+              const currentBlock = await provider().getBlockNumber();
+              if (currentBlock >= startBlock + 3) {
                 resolve(null);
               } else {
                 setTimeout(checkBlock, 1000); // Check every sec