@instadapp/interop-x 0.0.0-dev.0ee2ee3 → 0.0.0-dev.107fdbd

package/src/alias.ts

@@ -0,0 +1,6 @@
+import moduleAlias from 'module-alias';
+moduleAlias.addAliases({
+    "@": __dirname,
+})
+
+moduleAlias();

package/src/api/index.ts

@@ -0,0 +1,36 @@
+import fastify from "fastify"
+import cors from '@fastify/cors'
+import Logger from "@/logger"
+import { Transaction } from "@/db";
+
+const logger = new Logger("RPC");
+
+
+const server = fastify({ logger: false })
+
+server.register(cors, {})
+
+server.get('/', async () => 'Interop X API')
+
+export const startApiServer = async () => {
+    const HOST = process.env.API_HOST || '0.0.0.0';
+    const PORT = process.env.API_PORT || '8080';
+    try {
+        server.get('/transactions', async (req) => {
+            return await Transaction.findAndCountAll({
+                limit: 20,
+                offset: 0,
+                order: [
+                    ['updatedAt', 'DESC']
+                ]
+            })
+        })
+
+        await server.listen(PORT, HOST)
+
+        logger.log(`RPC Server listening at http://${HOST}:${PORT}`)
+    } catch (err) {
+        logger.error(err.message)
+        process.exit(1)
+    }
+}

package/src/config/index.ts

@@ -1,5 +1,7 @@
 import { ethers, Wallet } from "ethers"
-import { EventBus, EventBusType } from "types"
+import { EventBus, EventBusType } from "@/types"
+import fs from 'fs-extra'
+import expandHomeDir from "expand-home-dir";
 
 class Config {
     public readonly events: EventBusType
@@ -7,18 +9,32 @@ class Config {
     public readonly leadNodeAddress: string
     public readonly privateKey: string
     public readonly wallet: Wallet
+    public readonly staging: boolean
+    public readonly autoUpdate: boolean
+    public readonly baseConfigPath: string
 
     constructor() {
         this.events = new EventBus()  as EventBusType
-        this.maxPeers = 10
+        this.maxPeers = 20
         this.privateKey = process.env.PRIVATE_KEY as string;
+        this.staging = !! process.env.STAGING && process.env.STAGING === 'true';
+        this.autoUpdate = !! process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
         this.wallet = new Wallet(this.privateKey);
         this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E'
+        this.baseConfigPath = expandHomeDir(`~/.interop-x`);
+    }
+
+    get publicAddress(){
+        return this.wallet.address
     }
 
     isLeadNode() {
         return ethers.utils.getAddress(this.leadNodeAddress) === ethers.utils.getAddress(this.wallet.address)
     }
+
+    isMaintenanceMode(){
+        return fs.existsSync(this.baseConfigPath + '/maintenance')
+    }
 }
 
 export default new Config()

package/src/constants/addresses.ts

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

package/src/constants/index.ts

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

package/src/constants/tokens.ts

@@ -0,0 +1,127 @@
+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",
+  //     decimals: 8,
+  //   },
+  // ],
+  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,
+    },
+  ],
+  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,
+    },
+    {
+      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/db/index.ts

@@ -1 +1 @@
-export * from "./models"
+export * from "./models"

package/src/db/models/index.ts

@@ -1 +1 @@
-export * from './execution';
+export * from './transaction';

package/src/db/models/transaction.ts

@@ -0,0 +1,136 @@
+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[];
+}
+
+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>;
+}
+
+Transaction.init({
+    id: {
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
+        primaryKey: true
+    },
+
+    transactionHash: 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: 'pending'
+    },
+    sourceErrors: {
+        type: DataTypes.JSON,
+        // defaultValue: [],
+    },
+    sourceLogs: {
+        type: DataTypes.JSON,
+        // defaultValue: [],
+    },
+    sourceCreatedAt: {
+        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: 'pending'
+    },
+    targetErrors: {
+        type: DataTypes.JSON,
+        // defaultValue: [],
+    },
+    targetLogs: {
+        type: DataTypes.JSON,
+        // defaultValue: [],
+    },
+    targetCreatedAt: DataTypes.DATE,
+    targetDelayUntil: DataTypes.DATE,
+
+    submitEvent: {
+        type: DataTypes.JSON,
+        allowNull: false
+    },
+
+    status: {
+        type: DataTypes.STRING,
+        defaultValue: 'pending'
+    },
+    createdAt: DataTypes.DATE,
+    updatedAt: DataTypes.DATE,
+}, { sequelize, tableName: 'transactions' });

package/src/db/sequelize.ts

@@ -1,9 +1,10 @@
 //@ts-ignore
+import config from "@/config";
 import expandHomeDir from "expand-home-dir";
 
 import { Sequelize } from 'sequelize';
 
-const basePath = expandHomeDir('~/.interop-x/data');
+const basePath = expandHomeDir(`~/.interop-x/data/${config.publicAddress}/${config.staging ? 'staging' : ''}`);
 
 export const sequelize = new Sequelize({
     dialect: 'sqlite',

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,104 @@
+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 interopAddress = addresses[sourceChainId].interopX;
+  const contract = getContract<InteropX>(
+    interopAddress,
+    abi.interopX,
+    sourceWallet
+  );
+
+  const sourceSpells: any[] = [];
+  const commonSpells = [];
+
+  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, interopAddress, "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

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

package/src/gnosis/index.ts

@@ -0,0 +1,19 @@
+import { Transaction } from "@/db";
+import { encodeMulti } from "ethers-multisend";
+import actions from "./actions";
+
+export const buildGnosisAction = async (transaction: Transaction, type: 'source' | 'target') => {
+    // type = type || (transaction.sourceStatus === 'success' ? 'target' : 'source')
+
+    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.actionId}`);
+}

package/src/index.ts

@@ -1,21 +1,132 @@
-import { assert } from "console";
+import './alias'
+import expandHomeDir from "expand-home-dir";
+import fs from 'fs-extra'
+
 import dotenv from "dotenv";
-import { Tasks } from "tasks";
-import Logger from "./logger";
-import { startPeer } from "./net";
+import chalk from 'chalk';
+import { ethers } from "ethers";
+import packageJson from '../package.json'
 dotenv.config();
 
-assert(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
-
+import Logger from "@/logger";
 const logger = new Logger('Process')
 
+const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
+
+const printUsage = () => {
+    console.log()
+    console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
+    console.log()
+
+    console.log('Usage:')
+    console.log('   interop-x help                                                              Show this message')
+    console.log('   interop-x version                                                           Print out the installed version of Interop X')
+
+    console.log()
+
+    console.log('   interop-x down                                                              Put the node into maintenance mode')
+    console.log('   interop-x up                                                                Take the node out of maintenance mode')
+
+    console.log()
+
+    console.log('   PRIVATE_KEY=abcd1234 interop-x                                              Start the node with the given private key')
+    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x                                 Start the node in staging mode')
+    console.log('   PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x                             Start the node in auto update mode')
+    console.log('   PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x               Start the node with custom API host and port')
+    console.log()
+
+}
+
+if (process.argv.at(-1) === 'help') {
+    printUsage()
+    process.exit(0)
+}
+
+const basePath = expandHomeDir(`~/.interop-x`);
+
+if (process.argv.at(-1) === 'down') {
+    fs.outputFileSync(basePath + '/maintenance', Date.now().toString())
+    console.log(chalk.red('Maintenance mode enabled'))
+    process.exit(0)
+}
+
+if (process.argv.at(-1) === 'up') {
+    fs.removeSync(basePath + '/maintenance')
+    console.log(chalk.green('Maintenance mode disabled'))
+    process.exit(0)
+}
+
+
+if (process.argv.at(-1) === 'version') {
+    console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
+    process.exit(0)
+}
+
+if (!process.env.PRIVATE_KEY) {
+    console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
+    printUsage()
+    process.exit(1)
+}
+try {
+    new ethers.Wallet(process.env.PRIVATE_KEY!)
+} catch (e) {
+    console.error(chalk.bgRed.white('Invalid private key\n'))
+    printUsage()
+    process.exit(1)
+}
+
+logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
+
+import { Tasks } from "@/tasks";
+import { startPeer, protocol, peerPool } from "@/net";
+import { startApiServer } from '@/api';
+import { Transaction } from './db';
+import { shortenHash } from './utils';
+
 async function main() {
 
     startPeer({})
 
     const tasks = new Tasks()
 
-    tasks.start();
+    setTimeout(() => {
+        tasks.start();
+    }, 10000)
+
+    startApiServer()
+
+    protocol.on('TransactionStatus', async (payload) => {
+        if (!peerPool.isLeadNode(payload.peerId)) {
+            const peer = peerPool.getPeer(payload.peerId)
+
+            if (!peer) {
+                return;
+            }
+
+            logger.info(`ignored transaction status from ${payload.peerId} ${shortenHash(peer.publicAddress)} `)
+            return;
+        }
+
+        const transaction = await Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } })
+
+        if (!transaction) {
+            return;
+        }
+
+        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
+
+        await transaction.save()
+    })
 }
 
 main()