@instadapp/interop-x 0.0.0-dev.9e91661 → 0.0.0-dev.a271713

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

@@ -0,0 +1,142 @@
+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";
+
+
+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/gnosis/actions/aaveV3/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/aaveV3/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 };
+}

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

@@ -0,0 +1,142 @@
+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";
+
+
+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/gnosis/actions/index.ts

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

package/src/gnosis/index.ts

@@ -2,12 +2,18 @@ import { Transaction } from "@/db";
 import { encodeMulti } from "ethers-multisend";
 import actions from "./actions";
 
-export const buildGnosisData = async (transaction: Transaction, type?: 'source' | 'target') => {
-    type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
+export const buildGnosisAction = async (transaction: Transaction, type: 'source' | 'target') => {
+    // type = type || (transaction.sourceStatus === 'success' ? 'target' : 'source')
 
-    if (actions.hasOwnProperty(transaction.action)) {
-        return encodeMulti(actions[transaction.action](transaction, type)).data;
+    if (actions.hasOwnProperty(transaction.actionId)) {
+
+        const { transactions, logs } = await actions[transaction.actionId](transaction, type);
+
+        return {
+            data: encodeMulti(transactions).data,
+            logs
+        };
     }
 
-    throw new Error(`Unknown action: ${transaction.action}`);
+    throw new Error(`Unknown action: ${transaction.actionId}`);
 }

package/src/index.ts

@@ -1,22 +1,7 @@
-import moduleAlias from 'module-alias';
+import './alias'
 import expandHomeDir from "expand-home-dir";
 import fs from 'fs-extra'
-moduleAlias.addAliases({
-    "@/": __dirname + "/",
-    "@/logger": __dirname + "/logger",
-    "@/tasks": __dirname + "/tasks",
-    "@/utils": __dirname + "/utils",
-    "@/api": __dirname + "/api",
-    "@/net": __dirname + "/net",
-    "@/db": __dirname + "/db",
-    "@/config": __dirname + "/config",
-    "@/types": __dirname + "/types",
-    "@/abi": __dirname + "/abi",
-    "@/constants": __dirname + "/constants",
-    "@/typechain": __dirname + "/typechain"
-})
 
-moduleAlias();
 import dotenv from "dotenv";
 import chalk from 'chalk';
 import { ethers } from "ethers";
@@ -97,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() {
 
@@ -104,7 +90,9 @@ async function main() {
 
     const tasks = new Tasks()
 
-    tasks.start();
+    setTimeout(() => {
+        tasks.start();
+    }, 10000)
 
     startApiServer()
 
@@ -129,10 +117,12 @@ async function main() {
         transaction.sourceStatus = payload.data.sourceStatus
         transaction.sourceTransactionHash = payload.data.sourceTransactionHash
         transaction.sourceErrors = payload.data.sourceErrors
+        transaction.sourceLogs = payload.data.sourceLogs
 
         transaction.targetStatus = payload.data.targetStatus
         transaction.targetTransactionHash = payload.data.targetTransactionHash
         transaction.targetErrors = payload.data.targetErrors
+        transaction.targetLogs = payload.data.targetLogs
 
         transaction.status = payload.data.status
 

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

@@ -5,13 +5,14 @@ import { Transaction } from "@/db";
 import { signGnosisSafeTx } from "@/utils";
 import { addresses } from "@/constants";
 import { ChainId } from "@/types";
-import { buildGnosisData } from "@/gnosis";
+import { buildGnosisAction } from "@/gnosis";
 
 export interface ISignatureRequest {
-    type: 'source' | 'target' ,
+    type: 'source' | 'target',
     transactionHash: string
     safeTxGas: string
     safeNonce: string
+    chainId: number
 }
 export interface ISignatureResponse {
     signer: string,
@@ -26,6 +27,10 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
     }
 
     async response(data: ISignatureRequest): Promise<ISignatureResponse> {
+        console.log({
+            tag: 'SignatureDialProtocol',
+            data
+        })
         const signer = config.wallet;
 
         let transaction: Transaction | null;
@@ -47,11 +52,12 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
                 error: 'Event not found'
             };
         }
+        const { data: gnosisData } = await buildGnosisAction(transaction, data.type);
 
         const signedData = await signGnosisSafeTx({
-            to: addresses[transaction.targetChainId].multisend,
-            data: await buildGnosisData(transaction, data.type),
-            chainId: transaction.targetChainId as ChainId,
+            to: addresses[data.chainId].multisend,
+            data: gnosisData,
+            chainId: data.chainId as ChainId,
             safeTxGas: data.safeTxGas,
             nonce: data.safeNonce,
         }, { signer });

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

@@ -1,7 +1,7 @@
 import { BaseDialProtocol } from "./BaseDialProtocol";
 import { Transaction } from "@/db";
 
-export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'> | null> {
+export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs'  | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'> | null> {
     protected timeout = 30000;
 
     constructor(libp2p) {
@@ -20,10 +20,12 @@ export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick
             sourceStatus: transaction.sourceStatus,
             sourceTransactionHash: transaction.sourceTransactionHash,
             sourceErrors: transaction.sourceErrors,
+            sourceLogs: transaction.sourceLogs,
 
             targetStatus: transaction.targetStatus,
             targetTransactionHash: transaction.targetTransactionHash,
             targetErrors: transaction.targetErrors,
+            targetLogs: transaction.targetLogs,
 
             status: transaction.status,
         }

package/src/net/protocol/index.ts

@@ -36,7 +36,7 @@ interface PeerInfoEvent extends BaseMessageEvent {
 }
 
 interface TransactionStatusEvent extends BaseMessageEvent {
-    data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'>
+    data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'>
 }
 
 declare interface Protocol {
@@ -68,23 +68,33 @@ class Protocol extends EventEmitter {
                 Buffer.from(transaction.sourceStatus),
                 Buffer.from(transaction.sourceTransactionHash || ''),
                 transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
+                transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
 
                 Buffer.from(transaction.targetStatus),
                 Buffer.from(transaction.targetTransactionHash || ''),
                 transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
+                transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
 
                 Buffer.from(transaction.status),
             ],
-            decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]: [Buffer, Buffer, Buffer, Buffer[], Buffer, Buffer, Buffer[], Buffer]) => ({
+            decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]: [Buffer, Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer]) => ({
                 transactionHash: transactionHash.toString(),
 
                 sourceStatus: sourceStatus.toString(),
                 sourceTransactionHash: sourceTransactionHash.toString() || null,
                 sourceErrors: sourceErrors.map((e) => e.toString()),
+                sourceLogs: sourceLogs.map(e => ({
+                    type: e[0].toString(),
+                    message: e[1].toString(),
+                })),
 
                 targetStatus: targetStatus.toString(),
-                targetTransactionHash: targetTransactionHash.toString()|| null,
+                targetTransactionHash: targetTransactionHash.toString() || null,
                 targetErrors: targetErrors.map((e) => e.toString()),
+                targetLogs: targetLogs.map(e => ({
+                    type: e[0].toString(),
+                    message: e[1].toString(),
+                })),
 
                 status: status.toString(),
             }),

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 });
+    }
+}