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

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/constants/addresses.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addresses = void 0;
 exports.addresses = {
     1: {
-        gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
+        gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
         multisend: "0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761",
     },
     137: {

package/dist/index.js

@@ -3,14 +3,22 @@ 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");
+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 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

@@ -22,6 +22,7 @@ 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 logger = new logger_1.default("Peer");
 let node;
 // Known peers addresses
@@ -85,6 +86,9 @@ const startPeer = async ({}) => {
     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({
+        publicAddress: config_1.default.wallet.address,
+    }), 5000);
 };
 exports.startPeer = startPeer;
 const stopPeer = async () => {

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

@@ -7,7 +7,7 @@ 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 config_1 = __importDefault(require("../../../config"));
 const constants_1 = require("../../../constants");
 const db_1 = require("db");
 class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.3e0fb42",
+  "version": "0.0.0-dev.9387bd9",
   "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"
   },

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/constants/addresses.ts

@@ -1,6 +1,6 @@
 export const addresses = {
   1: {
-    gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
+    gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
     multisend: "0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761",
   },
   137: {

package/src/index.ts

@@ -1,13 +1,22 @@
-import { assert } from "console";
+import assert from "assert";
 import dotenv from "dotenv";
-import { Tasks } from "tasks";
 import Logger from "./logger";
-import { startPeer } from "./net";
+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

@@ -16,6 +16,7 @@ import KadDHT from "libp2p-kad-dht";
 //@ts-ignore
 import PubsubPeerDiscovery from "libp2p-pubsub-peer-discovery";
 import { protocol } from "../protocol";
+import config from "../../config";
 
 const logger = new Logger("Peer");
 
@@ -97,6 +98,11 @@ export const startPeer = async ({ }: IPeerOptions) => {
   logger.log("Peer discovery started");
 
   await wait(1000);
+
+
+  setInterval(() => protocol.sendPeerInfo({
+    publicAddress: config.wallet.address,
+  }), 5000)
 };
 
 export const stopPeer = async () => {

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

@@ -2,7 +2,7 @@ import { signGnosisSafeTx } from "../../../utils";
 import { BaseDialProtocol } from "./BaseDialProtocol";
 import wait from "waait";
 import { ChainId } from "../../../types";
-import config from "config";
+import config from "../../../config";
 import { addresses } from "../../../constants";
 import { Execution } from "db";
 

package/src/net/protocol/index.ts

@@ -113,7 +113,7 @@ class Protocol extends EventEmitter {
     }
 
 
-    public sendPeerInfo(data: Omit<IPeerInfo, 'peerId' | 'updated' | 'idle'>) {
+    public sendPeerInfo(data: Pick<IPeerInfo, 'publicAddress'>) {
         const message = this.protocolMessages.find((m) => m.name === 'PeerInfo')!
 
         const encoded = rlp.encode([message.code, message.encode(data)]);