@instadapp/interop-x 0.0.0-dev.48c6eec → 0.0.0-dev.4e07f7a

package/src/constants/addresses.ts

@@ -1,17 +1,14 @@
 export const addresses = {
-  // 1: {
-  //   gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
-  //   multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-  //   interopXContract: '',
-  // },
   137: {
     gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
     multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-    interopXContract: '0x65AcB77B5191CED1B1ae85B454D20E2d128fAfEe',
+    interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
+    dsaAddress: '0x9Fbd453a8e7a158510fBae5D9935958507cf4b19',
   },
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
     multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-    interopXContract: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
+    interopX: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
+    dsaAddress: '0xFcB7d826E32081c4799de2f83b47b49df600dc8c',
   }
-} as Record<number, { gnosisSafe: string, multisend: string, interopXContract: string }>
+} as Record<number, { gnosisSafe: string, multisend: string, interopX: string, dsaAddress: string }>

package/src/constants/blockConfirmations.ts

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

package/src/constants/index.ts

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

package/src/db/models/transaction.ts

@@ -1,7 +1,7 @@
 import { sequelize } from '@/db/sequelize'
 import { CreationOptional, InferAttributes, InferCreationAttributes, Model, DataTypes } from 'sequelize';
 
-export interface IPositionTokenInfo{
+export interface IPositionTokenInfo {
     amount: string;
     sourceToken: string;
     targetToken: string;
@@ -16,14 +16,17 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
     declare id: CreationOptional<number>;
 
     declare transactionHash: string;
-    
+    declare vnonce: string;
     declare actionId: string;
-    declare bridger: string;
-    declare requestTransactionHash: string;
+    declare sourceSender: string;
 
-    declare requestBlockNumber: number;
+    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>;
@@ -33,6 +36,7 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
     declare sourceDelayUntil: CreationOptional<Date>;
 
     declare targetChainId: number;
+    declare targetDsaId: string;
     declare targetTransactionHash: CreationOptional<string>;
     declare targetBlockNumber: CreationOptional<number>;
     declare targetStatus: CreationOptional<string>;
@@ -41,33 +45,18 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
     declare targetCreatedAt: CreationOptional<Date>;
     declare targetDelayUntil: CreationOptional<Date>;
 
-    declare requestEvent: {
-        actionId: string;
-        bridger: string;
-        metadata: string;
+    declare submitEvent: {
         position: IPosition;
-        sourceChainId: number;
-        targetChainId: number;
-    };
-    declare requestSentEvent: CreationOptional<{
         actionId: string;
-        bridger: string;
-        metadata: string;
-        position: IPosition;
+        actionIdHashHash: string;
+        sourceSender: string;
+        sourceDsaId: string;
+        targetDsaId: string;
         sourceChainId: number;
         targetChainId: number;
-        requestTransactionHash: string;
-    }>;
-    declare committedEvent: CreationOptional<{
-        actionId: string;
-        bridger: string;
+        vnonce: string;
         metadata: string;
-        position: IPosition;
-        sourceChainId: number;
-        targetChainId: number;
-        requestTransactionHash: string;
-    }>;
-    declare completedEvent: CreationOptional<any>;
+    };
 
     declare status: CreationOptional<string>;
 
@@ -82,19 +71,23 @@ Transaction.init({
         primaryKey: true
     },
 
-    requestTransactionHash: DataTypes.NUMBER,
-    requestBlockNumber: DataTypes.NUMBER,
-
     transactionHash: DataTypes.STRING,
     actionId: DataTypes.STRING,
-    bridger: 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'
+        defaultValue: 'pending'
     },
     sourceErrors: {
         type: DataTypes.JSON,
@@ -111,11 +104,12 @@ Transaction.init({
     sourceDelayUntil: DataTypes.STRING,
 
     targetChainId: DataTypes.NUMBER,
+    targetDsaId: DataTypes.STRING,
     targetTransactionHash: DataTypes.STRING,
     targetBlockNumber: DataTypes.NUMBER,
     targetStatus: {
         type: DataTypes.STRING,
-        defaultValue: 'uninitialised'
+        defaultValue: 'pending'
     },
     targetErrors: {
         type: DataTypes.JSON,
@@ -128,13 +122,10 @@ Transaction.init({
     targetCreatedAt: DataTypes.DATE,
     targetDelayUntil: DataTypes.DATE,
 
-    requestEvent: {
+    submitEvent: {
         type: DataTypes.JSON,
         allowNull: false
     },
-    requestSentEvent: DataTypes.JSON,
-    committedEvent: DataTypes.JSON,
-    completedEvent: DataTypes.JSON,
 
     status: {
         type: DataTypes.STRING,

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,120 @@
+import abi from "@/abi";
+import config from "@/config";
+import { addresses } from "@/constants";
+import { Transaction } from "@/db";
+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 ethers.providers.JsonRpcProvider(
+    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.method,
+      data: encodeConnectorMethod(spellData),
+    });
+  }
+
+  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.method,
+      data: encodeConnectorMethod(spellDataWithdraw),
+    });
+
+    let spellDataBasicWithdraw = {
+      connector: "BASIC-A",
+      method: "withdraw",
+      args: [supply.sourceToken, supply.amount, sourceUserAddress, "0", "0"],
+    };
+
+    sourceSpells.push({
+      connector: spellDataBasicWithdraw.method,
+      data: encodeConnectorMethod(spellDataBasicWithdraw),
+    });
+  }
+
+  for (const withdraw of position.withdraw) {
+    let spellDataBasicWithdraw = {
+      connector: "BASIC-A",
+      method: "withdraw",
+      args: [withdraw.sourceToken, withdraw.amount, sourceSender, "0", "0"],
+    };
+
+    commonSpells.push({
+      connector: spellDataBasicWithdraw.method,
+      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 };
+}

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

@@ -0,0 +1,13 @@
+
+
+import { Transaction } from "@/db";
+import { MetaTransaction, OperationType } from "ethers-multisend";
+
+
+export default async function (transaction: Transaction) {
+    const transactions: MetaTransaction[] = [];
+    const logs: any[] = [];
+
+
+    return { transactions, logs }
+}

package/src/gnosis/actions/index.ts

@@ -1,5 +1,5 @@
-import withdraw from "./withdraw"
+import aaveV2 from "./aaveV2"
 
 export default {
-    withdraw,
+    'A:AAVE-V2:AAVE-V2': aaveV2,
 }

package/src/net/protocol/dial/SignatureDialProtocol.ts

@@ -12,6 +12,7 @@ export interface ISignatureRequest {
     transactionHash: string
     safeTxGas: string
     safeNonce: string
+    chainId: number
 }
 export interface ISignatureResponse {
     signer: string,
@@ -54,9 +55,9 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
         const { data: gnosisData } = await buildGnosisAction(transaction, data.type);
 
         const signedData = await signGnosisSafeTx({
-            to: addresses[transaction.sourceChainId].multisend,
+            to: addresses[data.chainId].multisend,
             data: gnosisData,
-            chainId: transaction.sourceChainId as ChainId,
+            chainId: data.chainId as ChainId,
             safeTxGas: data.safeTxGas,
             nonce: data.safeNonce,
         }, { signer });

package/src/tasks/InteropX/ProcessSubmitSubmitEvents.ts

@@ -0,0 +1,260 @@
+import { BaseTask } from "../BaseTask";
+import Logger from "@/logger";
+import { ethers, Wallet } from "ethers";
+import abi from "@/abi";
+import { Transaction } from "@/db";
+import {
+  buildSignatureBytes,
+  generateGnosisTransaction,
+  generateInteropTransactionHash,
+  getContract,
+  getRpcProviderUrl,
+  LiquidityError,
+  Signature,
+} from "@/utils";
+import { addresses, blockConfirmations } from "@/constants";
+import { ChainId } from "@/types";
+import config from "@/config";
+import { GnosisSafe, InteropX } from "@/typechain";
+import moment from "moment";
+import { Op } from "sequelize";
+import { buildGnosisAction } from "@/gnosis";
+import { peerPool, protocol } from "@/net";
+import { LogDescription } from "ethers/lib/utils";
+import wait from "waait";
+
+class ProcessSubmitSubmitEvents extends BaseTask {
+  sourceProvider: ethers.providers.JsonRpcProvider;
+  sourceGnosisContract: GnosisSafe;
+  sourceWallet: Wallet;
+  chainId: ChainId;
+  leadNodeOnly: boolean = true;
+  blockConfirmationsCount: number = 12;
+
+  constructor({ chainId }: { chainId: ChainId }) {
+    super({
+      logger: new Logger("InteropX::ProcessSubmitSubmitEvents"),
+    });
+    this.chainId = chainId;
+  }
+
+  async pollHandler() {
+    const currentBlockNumber = await this.sourceProvider.getBlockNumber();
+
+    const transaction = await Transaction.findOne({
+      where: {
+        status: "pending",
+        sourceStatus: "pending",
+        sourceChainId: this.chainId,
+        submitBlockNumber: {
+          [Op.lt]: currentBlockNumber - this.blockConfirmationsCount,
+        },
+        sourceDelayUntil: {
+          [Op.or]: {
+            [Op.is]: null,
+            [Op.lt]: new Date(),
+          },
+        },
+
+        submitEvent: { $ne: null },
+
+        createdAt: {
+          [Op.gt]: moment().subtract({ hours: 12 }).toDate(),
+        },
+      },
+    });
+
+    if (!transaction) {
+      return;
+    }
+
+    this.logger.debug(`Processing transaction ${transaction.transactionHash}`);
+
+    transaction.sourceStatus = "proccessing";
+    await transaction.save();
+
+    const ownersThreshold = await this.sourceGnosisContract.getThreshold();
+    await wait(10000);
+
+
+    this.logger.debug(`Build gnosis action for ${transaction.transactionHash}`);
+
+    let data,
+      logs = [];
+
+    try {
+      ({ data, logs } = await buildGnosisAction(transaction, "source"));
+    } catch (error) {
+      if (error instanceof LiquidityError) {
+        await transaction.save();
+        transaction.sourceDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
+        transaction.sourceStatus = "pending";
+
+        await transaction.save();
+
+        throw error;
+        return;
+      }
+
+      transaction.sourceStatus = "failed";
+      transaction.sourceErrors = [error.message];
+      transaction.targetStatus = "failed";
+
+      transaction.status = "failed";
+      await transaction.save();
+      protocol.sendTransaction(transaction);
+      return;
+    }
+
+    this.logger.debug(`Generating gnosis tx for ${transaction.transactionHash}`);
+
+
+    let gnosisTx = await generateGnosisTransaction(
+      {
+        baseGas: "0",
+        data,
+        gasPrice: "0",
+        gasToken: "0x0000000000000000000000000000000000000000",
+        nonce: "0",
+        operation: "1",
+        refundReceiver: "0x0000000000000000000000000000000000000000",
+        safeAddress: this.sourceGnosisContract.address,
+        safeTxGas: "79668",
+        to: addresses[transaction.sourceChainId].multisend,
+        value: "0",
+      },
+      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);
+
+    console.log(
+      `Collecting signatures for execution ${transaction.transactionHash}`
+    );
+
+    console.log(ownerPeerIds);
+
+    const signatures = await protocol.requestSignatures(
+      {
+        type: "source",
+        transactionHash: transaction.transactionHash,
+        safeTxGas: gnosisTx.safeTxGas,
+        safeNonce: gnosisTx.nonce,
+        chainId: this.chainId,
+      },
+      ownerPeerIds
+    );
+
+    const validSignatures = signatures.filter(
+      (s) => !!s.data && s.data !== "0x"
+    ) as Signature[];
+
+    console.log({
+      signatures,
+      validSignatures,
+      ownersThreshold: ownersThreshold.toString(),
+    });
+
+    if (
+      validSignatures.length === 0 ||
+      ownersThreshold.gt(validSignatures.length)
+    ) {
+      await transaction.save();
+      transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
+      transaction.sourceStatus = "pending";
+
+      await transaction.save();
+      const errorMessage = signatures.find((s) => !!s.error)?.error;
+      throw new Error(
+        `Not enough signatures` + (errorMessage ? `: ${errorMessage}` : "")
+      );
+    }
+
+    console.log(
+      `Executing transaction for execution ${transaction.transactionHash}`
+    );
+
+    const { data: txData } =
+      await this.sourceGnosisContract.populateTransaction.execTransaction(
+        gnosisTx.to,
+        gnosisTx.value,
+        gnosisTx.data,
+        gnosisTx.operation,
+        gnosisTx.safeTxGas,
+        gnosisTx.baseGas,
+        gnosisTx.gasPrice,
+        gnosisTx.gasToken,
+        gnosisTx.refundReceiver,
+        buildSignatureBytes(validSignatures)
+      );
+
+    const txSent = await this.sourceWallet.sendTransaction({
+      from: this.sourceWallet.address,
+      gasPrice: ethers.BigNumber.from(120 * 10 ** 9),
+      to: this.sourceGnosisContract.address,
+      data: txData,
+    });
+
+    console.log(txSent);
+
+    const receipt = await txSent.wait();
+
+    const parsedLogs: LogDescription[] = [];
+
+    receipt.logs.forEach((log) => {
+      try {
+        parsedLogs.push(this.sourceGnosisContract.interface.parseLog(log));
+      } catch (e) {}
+    });
+
+    if (parsedLogs.find((e) => e.name === "ExecutionSuccess")) {
+      console.log("ExecutionSuccess");
+      transaction.sourceStatus = "success";
+      if (txSent.blockNumber)
+        transaction.sourceBlockNumber = txSent.blockNumber;
+      transaction.sourceTransactionHash = txSent.hash;
+      transaction.sourceLogs = logs;
+      await transaction.save();
+    } else {
+      console.log("ExecutionFailure");
+      transaction.sourceStatus = "failed";
+      if (txSent.blockNumber)
+        transaction.sourceBlockNumber = txSent.blockNumber;
+      transaction.sourceTransactionHash = txSent.hash;
+      transaction.sourceTransactionHash = txSent.hash;
+      transaction.status = "failed";
+      await transaction.save();
+    }
+
+    protocol.sendTransaction(transaction);
+  }
+
+  async start(): Promise<void> {
+    this.blockConfirmationsCount = blockConfirmations[this.chainId] + 1;
+
+    this.sourceProvider = new ethers.providers.JsonRpcProvider(
+      getRpcProviderUrl(this.chainId)
+    );
+
+    this.sourceWallet = new ethers.Wallet(
+      config.privateKey!,
+      this.sourceProvider
+    );
+
+    this.sourceGnosisContract = getContract<GnosisSafe>(
+      addresses[this.chainId].gnosisSafe,
+      abi.gnosisSafe,
+      this.sourceWallet
+    );
+
+    await super.start();
+  }
+}
+
+export default ProcessSubmitSubmitEvents;