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

package/.env.example

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

package/dist/config/index.js

@@ -7,9 +7,13 @@ 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';
     }
+    get publicAddress() {
+        return this.wallet.address;
+    }
     isLeadNode() {
         return ethers_1.ethers.utils.getAddress(this.leadNodeAddress) === ethers_1.ethers.utils.getAddress(this.wallet.address);
     }

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,13 +3,33 @@ 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",
+    "@/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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.f78418c",
+  "version": "0.0.0-dev.f9253db",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -48,7 +48,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 +63,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/config/index.ts

@@ -7,15 +7,21 @@ 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'
     }
 
+    get publicAddress(){
+        return this.wallet.address
+    }
+
     isLeadNode() {
         return ethers.utils.getAddress(this.leadNodeAddress) === ethers.utils.getAddress(this.wallet.address)
     }

package/src/db/sequelize.ts

@@ -1,9 +1,10 @@
 //@ts-ignore
+import config from "@/config";
 import expandHomeDir from "expand-home-dir";
 
 import { Sequelize } from 'sequelize';
 
-const basePath = expandHomeDir('~/.interop-x/data');
+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,20 @@
-import 'module-alias/register';
+import moduleAlias from 'module-alias';
+
+moduleAlias.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"
+})
+
+moduleAlias();
 import assert from "assert";
 import dotenv from "dotenv";
 import { ethers } from "ethers";
@@ -7,6 +23,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 {
@@ -19,7 +43,6 @@ try {
 import { Tasks } from "@/tasks";
 import { startPeer } from "@/net";
 
-
 async function main() {
 
     startPeer({})