@instadapp/interop-x 0.0.0-dev.c696e38 → 0.0.0-dev.cdc0510

package/src/tasks/InteropX/{ProcessSubmitSubmitEvents.ts → ProcessSubmitEvents.ts}

@@ -5,12 +5,18 @@ import abi from "@/abi";
 import { Transaction } from "@/db";
 import {
   buildSignatureBytes,
+  chainIdToName,
+  generateGnosisSignatureMessage,
   generateGnosisTransaction,
-  generateInteropTransactionHash,
+  getChainIdNativeSymbol,
   getContract,
+  getExplorerUrl,
   getRpcProviderUrl,
-  LiquidityError,
   Signature,
+  validateChains,
+  validateLiquidityCap,
+  validateSourceLiquidity,
+  getGnosisSignatureAddress,
 } from "@/utils";
 import { addresses, blockConfirmations } from "@/constants";
 import { ChainId } from "@/types";
@@ -22,9 +28,13 @@ import { buildGnosisAction } from "@/gnosis";
 import { peerPool, protocol } from "@/net";
 import { LogDescription } from "ethers/lib/utils";
 import wait from "waait";
+import { LiquidityError, UnsupportedChaindIdError } from "@/errors";
+import { BigNumber } from "bignumber.js";
+import dedent from "dedent";
+import { JsonRpcRetryProvider } from "@/providers";
 
-class ProcessSubmitSubmitEvents extends BaseTask {
-  sourceProvider: ethers.providers.JsonRpcProvider;
+export default class ProcessSubmitEvents extends BaseTask {
+  sourceProvider: JsonRpcRetryProvider;
   sourceGnosisContract: GnosisSafe;
   sourceWallet: Wallet;
   chainId: ChainId;
@@ -33,7 +43,7 @@ class ProcessSubmitSubmitEvents extends BaseTask {
 
   constructor({ chainId }: { chainId: ChainId }) {
     super({
-      logger: new Logger("InteropX::ProcessSubmitSubmitEvents"),
+      logger: new Logger("InteropX::ProcessSubmitEvents"),
     });
     this.chainId = chainId;
   }
@@ -73,6 +83,76 @@ class ProcessSubmitSubmitEvents extends BaseTask {
     transaction.sourceStatus = "proccessing";
     await transaction.save();
 
+    const { submitEvent: { position, sourceChainId, targetChainId } } = transaction;
+    try {
+      validateChains({ sourceChainId, targetChainId });
+    } catch (error) {
+      transaction.sourceErrors = [error.message];
+      transaction.sourceStatus = "failed";
+      transaction.targetStatus = "failed";
+      transaction.status = "failed";
+      await transaction.save();
+      return;
+    }
+
+    const walletBalance = (await this.sourceWallet.getBalance()).toString();
+    const currentGasPrice = (await this.sourceWallet.getGasPrice()).toString()
+
+    const minBalanceRequired = new BigNumber(currentGasPrice)
+      .multipliedBy(4_000_000)
+      .multipliedBy(2) // 2x balance
+
+    if (
+      new BigNumber(walletBalance).isLessThan(minBalanceRequired)
+    ) {
+      console.log(
+        dedent`Not enough balance in wallet ${getExplorerUrl(sourceChainId, '/address/' + this.sourceWallet.address)} on ${chainIdToName(sourceChainId)}
+        Balance: ${ethers.utils.parseEther(walletBalance)} ${getChainIdNativeSymbol(sourceChainId)}
+        Required Balance: ${ethers.utils.parseEther(minBalanceRequired.toString())}
+        Require more: ${ethers.utils.parseEther(minBalanceRequired.minus(walletBalance).toString())}`
+      );
+      transaction.sourceDelayUntil = moment().add({ minutes: 5 }).toDate();
+      transaction.sourceStatus = "pending";
+      await transaction.save();
+      return;
+    }
+
+    try {
+      await validateLiquidityCap(position, sourceChainId, targetChainId);
+    } catch (error) {
+      transaction.sourceErrors = [error.message];
+      transaction.sourceStatus = "failed";
+      transaction.targetStatus = "failed";
+      transaction.status = "failed";
+      await transaction.save();
+      return;
+    }
+
+    try {
+      await validateSourceLiquidity({
+        position,
+        sourceChainId,
+        sourceProvider: this.sourceProvider,
+      });
+    } catch (error) {
+      if (error instanceof UnsupportedChaindIdError) {
+        console.log(`Dropping transaction ${transaction.transactionHash}`);
+
+        transaction.sourceErrors = [error.message];
+        transaction.sourceStatus = "failed";
+        transaction.targetStatus = "failed";
+        transaction.status = "failed";
+        await transaction.save();
+      } else {
+        transaction.sourceStatus = "pending";
+        transaction.sourceDelayUntil = moment().add({ minutes: 5 }).toDate();
+        await transaction.save();
+
+        console.log("[validateSourceLiquidity][Warning]", error.message);
+        return;
+      }
+    }
+
     const ownersThreshold = await this.sourceGnosisContract.getThreshold();
     await wait(10000);
 
@@ -126,19 +206,36 @@ class ProcessSubmitSubmitEvents extends BaseTask {
       this.sourceGnosisContract
     );
 
-    const owners = await this.sourceGnosisContract
-      .getOwners()
-      .then((owners) => owners.map((owner) => owner.toLowerCase()));
 
-    const ownerPeerIds = peerPool.activePeers
-      .filter((peer) => owners.includes(peer.publicAddress.toLowerCase()))
-      .map((peer) => peer.id);
+    async function getGnosisOwnerPeerIds({
+      gnosisContract
+    }) {
+      const owners = await gnosisContract
+        .getOwners()
+        .then((owners) => owners.map((owner) => owner.toLowerCase()));
+
+      return peerPool.activePeers
+        .filter((peer) => owners.includes(peer.publicAddress.toLowerCase()))
+        .map((peer) => peer.id);
+    }
+
+    const ownerPeerIds = await getGnosisOwnerPeerIds({
+      gnosisContract: this.sourceGnosisContract,
+    });
 
     console.log(
-      `Collecting signatures for execution ${transaction.transactionHash}`
+      `Collecting signatures for execution ${transaction.transactionHash} `
     );
 
     console.log(ownerPeerIds);
+    
+    const message = generateGnosisSignatureMessage({
+      to: addresses[data.chainId].multisend,
+      data,
+      chainId: this.chainId,
+      safeTxGas: gnosisTx.safeTxGas,
+      nonce: gnosisTx.safeNonce,
+    });
 
     const signatures = await protocol.requestSignatures(
       {
@@ -151,9 +248,27 @@ class ProcessSubmitSubmitEvents 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: this.chainId,
+          })
+
+          return address?.toLowerCase() === s.signer.toLowerCase();
+
+        } catch (error) {
+          return false
+        }
+
+      }) as Signature[];
 
     console.log({
       signatures,
@@ -172,7 +287,7 @@ class ProcessSubmitSubmitEvents extends BaseTask {
       await transaction.save();
       const errorMessage = signatures.find((s) => !!s.error)?.error;
       throw new Error(
-        `Not enough signatures` + (errorMessage ? `: ${errorMessage}` : "")
+        `Not enough signatures` + (errorMessage ? `: ${errorMessage} ` : "")
       );
     }
 
@@ -220,7 +335,7 @@ class ProcessSubmitSubmitEvents extends BaseTask {
     receipt.logs.forEach((log) => {
       try {
         parsedLogs.push(this.sourceGnosisContract.interface.parseLog(log));
-      } catch (e) {}
+      } catch (e) { }
     });
 
     if (parsedLogs.find((e) => e.name === "ExecutionSuccess")) {
@@ -247,7 +362,7 @@ class ProcessSubmitSubmitEvents 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)
     );
 
@@ -265,5 +380,3 @@ class ProcessSubmitSubmitEvents extends BaseTask {
     await super.start();
   }
 }
-
-export default ProcessSubmitSubmitEvents;

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[data.chainId].multisend,
+      data,
+      chainId: this.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: this.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

@@ -0,0 +1,161 @@
+import { BaseTask } from "../BaseTask";
+import Logger from "@/logger";
+import { ethers } from "ethers";
+import abi from "@/abi";
+import { Transaction } from "@/db";
+import {
+  generateInteropTransactionHash,
+  getContract,
+  getRpcProviderUrl,
+} from "@/utils";
+import { addresses } from "@/constants";
+import { ChainId } from "@/types";
+import config from "@/config";
+import { InteropX } from "@/typechain";
+import { Op } from "sequelize";
+import { JsonRpcRetryProvider } from "@/providers";
+
+export default class SyncLogExecuteEvents extends BaseTask {
+  contractAddress: string;
+  provider: JsonRpcRetryProvider;
+  contract: InteropX;
+  targetChainId: ChainId;
+
+  constructor({ targetChainId }: { targetChainId: ChainId }) {
+    super({
+      logger: new Logger("InteropX::SyncLogExecuteEvents"),
+    });
+    this.targetChainId = targetChainId;
+  }
+
+  async pollHandler() {
+    const currentBlock = await this.provider.getBlockNumber();
+
+    const events = await this.contract.queryFilter(
+      this.contract.filters.LogExecute(),
+      currentBlock - 2000,
+      currentBlock
+    );
+
+    let processedEvents = 0;
+
+    for (const event of events) {
+      try {
+        if (!event.args) {
+          continue;
+        }
+
+        const {
+          sourceSpells,
+          targetSpells,
+          position,
+          actionId,
+          actionIdHash,
+          sourceSender,
+          sourceDsaId,
+          targetDsaId,
+          sourceChainId,
+          targetChainId,
+          vnonce,
+          metadata,
+        } = event.args;
+
+        const uniqueIdentifier = {
+          actionId,
+          vnonce: vnonce.toString(),
+          sourceSender: sourceSender.toString(),
+          sourceChainId: sourceChainId.toNumber(),
+          targetChainId: targetChainId.toNumber(),
+          sourceDsaId: sourceDsaId.toString(),
+          targetDsaId: targetDsaId.toString(),
+        };
+
+        let transactionHash = generateInteropTransactionHash(uniqueIdentifier);
+
+        const transaction = await Transaction.findOne({
+          where: {
+            transactionHash,
+            executeEvent: { [Op.eq]: null },
+          },
+        });
+
+        if (!transaction) {
+          continue;
+        }
+
+        if (transaction.targetStatus != "success") {
+          transaction.targetStatus = "success";
+        }
+
+        if (transaction.status != "success") {
+          transaction.status = "success";
+        }
+
+        if (!transaction.targetCreatedAt) {
+          transaction.targetCreatedAt = new Date();
+        }
+
+        transaction.targetTransactionHash = event.transactionHash;
+        transaction.targetBlockNumber = event.blockNumber;
+        transaction.targetLogs = [];
+        transaction.executeEvent = {
+          actionId,
+          actionIdHashHash: actionIdHash,
+          actionIdHash,
+          vnonce: vnonce.toString(),
+          sourceSpells: sourceSpells.map(({ connector, data }) => ({
+            connector,
+            data,
+          })),
+          targetSpells: targetSpells.map(({ connector, data }) => ({
+            connector,
+            data,
+          })),
+          position: {
+            withdraw: position.withdraw.map((v) => ({
+              sourceToken: v.sourceToken,
+              targetToken: v.targetToken,
+              amount: v.amount.toString(),
+            })),
+            supply: position.supply.map((v) => ({
+              sourceToken: v.sourceToken,
+              targetToken: v.targetToken,
+              amount: v.amount.toString(),
+            })),
+          },
+          sourceChainId: sourceChainId.toNumber(),
+          targetChainId: targetChainId.toNumber(),
+          sourceSender,
+          sourceDsaId: sourceDsaId.toString(),
+          targetDsaId: targetDsaId.toString(),
+          metadata,
+        };
+
+        await transaction.save();
+
+        this.logger.info(`New InteropX tranaction: ${transactionHash} `);
+      } catch (error) {
+        this.logger.error(error);
+      }
+    }
+
+    if (processedEvents > 0)
+      this.logger.info(`${processedEvents} events processed`);
+  }
+
+  async start(): Promise<void> {
+    this.contractAddress = addresses[this.targetChainId].interopX;
+
+    this.provider = new JsonRpcRetryProvider(
+      getRpcProviderUrl(this.targetChainId)
+    );
+
+    this.contract = getContract<InteropX>(
+      this.contractAddress,
+      abi.interopX,
+      new ethers.Wallet(config.privateKey!, this.provider)
+    );
+
+    await super.start();
+  }
+}

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;
 
@@ -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;
 
@@ -92,7 +93,7 @@ class SyncLogValidateEvents extends BaseTask {
         transaction.sourceTransactionHash = event.transactionHash;
         transaction.sourceBlockNumber = event.blockNumber;
         transaction.sourceLogs = [];
-        (transaction.validateEvent = {
+        transaction.validateEvent = {
           actionId,
           actionIdHashHash: actionIdHash,
           actionIdHash,
@@ -119,8 +120,8 @@ class SyncLogValidateEvents extends BaseTask {
           sourceDsaId: sourceDsaId.toString(),
           targetDsaId: targetDsaId.toString(),
           metadata,
-        }),
-          await transaction.save();
+        }
+        await transaction.save();
 
         this.logger.info(`New InteropX tranaction: ${transactionHash} `);
       } catch (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,22 +6,22 @@ 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";
 
 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 }),
@@ -29,6 +29,9 @@ export class Tasks {
         new ProcessValidateEvents({ chainId: 137 }),
         new ProcessValidateEvents({ chainId: 43114 }),
 
+        new SyncLogExecuteEvents({ targetChainId: 137 }),
+        new SyncLogExecuteEvents({ targetChainId: 43114 }),
+
         new SyncTransactionStatusTask(),
     ];
 
@@ -36,7 +39,7 @@ export class Tasks {
         for (const task of this.tasks) {
             try {
                 task.start();
-                await wait(1000)
+                await wait(300)
             } catch (error) {
                 console.error(`Error starting task: ${task.constructor.name}`);
             }