@instadapp/interop-x 0.0.0-dev.32db40c → 0.0.0-dev.373a918

package/src/db/models/transaction.ts

@@ -1,74 +1,100 @@
-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 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 +112,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 +134,36 @@ 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,
     },
 
     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/gnosis/actions/aaveV2/source.ts

@@ -53,7 +53,7 @@ export default async function (transaction: Transaction) {
     };
 
     sourceSpells.push({
-      connector: spellData.method,
+      connector: spellData.connector,
       data: encodeConnectorMethod(spellData),
     });
 
@@ -64,7 +64,7 @@ export default async function (transaction: Transaction) {
     };
 
     commonSpells.push({
-      connector: spellDataBasicWithdraw.method,
+      connector: spellDataBasicWithdraw.connector,
       data: encodeConnectorMethod(spellDataBasicWithdraw),
     });
   }
@@ -77,7 +77,7 @@ export default async function (transaction: Transaction) {
     };
 
     sourceSpells.push({
-      connector: spellDataWithdraw.method,
+      connector: spellDataWithdraw.connector,
       data: encodeConnectorMethod(spellDataWithdraw),
     });
 
@@ -88,7 +88,7 @@ export default async function (transaction: Transaction) {
     };
 
     sourceSpells.push({
-      connector: spellDataBasicWithdraw.method,
+      connector: spellDataBasicWithdraw.connector,
       data: encodeConnectorMethod(spellDataBasicWithdraw),
     });
   }

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

@@ -1,6 +1,12 @@
-
-
+import abi from "@/abi";
+import config from "@/config";
+import { addresses } from "@/constants";
 import { Transaction } from "@/db";
+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 +14,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 ethers.providers.JsonRpcProvider(
+        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/tasks/InteropX/ProcessSubmitSubmitEvents.ts

@@ -207,7 +207,7 @@ class ProcessSubmitSubmitEvents extends BaseTask {
       from: this.sourceWallet.address,
       to: this.sourceGnosisContract.address,
       gasPrice: gasPrice.mul(120).div(100),
-      gasLimit: gasLimit.mul(120).div(100),
+      gasLimit: 5_000_000,//gasLimit.mul(120).div(100),
       data: txData,
     });
 
@@ -237,7 +237,6 @@ class ProcessSubmitSubmitEvents extends BaseTask {
       if (txSent.blockNumber)
         transaction.sourceBlockNumber = txSent.blockNumber;
       transaction.sourceTransactionHash = txSent.hash;
-      transaction.sourceTransactionHash = txSent.hash;
       transaction.status = "failed";
       await transaction.save();
     }