@instadapp/interop-x 0.0.0-dev.80722d6 → 0.0.0-dev.b3789e6

package/dist/package.json

@@ -0,0 +1,69 @@
+{
+    "name": "@instadapp/interop-x",
+    "version": "0.0.0-dev.b3789e6",
+    "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"
+    },
+    "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.19.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/{db → src/db}/models/transaction.js

@@ -13,7 +13,7 @@ Transaction.init({
         primaryKey: true
     },
     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/{index.js → src/index.js}

@@ -9,6 +9,7 @@ module_alias_1.default.addAliases({
     "@/logger": __dirname + "/logger",
     "@/tasks": __dirname + "/tasks",
     "@/utils": __dirname + "/utils",
+    "@/api": __dirname + "/api",
     "@/net": __dirname + "/net",
     "@/db": __dirname + "/db",
     "@/config": __dirname + "/config",
@@ -21,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');
@@ -38,12 +40,15 @@ catch (e) {
     logger.error('Invalid private key');
     process.exit(1);
 }
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.b3789e6)`);
 const tasks_1 = require("@/tasks");
 const net_1 = require("@/net");
+const api_1 = require("@/api");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();
     tasks.start();
+    (0, api_1.startApiServer)();
 }
 main()
     .then(() => {

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

@@ -29,7 +29,7 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
                 }
                 const { sourceChainId, targetChainId, user, vnonce, amount, token } = event.args;
                 const uniqueIdentifier = {
-                    type: 'desposit',
+                    action: 'deposit',
                     sourceTransactionHash: event.transactionHash,
                     sourceChainId: sourceChainId.toNumber(),
                     targetChainId: targetChainId.toNumber(),
@@ -38,27 +38,14 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
                     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: {
+                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: {
                         user,
                         sourceChainId: sourceChainId.toString(),
                         targetChainId: targetChainId.toString(),
                         token: token,
                         ammout: amount.toString(),
                         vnonce: vnonce.toString(),
-                    },
-                    status: "pending",
-                });
+                    }, status: "pending" }));
                 this.logger.info(`Execution queued: ${event.transactionHash} ${event.blockNumber}`);
             }
             catch (error) {

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

@@ -92,7 +92,7 @@ const asyncCallWithTimeout = async (asyncPromise, timeout) => {
 exports.asyncCallWithTimeout = asyncCallWithTimeout;
 const generateInteropTransactionHash = (data) => {
     return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
-        String(data.type),
+        String(data.action),
         String(data.sourceTransactionHash),
         String(data.sourceChainId),
         String(data.targetChainId),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.80722d6",
+  "version": "0.0.0-dev.b3789e6",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -32,6 +32,8 @@
     "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",
@@ -48,7 +50,8 @@
     "waait": "^1.0.5"
   },
   "bin": {
-    "interop-x": "bin/interop-x"
+    "interop-x": "bin/interop-x",
+    "interopx": "bin/interop-x"
   },
   "devDependencies": {
     "@typechain/ethers-v5": "^10.0.0",

package/src/api/index.ts

@@ -0,0 +1,33 @@
+import fastify from "fastify"
+import cors from 'fastify-cors'
+import Logger from "@/logger"
+import { Transaction } from "@/db";
+
+const logger = new Logger("RPC");
+
+
+const server = fastify({ logger: false })
+
+server.register(cors, {})
+
+server.get('/', async () => 'Interop X API')
+
+export 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 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)
+    }
+}

package/src/db/models/transaction.ts

@@ -5,7 +5,7 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
     declare id: CreationOptional<number>;
 
     declare transactionHash: string;
-    declare type: string;
+    declare action: string;
     declare from: string;
     declare to: string;
 
@@ -47,7 +47,7 @@ Transaction.init({
 
 
     transactionHash: DataTypes.STRING,
-    type: DataTypes.STRING,
+    action: DataTypes.STRING,
 
     from: DataTypes.STRING,
     to: DataTypes.STRING,

package/src/index.ts

@@ -5,6 +5,7 @@ moduleAlias.addAliases({
     "@/logger": __dirname + "/logger",
     "@/tasks": __dirname + "/tasks",
     "@/utils": __dirname + "/utils",
+    "@/api": __dirname + "/api",
     "@/net": __dirname + "/net",
     "@/db": __dirname + "/db",
     "@/config": __dirname + "/config",
@@ -18,6 +19,7 @@ moduleAlias();
 import assert from "assert";
 import dotenv from "dotenv";
 import { ethers } from "ethers";
+import packageJson from '../package.json'
 dotenv.config();
 
 import Logger from "@/logger";
@@ -40,8 +42,11 @@ try {
     process.exit(1)
 }
 
+logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.@GIT_SHORT_HASH@)`)
+
 import { Tasks } from "@/tasks";
 import { startPeer } from "@/net";
+import { startApiServer } from '@/api';
 
 async function main() {
 
@@ -50,6 +55,8 @@ async function main() {
     const tasks = new Tasks()
 
     tasks.start();
+
+    startApiServer()
 }
 
 main()

package/src/tasks/InteropXGateway/SyncDepositEvents.ts

@@ -43,7 +43,7 @@ class SyncDepositEvents extends BaseTask {
                 const { sourceChainId, targetChainId, user, vnonce, amount, token } = event.args;
 
                 const uniqueIdentifier = {
-                    type: 'desposit',
+                    action: 'deposit',
                     sourceTransactionHash: event.transactionHash,
                     sourceChainId: sourceChainId.toNumber(),
                     targetChainId: targetChainId.toNumber(),
@@ -56,17 +56,14 @@ class SyncDepositEvents extends BaseTask {
                 const tx = await event.getTransaction()
 
                 await Transaction.create({
+                    ...uniqueIdentifier,
                     transactionHash: 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: {

package/src/utils/index.ts

@@ -119,9 +119,9 @@ export const asyncCallWithTimeout = async <T>(asyncPromise: Promise<T>, timeout:
 }
 
 
-export const generateInteropTransactionHash = (data: { type: string, sourceTransactionHash: string, sourceChainId: string | number, targetChainId: string | number }) => {
+export const generateInteropTransactionHash = (data: { action: string, sourceTransactionHash: string, sourceChainId: string | number, targetChainId: string | number }) => {
   return ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
-    String(data.type),
+    String(data.action),
     String(data.sourceTransactionHash),
     String(data.sourceChainId),
     String(data.targetChainId),