Refactor getCommit function to streamline commit configuration handli…

…ng and improve error management
layerswap · Dec 18, 2024 · a6ae293 · a6ae293
1 parent eed13a8
commit a6ae293
Show file tree

Hide file tree

Showing 2 changed files with 118 additions and 100 deletions.
diff --git a/public/workers/helios/heliosWorker.js b/public/workers/helios/heliosWorker.js
@@ -3,64 +3,73 @@ import { ethers } from "https://cdnjs.cloudflare.com/ajax/libs/ethers/5.7.2/ethe
 self.onmessage = (e) => {
     switch (e.data.type) {
         case 'init':
-            const configEthereum = {
-                executionRpc: "https://eth-sepolia.g.alchemy.com/v2/ErGCcrn6KRA91KfnRkqtyb3SJVdYGz1S",
-                consensusRpc: e.data.payload.data.commitConfigs.hostname + '/api/consensusRpc',
-                checkpoint: "0x5d7fbedda647649b940f099fe79832dc0b031b08e5558ff7371bcce472471ab4",
-                dbType: "localstorage",
-                network: 'sepolia'
-            };
-            const opstackConfigs = {
-                executionRpc: "https://opt-sepolia.g.alchemy.com/v2/ErGCcrn6KRA91KfnRkqtyb3SJVdYGz1S",
-                network: "op-sepolia",
-            };
-            const configs = e.data.payload.data.commitConfigs.network?.includes('optimism') ? opstackConfigs : configEthereum;
-            getCommit(configs, e.data.payload.data.commitConfigs);
+            getCommit(e.data.payload.data.commitConfigs);
             break;
         default:
             // Handle any cases that are not explicitly mentioned
             console.error('Unhandled message type:', e.data.type);
     }
 };
-async function getCommit(providerConfig, commitConfigs) {
-    await init();
-    const heliosProvider = new HeliosProvider(providerConfig, commitConfigs.network?.includes('optimsim') ? "opstack" : 'ethereum');
-    await heliosProvider.sync();
-    const web3Provider = new ethers.providers.Web3Provider(heliosProvider);
-    const { abi, contractAddress, commitId } = commitConfigs;
-    async function getCommitDetails(provider) {
-        if (provider) {
-            try {
-                const contract = new ethers.Contract(contractAddress, abi, web3Provider);
-                const res = await contract.getDetails(commitId);
-                return res;
-            }
-            catch (e) {
-                console.log(e);
+async function getCommit(commitConfigs) {
+    try {
+        await init();
+
+        // const checkpoint  = await fetch('https://sync-sepolia.beaconcha.in/checkpointz/v1/status')
+        const configEthereum = {
+            executionRpc: "https://eth-sepolia.g.alchemy.com/v2/ErGCcrn6KRA91KfnRkqtyb3SJVdYGz1S",
+            consensusRpc: e.data.payload.data.commitConfigs.hostname + '/api/consensusRpc',
+            checkpoint: "0x5d7fbedda647649b940f099fe79832dc0b031b08e5558ff7371bcce472471ab4",
+            dbType: "localstorage",
+            network: 'sepolia'
+        };
+        const opstackConfigs = {
+            executionRpc: "https://opt-mainnet.g.alchemy.com/v2/ErGCcrn6KRA91KfnRkqtyb3SJVdYGz1S",
+            network: "op-sepolia",
+        };
+        const providerConfig = e.data.payload.data.commitConfigs.network?.includes('optimism') ? opstackConfigs : configEthereum;
+
+        const heliosProvider = new HeliosProvider(providerConfig, commitConfigs.network?.includes('optimsim') ? "opstack" : 'ethereum');
+        await heliosProvider.sync();
+        const web3Provider = new ethers.providers.Web3Provider(heliosProvider);
+        const { abi, contractAddress, commitId } = commitConfigs;
+        async function getCommitDetails(provider) {
+            if (provider) {
+                try {
+                    const contract = new ethers.Contract(contractAddress, abi, web3Provider);
+                    const res = await contract.getDetails(commitId);
+                    return res;
+                }
+                catch (e) {
+                    console.log(e);
+                }
             }
         }
-    }
-    let getDetailsHandler = undefined;
-    (async () => {
-        let attempts = 0;
-        getDetailsHandler = setInterval(async () => {
-            try {
-                if (attempts > 20) {
-                    clearInterval(getDetailsHandler);
-                    self.postMessage({ type: 'commitDetails', data: null });
-                    return;
+        let getDetailsHandler = undefined;
+        (async () => {
+            let attempts = 0;
+            getDetailsHandler = setInterval(async () => {
+                try {
+                    if (attempts > 20) {
+                        clearInterval(getDetailsHandler);
+                        self.postMessage({ type: 'commitDetails', data: null });
+                        return;
+                    }
+
+                    attempts++;
+                    const data = await getCommitDetails(web3Provider);
+                    if (data?.hashlock && data?.hashlock !== "0x0100000000000000000000000000000000000000000000000000000000000000" && data?.hashlock !== "0x0000000000000000000000000000000000000000000000000000000000000000") {
+                        self.postMessage({ type: 'commitDetails', data: data });
+                        clearInterval(getDetailsHandler);
+                    }
                 }
-
-                attempts++;
-                const data = await getCommitDetails(web3Provider);
-                if (data?.hashlock && data?.hashlock !== "0x0100000000000000000000000000000000000000000000000000000000000000" && data?.hashlock !== "0x0000000000000000000000000000000000000000000000000000000000000000") {
-                    self.postMessage({ type: 'commitDetails', data: data });
-                    clearInterval(getDetailsHandler);
+                catch (e) {
+                    console.log(e);
                 }
-            }
-            catch (e) {
-                console.log(e);
-            }
-        }, 5000);
-    })();
+            }, 5000);
+        })();
+    } catch (e) {
+        self.postMessage({ type: 'commitDetails', data: undefined });
+        console.log(e);
+    }
+
 }
diff --git a/workers/helios/heliosWorker.js b/workers/helios/heliosWorker.js
@@ -3,64 +3,73 @@ import { ethers } from "https://cdnjs.cloudflare.com/ajax/libs/ethers/5.7.2/ethe
 self.onmessage = (e) => {
     switch (e.data.type) {
         case 'init':
-            const configEthereum = {
-                executionRpc: "https://eth-sepolia.g.alchemy.com/v2/ErGCcrn6KRA91KfnRkqtyb3SJVdYGz1S",
-                consensusRpc: e.data.payload.data.commitConfigs.hostname + '/api/consensusRpc',
-                checkpoint: "0x5d7fbedda647649b940f099fe79832dc0b031b08e5558ff7371bcce472471ab4",
-                dbType: "localstorage",
-                network: 'sepolia'
-            };
-            const opstackConfigs = {
-                executionRpc: "https://opt-sepolia.g.alchemy.com/v2/ErGCcrn6KRA91KfnRkqtyb3SJVdYGz1S",
-                network: "op-sepolia",
-            };
-            const configs = e.data.payload.data.commitConfigs.network?.includes('optimism') ? opstackConfigs : configEthereum;
-            getCommit(configs, e.data.payload.data.commitConfigs);
+            getCommit(e.data.payload.data.commitConfigs);
             break;
         default:
             // Handle any cases that are not explicitly mentioned
             console.error('Unhandled message type:', e.data.type);
     }
 };
-async function getCommit(providerConfig, commitConfigs) {
-    await init();
-    const heliosProvider = new HeliosProvider(providerConfig, commitConfigs.network?.includes('optimsim') ? "opstack" : 'ethereum');
-    await heliosProvider.sync();
-    const web3Provider = new ethers.providers.Web3Provider(heliosProvider);
-    const { abi, contractAddress, commitId } = commitConfigs;
-    async function getCommitDetails(provider) {
-        if (provider) {
-            try {
-                const contract = new ethers.Contract(contractAddress, abi, web3Provider);
-                const res = await contract.getDetails(commitId);
-                return res;
-            }
-            catch (e) {
-                console.log(e);
+async function getCommit(commitConfigs) {
+    try {
+        await init();
+
+        // const checkpoint  = await fetch('https://sync-sepolia.beaconcha.in/checkpointz/v1/status')
+        const configEthereum = {
+            executionRpc: "https://eth-sepolia.g.alchemy.com/v2/ErGCcrn6KRA91KfnRkqtyb3SJVdYGz1S",
+            consensusRpc: e.data.payload.data.commitConfigs.hostname + '/api/consensusRpc',
+            checkpoint: "0x5d7fbedda647649b940f099fe79832dc0b031b08e5558ff7371bcce472471ab4",
+            dbType: "localstorage",
+            network: 'sepolia'
+        };
+        const opstackConfigs = {
+            executionRpc: "https://opt-mainnet.g.alchemy.com/v2/ErGCcrn6KRA91KfnRkqtyb3SJVdYGz1S",
+            network: "op-sepolia",
+        };
+        const providerConfig = e.data.payload.data.commitConfigs.network?.includes('optimism') ? opstackConfigs : configEthereum;
+
+        const heliosProvider = new HeliosProvider(providerConfig, commitConfigs.network?.includes('optimsim') ? "opstack" : 'ethereum');
+        await heliosProvider.sync();
+        const web3Provider = new ethers.providers.Web3Provider(heliosProvider);
+        const { abi, contractAddress, commitId } = commitConfigs;
+        async function getCommitDetails(provider) {
+            if (provider) {
+                try {
+                    const contract = new ethers.Contract(contractAddress, abi, web3Provider);
+                    const res = await contract.getDetails(commitId);
+                    return res;
+                }
+                catch (e) {
+                    console.log(e);
+                }
             }
         }
-    }
-    let getDetailsHandler = undefined;
-    (async () => {
-        let attempts = 0;
-        getDetailsHandler = setInterval(async () => {
-            try {
-                if (attempts > 20) {
-                    clearInterval(getDetailsHandler);
-                    self.postMessage({ type: 'commitDetails', data: null });
-                    return;
+        let getDetailsHandler = undefined;
+        (async () => {
+            let attempts = 0;
+            getDetailsHandler = setInterval(async () => {
+                try {
+                    if (attempts > 20) {
+                        clearInterval(getDetailsHandler);
+                        self.postMessage({ type: 'commitDetails', data: null });
+                        return;
+                    }
+
+                    attempts++;
+                    const data = await getCommitDetails(web3Provider);
+                    if (data?.hashlock && data?.hashlock !== "0x0100000000000000000000000000000000000000000000000000000000000000" && data?.hashlock !== "0x0000000000000000000000000000000000000000000000000000000000000000") {
+                        self.postMessage({ type: 'commitDetails', data: data });
+                        clearInterval(getDetailsHandler);
+                    }
                 }
-
-                attempts++;
-                const data = await getCommitDetails(web3Provider);
-                if (data?.hashlock && data?.hashlock !== "0x0100000000000000000000000000000000000000000000000000000000000000" && data?.hashlock !== "0x0000000000000000000000000000000000000000000000000000000000000000") {
-                    self.postMessage({ type: 'commitDetails', data: data });
-                    clearInterval(getDetailsHandler);
+                catch (e) {
+                    console.log(e);
                 }
-            }
-            catch (e) {
-                console.log(e);
-            }
-        }, 5000);
-    })();
+            }, 5000);
+        })();
+    } catch (e) {
+        self.postMessage({ type: 'commitDetails', data: undefined });
+        console.log(e);
+    }
+
 }