@instadapp/interop-x 0.0.0-dev.f78418c → 0.0.0-dev.fbcbec6

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

@@ -6,6 +6,11 @@ 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 utils_2 = require("@/utils");
+const chalk_1 = __importDefault(require("chalk"));
+const logger = new logger_1.default('PeerPool');
 class PeerPool {
     constructor() {
         this.PEERS_CLEANUP_TIME_LIMIT = 1;
@@ -62,10 +67,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 ${chalk_1.default.bold((0, utils_2.shortenHash)(peer.id, 16))} with address ${chalk_1.default.bold((0, utils_2.shortenHash)(peer.publicAddress))} added to pool`);
+            }
         }
     }
     /**
@@ -78,6 +87,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 ${chalk_1.default.bold((0, utils_2.shortenHash)(peer.id, 16))} with address ${chalk_1.default.bold((0, utils_2.shortenHash)(peer.publicAddress))} removed from pool`);
             }
         }
     }
@@ -93,14 +103,27 @@ 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);
+    }
+    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);
-            }
-        });
+        // 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,38 +8,47 @@ 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");
+const gnosis_1 = require("@/gnosis");
 class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
     constructor(libp2p) {
         super(libp2p, '/interop-x/signatures');
         this.timeout = 30000;
     }
     async response(data) {
+        console.log({
+            tag: 'SignatureDialProtocol',
+            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 { data: gnosisData } = await (0, gnosis_1.buildGnosisAction)(transaction, data.type);
+        const signedData = await (0, utils_1.signGnosisSafeTx)({
+            to: constants_1.addresses[transaction.sourceChainId].multisend,
+            data: gnosisData,
+            chainId: transaction.sourceChainId,
+            safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
+        }, { signer });
         return {
             signer: signer.address,
-            data: null, //signedData,
+            data: signedData
         };
     }
 }

package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionStatusDialProtocol = void 0;
+const BaseDialProtocol_1 = require("./BaseDialProtocol");
+const db_1 = require("@/db");
+class TransactionStatusDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
+    constructor(libp2p) {
+        super(libp2p, '/interop-x/transaction-status');
+        this.timeout = 30000;
+    }
+    async response(transactionHash) {
+        const transaction = await db_1.Transaction.findOne({ where: { transactionHash } });
+        if (!transaction) {
+            return null;
+        }
+        return {
+            transactionHash: transaction.transactionHash,
+            sourceStatus: transaction.sourceStatus,
+            sourceTransactionHash: transaction.sourceTransactionHash,
+            sourceErrors: transaction.sourceErrors,
+            sourceLogs: transaction.sourceLogs,
+            targetStatus: transaction.targetStatus,
+            targetTransactionHash: transaction.targetTransactionHash,
+            targetErrors: transaction.targetErrors,
+            targetLogs: transaction.targetLogs,
+            status: transaction.status,
+        };
+    }
+}
+exports.TransactionStatusDialProtocol = TransactionStatusDialProtocol;

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

@@ -10,13 +10,14 @@ const SignatureDialProtocol_1 = require("./dial/SignatureDialProtocol");
 const __1 = require("..");
 const config_1 = __importDefault(require("@/config"));
 const types_1 = require("@/types");
+const TransactionStatusDialProtocol_1 = require("./dial/TransactionStatusDialProtocol");
 class Protocol extends stream_1.EventEmitter {
     constructor() {
         super(...arguments);
         this.protocolMessages = [
             {
                 name: 'PeerInfo',
-                code: 0x09,
+                code: 0x01,
                 encode: (info) => [
                     Buffer.from(info.publicAddress),
                 ],
@@ -24,6 +25,40 @@ 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)) : [],
+                    transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
+                    Buffer.from(transaction.targetStatus),
+                    Buffer.from(transaction.targetTransactionHash || ''),
+                    transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
+                    transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
+                    Buffer.from(transaction.status),
+                ],
+                decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]) => ({
+                    transactionHash: transactionHash.toString(),
+                    sourceStatus: sourceStatus.toString(),
+                    sourceTransactionHash: sourceTransactionHash.toString() || null,
+                    sourceErrors: sourceErrors.map((e) => e.toString()),
+                    sourceLogs: sourceLogs.map(e => ({
+                        type: e[0].toString(),
+                        message: e[1].toString(),
+                    })),
+                    targetStatus: targetStatus.toString(),
+                    targetTransactionHash: targetTransactionHash.toString() || null,
+                    targetErrors: targetErrors.map((e) => e.toString()),
+                    targetLogs: targetLogs.map(e => ({
+                        type: e[0].toString(),
+                        message: e[1].toString(),
+                    })),
+                    status: status.toString(),
+                }),
+            },
         ];
     }
     start({ libp2p, topic = null, }) {
@@ -40,6 +75,7 @@ class Protocol extends stream_1.EventEmitter {
             });
         });
         this.signature = new SignatureDialProtocol_1.SignatureDialProtocol(this.libp2p);
+        this.transactionStatus = new TransactionStatusDialProtocol_1.TransactionStatusDialProtocol(this.libp2p);
     }
     init() {
         this.libp2p.pubsub.subscribe(this.topic);
@@ -75,6 +111,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;
@@ -88,5 +129,14 @@ class Protocol extends stream_1.EventEmitter {
             return [];
         }
     }
+    async requestTransactionStatus(transactionHash, peerId) {
+        try {
+            return await this.transactionStatus.send(transactionHash, peerId);
+        }
+        catch (error) {
+            console.log(error);
+            return null;
+        }
+    }
 }
 exports.protocol = new Protocol();

package/dist/src/tasks/AutoUpdateTask.js

@@ -0,0 +1,70 @@
+"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 await_spawn_1 = __importDefault(require("await-spawn"));
+const child_process_1 = require("child_process");
+const config_1 = __importDefault(require("@/config"));
+const waait_1 = __importDefault(require("waait"));
+const package_json_1 = __importDefault(require("../../package.json"));
+const currentVersion = package_json_1.default.version;
+const tag = config_1.default.staging ? 'dev' : 'latest';
+class AutoUpdateTask extends BaseTask_1.BaseTask {
+    constructor() {
+        super({
+            logger: new logger_1.default("AutoUpdateTask"),
+        });
+        this.pollIntervalMs = 60 * 10 * 1000;
+    }
+    prePollHandler() {
+        return config_1.default.autoUpdate && !config_1.default.isLeadNode();
+    }
+    async getInstalledVersion() {
+        try {
+            const stdout = await (0, await_spawn_1.default)('npm', ['-g', 'ls', '--depth=0', '--json']);
+            return JSON.parse(stdout.toString()).dependencies[package_json_1.default.name].version;
+        }
+        catch (error) {
+            this.logger.error(error);
+            return currentVersion;
+        }
+    }
+    async getLatestVersion() {
+        try {
+            const stdout = await (0, await_spawn_1.default)('npm', ['view', `${package_json_1.default.name}@${tag}`, 'version']);
+            return stdout.toString().trim();
+        }
+        catch (error) {
+            this.logger.error(error);
+            return currentVersion;
+        }
+    }
+    async pollHandler() {
+        const version = await this.getLatestVersion();
+        if (version === currentVersion) {
+            return;
+        }
+        this.logger.warn(`New version ${version} available.`);
+        this.logger.info('Updating...');
+        await (0, await_spawn_1.default)('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
+        await (0, waait_1.default)(5000);
+        if (version !== await this.getInstalledVersion()) {
+            this.logger.warn(`failed to install ${version}, retrying in 5 minutes`);
+            return;
+        }
+        this.logger.warn(`Installed version ${version}`);
+        this.logger.warn(`Restarting...`);
+        // TODO: its restarting in the bg, but it should be in the fg
+        const subprocess = (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
+            cwd: process.cwd(),
+            stdio: "inherit",
+            // shell: process.env.SHELL, 
+        });
+        subprocess.unref();
+        process.exit();
+    }
+}
+exports.default = AutoUpdateTask;

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

@@ -14,6 +14,7 @@ class BaseTask extends events_1.default {
         this.started = false;
         this.pollIntervalMs = 10 * 1000;
         this.leadNodeOnly = false;
+        this.exceptLeadNode = false;
         this.logger = logger !== null && logger !== void 0 ? logger : new logger_1.default('BaseTask');
     }
     async pollCheck() {
@@ -28,16 +29,23 @@ 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();
         }
     }
     prePollHandler() {
-        if (!this.leadNodeOnly) {
-            return true;
+        if (config_1.default.isMaintenanceMode()) {
+            this.logger.warn('Maintenance mode is enabled. Skipping task.');
+            return false;
         }
-        return config_1.default.isLeadNode();
+        if (this.exceptLeadNode) {
+            return !config_1.default.isLeadNode();
+        }
+        if (this.leadNodeOnly) {
+            return config_1.default.isLeadNode();
+        }
+        return true;
     }
     async pollHandler() {
         this.logger.warn('pollHandler not implemented');

package/dist/src/tasks/InteropX/SyncLogSubmitEvents.js

@@ -0,0 +1,84 @@
+"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"));
+class SyncLogSubmitEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropX::SyncLogSubmitEvents"),
+        });
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+        const events = await this.contract.queryFilter(this.contract.filters.LogSubmit(), currentBlock - 2000, currentBlock);
+        let processedEvents = 0;
+        for (const event of events) {
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                const { position, actionId, actionIdHashHash, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = event.args;
+                const uniqueIdentifier = {
+                    actionId,
+                    vnonce: vnonce.toString(),
+                    sourceSender: sourceSender.toString(),
+                    sourceChainId: sourceChainId.toNumber(),
+                    targetChainId: targetChainId.toNumber(),
+                    sourceDsaId: sourceDsaId.toString(),
+                    targetDsaId: targetDsaId.toString(),
+                };
+                let transactionHash = (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier);
+                const transaction = await db_1.Transaction.findOne({ where: { transactionHash } });
+                if (transaction) {
+                    continue;
+                }
+                await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { submitChainId: this.chainId, submitTransactionHash: event.transactionHash, submitBlockNumber: event.blockNumber, submitCreatedAt: new Date(), submitEvent: {
+                        actionId,
+                        actionIdHashHash,
+                        vnonce: vnonce.toString(),
+                        position: {
+                            withdraw: position.withdraw.map((v) => ({
+                                sourceToken: v.sourceToken,
+                                targetToken: v.targetToken,
+                                amount: v.amount.toString()
+                            })),
+                            supply: position.supply.map((v) => ({
+                                sourceToken: v.sourceToken,
+                                targetToken: v.targetToken,
+                                amount: v.amount.toString()
+                            })),
+                        },
+                        sourceChainId: sourceChainId.toNumber(),
+                        targetChainId: targetChainId.toNumber(),
+                        sourceSender,
+                        sourceDsaId: sourceDsaId.toString(),
+                        targetDsaId: targetDsaId.toString(),
+                        metadata,
+                    } }));
+                this.logger.info(`New InteropX tranaction: ${transactionHash} `);
+            }
+            catch (error) {
+                this.logger.error(error);
+            }
+        }
+        if (processedEvents > 0)
+            this.logger.info(`${processedEvents} events processed`);
+    }
+    async start() {
+        this.contractAddress = constants_1.addresses[this.chainId].interopX;
+        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.interopX, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        await super.start();
+    }
+}
+exports.default = SyncLogSubmitEvents;

package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js

@@ -0,0 +1,58 @@
+"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 net_1 = require("@/net");
+const db_1 = require("@/db");
+const sequelize_1 = require("sequelize");
+class SyncTransactionStatusTask extends BaseTask_1.BaseTask {
+    constructor() {
+        super({
+            logger: new logger_1.default("SyncTransactionStatusTask"),
+        });
+        this.pollIntervalMs = 60 * 1000;
+        this.exceptLeadNode = true;
+    }
+    async pollHandler() {
+        // if transaction is pending for more than 1 hour, check lead node for status
+        const leadNode = net_1.peerPool.getLeadPeer();
+        if (!leadNode) {
+            console.log("No lead node found");
+            return;
+        }
+        const transaction = await db_1.Transaction.findOne({
+            where: {
+                status: {
+                    [sequelize_1.Op.notIn]: ['success', 'failed'],
+                },
+                createdAt: {
+                    [sequelize_1.Op.lt]: new Date(Date.now() - 15 * 60 * 1000),
+                },
+            }
+        });
+        if (!transaction) {
+            return;
+        }
+        this.logger.info(`Requesting transaction status for ${transaction.transactionHash}`);
+        const transactionStatus = await net_1.protocol.requestTransactionStatus(transaction.transactionHash, leadNode.id);
+        if (!transactionStatus) {
+            return;
+        }
+        this.logger.info(`Received transaction status for ${transaction.transactionHash}`);
+        transaction.sourceStatus = transactionStatus.sourceStatus;
+        transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash;
+        transaction.sourceErrors = transactionStatus.sourceErrors;
+        transaction.sourceLogs = transactionStatus.sourceLogs;
+        transaction.targetStatus = transactionStatus.targetStatus;
+        transaction.targetTransactionHash = transactionStatus.targetTransactionHash;
+        transaction.targetErrors = transactionStatus.targetErrors;
+        transaction.targetLogs = transactionStatus.targetLogs;
+        transaction.status = transactionStatus.status;
+        await transaction.save();
+        this.logger.info(`Updated transaction status for ${transaction.transactionHash}`);
+    }
+}
+exports.default = SyncTransactionStatusTask;

package/dist/src/tasks/index.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Tasks = void 0;
+const waait_1 = __importDefault(require("waait"));
+const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
+const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
+const SyncLogSubmitEvents_1 = __importDefault(require("./InteropX/SyncLogSubmitEvents"));
+class Tasks {
+    constructor() {
+        this.tasks = [
+            // new SyncTransactionStatusTask(),
+            new AutoUpdateTask_1.default(),
+            // InteropX
+            new SyncLogSubmitEvents_1.default({ chainId: 137 }),
+            new SyncLogSubmitEvents_1.default({ chainId: 43114 }),
+            new SyncTransactionStatusTask_1.default(),
+        ];
+    }
+    async start() {
+        for (const task of this.tasks) {
+            try {
+                task.start();
+                await (0, waait_1.default)(1000);
+            }
+            catch (error) {
+                console.error(`Error starting task: ${task.constructor.name}`);
+            }
+        }
+    }
+}
+exports.Tasks = Tasks;