@instadapp/interop-x 0.0.0-dev.5953f3d → 0.0.0-dev.5a90c8d

package/src/db/models/transaction.ts

@@ -1,74 +1,116 @@
-import { sequelize } from '@/db/sequelize'
-import { CreationOptional, InferAttributes, InferCreationAttributes, Model, DataTypes } from 'sequelize';
+import { sequelize } from "@/db/sequelize";
+import {
+  CreationOptional,
+  InferAttributes,
+  InferCreationAttributes,
+  Model,
+  DataTypes,
+} from "sequelize";
 
 export interface IPositionTokenInfo {
-    amount: string;
-    sourceToken: string;
-    targetToken: string;
+  amount: string;
+  sourceToken: string;
+  targetToken: string;
 }
 
 export interface IPosition {
-    supply: IPositionTokenInfo[];
-    withdraw: IPositionTokenInfo[];
+  supply: IPositionTokenInfo[];
+  withdraw: IPositionTokenInfo[];
 }
 
-export class Transaction extends Model<InferAttributes<Transaction>, InferCreationAttributes<Transaction>> {
-    declare id: CreationOptional<number>;
-
-    declare transactionHash: string;
-    declare vnonce: string;
-    declare actionId: string;
-    declare sourceSender: string;
-
-    declare submitChainId: number;
-    declare submitTransactionHash: string;
-    declare submitBlockNumber: number;
-    declare submitCreatedAt: Date;
-
-    declare sourceChainId: number;
-    declare sourceDsaId: string;
-    declare sourceTransactionHash: CreationOptional<string>;
-    declare sourceBlockNumber: CreationOptional<number>;
-    declare sourceStatus: CreationOptional<string>;
-    declare sourceErrors: CreationOptional<string[]>;
-    declare sourceLogs: CreationOptional<any[]>;
-    declare sourceCreatedAt: CreationOptional<Date>;
-    declare sourceDelayUntil: CreationOptional<Date>;
-
-    declare targetChainId: number;
-    declare targetDsaId: string;
-    declare targetTransactionHash: CreationOptional<string>;
-    declare targetBlockNumber: CreationOptional<number>;
-    declare targetStatus: CreationOptional<string>;
-    declare targetErrors: CreationOptional<string[]>;
-    declare targetLogs: CreationOptional<any[]>;
-    declare targetCreatedAt: CreationOptional<Date>;
-    declare targetDelayUntil: CreationOptional<Date>;
-
-    declare submitEvent: {
-        position: IPosition;
-        actionId: string;
-        actionIdHashHash: string;
-        sourceSender: string;
-        sourceDsaId: string;
-        targetDsaId: string;
-        sourceChainId: number;
-        targetChainId: number;
-        vnonce: string;
-        metadata: string;
-    };
-
-    declare status: CreationOptional<string>;
-
-    declare createdAt: CreationOptional<Date>;
-    declare updatedAt: CreationOptional<Date>;
+export class Transaction extends Model<
+  InferAttributes<Transaction>,
+  InferCreationAttributes<Transaction>
+> {
+  declare id: CreationOptional<number>;
+
+  declare transactionHash: string;
+  declare vnonce: string;
+  declare actionId: string;
+  declare sourceSender: string;
+
+  declare submitChainId: number;
+  declare submitTransactionHash: string;
+  declare submitBlockNumber: number;
+  declare submitCreatedAt: Date;
+
+  declare sourceChainId: number;
+  declare sourceDsaId: string;
+  declare sourceTransactionHash: CreationOptional<string>;
+  declare sourceBlockNumber: CreationOptional<number>;
+  declare sourceStatus: CreationOptional<string>;
+  declare sourceErrors: CreationOptional<string[]>;
+  declare sourceLogs: CreationOptional<any[]>;
+  declare sourceCreatedAt: CreationOptional<Date>;
+  declare sourceDelayUntil: CreationOptional<Date>;
+
+  declare targetChainId: number;
+  declare targetDsaId: string;
+  declare targetTransactionHash: CreationOptional<string>;
+  declare targetBlockNumber: CreationOptional<number>;
+  declare targetStatus: CreationOptional<string>;
+  declare targetErrors: CreationOptional<string[]>;
+  declare targetLogs: CreationOptional<any[]>;
+  declare targetCreatedAt: CreationOptional<Date>;
+  declare targetDelayUntil: CreationOptional<Date>;
+
+  declare submitEvent: {
+    position: IPosition;
+    actionId: string;
+    actionIdHashHash: string;
+    actionIdHash: string;
+    sourceSender: string;
+    sourceDsaId: string;
+    targetDsaId: string;
+    sourceChainId: number;
+    targetChainId: number;
+    vnonce: string;
+    metadata: string;
+  };
+
+  declare validateEvent: CreationOptional<{
+    sourceSpells: Array<{ connector: string; data: string }>;
+    position: IPosition;
+    actionId: string;
+    actionIdHashHash: string;
+    actionIdHash: string;
+    sourceSender: string;
+    sourceDsaId: string;
+    targetDsaId: string;
+    sourceChainId: number;
+    targetChainId: number;
+    vnonce: string;
+    metadata: string;
+  }>;
+
+  declare executeEvent: CreationOptional<{
+    sourceSpells: Array<{ connector: string; data: string }>;
+    targetSpells: Array<{ connector: string; data: string }>;
+    position: IPosition;
+    actionId: string;
+    actionIdHashHash: string;
+    actionIdHash: string;
+    sourceSender: string;
+    sourceDsaId: string;
+    targetDsaId: string;
+    sourceChainId: number;
+    targetChainId: number;
+    vnonce: string;
+    metadata: string;
+  }>;
+
+  declare status: CreationOptional<string>;
+
+  declare createdAt: CreationOptional<Date>;
+  declare updatedAt: CreationOptional<Date>;
 }
 
-Transaction.init({
+Transaction.init(
+  {
     id: {
-        type: DataTypes.INTEGER,
-        autoIncrement: true,
-        primaryKey: true
+      type: DataTypes.INTEGER,
+      autoIncrement: true,
+      primaryKey: true,
     },
 
     transactionHash: DataTypes.STRING,
@@ -86,20 +128,20 @@ Transaction.init({
     sourceTransactionHash: DataTypes.STRING,
     sourceBlockNumber: DataTypes.NUMBER,
     sourceStatus: {
-        type: DataTypes.STRING,
-        defaultValue: 'pending'
+      type: DataTypes.STRING,
+      defaultValue: "pending",
     },
     sourceErrors: {
-        type: DataTypes.JSON,
-        // defaultValue: [],
+      type: DataTypes.JSON,
+      // defaultValue: [],
     },
     sourceLogs: {
-        type: DataTypes.JSON,
-        // defaultValue: [],
+      type: DataTypes.JSON,
+      // defaultValue: [],
     },
     sourceCreatedAt: {
-        type: DataTypes.DATE,
-        defaultValue: Date.now()
+      type: DataTypes.DATE,
+      defaultValue: Date.now(),
     },
     sourceDelayUntil: DataTypes.STRING,
 
@@ -108,29 +150,41 @@ Transaction.init({
     targetTransactionHash: DataTypes.STRING,
     targetBlockNumber: DataTypes.NUMBER,
     targetStatus: {
-        type: DataTypes.STRING,
-        defaultValue: 'pending'
+      type: DataTypes.STRING,
+      defaultValue: "pending",
     },
     targetErrors: {
-        type: DataTypes.JSON,
-        // defaultValue: [],
+      type: DataTypes.JSON,
+      // defaultValue: [],
     },
     targetLogs: {
-        type: DataTypes.JSON,
-        // defaultValue: [],
+      type: DataTypes.JSON,
+      // defaultValue: [],
     },
     targetCreatedAt: DataTypes.DATE,
     targetDelayUntil: DataTypes.DATE,
 
     submitEvent: {
-        type: DataTypes.JSON,
-        allowNull: false
+      type: DataTypes.JSON,
+      allowNull: false,
+    },
+
+    validateEvent: {
+      type: DataTypes.JSON,
+      allowNull: true,
+    },
+
+    executeEvent: {
+      type: DataTypes.JSON,
+      allowNull: true,
     },
 
     status: {
-        type: DataTypes.STRING,
-        defaultValue: 'pending'
+      type: DataTypes.STRING,
+      defaultValue: "pending",
     },
     createdAt: DataTypes.DATE,
     updatedAt: DataTypes.DATE,
-}, { sequelize, tableName: 'transactions' });
+  },
+  { sequelize, tableName: "transactions" }
+);

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,13 +26,16 @@ 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(
     config.privateKey,
     sourceChainProvider
   );
+  const dsaAddress = addresses[sourceChainId].dsaAddress;
+  const sourceUserAddress =
+    Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
   const interopAddress = addresses[sourceChainId].interopX;
   const contract = getContract<InteropX>(
     interopAddress,
@@ -40,7 +44,7 @@ export default async function (transaction: Transaction) {
   );
 
   const sourceSpells: any[] = [];
-  const commonSpells = [];
+  const commonSpells: any[] = [];
 
   for (const withdraw of position.withdraw) {
     let spellData = {
@@ -50,9 +54,20 @@ export default async function (transaction: Transaction) {
     };
 
     sourceSpells.push({
-      connector: spellData.method,
+      connector: spellData.connector,
       data: encodeConnectorMethod(spellData),
     });
+
+    let spellDataBasicWithdraw = {
+      connector: "BASIC-A",
+      method: "withdraw",
+      args: [withdraw.sourceToken, withdraw.amount, sourceUserAddress, "0", "0"],
+    };
+
+    commonSpells.push({
+      connector: spellDataBasicWithdraw.connector,
+      data: encodeConnectorMethod(spellDataBasicWithdraw),
+    });
   }
 
   for (const supply of position.supply) {
@@ -63,18 +78,18 @@ export default async function (transaction: Transaction) {
     };
 
     sourceSpells.push({
-      connector: spellDataWithdraw.method,
+      connector: spellDataWithdraw.connector,
       data: encodeConnectorMethod(spellDataWithdraw),
     });
 
     let spellDataBasicWithdraw = {
       connector: "BASIC-A",
       method: "withdraw",
-      args: [supply.sourceToken, supply.amount, interopAddress, "0", "0"],
+      args: [supply.sourceToken, supply.amount, dsaAddress, "0", "0"],
     };
 
     sourceSpells.push({
-      connector: spellDataBasicWithdraw.method,
+      connector: spellDataBasicWithdraw.connector,
       data: encodeConnectorMethod(spellDataBasicWithdraw),
     });
   }

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

@@ -1,6 +1,13 @@
-
-
+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";
 import { MetaTransaction, OperationType } from "ethers-multisend";
 
 
@@ -8,6 +15,128 @@ export default async function (transaction: Transaction) {
     const transactions: MetaTransaction[] = [];
     const logs: any[] = [];
 
+    const {
+        sourceSpells,
+        position,
+        actionId,
+        sourceSender,
+        sourceDsaId,
+        targetDsaId,
+        sourceChainId,
+        targetChainId,
+        vnonce,
+        metadata,
+    } = transaction.validateEvent;
+
+    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 interopAddress = addresses[targetChainId].interopX;
+    const contract = getContract<InteropX>(
+        interopAddress,
+        abi.interopX,
+        targetWallet
+    );
+
+    const targetSpells: any[] = [];
+    const commonSpells: any[] = [];
+
+    for (const supplyToken of position.supply) {
+        let spellData = {
+            connector: "AAVE-V2-A",
+            method: "deposit",
+            args: [supplyToken.targetToken, supplyToken.amount, "0", "0"],
+        };
+
+        targetSpells.push({
+            connector: spellData.connector,
+            data: encodeConnectorMethod(spellData),
+        });
+
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [supplyToken.targetToken, supplyToken.amount, targetDsaAddress, "0", "0"],
+        };
+
+        commonSpells.push({
+            connector: spellDataBasicWithdraw.connector,
+            data: encodeConnectorMethod(spellDataBasicWithdraw),
+        });
+    }
+
+    for (const withdrawToken of position.withdraw) {
+
+        let spellData = {
+            connector: "AAVE-V2-A",
+            method: "borrow",
+            args: [
+                withdrawToken.targetToken,
+                withdrawToken.amount,
+                "2",
+                "0",
+                "0",
+            ],
+        };
+
+        targetSpells.push({
+            connector: spellData.connector,
+            data: encodeConnectorMethod(spellData),
+        });
+
+        let spellData2 = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [
+                withdrawToken.targetToken,
+                withdrawToken.amount,
+                dsaAddress,
+                "0",
+                "0",
+            ],
+        };
+
+        targetSpells.push({
+            connector: spellData.connector,
+            data: encodeConnectorMethod(spellData2),
+        });
+    }
+
+    const { data } = await contract.populateTransaction.targetAction(
+        sourceSpells,
+        targetSpells,
+        commonSpells,
+        position,
+        actionId,
+        sourceSender,
+        sourceDsaId,
+        targetDsaId,
+        sourceChainId,
+        targetChainId,
+        vnonce,
+        metadata
+    );
+
+    transactions.push({
+        to: interopAddress,
+        data: data!,
+        value: "0",
+        operation: OperationType.Call,
+    });
 
     return { transactions, logs }
 }

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';