feat: use custom RPC provider for log scanning

.gitignore

@@ -2,6 +2,7 @@ tags
 .idea/
 .vscode/
 
+.env
 *.log
 dist/
 ts-out/

babel.config.js

@@ -5,6 +5,7 @@ module.exports = {
         "@babel/preset-typescript",
     ],
     plugins: [
+        "babel-plugin-transform-vite-meta-env",
         [
             "@babel/plugin-transform-modules-commonjs",
             { allowTopLevelThis: true },

package.json

@@ -33,6 +33,7 @@
         "@types/node": "^22.0.2",
         "@webbtc/webln-types": "^3.0.0",
         "babel-jest": "^29.7.0",
+        "babel-plugin-transform-vite-meta-env": "^1.0.3",
         "babel-preset-jest": "^29.6.3",
         "babel-preset-solid": "^1.8.18",
         "eventsource": "^2.0.2",

src/config.ts

@@ -33,6 +33,7 @@ type Asset = {
 
     rifRelay?: string;
     contracts?: {
+        deployHeight: number;
         smartWalletFactory?: string;
         deployVerifier?: string;
     };

src/configs/regtest.json

@@ -30,6 +30,7 @@
             },
             "rifRelay": "http://localhost:8090",
             "contracts": {
+                "deployHeight": 0,
                 "smartWalletFactory": "0x59b670e9fA9D0A427751Af201D676719a970857b",
                 "deployVerifier": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9"
             }

src/configs/testnet.json

@@ -30,6 +30,7 @@
             },
             "rifRelay": "https://boltz.testnet.relay.rifcomputing.net",
             "contracts": {
+                "deployHeight": 4781682,
                 "smartWalletFactory": "0x82bc3558863b3f0C9914539DbB2d143AfB9c8768",
                 "deployVerifier": "0x5e8F98ddAd4Da6eE8A8eA3D64E09385dF6b609D0"
             }

src/context/Web3.tsx

@@ -220,4 +220,4 @@ const Web3SignerProvider = (props: {
 
 const useWeb3Signer = () => useContext(Web3SignerContext);
 
-export { useWeb3Signer, Web3SignerProvider };
+export { useWeb3Signer, Web3SignerProvider, EtherSwapAbi };

src/utils/contractLogs.ts

@@ -1,11 +1,19 @@
 import type { EtherSwap } from "boltz-core/typechain/EtherSwap";
-import { Result, Signer, solidityPackedKeccak256 } from "ethers";
+import {
+    Contract,
+    JsonRpcProvider,
+    Result,
+    Signer,
+    solidityPackedKeccak256,
+} from "ethers";
 import log from "loglevel";
 
+import { config } from "../config";
 import { AssetType, RBTC } from "../consts/Assets";
+import { EtherSwapAbi } from "../context/Web3";
 import { weiToSatoshi } from "./rootstock";
 
-const scanInterval = 10_000;
+const scanInterval = 2_000;
 
 export type LogRefundData = {
     asset: AssetType;
@@ -48,19 +56,41 @@ async function* scanLogsForPossibleRefunds(
         signer.getAddress(),
         signer.provider.getBlockNumber(),
     ]);
-    log.info(`Scanning for possible refunds of: ${signerAddress}`);
 
+    const deployHeight = config.assets[RBTC].contracts.deployHeight;
     const filter = etherSwap.filters.Lockup(null, null, null, signerAddress);
 
-    for (let toBlock = latestBlock; toBlock >= 0; toBlock -= scanInterval) {
+    log.info(
+        `Scanning for possible refunds of ${signerAddress} from ${deployHeight} to ${latestBlock}`,
+    );
+
+    const scanProviderUrl = import.meta.env.VITE_RSK_LOG_SCAN_ENDPOINT;
+    const etherSwapScan =
+        scanProviderUrl !== undefined
+            ? (new Contract(
+                  await etherSwap.getAddress(),
+                  EtherSwapAbi,
+                  new JsonRpcProvider(scanProviderUrl),
+              ) as unknown as EtherSwap)
+            : etherSwap;
+
+    for (
+        let toBlock = latestBlock;
+        toBlock >= deployHeight;
+        toBlock -= scanInterval
+    ) {
         if (abortSignal.aborted) {
             log.info(`Cancelling refund log scan of: ${signerAddress}`);
             return;
         }
 
         const fromBlock = Math.max(toBlock - scanInterval, 0);
         log.debug(`Scanning possible refunds from ${fromBlock} to ${toBlock}`);
-        const events = await etherSwap.queryFilter(filter, fromBlock, toBlock);
+        const events = await etherSwapScan.queryFilter(
+            filter,
+            fromBlock,
+            toBlock,
+        );
 
         const results: LogRefundData[] = [];