@instadapp/interop-x 0.0.0-dev.051cd4e → 0.0.0-dev.0520d2e

package/src/alias.ts

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

package/src/api/index.ts

@@ -1,5 +1,5 @@
 import fastify from "fastify"
-import cors from 'fastify-cors'
+import cors from '@fastify/cors'
 import Logger from "@/logger"
 import { Transaction } from "@/db";
 
@@ -20,6 +20,9 @@ export const startApiServer = async () => {
             return await Transaction.findAndCountAll({
                 limit: 20,
                 offset: 0,
+                order: [
+                    ['createdAt', 'DESC']
+                ]
             })
         })
 
@@ -27,7 +30,7 @@ export const startApiServer = async () => {
 
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`)
     } catch (err) {
-        logger.error(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 fs from 'fs-extra'
+import expandHomeDir from "expand-home-dir";
 
 class Config {
     public readonly events: EventBusType
@@ -9,15 +11,17 @@ class Config {
     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(){
@@ -27,6 +31,10 @@ class Config {
     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

@@ -2,16 +2,16 @@ export const addresses = {
   1: {
     gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
     multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-    interopXGateway: '',
+    interopXContract: '',
   },
   137: {
     gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
     multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-    interopXGateway: '',
+    interopXContract: '0x2189741c8cAc1cf51570932817A7d6390646C80e',
   },
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
     multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-    interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
+    interopXContract: '0x1867DF97Ec24bb0bbD4AD464F0Be9C6713422EAE',
   }
 }

package/src/constants/index.ts

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

package/src/constants/tokens.ts

@@ -1,30 +1,42 @@
 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",
@@ -33,36 +45,42 @@ export const tokens = {
   ],
   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,
     },
     {
+      aliases: ['avax'],
       symbol: "AVAX",
       name: "Avalanche Token",
       address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
@@ -71,34 +89,46 @@ export const tokens = {
   ],
   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,
     },
     {
-      symbol: "USDT",
+      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/models/transaction.ts

@@ -1,40 +1,65 @@
 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 action: string;
-    declare from: string;
-    declare to: string;
+    declare bridger: string;
+    declare requestTransactionHash: string;
 
-    declare submitTransactionHash: string;
-    declare submitBlockNumber: number;
+    declare requestBlockNumber: number;
 
     declare sourceChainId: number;
     declare sourceTransactionHash: CreationOptional<string>;
     declare sourceBlockNumber: CreationOptional<number>;
-    declare sourceStatus: string;
+    declare sourceStatus: CreationOptional<string>;
     declare sourceErrors: CreationOptional<string[]>;
+    declare sourceLogs: CreationOptional<any[]>;
     declare sourceCreatedAt: CreationOptional<Date>;
     declare sourceDelayUntil: CreationOptional<Date>;
 
     declare targetChainId: number;
     declare targetTransactionHash: CreationOptional<string>;
     declare targetBlockNumber: CreationOptional<number>;
-    declare targetStatus: string;
+    declare targetStatus: CreationOptional<string>;
     declare targetErrors: CreationOptional<string[]>;
+    declare targetLogs: CreationOptional<any[]>;
     declare targetCreatedAt: CreationOptional<Date>;
     declare targetDelayUntil: CreationOptional<Date>;
 
-    declare submitEvent: any;
-    declare sourceEvent: CreationOptional<any>;
-    declare targetEvent: CreationOptional<any>;
-
-    declare metadata: CreationOptional<any>;
-
-    declare status: string;
+    declare requestEvent: {
+        bridger: string;
+        metadata: string;
+        position: IPosition;
+        sourceChainId: number;
+        targetChainId: number;
+    };
+    declare requestSentEvent: CreationOptional<{
+        bridger: string;
+        metadata: string;
+        position: IPosition;
+        sourceChainId: number;
+        targetChainId: number;
+        requestTransactionHash: string;
+    }>;
+    declare committedEvent: CreationOptional<any>;
+    declare completedEvent: CreationOptional<any>;
+
+    declare status: CreationOptional<string>;
 
     declare createdAt: CreationOptional<Date>;
     declare updatedAt: CreationOptional<Date>;
@@ -47,23 +72,28 @@ Transaction.init({
         primaryKey: true
     },
 
-    submitTransactionHash: DataTypes.NUMBER,
-    submitBlockNumber: DataTypes.NUMBER,
+    requestTransactionHash: DataTypes.NUMBER,
+    requestBlockNumber: DataTypes.NUMBER,
 
     transactionHash: DataTypes.STRING,
     action: DataTypes.STRING,
-
-    from: DataTypes.STRING,
-    to: DataTypes.STRING,
+    bridger: DataTypes.STRING,
 
     sourceChainId: DataTypes.NUMBER,
     sourceTransactionHash: DataTypes.STRING,
     sourceBlockNumber: DataTypes.NUMBER,
-    sourceStatus: DataTypes.STRING,
+    sourceStatus: {
+        type: DataTypes.STRING,
+        defaultValue: 'uninitialised'
+    },
     sourceErrors: {
         type: DataTypes.JSON,
         // defaultValue: [],
     },
+    sourceLogs: {
+        type: DataTypes.JSON,
+        // defaultValue: [],
+    },
     sourceCreatedAt: {
         type: DataTypes.DATE,
         defaultValue: Date.now()
@@ -73,19 +103,28 @@ Transaction.init({
     targetChainId: DataTypes.NUMBER,
     targetTransactionHash: DataTypes.STRING,
     targetBlockNumber: DataTypes.NUMBER,
-    targetStatus: DataTypes.STRING,
+    targetStatus: {
+        type: DataTypes.STRING,
+        defaultValue: 'uninitialised'
+    },
     targetErrors: {
         type: DataTypes.JSON,
         // defaultValue: [],
     },
+    targetLogs: {
+        type: DataTypes.JSON,
+        // defaultValue: [],
+    },
     targetCreatedAt: DataTypes.DATE,
     targetDelayUntil: DataTypes.DATE,
 
-    submitEvent: DataTypes.JSON,
-    sourceEvent: DataTypes.JSON,
-    targetEvent: DataTypes.JSON,
-
-    metadata: DataTypes.JSON,
+    requestEvent: {
+        type: DataTypes.JSON,
+        allowNull: false
+    },
+    requestSentEvent: DataTypes.JSON,
+    committedEvent: DataTypes.JSON,
+    completedEvent: DataTypes.JSON,
 
     status: {
         type: DataTypes.STRING,

package/src/gnosis/actions/index.ts

@@ -0,0 +1,5 @@
+import withdraw from "./withdraw"
+
+export default {
+    withdraw,
+}

package/src/gnosis/actions/withdraw/index.ts

@@ -0,0 +1,76 @@
+import abi from "@/abi";
+import config from "@/config";
+import { addresses, tokens } from "@/constants";
+import { Transaction } from "@/db";
+import { InteropXContract } from "@/typechain";
+import { ChainId } from "@/types";
+import { getContract, getRpcProviderUrl } from "@/utils";
+import { ethers } from "ethers";
+import { MetaTransaction, OperationType } from "ethers-multisend";
+
+export default async function (transaction: Transaction, type: 'source' | 'target') {
+    const transactions: MetaTransaction[] = [];
+    const logs: any[] = [];
+
+    if (transaction.action !== 'withdraw') {
+        throw new Error(`Invalid action: ${transaction.action}`)
+    }
+
+    if (type !== 'source') {
+        throw new Error(`[WIP] Type not supported: ${type}`)
+    }
+
+    if (transaction.sourceStatus === 'pending') {
+        throw Error('Source transaction already processesing')
+    }
+
+    if (transaction.sourceStatus === 'pending') {
+        throw Error('Source transaction already processed')
+    }
+
+    if (!transaction.requestEvent) {
+        throw Error('Something went wrong, source transaction has no request event')
+    }
+
+    const { bridger, position, sourceChainId, targetChainId, metadata, } = transaction.requestEvent;
+
+    const sourceChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(targetChainId as ChainId));
+    const sourceWallet = new ethers.Wallet(config.privateKey, sourceChainProvider);
+    const contractAddress = addresses[sourceChainId].interopXContract;
+    const contract = getContract<InteropXContract>(contractAddress, abi.interopXContract, sourceWallet);
+
+    const sourceToken = tokens[sourceChainId].find( t => t.address.toLowerCase() === position.withdraw[0].sourceToken.toLowerCase());
+
+    if(!sourceToken) {
+        throw Error('Source token not found')
+    }
+
+    const targetToken = tokens[targetChainId].find( t => t.address.toLowerCase() === position.withdraw[0].targetToken.toLowerCase());
+
+    if(!targetToken) {
+        throw Error('Target token not found')
+    }
+
+    if(sourceToken.aliases.some(alias => targetToken.aliases.includes(alias))) {
+        throw Error('Source and target token must be the same')
+    }
+
+    const { data } = await contract.populateTransaction.withdrawRequested(
+        bridger,
+        position.withdraw[0].sourceToken,
+        position.withdraw[0].targetToken,
+        position.withdraw[0].amount,
+        targetChainId,
+        transaction.requestTransactionHash,
+        metadata,
+    );
+
+    transactions.push({
+        to: contractAddress,
+        data: data!,
+        value: '0',
+        operation: OperationType.Call,
+    });
+
+    return { transactions, logs }
+}

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.action)) {
+
+        const { transactions, logs } = await actions[transaction.action](transaction, type);
+
+        return {
+            data: encodeMulti(transactions).data,
+            logs
+        };
+    }
+
+    throw new Error(`Unknown action: ${transaction.action}`);
+}

package/src/index.ts

@@ -1,21 +1,7 @@
-import moduleAlias from 'module-alias';
-
-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"
-})
+import './alias'
+import expandHomeDir from "expand-home-dir";
+import fs from 'fs-extra'
 
-moduleAlias();
 import dotenv from "dotenv";
 import chalk from 'chalk';
 import { ethers } from "ethers";
@@ -25,12 +11,30 @@ dotenv.config();
 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('   PRIVATE_KEY=abcd1234 interop-x')
-    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x')
-    console.log('   PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x')
-    console.log('   PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x')
+    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') {
@@ -38,14 +42,27 @@ if (process.argv.at(-1) === 'help') {
     process.exit(0)
 }
 
-const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
+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) {
+if (!process.env.PRIVATE_KEY) {
     console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
     printUsage()
     process.exit(1)
@@ -64,6 +81,7 @@ 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() {
 
@@ -71,14 +89,21 @@ async function main() {
 
     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)
-            logger.info(`ignored transaction status from ${payload.peerId} ${peer?.publicAddress} `)
+
+            if (!peer) {
+                return;
+            }
+
+            logger.info(`ignored transaction status from ${payload.peerId} ${shortenHash(peer.publicAddress)} `)
             return;
         }
 
@@ -91,10 +116,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/peer/index.ts

@@ -17,6 +17,7 @@ import KadDHT from "libp2p-kad-dht";
 import PubsubPeerDiscovery from "libp2p-pubsub-peer-discovery";
 import { protocol } from "@/net";
 import config from "@/config";
+import chalk from "chalk";
 
 const logger = new Logger("Peer");
 
@@ -80,7 +81,7 @@ export const startPeer = async ({ }: IPeerOptions) => {
     },
   });
 
-  logger.info("Peer ID:", node.peerId.toB58String());
+  logger.info("Peer ID:", chalk.bold(node.peerId.toB58String()));
 
   await node.start();
 

package/src/net/pool/index.ts

@@ -2,6 +2,8 @@ import { Event } from "@/types";
 import config from "@/config";
 import Logger from "@/logger";
 import { getAddress } from "ethers/lib/utils";
+import { shortenHash } from "@/utils";
+import chalk from "chalk";
 
 
 const logger = new Logger('PeerPool')
@@ -87,7 +89,7 @@ export class PeerPool {
 
             if (newPeer) {
                 config.events.emit(Event.POOL_PEER_ADDED, peer)
-                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`)
+                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} added to pool`)
             }
         }
     }
@@ -102,7 +104,7 @@ export class PeerPool {
             if (this.pool.delete(peer.id)) {
                 peer.pooled = false
                 config.events.emit(Event.POOL_PEER_REMOVED, peer)
-                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`)
+                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} removed from pool`)
             }
         }
     }
@@ -123,7 +125,6 @@ export class PeerPool {
         return this.activePeers.map((p) => p.id)
     }
 
-
     getPeer(id: string){
      return this.pool.get(id);   
     }
@@ -138,6 +139,9 @@ export class PeerPool {
         return getAddress(peer.publicAddress) === getAddress(config.leadNodeAddress)
     }
 
+    getLeadPeer() {
+        return this.peers.find((p) => this.isLeadNode(p.id))
+    }
 
     cleanup() {
         // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60