@instadapp/interop-x 0.0.0-dev.9387bd9 → 0.0.0-dev.fd6776c

package/dist/db/models/transaction.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Transaction = void 0;
+const sequelize_1 = require("@/db/sequelize");
+const sequelize_2 = require("sequelize");
+class Transaction extends sequelize_2.Model {
+}
+exports.Transaction = Transaction;
+Transaction.init({
+    id: {
+        type: sequelize_2.DataTypes.INTEGER,
+        autoIncrement: true,
+        primaryKey: true
+    },
+    transactionHash: sequelize_2.DataTypes.STRING,
+    type: sequelize_2.DataTypes.STRING,
+    from: sequelize_2.DataTypes.STRING,
+    to: sequelize_2.DataTypes.STRING,
+    sourceChainId: sequelize_2.DataTypes.NUMBER,
+    sourceTransactionHash: sequelize_2.DataTypes.STRING,
+    sourceBlockNumber: sequelize_2.DataTypes.NUMBER,
+    sourceStatus: sequelize_2.DataTypes.STRING,
+    sourceErrors: {
+        type: sequelize_2.DataTypes.JSON,
+        // defaultValue: [],
+    },
+    sourceCreatedAt: {
+        type: sequelize_2.DataTypes.DATE,
+        defaultValue: Date.now()
+    },
+    sourceDelayUntil: sequelize_2.DataTypes.STRING,
+    targetChainId: sequelize_2.DataTypes.NUMBER,
+    targetTransactionHash: sequelize_2.DataTypes.STRING,
+    targetBlockNumber: sequelize_2.DataTypes.NUMBER,
+    targetStatus: sequelize_2.DataTypes.STRING,
+    targetErrors: {
+        type: sequelize_2.DataTypes.JSON,
+        // defaultValue: [],
+    },
+    targetCreatedAt: sequelize_2.DataTypes.DATE,
+    targetDelayUntil: sequelize_2.DataTypes.DATE,
+    submitEvent: sequelize_2.DataTypes.JSON,
+    sourceEvent: sequelize_2.DataTypes.JSON,
+    targetEvent: sequelize_2.DataTypes.JSON,
+    metadata: sequelize_2.DataTypes.JSON,
+    status: {
+        type: sequelize_2.DataTypes.STRING,
+        defaultValue: 'pending'
+    },
+    createdAt: sequelize_2.DataTypes.DATE,
+    updatedAt: sequelize_2.DataTypes.DATE,
+}, { sequelize: sequelize_1.sequelize, tableName: 'transactions' });

package/dist/db/sequelize.js

@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sequelize = void 0;
 //@ts-ignore
+const config_1 = __importDefault(require("@/config"));
 const expand_home_dir_1 = __importDefault(require("expand-home-dir"));
 const sequelize_1 = require("sequelize");
-const basePath = (0, expand_home_dir_1.default)('~/.interop-x/data');
+const basePath = (0, expand_home_dir_1.default)(`~/.interop-x/data/${config_1.default.publicAddress}/${config_1.default.staging ? 'staging' : ''}`);
 exports.sequelize = new sequelize_1.Sequelize({
     dialect: 'sqlite',
     storage: `${basePath}/localDB.sqlite`,

package/dist/index.js

@@ -3,12 +3,33 @@ 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",
+    "@/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 assert_1 = __importDefault(require("assert"));
 const dotenv_1 = __importDefault(require("dotenv"));
-const logger_1 = __importDefault(require("./logger"));
 const ethers_1 = require("ethers");
 dotenv_1.default.config();
+const logger_1 = __importDefault(require("@/logger"));
 const logger = new logger_1.default('Process');
+if (process.argv.at(-1) === 'help') {
+    console.log('Usage:');
+    console.log('   PRIVATE_KEY=abcd1234 interop-x');
+    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x');
+    process.exit(0);
+}
 (0, assert_1.default)(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
 try {
     new ethers_1.ethers.Wallet(process.env.PRIVATE_KEY);
@@ -17,8 +38,8 @@ catch (e) {
     logger.error('Invalid private key');
     process.exit(1);
 }
-const tasks_1 = require("./tasks");
-const net_1 = require("./net");
+const tasks_1 = require("@/tasks");
+const net_1 = require("@/net");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();

package/dist/net/peer/index.js

@@ -11,7 +11,7 @@ const libp2p_websockets_1 = __importDefault(require("libp2p-websockets"));
 //@ts-ignore
 const libp2p_mplex_1 = __importDefault(require("libp2p-mplex"));
 const libp2p_noise_1 = require("libp2p-noise");
-const logger_1 = __importDefault(require("../../logger"));
+const logger_1 = __importDefault(require("@/logger"));
 const libp2p_bootstrap_1 = __importDefault(require("libp2p-bootstrap"));
 const waait_1 = __importDefault(require("waait"));
 const libp2p_gossipsub_1 = __importDefault(require("@achingbrain/libp2p-gossipsub"));
@@ -21,8 +21,8 @@ const libp2p_mdns_1 = __importDefault(require("libp2p-mdns"));
 const libp2p_kad_dht_1 = __importDefault(require("libp2p-kad-dht"));
 //@ts-ignore
 const libp2p_pubsub_peer_discovery_1 = __importDefault(require("libp2p-pubsub-peer-discovery"));
-const protocol_1 = require("../protocol");
-const config_1 = __importDefault(require("../../config"));
+const net_1 = require("@/net");
+const config_1 = __importDefault(require("@/config"));
 const logger = new logger_1.default("Peer");
 let node;
 // Known peers addresses
@@ -79,14 +79,14 @@ const startPeer = async ({}) => {
     });
     logger.info("Peer ID:", node.peerId.toB58String());
     await node.start();
-    protocol_1.protocol.start({
+    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()}`));
     logger.log("Peer discovery started");
     await (0, waait_1.default)(1000);
-    setInterval(() => protocol_1.protocol.sendPeerInfo({
+    setInterval(() => net_1.protocol.sendPeerInfo({
         publicAddress: config_1.default.wallet.address,
     }), 5000);
 };

package/dist/net/pool/index.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.peerPool = exports.PeerPool = void 0;
-const types_1 = require("../../types");
-const config_1 = __importDefault(require("../../config"));
+const types_1 = require("@/types");
+const config_1 = __importDefault(require("@/config"));
 class PeerPool {
     constructor() {
         this.PEERS_CLEANUP_TIME_LIMIT = 1;

package/dist/net/protocol/dial/BaseDialProtocol.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseDialProtocol = void 0;
 const it_pipe_1 = __importDefault(require("it-pipe"));
 const peer_id_1 = __importDefault(require("peer-id"));
-const utils_1 = require("../../../utils");
+const utils_1 = require("@/utils");
 const waait_1 = __importDefault(require("waait"));
 class BaseDialProtocol {
     constructor(libp2p, protocol) {

package/dist/net/protocol/dial/SignatureDialProtocol.js

@@ -4,15 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignatureDialProtocol = void 0;
-const utils_1 = require("../../../utils");
 const BaseDialProtocol_1 = require("./BaseDialProtocol");
 const waait_1 = __importDefault(require("waait"));
-const config_1 = __importDefault(require("../../../config"));
-const constants_1 = require("../../../constants");
-const db_1 = require("db");
+const config_1 = __importDefault(require("@/config"));
+const db_1 = require("@/db");
 class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
     constructor(libp2p) {
-        super(libp2p, '/signatures');
+        super(libp2p, '/interop-x/signatures');
         this.timeout = 30000;
     }
     async response(data) {
@@ -20,7 +18,7 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
         let event;
         let maxTimeout = 20000;
         do {
-            event = await db_1.Execution.findOne({ where: { vnonce: data.vnonce.toString() } });
+            event = await db_1.Transaction.findOne({ where: { transactionHash: data.transactionHash } });
             if (!event) {
                 await (0, waait_1.default)(1000);
                 maxTimeout -= 1000;
@@ -33,15 +31,15 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
                 error: 'Event not found'
             };
         }
-        const signedData = await (0, utils_1.signGnosisSafeTx)({
-            to: constants_1.addresses[event.chainId].multisend,
-            data: 'TODO',
-            chainId: event.chainId,
-            safeTxGas: data.safeTxGas,
-        }, { signer });
+        // const signedData = await signGnosisSafeTx({
+        //     to: addresses[event.chainId as ChainId].multisend,
+        //     data: 'TODO',
+        //     chainId: event.chainId as ChainId,
+        //     safeTxGas: data.safeTxGas,
+        // }, { signer });
         return {
             signer: signer.address,
-            data: signedData,
+            data: null, //signedData,
         };
     }
 }

package/dist/net/protocol/index.js

@@ -8,8 +8,8 @@ const stream_1 = require("stream");
 const ethereumjs_util_1 = require("ethereumjs-util");
 const SignatureDialProtocol_1 = require("./dial/SignatureDialProtocol");
 const __1 = require("..");
-const config_1 = __importDefault(require("config"));
-const types_1 = require("types");
+const config_1 = __importDefault(require("@/config"));
+const types_1 = require("@/types");
 class Protocol extends stream_1.EventEmitter {
     constructor() {
         super(...arguments);
@@ -28,7 +28,7 @@ class Protocol extends stream_1.EventEmitter {
     }
     start({ libp2p, topic = null, }) {
         this.libp2p = libp2p;
-        this.topic = topic || 'protocol';
+        this.topic = topic || 'itnerop-x-protocol';
         if (this.libp2p.isStarted())
             this.init();
         this.on('PeerInfo', (payload) => {

package/dist/tasks/BaseTask.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseTask = void 0;
-const config_1 = __importDefault(require("config"));
+const config_1 = __importDefault(require("@/config"));
 const events_1 = __importDefault(require("events"));
 const waait_1 = __importDefault(require("waait"));
-const logger_1 = __importDefault(require("../logger"));
+const logger_1 = __importDefault(require("@/logger"));
 class BaseTask extends events_1.default {
     constructor({ logger }) {
         super();

package/dist/tasks/InteropXGateway/SyncDepositEvents.js

@@ -0,0 +1,79 @@
+"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 SyncDepositEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropXGateway::SyncDepositEvents"),
+        });
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+        const events = await this.contract.queryFilter(this.contract.filters.LogGatewayDeposit(), currentBlock - 2000, currentBlock);
+        let processedEvents = 0;
+        for (const event of events) {
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                const { sourceChainId, targetChainId, user, vnonce, amount, token } = event.args;
+                const uniqueIdentifier = {
+                    type: 'desposit',
+                    sourceTransactionHash: event.transactionHash,
+                    sourceChainId: sourceChainId.toNumber(),
+                    targetChainId: targetChainId.toNumber(),
+                };
+                if (await db_1.Transaction.findOne({ where: uniqueIdentifier })) {
+                    continue;
+                }
+                const tx = await event.getTransaction();
+                await db_1.Transaction.create({
+                    transactionHash: (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier),
+                    type: 'deposit',
+                    from: tx.from,
+                    to: user,
+                    sourceChainId: sourceChainId.toNumber(),
+                    sourceTransactionHash: event.transactionHash,
+                    sourceBlockNumber: event.blockNumber,
+                    sourceStatus: "uninitialised",
+                    targetChainId: targetChainId.toNumber(),
+                    targetStatus: "uninitialised",
+                    submitEvent: {
+                        user,
+                        sourceChainId: sourceChainId.toString(),
+                        targetChainId: targetChainId.toString(),
+                        token: token,
+                        ammout: amount.toString(),
+                        vnonce: vnonce.toString(),
+                    },
+                    status: "pending",
+                });
+                this.logger.info(`Execution queued: ${event.transactionHash} ${event.blockNumber}`);
+            }
+            catch (error) {
+                this.logger.error(error);
+            }
+        }
+        if (processedEvents > 0)
+            this.logger.info(`${processedEvents} events processed`);
+    }
+    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 = new ethers_1.ethers.Contract(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        await super.start();
+    }
+}
+exports.default = SyncDepositEvents;

package/dist/tasks/index.js

@@ -1,9 +1,17 @@
 "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 SyncDepositEvents_1 = __importDefault(require("./InteropXGateway/SyncDepositEvents"));
 class Tasks {
     constructor() {
-        this.tasks = [];
+        this.tasks = [
+            new SyncDepositEvents_1.default({
+                chainId: 43114
+            })
+        ];
     }
     async start() {
         for (const task of this.tasks) {

package/dist/typechain/Erc20.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/typechain/GnosisSafe.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/typechain/InteropBridgeToken.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/typechain/InteropXGateway.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/typechain/common.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });