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

package/src/errors/index.ts

@@ -0,0 +1,26 @@
+export class UnsupportedChaindIdError extends Error {
+    constructor(chainId: any) {
+        super(`Unsupported chainId: ${chainId}`);
+    }
+}
+
+export class LiquidityError extends Error {
+    constructor(message?: string) {
+        super(message || "Not enough liquidity");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+
+export class InvalidChaindIdError extends Error {
+    constructor(message?: string) {
+        super(message || "Invalid chain id");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+
+export class LowLiquidityError extends Error {
+    constructor(message?: string) {
+        super(message || "Low liquidity");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}

package/src/gnosis/actions/aaveV2/source.ts

@@ -2,6 +2,7 @@ import abi from "@/abi";
 import config from "@/config";
 import { addresses } from "@/constants";
 import { Transaction } from "@/db";
+import { JsonRpcRetryProvider } from "@/providers";
 import { InteropX } from "@/typechain";
 import { ChainId } from "@/types";
 import { encodeConnectorMethod, getContract, getRpcProviderUrl } from "@/utils";
@@ -25,7 +26,7 @@ export default async function (transaction: Transaction) {
     metadata,
   } = transaction.submitEvent;
 
-  const sourceChainProvider = new ethers.providers.JsonRpcProvider(
+  const sourceChainProvider = new JsonRpcRetryProvider(
     getRpcProviderUrl(sourceChainId as ChainId)
   );
   const sourceWallet = new ethers.Wallet(

package/src/gnosis/actions/aaveV2/target.ts

@@ -2,7 +2,9 @@ import abi from "@/abi";
 import config from "@/config";
 import { addresses } from "@/constants";
 import { Transaction } from "@/db";
+import { JsonRpcRetryProvider } from "@/providers";
 import { InteropX } from "@/typechain";
+import { InstList } from "@/typechain/InstList";
 import { ChainId } from "@/types";
 import { encodeConnectorMethod, getContract, getRpcProviderUrl } from "@/utils";
 import { ethers } from "ethers";
@@ -26,15 +28,23 @@ export default async function (transaction: Transaction) {
         metadata,
     } = transaction.validateEvent;
 
-    const targetChainProvider = new ethers.providers.JsonRpcProvider(
+    const targetChainProvider = new JsonRpcRetryProvider(
         getRpcProviderUrl(targetChainId as ChainId)
     );
     const targetWallet = new ethers.Wallet(
         config.privateKey,
         targetChainProvider
     );
+
+
+    const targetInstListContract = getContract<InstList>(
+        addresses[targetChainId].instList,
+        abi.instList,
+        targetChainProvider,
+    );
+
+    const targetDsaAddress = await targetInstListContract.accountAddr(targetDsaId)
     const dsaAddress = addresses[targetChainId].dsaAddress;
-    const sourceUserAddress = Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
     const interopAddress = addresses[targetChainId].interopX;
     const contract = getContract<InteropX>(
         interopAddress,
@@ -60,7 +70,7 @@ export default async function (transaction: Transaction) {
         let spellDataBasicWithdraw = {
             connector: "BASIC-A",
             method: "withdraw",
-            args: [supplyToken.targetToken, supplyToken.amount, sourceUserAddress, "0", "0"],
+            args: [supplyToken.targetToken, supplyToken.amount, targetDsaAddress, "0", "0"],
         };
 
         commonSpells.push({

package/src/index.ts

@@ -82,6 +82,7 @@ import { startPeer, protocol, peerPool } from "@/net";
 import { startApiServer } from '@/api';
 import { Transaction } from './db';
 import { shortenHash } from './utils';
+import './crons';
 
 async function main() {
 

package/src/providers/index.ts

@@ -0,0 +1 @@
+export * from './retry-provider';

package/src/providers/retry-provider.ts

@@ -0,0 +1,51 @@
+import { ethers } from "ethers";
+import wait from "waait";
+import Bluebird from "bluebird";
+
+export interface RetryOptions {
+    delay?: number;
+    timeouts: number[];
+}
+
+export function promiseTimeout<T>(ms: number, promise: Promise<T>): Promise<T> {
+    return Bluebird.resolve(promise).timeout(ms);
+}
+
+export function retryOperation(
+    retriesLeft: number,
+    operation: () => Promise<any>,
+    options: RetryOptions
+) {
+    return new Promise((resolve, reject) => {
+        const { timeouts } = options;
+        // Find the timeout for this specific iteration
+        const timeout = timeouts[timeouts.length - retriesLeft];
+
+        // Wrap the original operation in a timeout
+        const execution = promiseTimeout(timeout, operation());
+
+        // If the promise is successful, resolve it and bubble the result up
+        return execution.then(resolve).catch((reason: any) => {
+            // If there are any retries left, we call the same retryOperation function again,
+            // but decrementing the number of retries left by 1
+            if (retriesLeft - 1 > 0) {
+                // Delay the new attempt slightly
+                return wait(options.delay || 50)
+                    .then(retryOperation.bind(null, retriesLeft - 1, operation, options))
+                    .then(resolve)
+                    .catch(reject);
+            }
+            // Reject (and bubble the result up) if there are no more retries
+            return reject(reason);
+        });
+    });
+}
+
+export class JsonRpcRetryProvider extends ethers.providers.JsonRpcProvider {
+    public perform(method: string, params: any): Promise<any> {
+        const timeouts = [5_000, 10_000];
+        const operation = () => super.perform(method, params);
+
+        return retryOperation(2, operation, { timeouts, delay: 50 });
+    }
+}

package/src/services/Prices.ts

@@ -0,0 +1,89 @@
+import Web3Utils from "web3-utils";
+import path from "path";
+import fs from "fs";
+import { tokens } from "@/constants";
+import expandHomeDir from "expand-home-dir";
+import config from "@/config";
+import { http } from "@/utils";
+
+const basePath = expandHomeDir(`~/.interop-x/data/${config.publicAddress}/${config.staging ? 'staging' : ''}`);
+const mainnetPricesFilePath = path.resolve(basePath, "./mainnetPrices.json");
+const networkTokenPricesFilePath = path.resolve(basePath, "./networkTokenPrices.json");
+
+class Prices {
+  private static mainnetPrices = {};
+
+  private static networkTokenPrices = {};
+
+  static async fetch() {
+
+    if (!fs.existsSync(mainnetPricesFilePath)) {
+      fs.writeFileSync(mainnetPricesFilePath, JSON.stringify({}));
+    }
+
+    if (!fs.existsSync(networkTokenPricesFilePath)) {
+      fs.writeFileSync(networkTokenPricesFilePath, JSON.stringify({}));
+    }
+
+    this.mainnetPrices = JSON.parse(fs.readFileSync(mainnetPricesFilePath, "utf8"));
+    this.networkTokenPrices = JSON.parse(fs.readFileSync(networkTokenPricesFilePath, "utf8"));
+
+    try {
+      const path = tokens["1"]
+        .filter((a) => a.symbol !== "ETH")
+        .map((token) => token.address)
+        .join(",");
+
+      const [response, ethResponse, avaxResponse, polygonResponse] =
+        await Promise.all([
+          http.get(
+            "https://api.coingecko.com/api/v3/simple/token_price/ethereum",
+            {
+              params: { contract_addresses: path, vs_currencies: "usd" },
+            }
+          ),
+          http.get("https://api.coingecko.com/api/v3/simple/price", {
+            params: { ids: "ethereum", vs_currencies: "usd" },
+          }),
+          http.get("https://api.coingecko.com/api/v3/simple/price", {
+            params: { ids: "avalanche-2", vs_currencies: "usd" },
+          }),
+          http.get("https://api.coingecko.com/api/v3/simple/price", {
+            params: { ids: "matic-network", vs_currencies: "usd" },
+          }),
+        ]);
+
+      this.networkTokenPrices = {
+        "1": ethResponse.data.ethereum.usd.toString(),
+        "137": polygonResponse.data["matic-network"].usd.toString(),
+        "43114": avaxResponse.data["avalanche-2"].usd.toString(),
+      };
+
+      const data = response.data;
+
+      for (const key in data) {
+        const _key = Web3Utils.toChecksumAddress(key);
+        if (!data[key].usd) continue;
+        this.mainnetPrices[_key] = data[key].usd.toString();
+      }
+
+      this.mainnetPrices["0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"] =
+        ethResponse.data.ethereum.usd.toString();
+    } catch (error) { }
+
+    fs.writeFileSync(mainnetPricesFilePath, JSON.stringify(this.mainnetPrices));
+    fs.writeFileSync(networkTokenPricesFilePath, JSON.stringify(this.networkTokenPrices));
+
+    return this.mainnetPrices;
+  }
+
+  static getMainnetPrices() {
+    return this.mainnetPrices;
+  }
+
+  static getNetworkTokenPrices() {
+    return this.networkTokenPrices;
+  }
+}
+
+export default Prices;

package/src/services/index.ts

@@ -0,0 +1 @@
+export { default as Prices } from './Prices';

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;
+}