@instadapp/interop-x 0.0.0-dev.59f2858 → 0.0.0-dev.73da8c9

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.73da8c9",
+    "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",
+        "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",
+        "patch-package": "^6.4.7",
+        "postinstall-postinstall": "^2.1.0",
+        "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/{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: '0x6c20F03598d5ABF729348E2868b0ff5e8A48aB1F',
+            symbol: 'USDC',
+        }
+    ],
+    43114: []
+};

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

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

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

@@ -22,6 +22,7 @@ module_alias_1.default.addAliases({
 const assert_1 = __importDefault(require("assert"));
 const dotenv_1 = __importDefault(require("dotenv"));
 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');
@@ -39,6 +40,7 @@ catch (e) {
     logger.error('Invalid private key');
     process.exit(1);
 }
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.73da8c9)`);
 const tasks_1 = require("@/tasks");
 const net_1 = require("@/net");
 const api_1 = require("@/api");

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,8 @@ 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 logger = new logger_1.default('PeerPool');
 class PeerPool {
     constructor() {
         this.PEERS_CLEANUP_TIME_LIMIT = 1;
@@ -62,10 +64,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 +84,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`);
             }
         }
     }
@@ -94,13 +101,13 @@ class PeerPool {
         return this.activePeers.map((p) => 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);
-            }
-        });
+        // 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,32 @@ 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 });
+        const signedData = await (0, utils_1.signGnosisSafeTx)({
+            //TODO: chain id depends on event type
+            to: constants_1.addresses[transaction.sourceChainId].multisend,
+            data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
+            chainId: transaction.sourceChainId,
+            safeTxGas: data.safeTxGas,
+        }, { signer });
         return {
             signer: signer.address,
-            data: null, //signedData,
+            data: signedData
         };
     }
 }

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

package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js

@@ -0,0 +1,158 @@
+"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 ethers_1 = require("ethers");
+const abi_1 = __importDefault(require("@/abi"));
+const db_1 = require("@/db");
+const utils_1 = require("@/utils");
+const constants_1 = require("@/constants");
+const config_1 = __importDefault(require("@/config"));
+const sequelize_1 = require("sequelize");
+const waait_1 = __importDefault(require("waait"));
+const net_1 = require("@/net");
+const generateGnosisTransaction = async (transactionData, safeContract) => {
+    console.log(transactionData);
+    let isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
+    while (isExecuted == 1) {
+        transactionData.safeTxGas = ethers_1.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString();
+        isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
+    }
+    return transactionData;
+};
+class ProcessDepositEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropXGateway::ProcessDepositEvents"),
+        });
+        this.leadNodeOnly = true;
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        var _a;
+        const blockNumber = await this.provider.getBlockNumber();
+        const transaction = await db_1.Transaction.findOne({
+            where: {
+                status: 'pending',
+                sourceStatus: 'success',
+                targetStatus: 'uninitialised',
+                action: 'deposit',
+                sourceCreatedAt: {
+                    [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
+                },
+                targetDelayUntil: {
+                    [sequelize_1.Op.or]: {
+                        [sequelize_1.Op.is]: null,
+                        [sequelize_1.Op.lt]: new Date(),
+                    }
+                },
+                sourceBlockNumber: {
+                    [sequelize_1.Op.lt]: blockNumber - 12,
+                },
+                sourceChainId: this.chainId,
+            }
+        });
+        if (!transaction) {
+            return;
+        }
+        transaction.targetStatus = 'pending';
+        await transaction.save();
+        // refresh event data?
+        const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(transaction.targetChainId));
+        const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
+        const safeAddress = constants_1.addresses[transaction.targetChainId].gnosisSafe;
+        const safeContract = (0, utils_1.getContract)(safeAddress, abi_1.default.gnosisSafe, targetWallet);
+        const ownersThreshold = await safeContract.getThreshold();
+        await (0, waait_1.default)(10000);
+        let gnosisTx = await generateGnosisTransaction({
+            baseGas: "0",
+            data: await (0, utils_1.buildDataForTransaction)(transaction),
+            gasPrice: "0",
+            gasToken: "0x0000000000000000000000000000000000000000",
+            nonce: '0',
+            operation: "1",
+            refundReceiver: "0x0000000000000000000000000000000000000000",
+            safeAddress: safeAddress,
+            safeTxGas: "79668",
+            to: constants_1.addresses[transaction.targetChainId].multisend,
+            value: "0",
+        }, safeContract);
+        const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
+        const ownerPeerIds = net_1.peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id);
+        console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
+        console.log(ownerPeerIds);
+        const signatures = await net_1.protocol.requestSignatures({
+            type: 'source',
+            transactionHash: transaction.transactionHash,
+            safeTxGas: gnosisTx.safeTxGas,
+            safeNonce: gnosisTx.nonce
+        }, ownerPeerIds);
+        const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x');
+        console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
+        if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
+            await transaction.save();
+            transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
+            transaction.targetStatus = 'uninitialised';
+            await transaction.save();
+            const errorMessage = (_a = signatures.find(s => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
+            throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
+        }
+        const execTransactionParams = [
+            gnosisTx.to,
+            gnosisTx.value,
+            gnosisTx.data,
+            gnosisTx.operation,
+            gnosisTx.safeTxGas,
+            gnosisTx.baseGas,
+            gnosisTx.gasPrice,
+            gnosisTx.gasToken,
+            gnosisTx.refundReceiver,
+            (0, utils_1.buildSignatureBytes)(validSignatures),
+        ];
+        console.log(`Executing transaction for execution ${transaction.transactionHash}`);
+        console.log({
+            execTransactionParams
+        });
+        const { data: txData } = await safeContract.populateTransaction.execTransaction(gnosisTx.to, gnosisTx.value, gnosisTx.data, gnosisTx.operation, gnosisTx.safeTxGas, gnosisTx.baseGas, gnosisTx.gasPrice, gnosisTx.gasToken, gnosisTx.refundReceiver, (0, utils_1.buildSignatureBytes)(validSignatures));
+        console.log({
+            from: targetWallet.address,
+            gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9).toString(),
+            gasLimit: ethers_1.BigNumber.from(6000000).toString(),
+            to: safeAddress,
+            data: txData,
+        });
+        return;
+        const txSent = await targetWallet.sendTransaction({
+            from: targetWallet.address,
+            gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9),
+            gasLimit: ethers_1.BigNumber.from(6000000),
+            to: safeAddress,
+            data: txData,
+        });
+        const receipt = await txSent.wait();
+        const parsedLogs = [];
+        receipt.logs.forEach((log) => {
+            try {
+                parsedLogs.push(safeContract.interface.parseLog(log));
+            }
+            catch (e) { }
+        });
+        if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
+            console.log('ExecutionSuccess');
+        }
+        else {
+            console.log('ExecutionFailure');
+        }
+    }
+    async start() {
+        this.logger.info(`Starting execution watcher on interop chain`);
+        this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
+        this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        await super.start();
+    }
+}
+exports.default = ProcessDepositEvents;

package/dist/{tasks → src/tasks}/InteropXGateway/SyncDepositEvents.js

@@ -30,7 +30,7 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
                 const { sourceChainId, targetChainId, user, vnonce, amount, token } = event.args;
                 const uniqueIdentifier = {
                     action: 'deposit',
-                    sourceTransactionHash: event.transactionHash,
+                    submitTransactionHash: event.transactionHash,
                     sourceChainId: sourceChainId.toNumber(),
                     targetChainId: targetChainId.toNumber(),
                 };
@@ -38,12 +38,21 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
                     continue;
                 }
                 const tx = await event.getTransaction();
-                await db_1.Transaction.create(Object.assign(Object.assign({}, uniqueIdentifier), { transactionHash: (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier), from: tx.from, to: user, sourceBlockNumber: event.blockNumber, sourceStatus: "uninitialised", targetStatus: "uninitialised", submitEvent: {
+                await db_1.Transaction.create(Object.assign(Object.assign({}, uniqueIdentifier), { transactionHash: (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier), from: tx.from, to: user, submitTransactionHash: event.transactionHash, submitBlockNumber: event.blockNumber, 
+                    // submit & source are the same
+                    sourceTransactionHash: event.transactionHash, sourceBlockNumber: event.blockNumber, sourceStatus: "success", targetStatus: "uninitialised", submitEvent: {
                         user,
                         sourceChainId: sourceChainId.toString(),
                         targetChainId: targetChainId.toString(),
                         token: token,
-                        ammout: amount.toString(),
+                        amount: amount.toString(),
+                        vnonce: vnonce.toString(),
+                    }, sourceEvent: {
+                        user,
+                        sourceChainId: sourceChainId.toString(),
+                        targetChainId: targetChainId.toString(),
+                        token: token,
+                        amount: amount.toString(),
                         vnonce: vnonce.toString(),
                     }, status: "pending" }));
                 this.logger.info(`Execution queued: ${event.transactionHash} ${event.blockNumber}`);
@@ -59,7 +68,7 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
         this.logger.info(`Starting execution watcher on interop chain`);
         this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
         this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
-        this.contract = new ethers_1.ethers.Contract(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
         await super.start();
     }
 }

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

@@ -4,12 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tasks = void 0;
+const ProcessDepositEvents_1 = __importDefault(require("./InteropXGateway/ProcessDepositEvents"));
 const SyncDepositEvents_1 = __importDefault(require("./InteropXGateway/SyncDepositEvents"));
 class Tasks {
     constructor() {
         this.tasks = [
             new SyncDepositEvents_1.default({
                 chainId: 43114
+            }),
+            new ProcessDepositEvents_1.default({
+                chainId: 43114
             })
         ];
     }