@instadapp/interop-x 0.0.0-dev.75809ae → 0.0.0-dev.ef78459

package/bin/interop-x

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../dist/src/index')
+require('../dist/index')

package/dist/config/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
-const types_1 = require("types");
+const types_1 = require("@/types");
 class Config {
     constructor() {
         this.events = new types_1.EventBus();

package/dist/db/models/execution.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Execution = void 0;
-const sequelize_1 = require("../sequelize");
+const sequelize_1 = require("@/db/sequelize");
 const sequelize_2 = require("sequelize");
 class Execution extends sequelize_2.Model {
 }

package/dist/index.js

@@ -3,14 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const console_1 = require("console");
+require("module-alias/register");
+const assert_1 = __importDefault(require("assert"));
 const dotenv_1 = __importDefault(require("dotenv"));
-const tasks_1 = require("tasks");
-const logger_1 = __importDefault(require("./logger"));
-const net_1 = require("./net");
+const logger_1 = __importDefault(require("@/logger"));
+const ethers_1 = require("ethers");
 dotenv_1.default.config();
-(0, console_1.assert)(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
 const logger = new logger_1.default('Process');
+(0, assert_1.default)(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
+try {
+    new ethers_1.ethers.Wallet(process.env.PRIVATE_KEY);
+}
+catch (e) {
+    logger.error('Invalid private key');
+    process.exit(1);
+}
+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,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignatureDialProtocol = void 0;
-const utils_1 = require("../../../utils");
+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 config_1 = __importDefault(require("@/config"));
+const constants_1 = require("@/constants");
 const db_1 = require("db");
 class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
     constructor(libp2p) {

package/dist/tasks/BaseTask.js

@@ -7,7 +7,7 @@ exports.BaseTask = void 0;
 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/utils/index.js

@@ -9,7 +9,7 @@ exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProvi
  */
 const axios_1 = __importDefault(require("axios"));
 const axios_retry_1 = __importDefault(require("axios-retry"));
-const constants_1 = require("../constants");
+const constants_1 = require("@/constants");
 exports.http = axios_1.default.create();
 (0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
 function short(buffer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.75809ae",
+  "version": "0.0.0-dev.ef78459",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "start": "yarn build && node bin/interop-x",
-    "build": "export GIT_REF=$(git rev-parse --short HEAD) && rimraf ./dist && tsc -p tsconfig.json && replace-in-file '@GIT_SHORT_HASH@' $GIT_REF ./dist/src/**/*.js",
+    "build": "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": "NODE_ENV=development nodemon",
     "prepublishOnly": "yarn build"
   },
@@ -30,6 +30,7 @@
     "ethereumjs-util": "^7.1.4",
     "ethers": "^5.6.4",
     "ethers-multisend": "^2.1.1",
+    "expand-home-dir": "^0.0.3",
     "libp2p": "^0.36.2",
     "libp2p-bootstrap": "^0.14.0",
     "libp2p-kad-dht": "^0.28.6",
@@ -40,7 +41,9 @@
     "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": {
@@ -55,5 +58,8 @@
     "ts-node": "^10.5.0",
     "tsconfig-paths": "^3.12.0",
     "typescript": "^4.5.5"
+  },
+  "_moduleAliases": {
+    "@/": "./"
   }
 }

package/src/config/index.ts

@@ -1,5 +1,5 @@
 import { ethers, Wallet } from "ethers"
-import { EventBus, EventBusType } from "types"
+import { EventBus, EventBusType } from "@/types"
 
 class Config {
     public readonly events: EventBusType

package/src/db/index.ts

@@ -1 +1 @@
-export * from "./models"
+export * from "./models"

package/src/db/models/execution.ts

@@ -1,4 +1,4 @@
-import { sequelize } from '../sequelize'
+import { sequelize } from '@/db/sequelize'
 import { CreationOptional, InferAttributes, InferCreationAttributes, Model, DataTypes } from 'sequelize';
 
 export class Execution extends Model<InferAttributes<Execution>, InferCreationAttributes<Execution>> {

package/src/index.ts

@@ -1,13 +1,23 @@
-import { assert } from "console";
+import 'module-alias/register';
+import assert from "assert";
 import dotenv from "dotenv";
-import { Tasks } from "tasks";
-import Logger from "./logger";
-import { startPeer } from "./net";
+import Logger from "@/logger";
+import { ethers } from "ethers";
 dotenv.config();
+const logger = new Logger('Process')
 
 assert(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
 
-const logger = new Logger('Process')
+try {
+    new ethers.Wallet(process.env.PRIVATE_KEY!)
+} catch (e) {
+    logger.error('Invalid private key')
+    process.exit(1)
+}
+
+import { Tasks } from "@/tasks";
+import { startPeer } from "@/net";
+
 
 async function main() {
 

package/src/net/peer/index.ts

@@ -5,7 +5,7 @@ import WS from "libp2p-websockets";
 //@ts-ignore
 import Mplex from "libp2p-mplex";
 import { NOISE } from "libp2p-noise";
-import Logger from "../../logger";
+import Logger from "@/logger";
 import Bootstrap from "libp2p-bootstrap";
 import wait from "waait";
 import Gossipsub from "@achingbrain/libp2p-gossipsub";
@@ -15,8 +15,8 @@ import MulticastDNS from "libp2p-mdns";
 import KadDHT from "libp2p-kad-dht";
 //@ts-ignore
 import PubsubPeerDiscovery from "libp2p-pubsub-peer-discovery";
-import { protocol } from "../protocol";
-import config from "../../config";
+import { protocol } from "@/net";
+import config from "@/config";
 
 const logger = new Logger("Peer");
 

package/src/net/pool/index.ts

@@ -1,5 +1,5 @@
-import { Event } from "../../types";
-import config from "../../config";
+import { Event } from "@/types";
+import config from "@/config";
 
 export interface IPeerInfo {
     id: string;

package/src/net/protocol/dial/BaseDialProtocol.ts

@@ -1,7 +1,7 @@
 import pipe from 'it-pipe';
 import Libp2p from 'libp2p';
 import PeerId from 'peer-id';
-import { asyncCallWithTimeout } from '../../../utils';
+import { asyncCallWithTimeout } from '@/utils';
 import wait from 'waait';
 
 export class BaseDialProtocol<TRequest extends any, TResponse extends any> {

package/src/net/protocol/dial/SignatureDialProtocol.ts

@@ -1,9 +1,9 @@
-import { signGnosisSafeTx } from "../../../utils";
+import { signGnosisSafeTx } from "@/utils";
 import { BaseDialProtocol } from "./BaseDialProtocol";
 import wait from "waait";
-import { ChainId } from "../../../types";
-import config from "config";
-import { addresses } from "../../../constants";
+import { ChainId } from "@/types";
+import config from "@/config";
+import { addresses } from "@/constants";
 import { Execution } from "db";
 
 export interface ISignatureRequest {

package/src/tasks/BaseTask.ts

@@ -2,7 +2,7 @@ import config from "config";
 import { ethers } from "ethers";
 import EventEmitter from "events";
 import wait from "waait";
-import Logger from "../logger";
+import Logger from "@/logger";
 
 export interface IBaseTask {
     pollCheck(): Promise<void>

package/src/types.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events'
-import { IPeerInfo } from './net'
+import { IPeerInfo } from '@/net'
 
 /**
  * Types for the central event bus, emitted

package/src/utils/index.ts

@@ -3,8 +3,8 @@
  */
 import axios from 'axios'
 import axiosRetry from "axios-retry";
-import { addresses } from '../constants';
-import { ChainId } from '../types'
+import { addresses } from '@/constants';
+import { ChainId } from '@/types'
 
 export const http = axios.create();
 

package/tsconfig.json

@@ -16,6 +16,9 @@
     "noEmit": false,
     "outDir": "dist",
     "baseUrl": "src",
+    "paths": { 
+      "@/*" : ["./*" ]
+    },
     "typeRoots": [
       "./node_modules/@types",
       "./@types"