Pass the sender to the hasVoted call function

Author: pedro

federator/integrationTest/integrationTest.js

@@ -508,9 +508,9 @@ async function transfer(originFederators, destinationFederators, config, origin,
         logger.info(`${destination} token balance`, balance);
         let destinationInitialUserBalance = balance;
 
-        // Cross AnotherToken (type id 0) Small Amount < toWei('0.1')   
-        const userSmallAmount = originWeb3.utils.toWei('0.0516');
-        const userMediumAmount = originWeb3.utils.toWei('0.109');
+        // Cross AnotherToken (type id 0) Small Amount < toWei('0.01')
+        const userSmallAmount = originWeb3.utils.toWei('0.0056');
+        const userMediumAmount = originWeb3.utils.toWei('0.019'); // < toWei('0.1')
         const userLargeAmount = originWeb3.utils.toWei('1.32');
         const userAppoveTotalAmount = originWeb3.utils.toWei('10');
 
@@ -520,18 +520,18 @@ async function transfer(originFederators, destinationFederators, config, origin,
         await methodCall.call({from: userAddress});
         await transactionSender.sendTransaction(anotherTokenAddress, methodCall.encodeABI(), 0, userPrivateKey, true);
 
-        // Cross AnotherToken (type id 0) Small Amount < toWei('0.1')
+        // Cross AnotherToken (type id 0) Small Amount < toWei('0.01')
         methodCall = bridgeContract.methods.receiveTokensTo(anotherTokenAddress, userAddress, userSmallAmount);
         await methodCall.call({from: userAddress});
         const smallAmountReceipt = await transactionSender.sendTransaction(originBridgeAddress, methodCall.encodeABI(), 0, userPrivateKey, true);
 
-        // Cross AnotherToken (type id 0) Medium Amount >= toWei('0.1') && < toWei('1')
+        // Cross AnotherToken (type id 0) Medium Amount >= toWei('0.01') && < toWei('0.1')
         methodCall = bridgeContract.methods.receiveTokensTo(anotherTokenAddress, userAddress, userMediumAmount);
         await methodCall.call({from: userAddress});
         const mediumAmountReceipt = await transactionSender.sendTransaction(originBridgeAddress, methodCall.encodeABI(), 0, userPrivateKey, true);
 
-        // Cross AnotherToken (type id 0) Large Amount >= toWei('1') 
-        methodCall = bridgeContract.methods.receiveTokensTo(anotherTokenAddress, userAddress, userLargeAmount) 
+        // Cross AnotherToken (type id 0) Large Amount >= toWei('0.1')
+        methodCall = bridgeContract.methods.receiveTokensTo(anotherTokenAddress, userAddress, userLargeAmount)
         await methodCall.call({from: userAddress});
         const largeAmountReceipt = await transactionSender.sendTransaction(originBridgeAddress, methodCall.encodeABI(), 0, userPrivateKey, true);
 

federator/src/lib/Federator.js

@@ -168,26 +168,28 @@ module.exports = class Federator {
                     _typeId: typeId
                 } = log.returnValues;
 
-                let {
-                    allowed,
+                const mainBridge = await this.bridgeFactory.getMainBridgeContract();
+                const sideTokenAddress = await utils.retry3Times(mainBridge.getMappedToken(tokenAddress).call);
+                let allowed,
                     mediumAmount,
                     largeAmount
-                } = await allowTokens.getLimits(tokenAddress);
-
-                if (!allowed) {
-                    const mainBridge = await this.bridgeFactory.getMainBridgeContract();
-                    const sideTokenAddress = await utils.retry3Times(mainBridge.getMappedToken(tokenAddress).call);
-                    if (sideTokenAddress == utils.zeroAddress) {
+                if (sideTokenAddress == utils.zeroAddress) {
+                    ({
+                        allowed,
+                        mediumAmount,
+                        largeAmount
+                    } = await allowTokens.getLimits(tokenAddress));
+                    if (!allowed) {
                         throw new Error(`Original Token not allowed nor side token Tx:${transactionHash} originalTokenAddress:${tokenAddress}`);
-                    } else {
-                        ({
-                            allowed,
-                            mediumAmount,
-                            largeAmount
-                        } = await allowTokens.getLimits(sideTokenAddress));
-                        if (!allowed) {
-                            this.logger.error(`Side token:${sideTokenAddress} needs to be allowed Tx:${transactionHash} originalTokenAddress:${tokenAddress}`);
-                        }
+                    }
+                } else {
+                    ({
+                        allowed,
+                        mediumAmount,
+                        largeAmount
+                    } = await allowTokens.getLimits(sideTokenAddress));
+                    if (!allowed) {
+                        this.logger.error(`Side token:${sideTokenAddress} needs to be allowed Tx:${transactionHash} originalTokenAddress:${tokenAddress}`);
                     }
                 }
 
@@ -196,7 +198,7 @@ module.exports = class Federator {
                 const largeAmountBN = new BN(largeAmount);
                 const amountBN = new BN(amount);
 
-                if(mediumAndSmall) {
+                if (mediumAndSmall) {
                     // At this point we're processing blocks newer than largeAmountConfirmations
                     // and older than smallAmountConfirmations
                     if(amountBN.gte(largeAmountBN)) {
@@ -232,7 +234,7 @@ module.exports = class Federator {
 
                 let wasProcessed = await utils.retry3Times(fedContract.transactionWasProcessed(transactionId).call);
                 if (!wasProcessed) {
-                    let hasVoted = await utils.retry3Times(fedContract.hasVoted(transactionId).call);
+                    let hasVoted = await fedContract.hasVoted(transactionId).call({ from });
                     if(!hasVoted) {
                         this.logger.info(`Voting tx: ${log.transactionHash} block: ${log.blockHash} originalTokenAddress: ${tokenAddress}`);
                         await this._voteTransaction(
@@ -310,7 +312,7 @@ module.exports = class Federator {
             }
 
             const receipt = await this.transactionSender.sendTransaction(fedContract.getAddress(), txData, 0, this.config.privateKey);
-            
+
             if(receipt.status == false) {
                 fs.writeFileSync(
                     this.revertedTxnsPath,