@instadapp/interop-x 0.0.0-dev.c2272fd → 0.0.0-dev.dc4f10a

package/dist/package.json

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

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

package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js

@@ -138,7 +138,9 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
     }
     async start() {
         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 = (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/utils/index.js

@@ -157,7 +157,7 @@ const buildWithdrawDataForTransaction = async (transaction, type) => {
     if (!transaction.submitEvent) {
         throw Error('Cannot build data for transaction without submitEvent');
     }
-    const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
+    const { to, amount, chainId, itokenAddress } = transaction.submitEvent;
     const itoken = constants_1.itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
     if (!itoken) {
         throw Error('Cannot build data for transaction without itoken');
@@ -170,7 +170,7 @@ const buildWithdrawDataForTransaction = async (transaction, type) => {
     const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
     const gatewayAddress = constants_1.addresses[chainId].interopXGateway;
     const interopBridgeContract = getContract(gatewayAddress, abi_1.default.interopXGateway, targetWallet);
-    const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(ethers_1.ethers.BigNumber.from(amount.toString()), to, token.address, ethers_1.ethers.BigNumber.from(transaction.sourceChainId.toString()), transaction.submitTransactionHash);
+    const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(ethers_1.ethers.BigNumber.from(amount.toString()), to, token.address, ethers_1.ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()), transaction.submitTransactionHash);
     transactions.push({
         to: gatewayAddress,
         data: data,

package/package.json

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

package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts

@@ -54,7 +54,9 @@ const generateGnosisTransaction = async (transactionData: any, safeContract: Gno
 }
 
 class ProcessWithdrawEvents extends BaseTask {
+    contractAddress: string;
     provider: ethers.providers.JsonRpcProvider;
+    contract: InteropXGateway;
     chainId: ChainId;
     leadNodeOnly = true
 
@@ -220,10 +222,18 @@ class ProcessWithdrawEvents extends BaseTask {
     async start(): Promise<void> {
         this.logger.info(`Starting execution watcher on interop chain`);
 
+        this.contractAddress = addresses[this.chainId].interopXGateway;
+
         this.provider = new ethers.providers.JsonRpcProvider(
             getRpcProviderUrl(this.chainId)
         );
 
+        this.contract = getContract<InteropXGateway>(
+            this.contractAddress,
+            abi.interopXGateway,
+            new ethers.Wallet(config.privateKey!, this.provider)
+        );
+
         await super.start()
     }
 }

package/src/utils/index.ts

@@ -210,7 +210,7 @@ export const buildWithdrawDataForTransaction = async (transaction: Transaction,
     throw Error('Cannot build data for transaction without submitEvent');
   }
 
-  const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
+  const { to, amount, chainId, itokenAddress } = transaction.submitEvent;
 
   const itoken = itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
 
@@ -233,7 +233,7 @@ export const buildWithdrawDataForTransaction = async (transaction: Transaction,
     ethers.BigNumber.from(amount.toString()),
     to,
     token.address,
-    ethers.BigNumber.from(transaction.sourceChainId.toString()),
+    ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()),
     transaction.submitTransactionHash,
   );