@instadapp/interop-x 0.0.0-dev.7738003 → 0.0.0-dev.7913ed9

package/src/abi/connectors/v2/index.ts

@@ -0,0 +1,87 @@
+import {ONEINCH_A} from './1INCH-A'
+import {AAVE_CLAIM_A} from './AAVE-CLAIM-A'
+import {AAVE_CLAIM_B} from './AAVE-CLAIM-B'
+import {AAVE_STAKE_A} from './AAVE-STAKE-A'
+import {AAVE_V1} from './AAVE-V1-A'
+import {AAVE_V2} from './AAVE-V2-A'
+import {AUTHORITY_A} from './AUTHORITY-A'
+import {BASIC_A} from './BASIC-A'
+import {COMP_A} from './COMP-A'
+import {COMPOUND_A} from './COMPOUND-A'
+import {MAKERDAO_A} from './MAKERDAO-A'
+import {POLYGON_BRIDGE_A} from './POLYGON-BRIDGE-A'
+import {UNISWAP_A} from './UNISWAP-A'
+import {AAVE_V1_IMPORT_A} from './AAVE-V1-IMPORT-A'
+import {AAVE_V2_IMPORT_A} from './AAVE-V2-IMPORT-A'
+import {COMPOUND_IMPORT_A} from './COMPOUND-IMPORT-A'
+import {INSTAPOOL_A} from './INSTAPOOL-A'
+import {PARASWAP_A} from './PARASWAP-A'
+
+import {AAVE_V2_IMPORT_B} from './AAVE-V2-IMPORT-B'
+import {COMPOUND_IMPORT_B} from './COMPOUND-IMPORT-B'
+import {MAKERDAO_CLAIM_A} from './MAKERDAO-CLAIM-A'
+import {G_UNISWAP_A} from './G-UNISWAP-A'
+import {STAKE_ERC20_A} from './STAKE-ERC20-A'
+import {INST_STAKING_A} from './INST-STAKING-A'
+import {ONEINCH_B} from './1INCH-B'
+import {WETH_A} from './WETH-A'
+import {INST_A} from './INST-A'
+import {REFINANCE_A} from './REFINANCE-A'
+import {INST_LM_A} from './INST-LM-A'
+import {UNISWAP_V2_A} from './UNISWAP-V2-A'
+import {LIQUITY_A} from './LIQUITY-A'
+import {REFLEXER_A} from './REFLEXER-A'
+import {UNISWAP_V3_A} from './UNISWAP-V3-A'
+import {B_COMPOUND_A} from './B-COMPOUND-A'
+import {B_MAKERDAO_A} from './B-MAKERDAO-A'
+import {B_LIQUITY_A} from './B-LIQUITY-A'
+import {BASIC_B} from './BASIC-B'
+import {BASIC_C} from './BASIC-C'
+import {UNISWAP_V3_STAKE_A} from './UNISWAP-V3-STAKE-A'
+import {YEARN_VAULT_A} from './YEARN-VAULT-A'
+import {INST_STAKING_B} from './INST-STAKING-B'
+import {GELATO_AAVE_A} from './GELATO-AAVE-A'
+export const connectorsV2_M1 =  {
+    "GELATO-AAVE-A": GELATO_AAVE_A,
+    "INST-STAKING-B": INST_STAKING_B,
+    "YEARN-VAULT-A": YEARN_VAULT_A,
+    "UNISWAP-V3-STAKE-A": UNISWAP_V3_STAKE_A,
+    "BASIC-C": BASIC_C,
+    "BASIC-B": BASIC_B,
+    "B-LIQUITY-A": B_LIQUITY_A,
+    "B-MAKERDAO-A": B_MAKERDAO_A,
+    "B-COMPOUND-A": B_COMPOUND_A,
+    "UNISWAP-V3-A": UNISWAP_V3_A,
+    "REFLEXER-A": REFLEXER_A,
+    "LIQUITY-A": LIQUITY_A,
+    "UNISWAP-V2-A": UNISWAP_V2_A,
+    "INST-LM-A": INST_LM_A,
+    "REFINANCE-A": REFINANCE_A,
+    "INST-A": INST_A,
+    "WETH-A": WETH_A,
+    "1INCH-B": ONEINCH_B,
+    "INST-STAKING-A": INST_STAKING_A,
+    "STAKE-ERC20-A": STAKE_ERC20_A,
+    "G-UNISWAP-A": G_UNISWAP_A,
+    "INSTAPOOL-A": INSTAPOOL_A,
+    "COMPOUND-IMPORT-A": COMPOUND_IMPORT_A,
+    "AAVE-V2-IMPORT-A": AAVE_V2_IMPORT_A,
+    "AAVE-V1-IMPORT-A": AAVE_V1_IMPORT_A,
+    "1INCH-A": ONEINCH_A,
+    "AAVE-CLAIM-A": AAVE_CLAIM_A,
+    "AAVE-CLAIM-B": AAVE_CLAIM_B,
+    "AAVE-V1-A": AAVE_V1,
+    "AAVE-V2-A": AAVE_V2,
+    "AUTHORITY-A": AUTHORITY_A,
+    "BASIC-A": BASIC_A,
+    "COMP-A": COMP_A,
+    "COMPOUND-A": COMPOUND_A,
+    "MAKERDAO-A": MAKERDAO_A,
+    "UNISWAP-A": UNISWAP_A,
+    "POLYGON-BRIDGE-A": POLYGON_BRIDGE_A,
+    "AAVE-STAKE-A": AAVE_STAKE_A,
+    "PARASWAP-A": PARASWAP_A,
+    "COMPOUND-IMPORT-B": COMPOUND_IMPORT_B,
+    "AAVE-V2-IMPORT-B": AAVE_V2_IMPORT_B,
+    "MAKERDAO-CLAIM-A": MAKERDAO_CLAIM_A,
+}

package/src/abi/index.ts

@@ -1,9 +1,11 @@
 import gnosisSafe from "./gnosisSafe.json";
 import erc20 from "./erc20.json";
 import interopX from "./interopX.json";
+import { connectors } from "./connectors";
 
 export default {
-    gnosisSafe,
-    erc20,
-    interopX,
-}
+  gnosisSafe,
+  erc20,
+  interopX,
+  connectors,
+};

package/src/constants/addresses.ts

@@ -3,10 +3,12 @@ export const addresses = {
     gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
     multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
     interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
+    dsaAddress: '0x9Fbd453a8e7a158510fBae5D9935958507cf4b19',
   },
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
     multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
     interopX: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
+    dsaAddress: '0xFcB7d826E32081c4799de2f83b47b49df600dc8c',
   }
-} as Record<number, { gnosisSafe: string, multisend: string, interopX: 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/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,118 @@
+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),
+    });
+
+    let spellDataBasicWithdraw = {
+      connector: "BASIC-A",
+      method: "withdraw",
+      args: [withdraw.sourceToken, withdraw.amount, sourceUserAddress, "0", "0"],
+    };
+
+    commonSpells.push({
+      connector: spellDataBasicWithdraw.method,
+      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.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),
+    });
+  }
+
+  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,270 @@
+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 [gasPrice, gasLimit] = await Promise.all([
+      this.sourceProvider.getGasPrice(),
+      this.sourceProvider.estimateGas({
+        from: this.sourceWallet.address,
+        to: this.sourceGnosisContract.address,
+        data: txData,
+      }),
+    ]);
+
+    const txSent = await this.sourceWallet.sendTransaction({
+      from: this.sourceWallet.address,
+      to: this.sourceGnosisContract.address,
+      gasPrice: gasPrice.mul(120).div(100),
+      gasLimit: gasLimit.mul(120).div(100),
+      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;