@instadapp/interop-x 0.0.0-dev.fd6776c → 0.0.0-dev.fd7fd6f

package/bin/interop-x

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../dist/index')
+require('../dist/src/index')

package/dist/package.json

@@ -0,0 +1,72 @@
+{
+    "name": "@instadapp/interop-x",
+    "version": "0.0.0-dev.fd7fd6f",
+    "license": "MIT",
+    "main": "dist/index.js",
+    "engines": {
+        "node": ">=16",
+        "yarn": "^1.22.0"
+    },
+    "scripts": {
+        "start": "yarn build && node bin/interop-x",
+        "build": "yarn generate-abi-types && export GIT_REF=$(git rev-parse --short HEAD) && rimraf ./dist && tsc -p tsconfig.json && replace-in-file '@GIT_SHORT_HASH@' $GIT_REF ./dist/**/*.js",
+        "dev": "yarn generate-abi-types && NODE_ENV=development nodemon",
+        "generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
+        "prepublishOnly": "yarn build",
+        "postinstall": "patch-package"
+    },
+    "nodemonConfig": {
+        "watch": [
+            "src"
+        ],
+        "ext": "ts",
+        "exec": "./node_modules/.bin/ts-node --files -r tsconfig-paths/register ./src/index.ts"
+    },
+    "dependencies": {
+        "@achingbrain/libp2p-gossipsub": "^0.12.2",
+        "axios": "^0.27.1",
+        "axios-retry": "^3.2.4",
+        "bignumber.js": "^9.0.2",
+        "chalk": "4.1.2",
+        "dotenv": "^16.0.0",
+        "ethereumjs-util": "^7.1.4",
+        "ethers": "^5.6.4",
+        "ethers-multisend": "^2.1.1",
+        "expand-home-dir": "^0.0.3",
+        "fastify": "^3.28.0",
+        "fastify-cors": "^6.0.3",
+        "libp2p": "^0.36.2",
+        "libp2p-bootstrap": "^0.14.0",
+        "libp2p-kad-dht": "^0.28.6",
+        "libp2p-mdns": "^0.18.0",
+        "libp2p-mplex": "^0.10.7",
+        "libp2p-noise": "^4.0.0",
+        "libp2p-pubsub-peer-discovery": "^4.0.0",
+        "libp2p-tcp": "^0.17.2",
+        "libp2p-websockets": "^0.16.2",
+        "luxon": "^2.3.2",
+        "module-alias": "^2.2.2",
+        "patch-package": "^6.4.7",
+        "postinstall-postinstall": "^2.1.0",
+        "sequelize": "6.18.0",
+        "sqlite3": "^5.0.5",
+        "waait": "^1.0.5"
+    },
+    "bin": {
+        "interop-x": "bin/interop-x",
+        "interopx": "bin/interop-x"
+    },
+    "devDependencies": {
+        "@typechain/ethers-v5": "^10.0.0",
+        "@types/bn.js": "^5.1.0",
+        "@types/fs-extra": "^9.0.13",
+        "@types/node": "^17.0.17",
+        "nodemon": "^2.0.15",
+        "replace-in-file": "^6.3.2",
+        "rimraf": "^3.0.2",
+        "ts-node": "^10.5.0",
+        "tsconfig-paths": "^3.12.0",
+        "typechain": "^8.0.0",
+        "typescript": "^4.5.5"
+    }
+}

package/dist/src/api/index.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startApiServer = void 0;
+const fastify_1 = __importDefault(require("fastify"));
+const fastify_cors_1 = __importDefault(require("fastify-cors"));
+const logger_1 = __importDefault(require("@/logger"));
+const db_1 = require("@/db");
+const logger = new logger_1.default("RPC");
+const server = (0, fastify_1.default)({ logger: false });
+server.register(fastify_cors_1.default, {});
+server.get('/', async () => 'Interop X API');
+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 db_1.Transaction.findAndCountAll({
+                limit: 20,
+                offset: 0,
+            });
+        });
+        await server.listen(PORT, HOST);
+        logger.log(`RPC Server listening at http://${HOST}:${PORT}`);
+    }
+    catch (err) {
+        logger.error(err);
+        process.exit(1);
+    }
+};
+exports.startApiServer = startApiServer;

package/dist/{config → src/config}/index.js

@@ -8,6 +8,7 @@ class Config {
         this.maxPeers = 10;
         this.privateKey = process.env.PRIVATE_KEY;
         this.staging = !!process.env.STAGING && process.env.STAGING === 'true';
+        this.autoUpdate = !!process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
         this.wallet = new ethers_1.Wallet(this.privateKey);
         this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E';
     }

package/dist/{constants → src/constants}/addresses.js

@@ -6,23 +6,15 @@ exports.addresses = {
         gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
         interopXGateway: '',
-        interopBridgeTokens: [],
     },
     137: {
         gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
         interopXGateway: '',
-        interopBridgeTokens: [
-            {
-                address: '0x6c20F03598d5ABF729348E2868b0ff5e8A48aB1F',
-                symbol: 'USDC',
-            }
-        ],
     },
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
         interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
-        interopBridgeTokens: [],
     }
 };

package/dist/{constants → src/constants}/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./addresses"), exports);
 __exportStar(require("./tokens"), exports);
+__exportStar(require("./itokens"), exports);

package/dist/src/constants/itokens.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.itokens = void 0;
+exports.itokens = {
+    1: [],
+    137: [
+        {
+            address: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
+            symbol: 'USDC',
+        }
+    ],
+    43114: []
+};

package/dist/{db → src/db}/models/transaction.js

@@ -12,8 +12,10 @@ Transaction.init({
         autoIncrement: true,
         primaryKey: true
     },
+    submitTransactionHash: sequelize_2.DataTypes.NUMBER,
+    submitBlockNumber: sequelize_2.DataTypes.NUMBER,
     transactionHash: sequelize_2.DataTypes.STRING,
-    type: sequelize_2.DataTypes.STRING,
+    action: sequelize_2.DataTypes.STRING,
     from: sequelize_2.DataTypes.STRING,
     to: sequelize_2.DataTypes.STRING,
     sourceChainId: sequelize_2.DataTypes.NUMBER,

package/dist/src/index.js

@@ -0,0 +1,103 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const module_alias_1 = __importDefault(require("module-alias"));
+module_alias_1.default.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"
+});
+(0, module_alias_1.default)();
+const dotenv_1 = __importDefault(require("dotenv"));
+const chalk_1 = __importDefault(require("chalk"));
+const ethers_1 = require("ethers");
+const package_json_1 = __importDefault(require("../package.json"));
+dotenv_1.default.config();
+const logger_1 = __importDefault(require("@/logger"));
+const logger = new logger_1.default('Process');
+const printUsage = () => {
+    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');
+};
+if (process.argv.at(-1) === 'help') {
+    printUsage();
+    process.exit(0);
+}
+const GIT_SHORT_HASH = 'fd7fd6f';
+if (process.argv.at(-1) === 'version') {
+    console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
+    process.exit(0);
+}
+if (!process.env.PRIVATE_KEY) {
+    console.error(chalk_1.default.bgRed.white.bold('Please provide a private key\n'));
+    printUsage();
+    process.exit(1);
+}
+try {
+    new ethers_1.ethers.Wallet(process.env.PRIVATE_KEY);
+}
+catch (e) {
+    console.error(chalk_1.default.bgRed.white('Invalid private key\n'));
+    printUsage();
+    process.exit(1);
+}
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
+const tasks_1 = require("@/tasks");
+const net_1 = require("@/net");
+const api_1 = require("@/api");
+const db_1 = require("./db");
+async function main() {
+    (0, net_1.startPeer)({});
+    const tasks = new tasks_1.Tasks();
+    tasks.start();
+    (0, api_1.startApiServer)();
+    net_1.protocol.on('TransactionStatus', async (payload) => {
+        if (!net_1.peerPool.isLeadNode(payload.peerId)) {
+            const peer = net_1.peerPool.getPeer(payload.peerId);
+            logger.info(`ignored transaction status from ${payload.peerId} ${peer === null || peer === void 0 ? void 0 : peer.publicAddress} `);
+            return;
+        }
+        const transaction = await db_1.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()
+    .then(() => {
+}).catch(err => {
+    console.error(err);
+});
+process.on('SIGINT', () => {
+    logger.debug('received SIGINT signal. exiting.');
+    process.exit(0);
+});
+process.on('SIGTERM', () => {
+    logger.debug('received SIGTERM signal. exiting.');
+    process.exit(0);
+});
+process.on('unhandledRejection', (reason, p) => {
+    logger.error('unhandled rejection: promise:', p, 'reason:', reason);
+});

package/dist/{net → src/net}/peer/index.js

@@ -82,8 +82,12 @@ const startPeer = async ({}) => {
     net_1.protocol.start({
         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");
     await (0, waait_1.default)(1000);
     setInterval(() => net_1.protocol.sendPeerInfo({

package/dist/{net → src/net}/pool/index.js

@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.peerPool = exports.PeerPool = void 0;
 const types_1 = require("@/types");
 const config_1 = __importDefault(require("@/config"));
+const logger_1 = __importDefault(require("@/logger"));
+const utils_1 = require("ethers/lib/utils");
+const logger = new logger_1.default('PeerPool');
 class PeerPool {
     constructor() {
         this.PEERS_CLEANUP_TIME_LIMIT = 1;
@@ -62,10 +65,14 @@ class PeerPool {
      * @emits {@link Event.POOL_PEER_ADDED}
      */
     add(peer) {
-        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_1.default.events.emit(types_1.Event.POOL_PEER_ADDED, peer);
+            if (newPeer) {
+                config_1.default.events.emit(types_1.Event.POOL_PEER_ADDED, peer);
+                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`);
+            }
         }
     }
     /**
@@ -78,6 +85,7 @@ class PeerPool {
             if (this.pool.delete(peer.id)) {
                 peer.pooled = false;
                 config_1.default.events.emit(types_1.Event.POOL_PEER_REMOVED, peer);
+                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`);
             }
         }
     }
@@ -93,14 +101,24 @@ class PeerPool {
     get activePeerIds() {
         return this.activePeers.map((p) => p.id);
     }
+    getPeer(id) {
+        return this.pool.get(id);
+    }
+    isLeadNode(id) {
+        const peer = this.pool.get(id);
+        if (!peer) {
+            return false;
+        }
+        return (0, utils_1.getAddress)(peer.publicAddress) === (0, utils_1.getAddress)(config_1.default.leadNodeAddress);
+    }
     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);
-            }
-        });
+        // 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)
+        //     }
+        // })
     }
 }
 exports.PeerPool = PeerPool;

package/dist/{net → src/net}/protocol/dial/SignatureDialProtocol.js

@@ -8,6 +8,8 @@ const BaseDialProtocol_1 = require("./BaseDialProtocol");
 const waait_1 = __importDefault(require("waait"));
 const config_1 = __importDefault(require("@/config"));
 const db_1 = require("@/db");
+const utils_1 = require("@/utils");
+const constants_1 = require("@/constants");
 class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
     constructor(libp2p) {
         super(libp2p, '/interop-x/signatures');
@@ -15,31 +17,39 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
     }
     async response(data) {
         const signer = config_1.default.wallet;
-        let event;
+        let transaction;
         let maxTimeout = 20000;
         do {
-            event = await db_1.Transaction.findOne({ where: { transactionHash: data.transactionHash } });
-            if (!event) {
+            transaction = await db_1.Transaction.findOne({ where: { transactionHash: data.transactionHash } });
+            if (!transaction) {
                 await (0, waait_1.default)(1000);
                 maxTimeout -= 1000;
             }
-        } while (!event && maxTimeout > 0);
-        if (!event) {
+        } while (!transaction && maxTimeout > 0);
+        if (!transaction) {
             return {
                 signer: signer.address,
                 data: null,
                 error: 'Event not found'
             };
         }
-        // const signedData = await signGnosisSafeTx({
-        //     to: addresses[event.chainId as ChainId].multisend,
-        //     data: 'TODO',
-        //     chainId: event.chainId as ChainId,
-        //     safeTxGas: data.safeTxGas,
-        // }, { signer });
+        console.log("signing:", {
+            to: constants_1.addresses[transaction.targetChainId].multisend,
+            data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
+            chainId: transaction.targetChainId,
+            safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
+        });
+        const signedData = await (0, utils_1.signGnosisSafeTx)({
+            to: constants_1.addresses[transaction.targetChainId].multisend,
+            data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
+            chainId: transaction.targetChainId,
+            safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
+        }, { signer });
         return {
             signer: signer.address,
-            data: null, //signedData,
+            data: signedData
         };
     }
 }

package/dist/{net → src/net}/protocol/index.js

@@ -16,7 +16,7 @@ class Protocol extends stream_1.EventEmitter {
         this.protocolMessages = [
             {
                 name: 'PeerInfo',
-                code: 0x09,
+                code: 0x01,
                 encode: (info) => [
                     Buffer.from(info.publicAddress),
                 ],
@@ -24,6 +24,30 @@ class Protocol extends stream_1.EventEmitter {
                     publicAddress: publicAddress.toString(),
                 }),
             },
+            {
+                name: 'TransactionStatus',
+                code: 0x02,
+                encode: (transaction) => [
+                    Buffer.from(transaction.transactionHash),
+                    Buffer.from(transaction.sourceStatus),
+                    Buffer.from(transaction.sourceTransactionHash),
+                    transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
+                    Buffer.from(transaction.targetStatus),
+                    Buffer.from(transaction.targetTransactionHash),
+                    transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
+                    Buffer.from(transaction.status),
+                ],
+                decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]) => ({
+                    transactionHash: transactionHash.toString(),
+                    sourceStatus: sourceStatus.toString(),
+                    sourceTransactionHash: sourceTransactionHash.toString(),
+                    sourceErrors: sourceErrors.map((e) => e.toString()),
+                    targetStatus: targetStatus.toString(),
+                    targetTransactionHash: targetTransactionHash.toString(),
+                    targetErrors: targetErrors.map((e) => e.toString()),
+                    status: status.toString(),
+                }),
+            },
         ];
     }
     start({ libp2p, topic = null, }) {
@@ -75,6 +99,11 @@ class Protocol extends stream_1.EventEmitter {
         const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(data)]);
         this.libp2p.pubsub.publish(this.topic, encoded);
     }
+    sendTransaction(transaction) {
+        const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus');
+        const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(transaction)]);
+        this.libp2p.pubsub.publish(this.topic, encoded);
+    }
     async requestSignatures(data, peerIds) {
         try {
             peerIds = peerIds || __1.peerPool.activePeerIds;

package/dist/src/tasks/AutoUpdateTask.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const BaseTask_1 = require("./BaseTask");
+const logger_1 = __importDefault(require("@/logger"));
+const package_json_1 = __importDefault(require("../../package.json"));
+const utils_1 = require("@/utils");
+const child_process_1 = require("child_process");
+const config_1 = __importDefault(require("@/config"));
+const currentVersion = package_json_1.default.version;
+class AutoUpdateTask extends BaseTask_1.BaseTask {
+    constructor() {
+        super({
+            logger: new logger_1.default("AutoUpdateTask"),
+        });
+        this.pollIntervalMs = 60 * 1000;
+    }
+    prePollHandler() {
+        return config_1.default.autoUpdate && !config_1.default.isLeadNode();
+    }
+    async pollHandler() {
+        const { data } = await utils_1.http.get('https://registry.npmjs.org/@instadapp/interop-x');
+        const version = data['dist-tags'].latest;
+        if (version === currentVersion) {
+            return;
+        }
+        this.logger.warn(`New version ${version} available.`);
+        const update = (0, child_process_1.spawn)('npm', ['-g', 'install', '@instadapp/interop-x']);
+        update.on("close", () => {
+            this.logger.warn(`Installed version ${version}`);
+            this.logger.warn(`Restarting...`);
+            (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
+                cwd: process.cwd(),
+                env: Object.create(process.env),
+                detached: true,
+                stdio: "inherit"
+            });
+            process.exit();
+        });
+    }
+}
+exports.default = AutoUpdateTask;

package/dist/{tasks → src/tasks}/BaseTask.js

@@ -28,7 +28,7 @@ class BaseTask extends events_1.default {
                 }
             }
             catch (err) {
-                this.logger.error(`poll check error: ${err.message}\ntrace: ${err.stack}`);
+                this.logger.error(`poll check error:\n${err.message}\ntrace: ${err.stack}`);
             }
             await this.postPollHandler();
         }