@instadapp/interop-x 0.0.0-dev.ef78459 → 0.0.0-dev.f0a6281

package/src/constants/tokens.ts

@@ -0,0 +1,104 @@
+export const tokens = {
+  1: [
+    {
+      symbol: "ETH",
+      name: "Ethereum",
+      address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      decimals: 18,
+    },
+    {
+      symbol: "DAI",
+      name: "DAI Stable",
+      address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+      decimals: 18,
+    },
+    {
+      symbol: "USDC",
+      name: "USD Coin",
+      address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+      decimals: 6,
+    },
+    {
+      symbol: "USDT",
+      name: "Tether USD Coin",
+      address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+      decimals: 6,
+    },
+    {
+      symbol: "WBTC",
+      name: "Wrapped BTC",
+      address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
+      decimals: 8,
+    },
+  ],
+  137: [
+    {
+      symbol: "ETH",
+      name: "Ethereum",
+      address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
+      decimals: 18,
+    },
+    {
+      symbol: "DAI",
+      name: "DAI Stable",
+      address: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063",
+      decimals: 18,
+    },
+    {
+      symbol: "USDC",
+      name: "USD Coin",
+      address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+      decimals: 6,
+    },
+    {
+      symbol: "USDT",
+      name: "Tether USD Coin",
+      address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
+      decimals: 6,
+    },
+    {
+      symbol: "WBTC",
+      name: "Wrapped BTC",
+      address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
+      decimals: 8,
+    },
+    {
+      symbol: "AVAX",
+      name: "Avalanche Token",
+      address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
+      decimals: 18,
+    },
+  ],
+  43114: [
+    {
+      symbol: "ETH",
+      name: "Ethereum",
+      address: "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB",
+      decimals: 18,
+    },
+    {
+      symbol: "DAI",
+      name: "DAI Stable",
+      address: "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70",
+      decimals: 18,
+    },
+    {
+      symbol: "USDC",
+      name: "USD Coin",
+      address: "0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664",
+      decimals: 6,
+    },
+    {
+      symbol: "USDT",
+      name: "Tether USD Coin",
+      address: "0xc7198437980c041c805A1EDcbA50c1Ce5db95118",
+      decimals: 6,
+    },
+    {
+      symbol: "WBTC",
+      name: "Wrapped BTC",
+      address: "0x50b7545627a5162F82A992c33b87aDc75187B218",
+      decimals: 8,
+    },
+  ],
+};

package/src/db/models/index.ts

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

package/src/db/models/transaction.ts

@@ -0,0 +1,96 @@
+import { sequelize } from '@/db/sequelize'
+import { CreationOptional, InferAttributes, InferCreationAttributes, Model, DataTypes } from 'sequelize';
+
+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 submitTransactionHash: string;
+    declare submitBlockNumber: number;
+
+    declare sourceChainId: number;
+    declare sourceTransactionHash: CreationOptional<string>;
+    declare sourceBlockNumber: CreationOptional<number>;
+    declare sourceStatus: string;
+    declare sourceErrors: CreationOptional<string[]>;
+    declare sourceCreatedAt: CreationOptional<Date>;
+    declare sourceDelayUntil: CreationOptional<Date>;
+
+    declare targetChainId: number;
+    declare targetTransactionHash: CreationOptional<string>;
+    declare targetBlockNumber: CreationOptional<number>;
+    declare targetStatus: string;
+    declare targetErrors: CreationOptional<string[]>;
+    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 createdAt: CreationOptional<Date>;
+    declare updatedAt: CreationOptional<Date>;
+}
+
+Transaction.init({
+    id: {
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
+        primaryKey: true
+    },
+
+    submitTransactionHash: DataTypes.NUMBER,
+    submitBlockNumber: DataTypes.NUMBER,
+
+    transactionHash: DataTypes.STRING,
+    action: DataTypes.STRING,
+
+    from: DataTypes.STRING,
+    to: DataTypes.STRING,
+
+    sourceChainId: DataTypes.NUMBER,
+    sourceTransactionHash: DataTypes.STRING,
+    sourceBlockNumber: DataTypes.NUMBER,
+    sourceStatus: DataTypes.STRING,
+    sourceErrors: {
+        type: DataTypes.JSON,
+        // defaultValue: [],
+    },
+    sourceCreatedAt: {
+        type: DataTypes.DATE,
+        defaultValue: Date.now()
+    },
+    sourceDelayUntil: DataTypes.STRING,
+
+    targetChainId: DataTypes.NUMBER,
+    targetTransactionHash: DataTypes.STRING,
+    targetBlockNumber: DataTypes.NUMBER,
+    targetStatus: DataTypes.STRING,
+    targetErrors: {
+        type: DataTypes.JSON,
+        // defaultValue: [],
+    },
+    targetCreatedAt: DataTypes.DATE,
+    targetDelayUntil: DataTypes.DATE,
+
+    submitEvent: DataTypes.JSON,
+    sourceEvent: DataTypes.JSON,
+    targetEvent: DataTypes.JSON,
+
+    metadata: DataTypes.JSON,
+
+    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/index.ts

@@ -1,23 +1,102 @@
-import 'module-alias/register';
-import assert from "assert";
+import moduleAlias from 'module-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 Logger from "@/logger";
+import chalk from 'chalk';
 import { ethers } from "ethers";
+import packageJson from '../package.json'
 dotenv.config();
+
+import Logger from "@/logger";
 const logger = new Logger('Process')
 
-assert(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
+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) {
-    logger.error('Invalid private key')
+    console.error(chalk.bgRed.white('Invalid private key\n'))
+    printUsage()
     process.exit(1)
 }
 
-import { Tasks } from "@/tasks";
-import { startPeer } from "@/net";
+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() {
 
@@ -26,6 +105,39 @@ async function main() {
     const tasks = new Tasks()
 
     tasks.start();
+
+    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.targetStatus = payload.data.targetStatus
+        transaction.targetTransactionHash = payload.data.targetTransactionHash
+        transaction.targetErrors = payload.data.targetErrors
+
+        transaction.status = payload.data.status
+
+        await transaction.save()
+    })
 }
 
 main()

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();
 
@@ -88,12 +89,13 @@ export const startPeer = async ({ }: IPeerOptions) => {
     libp2p: node
   })
 
-  node.on("peer:discovery", (peer) =>
-    logger.log(`Discovered peer ${peer}`)
-  ); // peer disc.
-  node.connectionManager.on("peer:connect", (connection) =>
-    logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
-  );
+  node.on("peer:discovery", (peer) => {
+    // logger.log(`Discovered peer ${peer}`)
+  }); // peer disc.
+
+  node.connectionManager.on("peer:connect", (connection) => {
+    // logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
+  });
 
   logger.log("Peer discovery started");
 

package/src/net/pool/index.ts

@@ -1,5 +1,12 @@
 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')
 
 export interface IPeerInfo {
     id: string;
@@ -75,10 +82,15 @@ export class PeerPool {
      * @emits {@link Event.POOL_PEER_ADDED}
      */
     add(peer?: IPeerInfo) {
-        if (peer && peer.id && !this.pool.get(peer.id)) {
+        if (peer && peer.id) {
+            const newPeer = !this.pool.get(peer.id);
             this.pool.set(peer.id, peer)
             peer.pooled = true
-            config.events.emit(Event.POOL_PEER_ADDED, peer)
+
+            if (newPeer) {
+                config.events.emit(Event.POOL_PEER_ADDED, peer)
+                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} added to pool`)
+            }
         }
     }
 
@@ -92,6 +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 ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} removed from pool`)
             }
         }
     }
@@ -100,7 +113,7 @@ export class PeerPool {
         this.cleanup()
 
         return this.peers.filter((p) => {
-            if(!p.pooled) return false;
+            if (!p.pooled) return false;
 
             const now = new Date()
 
@@ -112,16 +125,33 @@ export class PeerPool {
         return this.activePeers.map((p) => p.id)
     }
 
+    getPeer(id: string){
+     return this.pool.get(id);   
+    }
 
-    cleanup() {
-        let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
+    isLeadNode(id: string) {
+        const peer = this.pool.get(id);
 
-        this.peers.forEach((peerInfo) => {
-            if (peerInfo.updated.getTime() < compDate) {
-                console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
-                this.remove(peerInfo)
-            }
-        })
+        if (!peer) {
+            return false;
+        }
+
+        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
+
+        // this.peers.forEach((peerInfo) => {
+        //     if (peerInfo.updated.getTime() < compDate) {
+        //         console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
+        //         this.remove(peerInfo)
+        //     }
+        // })
     }
 }
 

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

@@ -1,14 +1,14 @@
-import { signGnosisSafeTx } from "@/utils";
 import { BaseDialProtocol } from "./BaseDialProtocol";
 import wait from "waait";
-import { ChainId } from "@/types";
 import config from "@/config";
+import { Transaction } from "@/db";
+import { buildDataForTransaction, signGnosisSafeTx } from "@/utils";
 import { addresses } from "@/constants";
-import { Execution } from "db";
+import { ChainId } from "@/types";
 
 export interface ISignatureRequest {
-    type: string,
-    vnonce: string
+    type: 'source' | 'target' ,
+    transactionHash: string
     safeTxGas: string
     safeNonce: string
 }
@@ -21,25 +21,25 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
     protected timeout = 30000;
 
     constructor(libp2p) {
-        super(libp2p, '/signatures')
+        super(libp2p, '/interop-x/signatures')
     }
 
     async response(data: ISignatureRequest): Promise<ISignatureResponse> {
         const signer = config.wallet;
 
-        let event: Execution | null;
+        let transaction: Transaction | null;
         let maxTimeout = 20000;
 
         do {
-            event = await Execution.findOne({ where: { vnonce: data.vnonce.toString() } })
+            transaction = await Transaction.findOne({ where: { transactionHash: data.transactionHash } })
 
-            if (!event) {
+            if (!transaction) {
                 await wait(1000);
                 maxTimeout -= 1000;
             }
-        } while (!event && maxTimeout > 0)
+        } while (!transaction && maxTimeout > 0)
 
-        if (!event) {
+        if (!transaction) {
             return {
                 signer: signer.address,
                 data: null,
@@ -47,16 +47,25 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
             };
         }
 
+        console.log("signing:", {
+            to: addresses[transaction.targetChainId].multisend,
+            data: await buildDataForTransaction(transaction, data.type),
+            chainId: transaction.targetChainId as ChainId,
+            safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
+        });
+
         const signedData = await signGnosisSafeTx({
-            to: addresses[event.chainId as ChainId].multisend,
-            data: 'TODO',
-            chainId: event.chainId as ChainId,
+            to: addresses[transaction.targetChainId].multisend,
+            data: await buildDataForTransaction(transaction, data.type),
+            chainId: transaction.targetChainId as ChainId,
             safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
         }, { signer });
 
         return {
             signer: signer.address,
-            data: signedData,
+            data: signedData
         }
     }
 }

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

@@ -0,0 +1,31 @@
+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> {
+    protected timeout = 30000;
+
+    constructor(libp2p) {
+        super(libp2p, '/interop-x/transaction-status')
+    }
+
+    async response(transactionHash: string){
+        const transaction = await Transaction.findOne({ where: { transactionHash } })
+
+        if(! transaction){
+            return null
+        }
+        return {
+            transactionHash: transaction.transactionHash,
+
+            sourceStatus: transaction.sourceStatus,
+            sourceTransactionHash: transaction.sourceTransactionHash,
+            sourceErrors: transaction.sourceErrors,
+
+            targetStatus: transaction.targetStatus,
+            targetTransactionHash: transaction.targetTransactionHash,
+            targetErrors: transaction.targetErrors,
+
+            status: transaction.status,
+        }
+    }
+}