@instadapp/interop-x 0.0.0-dev.4c169eb → 0.0.0-dev.59f2858

package/.env.example

@@ -1 +1,2 @@
-PRIVATE_KEY=
+PRIVATE_KEY=
+STAGING=

package/dist/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/index.js

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

package/dist/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/db/sequelize.js

@@ -8,7 +8,7 @@ exports.sequelize = void 0;
 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/${config_1.default.publicAddress}`);
+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,13 +3,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-require("module-alias/register");
+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 assert_1 = __importDefault(require("assert"));
 const dotenv_1 = __importDefault(require("dotenv"));
 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);
@@ -20,10 +41,12 @@ catch (e) {
 }
 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/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/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.4c169eb",
+  "version": "0.0.0-dev.59f2858",
   "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-node": "bin/interop-x"
+    "interop-x": "bin/interop-x",
+    "interopx": "bin/interop-x"
   },
   "devDependencies": {
     "@typechain/ethers-v5": "^10.0.0",
@@ -62,18 +65,5 @@
     "tsconfig-paths": "^3.12.0",
     "typechain": "^8.0.0",
     "typescript": "^4.5.5"
-  },
-  "_moduleAliases": {
-    "@/": "./dist",
-    "@/logger": "./dist/logger",
-    "@/tasks": "./dist/tasks",
-    "@/utils": "./dist/utils",
-    "@/net": "./dist/net",
-    "@/db": "./dist/db",
-    "@/config": "./dist/config",
-    "@/types": "./dist/types",
-    "@/abi": "./dist/abi",
-    "@/constants": "./dist/constants",
-    "@/typechain": "./dist/typechain"
   }
 }

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/config/index.ts

@@ -7,11 +7,13 @@ class Config {
     public readonly leadNodeAddress: string
     public readonly privateKey: string
     public readonly wallet: Wallet
+    public readonly staging: boolean
 
     constructor() {
         this.events = new EventBus()  as EventBusType
         this.maxPeers = 10
         this.privateKey = process.env.PRIVATE_KEY as string;
+        this.staging = !! process.env.STAGING && process.env.STAGING === 'true';
         this.wallet = new Wallet(this.privateKey);
         this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E'
     }

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/db/sequelize.ts

@@ -4,7 +4,7 @@ import expandHomeDir from "expand-home-dir";
 
 import { Sequelize } from 'sequelize';
 
-const basePath = expandHomeDir(`~/.interop-x/data/${config.publicAddress}`);
+const basePath = expandHomeDir(`~/.interop-x/data/${config.publicAddress}/${config.staging ? 'staging' : ''}`);
 
 export const sequelize = new Sequelize({
     dialect: 'sqlite',

package/src/index.ts

@@ -1,4 +1,21 @@
-import 'module-alias/register';
+import moduleAlias from 'module-alias';
+
+moduleAlias.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"
+})
+
+moduleAlias();
 import assert from "assert";
 import dotenv from "dotenv";
 import { ethers } from "ethers";
@@ -7,6 +24,14 @@ dotenv.config();
 import Logger from "@/logger";
 const logger = new Logger('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)
+}
+
 assert(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
 
 try {
@@ -18,7 +43,7 @@ try {
 
 import { Tasks } from "@/tasks";
 import { startPeer } from "@/net";
-
+import { startApiServer } from '@/api';
 
 async function main() {
 
@@ -27,6 +52,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),