@instadapp/interop-x 0.0.0-dev.e916c22 → 0.0.0-dev.ea4acf6

package/src/tasks/InteropX/ProcessValidateEvents.ts

@@ -5,11 +5,12 @@ import abi from "@/abi";
 import { Transaction } from "@/db";
 import {
   buildSignatureBytes,
+  generateGnosisSignatureMessage,
   generateGnosisTransaction,
-  generateInteropTransactionHash,
   getContract,
+  getGnosisOwnerPeerIds,
+  getGnosisSignatureAddress,
   getRpcProviderUrl,
-  LiquidityError,
   Signature,
 } from "@/utils";
 import { addresses, blockConfirmations } from "@/constants";
@@ -22,9 +23,11 @@ import { buildGnosisAction } from "@/gnosis";
 import { peerPool, protocol } from "@/net";
 import { LogDescription } from "ethers/lib/utils";
 import wait from "waait";
+import { LiquidityError } from "@/errors";
+import { JsonRpcRetryProvider } from "@/providers";
 
-class ProcessValidateEvents extends BaseTask {
-  sourceProvider: ethers.providers.JsonRpcProvider;
+export default class ProcessValidateEvents extends BaseTask {
+  sourceProvider: JsonRpcRetryProvider;
   chainId: ChainId;
   leadNodeOnly: boolean = true;
   blockConfirmationsCount: number = 12;
@@ -75,7 +78,7 @@ class ProcessValidateEvents extends BaseTask {
 
     const { sourceChainId, targetChainId } = transaction.validateEvent
 
-    const targetProvider = new ethers.providers.JsonRpcProvider(
+    const targetProvider = new JsonRpcRetryProvider(
       getRpcProviderUrl(targetChainId as ChainId)
     );
 
@@ -141,13 +144,9 @@ class ProcessValidateEvents extends BaseTask {
       targetGnosisContract
     );
 
-    const owners = await targetGnosisContract
-      .getOwners()
-      .then((owners) => owners.map((owner) => owner.toLowerCase()));
-
-    const ownerPeerIds = peerPool.activePeers
-      .filter((peer) => owners.includes(peer.publicAddress.toLowerCase()))
-      .map((peer) => peer.id);
+    const ownerPeerIds = await getGnosisOwnerPeerIds({
+      gnosisContract: targetGnosisContract,
+    });
 
     console.log(
       `Collecting signatures for execution ${transaction.transactionHash}`
@@ -155,6 +154,14 @@ class ProcessValidateEvents extends BaseTask {
 
     console.log(ownerPeerIds);
 
+    const message = generateGnosisSignatureMessage({
+      to: addresses[targetChainId].multisend,
+      data,
+      chainId: targetChainId as ChainId,
+      safeTxGas: gnosisTx.safeTxGas,
+      nonce: gnosisTx.safeNonce,
+    });
+
     const signatures = await protocol.requestSignatures(
       {
         type: "target",
@@ -166,9 +173,27 @@ class ProcessValidateEvents extends BaseTask {
       ownerPeerIds
     );
 
-    const validSignatures = signatures.filter(
-      (s) => !!s.data && s.data !== "0x"
-    ) as Signature[];
+    const validSignatures = signatures
+      .filter(
+        (s) => !!s.data && s.data !== "0x"
+      )
+      .filter((s) => {
+
+        try {
+
+          const address = getGnosisSignatureAddress({
+            message,
+            signature: s.data!,
+            chainId: targetChainId as ChainId,
+          })
+
+          return address?.toLowerCase() === s.signer.toLowerCase();
+
+        } catch (error) {
+          return false
+        }
+
+      }) as Signature[];
 
     console.log({
       signatures,
@@ -263,12 +288,10 @@ class ProcessValidateEvents extends BaseTask {
   async start(): Promise<void> {
     this.blockConfirmationsCount = blockConfirmations[this.chainId] + 1;
 
-    this.sourceProvider = new ethers.providers.JsonRpcProvider(
+    this.sourceProvider = new JsonRpcRetryProvider(
       getRpcProviderUrl(this.chainId)
     );
 
     await super.start();
   }
-}
-
-export default ProcessValidateEvents;
+}

package/src/tasks/InteropX/SyncLogExecuteEvents.ts

@@ -13,10 +13,11 @@ import { ChainId } from "@/types";
 import config from "@/config";
 import { InteropX } from "@/typechain";
 import { Op } from "sequelize";
+import { JsonRpcRetryProvider } from "@/providers";
 
-class SyncLogExecuteEvents extends BaseTask {
+export default class SyncLogExecuteEvents extends BaseTask {
   contractAddress: string;
-  provider: ethers.providers.JsonRpcProvider;
+  provider: JsonRpcRetryProvider;
   contract: InteropX;
   targetChainId: ChainId;
 
@@ -132,7 +133,7 @@ class SyncLogExecuteEvents extends BaseTask {
 
         await transaction.save();
 
-        this.logger.info(`New InteropX tranaction: ${transactionHash} `);
+        this.logger.info(`New InteropX transaction: ${transactionHash} `);
       } catch (error) {
         this.logger.error(error);
       }
@@ -145,7 +146,7 @@ class SyncLogExecuteEvents extends BaseTask {
   async start(): Promise<void> {
     this.contractAddress = addresses[this.targetChainId].interopX;
 
-    this.provider = new ethers.providers.JsonRpcProvider(
+    this.provider = new JsonRpcRetryProvider(
       getRpcProviderUrl(this.targetChainId)
     );
 
@@ -158,5 +159,3 @@ class SyncLogExecuteEvents extends BaseTask {
     await super.start();
   }
 }
-
-export default SyncLogExecuteEvents;

package/src/tasks/InteropX/SyncLogSubmitEvents.ts

@@ -12,10 +12,11 @@ import { addresses } from "@/constants";
 import { ChainId } from "@/types";
 import config from "@/config";
 import { InteropX } from "@/typechain";
+import { JsonRpcRetryProvider } from "@/providers";
 
-class SyncLogSubmitEvents extends BaseTask {
+export default class SyncLogSubmitEvents extends BaseTask {
   contractAddress: string;
-  provider: ethers.providers.JsonRpcProvider;
+  provider: JsonRpcRetryProvider;
   contract: InteropX;
   chainId: ChainId;
 
@@ -109,7 +110,7 @@ class SyncLogSubmitEvents extends BaseTask {
           },
         });
 
-        this.logger.info(`New InteropX tranaction: ${transactionHash} `);
+        this.logger.info(`New InteropX transaction: ${transactionHash} `);
       } catch (error) {
         this.logger.error(error);
       }
@@ -122,7 +123,7 @@ class SyncLogSubmitEvents extends BaseTask {
   async start(): Promise<void> {
     this.contractAddress = addresses[this.chainId].interopX;
 
-    this.provider = new ethers.providers.JsonRpcProvider(
+    this.provider = new JsonRpcRetryProvider(
       getRpcProviderUrl(this.chainId)
     );
 
@@ -134,6 +135,4 @@ class SyncLogSubmitEvents extends BaseTask {
 
     await super.start();
   }
-}
-
-export default SyncLogSubmitEvents;
+}

package/src/tasks/InteropX/SyncLogValidateEvents.ts

@@ -13,10 +13,11 @@ import { ChainId } from "@/types";
 import config from "@/config";
 import { InteropX } from "@/typechain";
 import { Op } from "sequelize";
+import { JsonRpcRetryProvider } from "@/providers";
 
-class SyncLogValidateEvents extends BaseTask {
+export default class SyncLogValidateEvents extends BaseTask {
   contractAddress: string;
-  provider: ethers.providers.JsonRpcProvider;
+  provider: JsonRpcRetryProvider;
   contract: InteropX;
   chainId: ChainId;
 
@@ -122,7 +123,7 @@ class SyncLogValidateEvents extends BaseTask {
         }
         await transaction.save();
 
-        this.logger.info(`New InteropX tranaction: ${transactionHash} `);
+        this.logger.info(`New InteropX transaction: ${transactionHash} `);
       } catch (error) {
         this.logger.error(error);
       }
@@ -135,7 +136,7 @@ class SyncLogValidateEvents extends BaseTask {
   async start(): Promise<void> {
     this.contractAddress = addresses[this.chainId].interopX;
 
-    this.provider = new ethers.providers.JsonRpcProvider(
+    this.provider = new JsonRpcRetryProvider(
       getRpcProviderUrl(this.chainId)
     );
 
@@ -147,6 +148,4 @@ class SyncLogValidateEvents extends BaseTask {
 
     await super.start();
   }
-}
-
-export default SyncLogValidateEvents;
+}

package/src/tasks/index.ts

@@ -6,7 +6,7 @@ import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask"
 import AutoUpdateTask from "./AutoUpdateTask";
 
 import SyncLogSubmitEvents from "./InteropX/SyncLogSubmitEvents";
-import ProcessSubmitSubmitEvents from "./InteropX/ProcessSubmitSubmitEvents";
+import ProcessSubmitEvents from "./InteropX/ProcessSubmitEvents";
 import SyncLogValidateEvents from "./InteropX/SyncLogValidateEvents";
 import ProcessValidateEvents from "./InteropX/ProcessValidateEvents";
 import SyncLogExecuteEvents from "./InteropX/SyncLogExecuteEvents";
@@ -14,15 +14,14 @@ import SyncLogExecuteEvents from "./InteropX/SyncLogExecuteEvents";
 export class Tasks {
 
     tasks: BaseTask[] = [
-        // new SyncTransactionStatusTask(),
         new AutoUpdateTask(),
 
         // InteropX
         new SyncLogSubmitEvents({ chainId: 137 }),
         new SyncLogSubmitEvents({ chainId: 43114 }),
 
-        new ProcessSubmitSubmitEvents({ chainId: 137 }),
-        new ProcessSubmitSubmitEvents({ chainId: 43114 }),
+        new ProcessSubmitEvents({ chainId: 137 }),
+        new ProcessSubmitEvents({ chainId: 43114 }),
 
         new SyncLogValidateEvents({ chainId: 137 }),
         new SyncLogValidateEvents({ chainId: 43114 }),