@instadapp/interop-x 0.0.0-dev.8a0297a → 0.0.0-dev.8f86e9f

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.8a0297a",
+    "version": "0.0.0-dev.8f86e9f",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -46,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"
     },

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.8a0297a)`);
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.8f86e9f)`);
 const tasks_1 = require("@/tasks");
 const net_1 = require("@/net");
 const api_1 = require("@/api");

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

@@ -101,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

@@ -34,11 +34,11 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
             };
         }
         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,
+            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/InteropXGateway/ProcessDepositEvents.js

@@ -43,6 +43,12 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
                 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,
                 },
@@ -77,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,
@@ -88,7 +95,7 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
             await transaction.save();
             transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
-            transaction.targetStatus = 'pending';
+            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}` : ''));

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}`);

package/dist/src/utils/index.js

@@ -125,7 +125,7 @@ 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 = 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), transaction.sourceChainId, transaction.sourceTransactionHash);
+    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,
@@ -143,10 +143,10 @@ function getContract(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)) {
+            if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
                 return async (...args) => {
                     try {
-                        return await value(...args);
+                        return await value.bind(contract)(...args);
                     }
                     catch (error) {
                         throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
@@ -161,7 +161,7 @@ function getContract(address, contractInterface, signerOrProvider) {
                         if (typeof value === 'function') {
                             return async (...args) => {
                                 try {
-                                    return await value(...args);
+                                    return await value.bind(contract)(...args);
                                 }
                                 catch (error) {
                                     throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.8a0297a",
+  "version": "0.0.0-dev.8f86e9f",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -46,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"
   },

package/src/net/pool/index.ts

@@ -124,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

@@ -48,11 +48,11 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
         }
 
         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,
+            data:  await buildDataForTransaction(transaction, data.type),
+            chainId: transaction.targetChainId as ChainId,
             safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
         }, { signer });
 
         return {

package/src/tasks/InteropXGateway/ProcessDepositEvents.ts

@@ -79,6 +79,12 @@ class ProcessDepositEvents extends BaseTask {
                 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,
                 },
@@ -135,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,
@@ -150,7 +158,7 @@ class ProcessDepositEvents extends BaseTask {
         if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
             await transaction.save();
             transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
-            transaction.targetStatus = 'pending'
+            transaction.targetStatus = 'uninitialised'
 
             await transaction.save();
             const errorMessage = signatures.find(s => !!s.error)?.error;

package/src/tasks/InteropXGateway/SyncDepositEvents.ts

@@ -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",

package/src/utils/index.ts

@@ -169,8 +169,8 @@ export const buildDataForTransaction = async (transaction: Transaction, type?: '
 
   const { data } = await interopBridgeContract.populateTransaction.mint(
     transaction.submitEvent.user,
-    ethers.BigNumber.from(transaction.submitEvent.amount),
-    transaction.sourceChainId,
+    ethers.BigNumber.from(transaction.submitEvent.amount.toString()),
+    ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()),
     transaction.sourceTransactionHash,
   );
 
@@ -201,10 +201,10 @@ export function getContract<TContract extends ethers.Contract>(address: string,
     get(target, prop, receiver) {
       const value = Reflect.get(target, prop, receiver);
 
-      if (typeof value === 'function' && contract.functions.hasOwnProperty(prop)) {
+      if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
         return async (...args: any[]) => {
           try {
-            return await value(...args);
+            return await value.bind(contract)(...args);
           } catch (error) {
             throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`)
           }
@@ -222,7 +222,7 @@ export function getContract<TContract extends ethers.Contract>(address: string,
             if (typeof value === 'function') {
               return async (...args: any[]) => {
                 try {
-                  return await value(...args);
+                  return await value.bind(contract)(...args);
                 } catch (error) {
                   throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`)
                 }