@instadapp/interop-x 0.0.0-dev.7a02577 → 0.0.0-dev.7c2b0e5

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.7a02577",
+    "version": "0.0.0-dev.7c2b0e5",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -12,7 +12,8 @@
         "build": "yarn generate-abi-types && 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": "yarn generate-abi-types && NODE_ENV=development nodemon",
         "generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
-        "prepublishOnly": "yarn build"
+        "prepublishOnly": "yarn build",
+        "postinstall": "patch-package"
     },
     "nodemonConfig": {
         "watch": [
@@ -45,7 +46,7 @@
         "libp2p-websockets": "^0.16.2",
         "luxon": "^2.3.2",
         "module-alias": "^2.2.2",
-        "sequelize": "^6.19.0",
+        "sequelize": "6.18.0",
         "sqlite3": "^5.0.5",
         "waait": "^1.0.5"
     },
@@ -59,6 +60,8 @@
         "@types/fs-extra": "^9.0.13",
         "@types/node": "^17.0.17",
         "nodemon": "^2.0.15",
+        "patch-package": "^6.4.7",
+        "postinstall-postinstall": "^2.1.0",
         "replace-in-file": "^6.3.2",
         "rimraf": "^3.0.2",
         "ts-node": "^10.5.0",

package/dist/src/index.js

@@ -40,7 +40,7 @@ catch (e) {
     logger.error('Invalid private key');
     process.exit(1);
 }
-logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.7a02577)`);
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.7c2b0e5)`);
 const tasks_1 = require("@/tasks");
 const net_1 = require("@/net");
 const api_1 = require("@/api");

package/dist/src/net/peer/index.js

@@ -82,8 +82,12 @@ const startPeer = async ({}) => {
     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()}`));
+    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(() => net_1.protocol.sendPeerInfo({

package/dist/src/net/pool/index.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.peerPool = exports.PeerPool = void 0;
 const types_1 = require("@/types");
 const config_1 = __importDefault(require("@/config"));
+const logger_1 = __importDefault(require("@/logger"));
+const logger = new logger_1.default('PeerPool');
 class PeerPool {
     constructor() {
         this.PEERS_CLEANUP_TIME_LIMIT = 1;
@@ -62,10 +64,14 @@ class PeerPool {
      * @emits {@link Event.POOL_PEER_ADDED}
      */
     add(peer) {
-        if (peer && peer.id && !this.pool.get(peer.id)) {
+        if (peer && peer.id) {
+            const newPeer = !this.pool.get(peer.id);
             this.pool.set(peer.id, peer);
             peer.pooled = true;
-            config_1.default.events.emit(types_1.Event.POOL_PEER_ADDED, peer);
+            if (newPeer) {
+                config_1.default.events.emit(types_1.Event.POOL_PEER_ADDED, peer);
+                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`);
+            }
         }
     }
     /**
@@ -78,6 +84,7 @@ class PeerPool {
             if (this.pool.delete(peer.id)) {
                 peer.pooled = false;
                 config_1.default.events.emit(types_1.Event.POOL_PEER_REMOVED, peer);
+                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`);
             }
         }
     }
@@ -94,13 +101,13 @@ class PeerPool {
         return this.activePeers.map((p) => p.id);
     }
     cleanup() {
-        let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60;
-        this.peers.forEach((peerInfo) => {
-            if (peerInfo.updated.getTime() < compDate) {
-                console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`);
-                this.remove(peerInfo);
-            }
-        });
+        // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
+        // this.peers.forEach((peerInfo) => {
+        //     if (peerInfo.updated.getTime() < compDate) {
+        //         console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
+        //         this.remove(peerInfo)
+        //     }
+        // })
     }
 }
 exports.PeerPool = PeerPool;

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

@@ -33,12 +33,19 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
                 error: 'Event not found'
             };
         }
+        console.log("signing:", {
+            to: constants_1.addresses[transaction.targetChainId].multisend,
+            data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
+            chainId: transaction.targetChainId,
+            safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
+        });
         const signedData = await (0, utils_1.signGnosisSafeTx)({
-            //TODO: chain id depends on event type
-            to: constants_1.addresses[transaction.sourceChainId].multisend,
-            data: (0, utils_1.buildDataForTransaction)(transaction, data.type),
-            chainId: transaction.sourceChainId,
+            to: constants_1.addresses[transaction.targetChainId].multisend,
+            data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
+            chainId: transaction.targetChainId,
             safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
         }, { signer });
         return {
             signer: signer.address,

package/dist/src/tasks/BaseTask.js

@@ -28,7 +28,7 @@ class BaseTask extends events_1.default {
                 }
             }
             catch (err) {
-                this.logger.error(`poll check error: ${err.message}\ntrace: ${err.stack}`);
+                this.logger.error(`poll check error:\n${err.message}\ntrace: ${err.stack}`);
             }
             await this.postPollHandler();
         }

package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js

@@ -15,6 +15,7 @@ const sequelize_1 = require("sequelize");
 const waait_1 = __importDefault(require("waait"));
 const net_1 = require("@/net");
 const generateGnosisTransaction = async (transactionData, safeContract) => {
+    console.log(transactionData);
     let isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
     while (isExecuted == 1) {
         transactionData.safeTxGas = ethers_1.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString();
@@ -37,30 +38,38 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
             where: {
                 status: 'pending',
                 sourceStatus: 'success',
+                targetStatus: 'uninitialised',
                 action: 'deposit',
                 sourceCreatedAt: {
                     [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
                 },
+                targetDelayUntil: {
+                    [sequelize_1.Op.or]: {
+                        [sequelize_1.Op.is]: null,
+                        [sequelize_1.Op.lt]: new Date(),
+                    }
+                },
                 sourceBlockNumber: {
                     [sequelize_1.Op.lt]: blockNumber - 12,
-                }
+                },
+                sourceChainId: this.chainId,
             }
         });
         if (!transaction) {
             return;
         }
-        transaction.sourceStatus = 'pending';
+        transaction.targetStatus = 'pending';
         await transaction.save();
         // refresh event data?
         const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(transaction.targetChainId));
         const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
         const safeAddress = constants_1.addresses[transaction.targetChainId].gnosisSafe;
-        const safeContract = new ethers_1.ethers.Contract(safeAddress, abi_1.default.gnosisSafe, targetWallet);
+        const safeContract = (0, utils_1.getContract)(safeAddress, abi_1.default.gnosisSafe, targetWallet);
         const ownersThreshold = await safeContract.getThreshold();
         await (0, waait_1.default)(10000);
         let gnosisTx = await generateGnosisTransaction({
             baseGas: "0",
-            data: (0, utils_1.buildDataForTransaction)(transaction),
+            data: await (0, utils_1.buildDataForTransaction)(transaction),
             gasPrice: "0",
             gasToken: "0x0000000000000000000000000000000000000000",
             nonce: '0',
@@ -74,6 +83,7 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
         const ownerPeerIds = net_1.peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id);
         console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
+        console.log(ownerPeerIds);
         const signatures = await net_1.protocol.requestSignatures({
             type: 'source',
             transactionHash: transaction.transactionHash,
@@ -84,8 +94,8 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
         if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
             await transaction.save();
-            transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
-            transaction.sourceStatus = 'pending';
+            transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
+            transaction.targetStatus = 'uninitialised';
             await transaction.save();
             const errorMessage = (_a = signatures.find(s => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
             throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
@@ -107,6 +117,14 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
             execTransactionParams
         });
         const { data: txData } = await safeContract.populateTransaction.execTransaction(gnosisTx.to, gnosisTx.value, gnosisTx.data, gnosisTx.operation, gnosisTx.safeTxGas, gnosisTx.baseGas, gnosisTx.gasPrice, gnosisTx.gasToken, gnosisTx.refundReceiver, (0, utils_1.buildSignatureBytes)(validSignatures));
+        console.log({
+            from: targetWallet.address,
+            gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9).toString(),
+            gasLimit: ethers_1.BigNumber.from(6000000).toString(),
+            to: safeAddress,
+            data: txData,
+        });
+        return;
         const txSent = await targetWallet.sendTransaction({
             from: targetWallet.address,
             gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9),
@@ -133,7 +151,7 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         this.logger.info(`Starting execution watcher on interop chain`);
         this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
         this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
-        this.contract = new ethers_1.ethers.Contract(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
         await super.start();
     }
 }

package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js

@@ -45,14 +45,14 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
                         sourceChainId: sourceChainId.toString(),
                         targetChainId: targetChainId.toString(),
                         token: token,
-                        ammout: amount.toString(),
+                        amount: amount.toString(),
                         vnonce: vnonce.toString(),
                     }, sourceEvent: {
                         user,
                         sourceChainId: sourceChainId.toString(),
                         targetChainId: targetChainId.toString(),
                         token: token,
-                        ammout: amount.toString(),
+                        amount: amount.toString(),
                         vnonce: vnonce.toString(),
                     }, status: "pending" }));
                 this.logger.info(`Execution queued: ${event.transactionHash} ${event.blockNumber}`);
@@ -68,7 +68,7 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
         this.logger.info(`Starting execution watcher on interop chain`);
         this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
         this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
-        this.contract = new ethers_1.ethers.Contract(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
         await super.start();
     }
 }

package/dist/src/tasks/index.js

@@ -4,12 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tasks = void 0;
+const ProcessDepositEvents_1 = __importDefault(require("./InteropXGateway/ProcessDepositEvents"));
 const SyncDepositEvents_1 = __importDefault(require("./InteropXGateway/SyncDepositEvents"));
 class Tasks {
     constructor() {
         this.tasks = [
             new SyncDepositEvents_1.default({
                 chainId: 43114
+            }),
+            new ProcessDepositEvents_1.default({
+                chainId: 43114
             })
         ];
     }

package/dist/src/utils/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
+exports.getContract = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
 /**
  * @module util
  */
@@ -124,8 +124,8 @@ const buildDataForTransaction = async (transaction, type) => {
     }
     const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
     const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
-    const interopBridgeContract = new ethers_1.ethers.Contract(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
-    const { data } = await interopBridgeContract.populateTransaction.mint(transaction.submitEvent.to, transaction.submitEvent.amount, transaction.sourceChainId, transaction.sourceTransactionHash);
+    const interopBridgeContract = getContract(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
+    const { data } = await interopBridgeContract.populateTransaction.mint(transaction.submitEvent.user, ethers_1.ethers.BigNumber.from(transaction.submitEvent.amount.toString()), ethers_1.ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()), transaction.sourceTransactionHash);
     transactions.push({
         to: itoken.address,
         data: data,
@@ -135,3 +135,44 @@ const buildDataForTransaction = async (transaction, type) => {
     return (0, ethers_multisend_1.encodeMulti)(transactions).data;
 };
 exports.buildDataForTransaction = buildDataForTransaction;
+function getContract(address, contractInterface, signerOrProvider) {
+    if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
+        throw Error(`Invalid 'address' parameter '${address}'.`);
+    }
+    const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
+    return new Proxy(contract, {
+        get(target, prop, receiver) {
+            const value = Reflect.get(target, prop, receiver);
+            if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
+                return async (...args) => {
+                    try {
+                        return await value.bind(contract)(...args);
+                    }
+                    catch (error) {
+                        throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
+                    }
+                };
+            }
+            if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
+                const parentProp = String(prop);
+                return new Proxy(value, {
+                    get(target, prop, receiver) {
+                        const value = Reflect.get(target, prop, receiver);
+                        if (typeof value === 'function') {
+                            return async (...args) => {
+                                try {
+                                    return await value.bind(contract)(...args);
+                                }
+                                catch (error) {
+                                    throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
+                                }
+                            };
+                        }
+                    }
+                });
+            }
+            return value;
+        },
+    });
+}
+exports.getContract = getContract;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.7a02577",
+  "version": "0.0.0-dev.7c2b0e5",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -12,7 +12,8 @@
     "build": "yarn generate-abi-types && 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": "yarn generate-abi-types && NODE_ENV=development nodemon",
     "generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
-    "prepublishOnly": "yarn build"
+    "prepublishOnly": "yarn build",
+    "postinstall": "patch-package"
   },
   "nodemonConfig": {
     "watch": [
@@ -45,7 +46,7 @@
     "libp2p-websockets": "^0.16.2",
     "luxon": "^2.3.2",
     "module-alias": "^2.2.2",
-    "sequelize": "^6.19.0",
+    "sequelize": "6.18.0",
     "sqlite3": "^5.0.5",
     "waait": "^1.0.5"
   },
@@ -59,6 +60,8 @@
     "@types/fs-extra": "^9.0.13",
     "@types/node": "^17.0.17",
     "nodemon": "^2.0.15",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0",
     "replace-in-file": "^6.3.2",
     "rimraf": "^3.0.2",
     "ts-node": "^10.5.0",

package/patches/@ethersproject+properties+5.6.0.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@ethersproject/properties/lib/index.js b/node_modules/@ethersproject/properties/lib/index.js
+index 41e0b52..4c7a9e3 100644
+--- a/node_modules/@ethersproject/properties/lib/index.js
++++ b/node_modules/@ethersproject/properties/lib/index.js
+@@ -44,7 +44,7 @@ function defineReadOnly(object, name, value) {
+     Object.defineProperty(object, name, {
+         enumerable: true,
+         value: value,
+-        writable: false,
++        writable: true,
+     });
+ }
+ exports.defineReadOnly = defineReadOnly;

package/src/net/peer/index.ts

@@ -88,12 +88,13 @@ export const startPeer = async ({ }: IPeerOptions) => {
     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()}`)
-  );
+  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");
 

package/src/net/pool/index.ts

@@ -1,5 +1,9 @@
 import { Event } from "@/types";
 import config from "@/config";
+import Logger from "@/logger";
+
+
+const logger = new Logger('PeerPool')
 
 export interface IPeerInfo {
     id: string;
@@ -75,10 +79,15 @@ export class PeerPool {
      * @emits {@link Event.POOL_PEER_ADDED}
      */
     add(peer?: IPeerInfo) {
-        if (peer && peer.id && !this.pool.get(peer.id)) {
+        if (peer && peer.id) {
+            const newPeer = !this.pool.get(peer.id);
             this.pool.set(peer.id, peer)
             peer.pooled = true
-            config.events.emit(Event.POOL_PEER_ADDED, peer)
+           
+            if(newPeer) {
+                config.events.emit(Event.POOL_PEER_ADDED, peer)
+                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`)
+            }
         }
     }
 
@@ -92,6 +101,7 @@ export class PeerPool {
             if (this.pool.delete(peer.id)) {
                 peer.pooled = false
                 config.events.emit(Event.POOL_PEER_REMOVED, peer)
+                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`)
             }
         }
     }
@@ -114,14 +124,14 @@ export class PeerPool {
 
 
     cleanup() {
-        let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
-
-        this.peers.forEach((peerInfo) => {
-            if (peerInfo.updated.getTime() < compDate) {
-                console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
-                this.remove(peerInfo)
-            }
-        })
+        // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
+
+        // this.peers.forEach((peerInfo) => {
+        //     if (peerInfo.updated.getTime() < compDate) {
+        //         console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
+        //         this.remove(peerInfo)
+        //     }
+        // })
     }
 }
 

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

@@ -47,12 +47,20 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
             };
         }
 
+        console.log("signing:", {
+            to: addresses[transaction.targetChainId].multisend,
+            data: await buildDataForTransaction(transaction, data.type),
+            chainId: transaction.targetChainId as ChainId,
+            safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
+        });
+
         const signedData = await signGnosisSafeTx({
-            //TODO: chain id depends on event type
-            to: addresses[transaction.sourceChainId].multisend,
-            data:  buildDataForTransaction(transaction, data.type),
-            chainId: transaction.sourceChainId as ChainId,
+            to: addresses[transaction.targetChainId].multisend,
+            data: await buildDataForTransaction(transaction, data.type),
+            chainId: transaction.targetChainId as ChainId,
             safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
         }, { signer });
 
         return {

package/src/tasks/BaseTask.ts

@@ -37,7 +37,7 @@ export class BaseTask extends EventEmitter implements IBaseTask {
                     await this.pollHandler()
                 }
             } catch (err) {
-                this.logger.error(`poll check error: ${err.message}\ntrace: ${err.stack}`)
+                this.logger.error(`poll check error:\n${err.message}\ntrace: ${err.stack}`)
             }
 
             await this.postPollHandler()

package/src/tasks/InteropXGateway/ProcessDepositEvents.ts

@@ -3,7 +3,7 @@ import Logger from '@/logger';
 import { BigNumber, ethers } from "ethers";
 import abi from "@/abi";
 import { Transaction } from "@/db";
-import { buildDataForTransaction, buildSignatureBytes, getRpcProviderUrl, Signature } from "@/utils";
+import { buildDataForTransaction, buildSignatureBytes, getContract, getRpcProviderUrl, Signature } from "@/utils";
 import { addresses } from "@/constants";
 import { ChainId } from "@/types";
 import config from "@/config";
@@ -13,7 +13,9 @@ import wait from "waait";
 import { peerPool, protocol } from "@/net";
 import { LogDescription } from "ethers/lib/utils";
 
-const generateGnosisTransaction = async (transactionData: any, safeContract: any) => {
+const generateGnosisTransaction = async (transactionData: any, safeContract: GnosisSafe) => {
+    console.log(transactionData);
+    
     let isExecuted = await safeContract.dataHashes(
         await safeContract.getTransactionHash(
             transactionData.to,
@@ -72,13 +74,21 @@ class ProcessDepositEvents extends BaseTask {
             where: {
                 status: 'pending',
                 sourceStatus: 'success',
+                targetStatus: 'uninitialised',
                 action: 'deposit',
                 sourceCreatedAt: {
                     [Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
                 },
+                targetDelayUntil: {
+                    [Op.or]: {
+                        [Op.is]: null,
+                        [Op.lt]: new Date(),
+                    }
+                },
                 sourceBlockNumber: {
                     [Op.lt]: blockNumber - 12,
-                }
+                },
+                sourceChainId: this.chainId,
             }
         })
 
@@ -87,7 +97,7 @@ class ProcessDepositEvents extends BaseTask {
         }
 
 
-        transaction.sourceStatus = 'pending';
+        transaction.targetStatus = 'pending';
         await transaction.save();
 
 
@@ -101,19 +111,19 @@ class ProcessDepositEvents extends BaseTask {
 
         const safeAddress = addresses[transaction.targetChainId].gnosisSafe;
 
-        const safeContract = new ethers.Contract(
+
+        const safeContract = getContract<GnosisSafe>(
             safeAddress,
             abi.gnosisSafe,
             targetWallet
-        ) as GnosisSafe;
+        )
 
         const ownersThreshold = await safeContract.getThreshold();
-
         await wait(10000);
 
         let gnosisTx = await generateGnosisTransaction({
             baseGas: "0",
-            data: buildDataForTransaction(transaction),
+            data: await buildDataForTransaction(transaction),
             gasPrice: "0",
             gasToken: "0x0000000000000000000000000000000000000000",
             nonce: '0',
@@ -131,6 +141,8 @@ class ProcessDepositEvents extends BaseTask {
 
         console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
 
+        console.log(ownerPeerIds);
+        
         const signatures = await protocol.requestSignatures({
             type: 'source',
             transactionHash: transaction.transactionHash,
@@ -145,8 +157,8 @@ class ProcessDepositEvents extends BaseTask {
 
         if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
             await transaction.save();
-            transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
-            transaction.sourceStatus = 'pending'
+            transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
+            transaction.targetStatus = 'uninitialised'
 
             await transaction.save();
             const errorMessage = signatures.find(s => !!s.error)?.error;
@@ -185,6 +197,15 @@ class ProcessDepositEvents extends BaseTask {
             buildSignatureBytes(validSignatures)
         );
 
+        console.log({
+            from: targetWallet.address,
+            gasPrice: BigNumber.from(120 * 10 ** 9).toString(),
+            gasLimit: BigNumber.from(6_000_000).toString(),
+            to: safeAddress,
+            data: txData,
+        })
+        return;
+
         const txSent = await targetWallet.sendTransaction({
             from: targetWallet.address,
             gasPrice: BigNumber.from(120 * 10 ** 9),
@@ -219,11 +240,11 @@ class ProcessDepositEvents extends BaseTask {
             getRpcProviderUrl(this.chainId)
         );
 
-        this.contract = new ethers.Contract(
+        this.contract = getContract<InteropXGateway>(
             this.contractAddress,
             abi.interopXGateway,
             new ethers.Wallet(config.privateKey!, this.provider)
-        ) as InteropXGateway;
+        );
 
         await super.start()
     }

package/src/tasks/InteropXGateway/SyncDepositEvents.ts

@@ -3,7 +3,7 @@ import Logger from '@/logger';
 import { ethers } from "ethers";
 import abi from "@/abi";
 import { Transaction } from "@/db";
-import { generateInteropTransactionHash, getRpcProviderUrl } from "@/utils";
+import { generateInteropTransactionHash, getContract, getRpcProviderUrl } from "@/utils";
 import { addresses } from "@/constants";
 import { ChainId } from "@/types";
 import config from "@/config";
@@ -77,7 +77,7 @@ class SyncDepositEvents extends BaseTask {
                         sourceChainId: sourceChainId.toString(),
                         targetChainId: targetChainId.toString(),
                         token: token,
-                        ammout: amount.toString(),
+                        amount: amount.toString(),
                         vnonce: vnonce.toString(),
                     },
 
@@ -86,7 +86,7 @@ class SyncDepositEvents extends BaseTask {
                         sourceChainId: sourceChainId.toString(),
                         targetChainId: targetChainId.toString(),
                         token: token,
-                        ammout: amount.toString(),
+                        amount: amount.toString(),
                         vnonce: vnonce.toString(),
                     },
                     status: "pending",
@@ -113,11 +113,11 @@ class SyncDepositEvents extends BaseTask {
             getRpcProviderUrl(this.chainId)
         );
 
-        this.contract = new ethers.Contract(
+        this.contract = getContract<InteropXGateway>(
             this.contractAddress,
             abi.interopXGateway,
             new ethers.Wallet(config.privateKey!, this.provider)
-        ) as InteropXGateway;
+        );
 
         await super.start()
     }

package/src/tasks/index.ts

@@ -1,10 +1,15 @@
 import { BaseTask } from "./BaseTask";
-import SyncInteropXGatewayDepositEvents from "./InteropXGateway/SyncDepositEvents";
+import InteropXGatewayProcessDepositEvents from "./InteropXGateway/ProcessDepositEvents";
+import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvents";
 
 export class Tasks {
     
     tasks: BaseTask[] = [
-        new SyncInteropXGatewayDepositEvents({
+        new InteropXGatewaySyncDepositEvents({
+            chainId: 43114
+        }),
+
+        new InteropXGatewayProcessDepositEvents({
             chainId: 43114
         })
     ];

package/src/utils/index.ts

@@ -138,7 +138,7 @@ export const buildDataForTransaction = async (transaction: Transaction, type?: '
 
   const transactions: MetaTransaction[] = [];
 
-  if(transaction.action != 'deposit') {
+  if (transaction.action != 'deposit') {
     throw new Error('Invalid action');
   }
 
@@ -165,12 +165,12 @@ export const buildDataForTransaction = async (transaction: Transaction, type?: '
 
   const targetChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(transaction.targetChainId as ChainId));
   const targetWallet = new ethers.Wallet(config.privateKey, targetChainProvider);
-  const interopBridgeContract = new ethers.Contract(itoken.address, abi.interopBridgeToken, targetWallet) as InteropBridgeToken;
+  const interopBridgeContract = getContract<InteropBridgeToken>(itoken.address, abi.interopBridgeToken, targetWallet);
 
   const { data } = await interopBridgeContract.populateTransaction.mint(
-    transaction.submitEvent.to,
-    transaction.submitEvent.amount,
-    transaction.sourceChainId,
+    transaction.submitEvent.user,
+    ethers.BigNumber.from(transaction.submitEvent.amount.toString()),
+    ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()),
     transaction.sourceTransactionHash,
   );
 
@@ -183,3 +183,56 @@ export const buildDataForTransaction = async (transaction: Transaction, type?: '
 
   return encodeMulti(transactions).data
 }
+
+
+export function getContract<TContract extends ethers.Contract>(address: string, contractInterface: ethers.ContractInterface | any, signerOrProvider?: ethers.Signer | ethers.providers.Provider) {
+  if (!ethers.utils.getAddress(address) || address === ethers.constants.AddressZero) {
+    throw Error(`Invalid 'address' parameter '${address}'.`)
+  }
+
+  const contract = new ethers.Contract(
+    address,
+    contractInterface,
+    signerOrProvider
+  ) as TContract
+
+
+  return new Proxy(contract, {
+    get(target, prop, receiver) {
+      const value = Reflect.get(target, prop, receiver);
+
+      if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
+        return async (...args: any[]) => {
+          try {
+            return await value.bind(contract)(...args);
+          } catch (error) {
+            throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`)
+          }
+        }
+      }
+
+
+      if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
+        const parentProp = String(prop);
+
+        return new Proxy(value, {
+          get(target, prop, receiver) {
+            const value = Reflect.get(target, prop, receiver);
+
+            if (typeof value === 'function') {
+              return async (...args: any[]) => {
+                try {
+                  return await value.bind(contract)(...args);
+                } catch (error) {
+                  throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`)
+                }
+              }
+            }
+          }
+        })
+      }
+
+      return value;
+    },
+  });
+}