@instadapp/interop-x 0.0.0-dev.1f933be → 0.0.0-dev.28f049d

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.1f933be",
+    "version": "0.0.0-dev.28f049d",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {

package/dist/src/gnosis/index.js

@@ -7,7 +7,7 @@ exports.buildGnosisAction = void 0;
 const ethers_multisend_1 = require("ethers-multisend");
 const actions_1 = __importDefault(require("./actions"));
 const buildGnosisAction = async (transaction, type) => {
-    // type = type || (transaction.sourceStatus === 'success' ? 'target' : 'source')
+    type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
     if (actions_1.default.hasOwnProperty(transaction.action)) {
         const { transactions, logs } = await actions_1.default[transaction.action](transaction, type);
         return {

package/dist/src/index.js

@@ -13,7 +13,7 @@ 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');
-const GIT_SHORT_HASH = '1f933be';
+const GIT_SHORT_HASH = '28f049d';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
@@ -72,9 +72,7 @@ const utils_1 = require("./utils");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();
-    setTimeout(() => {
-        tasks.start();
-    }, 10000);
+    tasks.start();
     (0, api_1.startApiServer)();
     net_1.protocol.on('TransactionStatus', async (payload) => {
         if (!net_1.peerPool.isLeadNode(payload.peerId)) {

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

@@ -17,10 +17,6 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
         this.timeout = 30000;
     }
     async response(data) {
-        console.log({
-            tag: 'SignatureDialProtocol',
-            data
-        });
         const signer = config_1.default.wallet;
         let transaction;
         let maxTimeout = 20000;

package/dist/src/tasks/InteropXContract/ProcessBridgeRequestEvents.js

@@ -30,7 +30,7 @@ class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
             where: {
                 status: 'pending',
                 sourceStatus: 'uninitialised',
-                createdAt: {
+                sourceCreatedAt: {
                     [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
                 },
                 sourceDelayUntil: {
@@ -39,7 +39,7 @@ class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
                         [sequelize_1.Op.lt]: new Date(),
                     }
                 },
-                requestBlockNumber: {
+                sourceBlockNumber: {
                     [sequelize_1.Op.lt]: blockNumber - 12,
                 },
                 sourceChainId: this.chainId,
@@ -55,7 +55,7 @@ class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
         await (0, waait_1.default)(10000);
         let data, logs = [];
         try {
-            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, 'source'));
+            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction));
         }
         catch (error) {
             console.log(error);
@@ -108,7 +108,6 @@ class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
             to: this.safeContractAddress,
             data: txData,
         });
-        console.log(txSent);
         const receipt = await txSent.wait();
         const parsedLogs = [];
         receipt.logs.forEach((log) => {

package/dist/src/tasks/index.js

@@ -7,7 +7,6 @@ exports.Tasks = void 0;
 const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
 const SyncBridgeRequestEvents_1 = __importDefault(require("./InteropXContract/SyncBridgeRequestEvents"));
 const ProcessBridgeRequestEvents_1 = __importDefault(require("./InteropXContract/ProcessBridgeRequestEvents"));
-const waait_1 = __importDefault(require("waait"));
 class Tasks {
     constructor() {
         this.tasks = [
@@ -24,7 +23,6 @@ class Tasks {
         for (const task of this.tasks) {
             try {
                 task.start();
-                await (0, waait_1.default)(1000);
             }
             catch (error) {
                 console.error(`Error starting task: ${task.constructor.name}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.1f933be",
+  "version": "0.0.0-dev.28f049d",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {

package/src/gnosis/index.ts

@@ -2,8 +2,8 @@ import { Transaction } from "@/db";
 import { encodeMulti } from "ethers-multisend";
 import actions from "./actions";
 
-export const buildGnosisAction = async (transaction: Transaction, type: 'source' | 'target') => {
-    // type = type || (transaction.sourceStatus === 'success' ? 'target' : 'source')
+export const buildGnosisAction = async (transaction: Transaction, type?: 'source' | 'target') => {
+    type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
 
     if (actions.hasOwnProperty(transaction.action)) {
 

package/src/index.ts

@@ -89,9 +89,7 @@ async function main() {
 
     const tasks = new Tasks()
 
-    setTimeout(() => {
-        tasks.start();
-    }, 10000)
+    tasks.start();
 
     startApiServer()
 

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

@@ -26,10 +26,6 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
     }
 
     async response(data: ISignatureRequest): Promise<ISignatureResponse> {
-        console.log({
-            tag: 'SignatureDialProtocol',
-            data
-        })
         const signer = config.wallet;
 
         let transaction: Transaction | null;

package/src/tasks/InteropXContract/ProcessBridgeRequestEvents.ts

@@ -39,7 +39,7 @@ class ProccessBridgeRequestEvents extends BaseTask {
             where: {
                 status: 'pending',
                 sourceStatus: 'uninitialised',
-                createdAt: {
+                sourceCreatedAt: {
                     [Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
                 },
                 sourceDelayUntil: {
@@ -48,7 +48,7 @@ class ProccessBridgeRequestEvents extends BaseTask {
                         [Op.lt]: new Date(),
                     }
                 },
-                requestBlockNumber: {
+                sourceBlockNumber: {
                     [Op.lt]: blockNumber - 12,
                 },
                 sourceChainId: this.chainId,
@@ -71,7 +71,7 @@ class ProccessBridgeRequestEvents extends BaseTask {
         let data, logs = [];
 
         try {
-            ({ data, logs } = await buildGnosisAction(transaction, 'source'));
+            ({ data, logs } = await buildGnosisAction(transaction));
 
         } catch (error) {
             console.log(error);
@@ -151,9 +151,6 @@ class ProccessBridgeRequestEvents extends BaseTask {
             data: txData,
         })
 
-        console.log(txSent);
-        
-
         const receipt = await txSent.wait();
 
         const parsedLogs: LogDescription[] = [];

package/src/tasks/index.ts

@@ -5,10 +5,9 @@ import AutoUpdateTask from "./AutoUpdateTask";
 
 import SyncBridgeRequestEvents from "./InteropXContract/SyncBridgeRequestEvents";
 import ProccessBridgeRequestEvents from "./InteropXContract/ProcessBridgeRequestEvents";
-import wait from "waait";
 
 export class Tasks {
-
+    
     tasks: BaseTask[] = [
         // new SyncTransactionStatusTask(),
         new AutoUpdateTask(),
@@ -26,7 +25,6 @@ export class Tasks {
         for (const task of this.tasks) {
             try {
                 task.start();
-                await wait(1000)
             } catch (error) {
                 console.error(`Error starting task: ${task.constructor.name}`);
             }