@instadapp/interop-x 0.0.0-dev.28f049d → 0.0.0-dev.326bdca

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.28f049d",
+    "version": "0.0.0-dev.326bdca",
     "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 === 'pending' ? 'source' : 'target';
+    type = type || transaction.sourceStatus === 'success' ? 'target' : 'source';
     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 = '28f049d';
+const GIT_SHORT_HASH = '326bdca';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
@@ -72,7 +72,9 @@ const utils_1 = require("./utils");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();
-    tasks.start();
+    setTimeout(() => {
+        tasks.start();
+    }, 10000);
     (0, api_1.startApiServer)();
     net_1.protocol.on('TransactionStatus', async (payload) => {
         if (!net_1.peerPool.isLeadNode(payload.peerId)) {

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

@@ -30,7 +30,7 @@ class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
             where: {
                 status: 'pending',
                 sourceStatus: 'uninitialised',
-                sourceCreatedAt: {
+                createdAt: {
                     [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(),
                     }
                 },
-                sourceBlockNumber: {
+                requestBlockNumber: {
                     [sequelize_1.Op.lt]: blockNumber - 12,
                 },
                 sourceChainId: this.chainId,

package/dist/src/tasks/index.js

@@ -7,6 +7,7 @@ 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 = [
@@ -23,6 +24,7 @@ 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.28f049d",
+  "version": "0.0.0-dev.326bdca",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {

package/src/gnosis/index.ts

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

package/src/index.ts

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

package/src/tasks/InteropXContract/ProcessBridgeRequestEvents.ts

@@ -39,7 +39,7 @@ class ProccessBridgeRequestEvents extends BaseTask {
             where: {
                 status: 'pending',
                 sourceStatus: 'uninitialised',
-                sourceCreatedAt: {
+                createdAt: {
                     [Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
                 },
                 sourceDelayUntil: {
@@ -48,7 +48,7 @@ class ProccessBridgeRequestEvents extends BaseTask {
                         [Op.lt]: new Date(),
                     }
                 },
-                sourceBlockNumber: {
+                requestBlockNumber: {
                     [Op.lt]: blockNumber - 12,
                 },
                 sourceChainId: this.chainId,

package/src/tasks/index.ts

@@ -5,9 +5,10 @@ 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(),
@@ -25,6 +26,7 @@ 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}`);
             }