@instadapp/interop-x 0.0.0-dev.59f84ce → 0.0.0-dev.5a90c8d

package/src/api/index.ts

@@ -21,11 +21,19 @@ export const startApiServer = async () => {
                 limit: 20,
                 offset: 0,
                 order: [
-                    ['createdAt', 'DESC']
+                    ['updatedAt', 'DESC']
                 ]
             })
         })
 
+        server.get('/transactions/:transaction', async (req) => {
+            return await Transaction.findOne({
+                where: {
+                    transactionHash: (req.params as any).transaction
+                }
+            })
+        })
+
         await server.listen(PORT, HOST)
 
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`)

package/src/constants/addresses.ts

@@ -1,17 +1,30 @@
+export type NetworkAddresses = {
+  gnosisSafe: string
+  multisend: string
+  interopX: string
+  dsaAddress: string
+  instList: string
+  aaveResolver: string
+  balanceResolver: string
+}
+
 export const addresses = {
-  1: {
-    gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
-    multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-    interopXContract: '',
-  },
   137: {
     gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
     multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-    interopXContract: '0x2189741c8cAc1cf51570932817A7d6390646C80e',
+    interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
+    dsaAddress: '0x9Fbd453a8e7a158510fBae5D9935958507cf4b19',
+    instList: "0x839c2D3aDe63DF5b0b8F3E57D5e145057Ab41556",
+    aaveResolver: "0x0731c1d0154C2bE74d50e2083Df10aa531AAbb10",
+    balanceResolver: "0xecc3991846bB21717B95A593Fd86C5930A491F95",
   },
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
     multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-    interopXContract: '0x1867DF97Ec24bb0bbD4AD464F0Be9C6713422EAE',
+    interopX: '0xA82A87096709E3D8648c9d9a22f31133bC4B6d32',
+    dsaAddress: '0x995e67a652d2be45a8bff438b3dfac66dfff1c46',
+    instList: "0x9926955e0Dd681Dc303370C52f4Ad0a4dd061687",
+    aaveResolver: "0x7C5C59944263311a1e350E3B871B0d1d8E9A513E",
+    balanceResolver: "0xD45dFA34cEeAB567208041331F5ed9916C23b1E8",
   }
-}
+} as Record<number, NetworkAddresses>

package/src/constants/blockConfirmations.ts

@@ -0,0 +1,5 @@
+export const blockConfirmations = {
+  "1": 12,
+  "137": 32,
+  "43114": 12,
+};

package/src/constants/capPerChain.ts

@@ -0,0 +1,5 @@
+export const capPerChain =  {
+    "1": 100_000_000,
+    "137": 100_000_000,
+    "43114": 100_000_000,
+};

package/src/constants/index.ts

@@ -1,2 +1,5 @@
 export * from './addresses';
 export * from './tokens';
+export * from './blockConfirmations';
+export * from './wrappedNativeToken';
+export * from './capPerChain';

package/src/constants/tokens.ts

@@ -1,30 +1,42 @@
 export const tokens = {
   1: [
     {
+      aliases: ['eth'],
       symbol: "ETH",
       name: "Ethereum",
       address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       decimals: 18,
     },
     {
+      aliases: ['weth'],
+      symbol: "WETH",
+      name: "Wrapped Ethereum",
+      address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+      decimals: 18,
+    },
+    {
+      aliases: ['dai'],
       symbol: "DAI",
       name: "DAI Stable",
       address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
       decimals: 18,
     },
     {
+      aliases: ['usdc'],
       symbol: "USDC",
       name: "USD Coin",
       address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       decimals: 6,
     },
     {
+      aliases: ['usdt'],
       symbol: "USDT",
       name: "Tether USD Coin",
       address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
       decimals: 6,
     },
     {
+      aliases: ['wbtc'],
       symbol: "WBTC",
       name: "Wrapped BTC",
       address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
@@ -33,72 +45,83 @@ export const tokens = {
   ],
   137: [
     {
+      aliases: ['eth', 'weth'],
       symbol: "ETH",
       name: "Ethereum",
       address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
       decimals: 18,
     },
     {
+      aliases: ['dai'],
       symbol: "DAI",
       name: "DAI Stable",
       address: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063",
       decimals: 18,
     },
     {
+      aliases: ['usdc'],
       symbol: "USDC",
       name: "USD Coin",
       address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
       decimals: 6,
     },
     {
+      aliases: ['usdt'],
       symbol: "USDT",
       name: "Tether USD Coin",
       address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
       decimals: 6,
     },
     {
+      aliases: ['wbtc'],
       symbol: "WBTC",
       name: "Wrapped BTC",
       address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
       decimals: 8,
     },
-    {
-      symbol: "AVAX",
-      name: "Avalanche Token",
-      address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
-      decimals: 18,
-    },
   ],
   43114: [
     {
+      aliases: ['eth', 'weth'],
       symbol: "ETH",
       name: "Ethereum",
       address: "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB",
       decimals: 18,
     },
     {
+      aliases: ['dai'],
       symbol: "DAI",
       name: "DAI Stable",
       address: "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70",
       decimals: 18,
     },
     {
+      aliases: ['usdc'],
       symbol: "USDC",
       name: "USD Coin",
       address: "0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664",
       decimals: 6,
     },
     {
-      symbol: "USDT",
+      aliases: ['usdt'],
+      symbol: "USDt",
       name: "Tether USD Coin",
+      address: "0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7",
+      decimals: 6,
+    },
+    {
+      aliases: ['usdt'],
+      symbol: "USDT.e",
+      name: "Tether USD",
       address: "0xc7198437980c041c805A1EDcbA50c1Ce5db95118",
       decimals: 6,
     },
     {
+      aliases: ["wbtc"],
       symbol: "WBTC",
       name: "Wrapped BTC",
       address: "0x50b7545627a5162F82A992c33b87aDc75187B218",
       decimals: 8,
     },
   ],
-};
+} as Record<number, { aliases: string[], symbol: string, name: string, address: string, decimals: number }[]>;

package/src/constants/wrappedNativeToken.ts

@@ -0,0 +1,5 @@
+export const wrappedNativeToken = {
+  "1": '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+  "137": '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
+  "43114": '0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7'
+};

package/src/crons/index.ts

@@ -0,0 +1 @@
+import "./prices"

package/src/crons/prices.ts

@@ -0,0 +1,12 @@
+import { Prices } from "@/services";
+import cron from "node-cron";
+
+Prices.fetch().catch(console.log);
+
+cron.schedule(`* * * * *`, async () => {
+    try {
+        await Prices.fetch();
+    } catch (error) {
+        console.log("Prices: ", error.message);
+    }
+});

package/src/db/models/transaction.ts

@@ -1,134 +1,190 @@
-import { sequelize } from '@/db/sequelize'
-import { CreationOptional, InferAttributes, InferCreationAttributes, Model, DataTypes } from 'sequelize';
-
-export interface IPositionTokenInfo{
-    amount: string;
-    sourceToken: string;
-    targetToken: string;
+import { sequelize } from "@/db/sequelize";
+import {
+  CreationOptional,
+  InferAttributes,
+  InferCreationAttributes,
+  Model,
+  DataTypes,
+} from "sequelize";
+
+export interface IPositionTokenInfo {
+  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 action: string;
-    declare bridger: string;
-    declare requestTransactionHash: string;
-
-    declare requestBlockNumber: number;
-
-    declare sourceChainId: number;
-    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 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 requestEvent: {
-        bridger: string;
-        metadata: string;
-        position: IPosition;
-        sourceChainId: number;
-        targetChainId: number;
-    };
-    declare requestSendEvent: CreationOptional<any>;
-    declare committedEvent: CreationOptional<any>;
-    declare completedEvent: CreationOptional<any>;
-
-    declare position: any;
-    declare metadata: CreationOptional<any>;
-
-    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,
     },
 
-    requestTransactionHash: DataTypes.NUMBER,
-    requestBlockNumber: DataTypes.NUMBER,
-
     transactionHash: DataTypes.STRING,
-    action: DataTypes.STRING,
-    bridger: DataTypes.STRING,
+    actionId: DataTypes.STRING,
+    vnonce: DataTypes.STRING,
+    sourceSender: DataTypes.STRING,
+
+    submitChainId: DataTypes.NUMBER,
+    submitTransactionHash: DataTypes.STRING,
+    submitBlockNumber: DataTypes.NUMBER,
+    submitCreatedAt: DataTypes.DATE,
 
     sourceChainId: DataTypes.NUMBER,
+    sourceDsaId: DataTypes.STRING,
     sourceTransactionHash: DataTypes.STRING,
     sourceBlockNumber: DataTypes.NUMBER,
     sourceStatus: {
-        type: DataTypes.STRING,
-        defaultValue: 'uninitialised'
+      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,
 
     targetChainId: DataTypes.NUMBER,
+    targetDsaId: DataTypes.STRING,
     targetTransactionHash: DataTypes.STRING,
     targetBlockNumber: DataTypes.NUMBER,
     targetStatus: {
-        type: DataTypes.STRING,
-        defaultValue: 'uninitialised'
+      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,
 
-    requestEvent: {
-        type: DataTypes.JSON,
-        allowNull: false
+    submitEvent: {
+      type: DataTypes.JSON,
+      allowNull: false,
     },
-    requestSendEvent: DataTypes.JSON,
-    committedEvent: DataTypes.JSON,
-    completedEvent: DataTypes.JSON,
 
-    position: DataTypes.JSON,
-    metadata: DataTypes.JSON,
+    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/index.ts

@@ -0,0 +1,9 @@
+import { Transaction } from "@/db";
+import source from "./source";
+import target from "./target";
+
+
+
+export default async function (transaction: Transaction, type: 'source' | 'target') {
+    return type === 'source' ? source(transaction) : target(transaction);
+}

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

@@ -0,0 +1,119 @@
+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";
+import { ethers } from "ethers";
+import { MetaTransaction, OperationType } from "ethers-multisend";
+
+export default async function (transaction: Transaction) {
+  const transactions: MetaTransaction[] = [];
+  const logs: any[] = [];
+
+  const {
+    position,
+    actionId,
+    actionIdHashHash,
+    sourceSender,
+    sourceDsaId,
+    targetDsaId,
+    sourceChainId,
+    targetChainId,
+    vnonce,
+    metadata,
+  } = transaction.submitEvent;
+
+  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,
+    abi.interopX,
+    sourceWallet
+  );
+
+  const sourceSpells: any[] = [];
+  const commonSpells: any[] = [];
+
+  for (const withdraw of position.withdraw) {
+    let spellData = {
+      connector: "AAVE-V2-A",
+      method: "payback",
+      args: [withdraw.sourceToken, withdraw.amount, "2", "0", "0"],
+    };
+
+    sourceSpells.push({
+      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) {
+    let spellDataWithdraw = {
+      connector: "AAVE-V2-A",
+      method: "withdraw",
+      args: [supply.sourceToken, supply.amount, "0", "0"],
+    };
+
+    sourceSpells.push({
+      connector: spellDataWithdraw.connector,
+      data: encodeConnectorMethod(spellDataWithdraw),
+    });
+
+    let spellDataBasicWithdraw = {
+      connector: "BASIC-A",
+      method: "withdraw",
+      args: [supply.sourceToken, supply.amount, dsaAddress, "0", "0"],
+    };
+
+    sourceSpells.push({
+      connector: spellDataBasicWithdraw.connector,
+      data: encodeConnectorMethod(spellDataBasicWithdraw),
+    });
+  }
+
+  const { data } = await contract.populateTransaction.sourceAction(
+    sourceSpells,
+    commonSpells,
+    position,
+    actionId,
+    sourceSender,
+    sourceDsaId,
+    targetDsaId,
+    sourceChainId,
+    targetChainId,
+    vnonce,
+    metadata
+  );
+
+  transactions.push({
+    to: interopAddress,
+    data: data!,
+    value: "0",
+    operation: OperationType.Call,
+  });
+
+  return { transactions, logs };
+}