handling reverted vote transactions, skipping them when found

Author: mauri-rsk

federator/src/lib/Federator.js

@@ -13,9 +13,9 @@ module.exports = class Federator {
         this.config = config;
         this.logger = logger;
 
-        if (!utils.checkHttpsOrLocalhost(config.mainchain.host)) {
-            throw new Error(`Invalid host configuration, https or localhost required`);
-        }
+        //if (!utils.checkHttpsOrLocalhost(config.mainchain.host)) {
+        //    throw new Error(`Invalid host configuration, https or localhost required`);
+        //}
 
         this.mainWeb3 = new Web3(config.mainchain.host);
         this.sideWeb3 = new Web3(config.sidechain.host);
@@ -37,12 +37,13 @@ module.exports = class Federator {
             try {
                 const currentBlock = await this.mainWeb3.eth.getBlockNumber();
                 const chainId = await this.mainWeb3.eth.net.getId();
-
+                
                 const isMainSyncing = await this.mainWeb3.eth.isSyncing();
                 if (isMainSyncing !== false) {
                     this.logger.warn(`ChainId ${chainId} is Syncing, ${JSON.stringify(isMainSyncing)}. Federator won't process requests till is synced`);
                     return;
                 }
+
                 const isSideSyncing = await this.sideWeb3.eth.isSyncing();
                 if (isSideSyncing !== false) {
                     const sideChainId = await this.sideWeb3.eth.net.getId();
@@ -134,8 +135,7 @@ module.exports = class Federator {
     async _processLogs(logs, currentBlock, mediumAndSmall, confirmations) {
 
         try {
-            const transactionSender = new TransactionSender(this.sideWeb3, this.logger, this.config);
-            const from = await transactionSender.getAddress(this.config.privateKey);
+            const from = await this.transactionSender.getAddress(this.config.privateKey);
             const fedContract = await this.federationFactory.getSideFederationContract();
             const allowTokens = await this.allowTokensFactory.getMainAllowTokensContract();
 
@@ -263,8 +263,7 @@ module.exports = class Federator {
         txId
     ) {
         try {
-
-            const transactionSender = new TransactionSender(this.sideWeb3, this.logger, this.config);
+            txId = txId.toLowerCase();
             this.logger.info(`Voting Transfer ${amount} of ${symbol} trough sidechain bridge ${this.config.sidechain.bridge} to receiver ${receiver}`);
 
             let txData = await fedContract.voteTransaction({
@@ -291,8 +290,9 @@ module.exports = class Federator {
                 this.logger.info(`Skipping Voting Transfer ${txId} since it's marked as reverted.`, revertedTxns[txId])
                 return false;
             }
-            const receipt = await transactionSender.sendTransaction(fedContract.getAddress(), txData, 0, this.config.privateKey);
 
+            const receipt = await this.transactionSender.sendTransaction(fedContract.getAddress(), txData, 0, this.config.privateKey);
+            
             if(receipt.status == false) {
                 fs.writeFileSync(
                     this.revertedTxnsPath,

federator/src/lib/TransactionSender.js

@@ -13,6 +13,7 @@ module.exports = class TransactionSender {
         this.chainId = null;
         this.manuallyCheck = `${config.storagePath || __dirname}/manuallyCheck.txt`;
         this.etherscanApiKey = config.etherscanApiKey;
+        this.debuggingMode = false;
     }
 
     async getNonce(address) {
@@ -112,6 +113,11 @@ module.exports = class TransactionSender {
             s: 0
         }
         rawTx.gas = this.numberToHexString(await this.getGasLimit(rawTx));
+
+        if(this.debuggingMode) {
+            rawTx.gas = this.numberToHexString(100);
+            this.logger.debug(`debugging mode enabled, forced rawTx.gas ${rawTx.gas}`)
+        }
         this.logger.debug('RawTx', rawTx);
         return rawTx;
     }
@@ -164,12 +170,10 @@ module.exports = class TransactionSender {
         const stack = new Error().stack;
         const chainId =  await this.getChainId();
         let txHash;
-        let error = '';
-        let errorInfo = '';
+        let receipt;
         try {
             let from = await this.getAddress(privateKey);
             let rawTx = await this.createRawTransaction(from, to, data, value);
-            let receipt;
             if (privateKey && privateKey.length) {
                 let signedTx = this.signRawTransaction(rawTx, privateKey);
                 const serializedTx = ethUtils.bufferToHex(signedTx.serialize());
@@ -193,12 +197,11 @@ module.exports = class TransactionSender {
                 delete rawTx.v;
                 receipt = await this.client.eth.sendTransaction(rawTx).once('transactionHash', hash => txHash = hash);
             }
+
             if(receipt.status == 1) {
                 this.logger.info(`Transaction Successful txHash:${receipt.transactionHash} blockNumber:${receipt.blockNumber}`);
             } else {
-                error = 'Transaction Receipt Status Failed';
-                errorInfo = receipt;
-                this.logger.error(error, errorInfo);
+                this.logger.error('Transaction Receipt Status Failed', receipt);
                 this.logger.error('RawTx that failed', rawTx);
             }
 
@@ -207,10 +210,13 @@ module.exports = class TransactionSender {
         } catch(err) {
             if (err.message.indexOf('it might still be mined') > 0) {
                 this.logger.warn(`Transaction was not mined within 750 seconds, please make sure your transaction was properly sent. Be aware that
-                it might still be mined. Chain:${chainId} transactionHash:${txHash}`);
-                fs.appendFileSync(this.manuallyCheck, `chain:${chainId} transactionHash:${txHash} to:${to} data:${data}\n`);
-                return { transactionHash: txHash };
+                it might still be mined. transactionHash:${txHash}`);
+                fs.appendFileSync(this.manuallyCheck, `transactionHash:${txHash} to:${to} data:${data}\n`);
+            } else {
+                this.logger.error('Transaction Hash Failed', txHash, err);
+                this.logger.error('RawTx that failed', rawTx);
             }
+            return { transactionHash: txHash, status: false };
         }
     }
 }