Merge pull request #222 from rsksmart/2.0.0-rebased

Check if the address of the event is the original address

Author: aeidelman

bridge/migrations/21_deploy_allowTokens.js

@@ -52,49 +52,49 @@ module.exports = async (deployer, networkName, accounts) => {
 function tokensTypesMainnet() {
     return [
         { description: 'BTC', limits: {
-            min:toWei('0.001'),
+            min:toWei('0.0001'),
             max:toWei('25'),
             daily:toWei('100'),
             mediumAmount:toWei('0.1'),
             largeAmount:toWei('1') }
         },
         { description: 'ETH', limits: {
-            min:toWei('0.05'),
+            min:toWei('0.005'),
             max:toWei('750'),
             daily:toWei('3000'),
             mediumAmount:toWei('3'),
             largeAmount:toWei('30') }
         },
         { description: '<1000usd', limits: {
-            min:toWei('0.1'),
+            min:toWei('0.01'),
             max:toWei('2500'),
             daily:toWei('5000'),
             mediumAmount:toWei('10'),
             largeAmount:toWei('100') }
         },
         { description: '<100usd', limits: {
-            min:toWei('1'),
+            min:toWei('0.1'),
             max:toWei('25000'),
             daily:toWei('50000'),
             mediumAmount:toWei('100'),
             largeAmount:toWei('1000') }
         },
         { description: '=1usd', limits: {
-            min:toWei('100'),
+            min:toWei('10'),
             max:toWei('2500000'),
             daily:toWei('5000000'),
             mediumAmount:toWei('10000'),
             largeAmount:toWei('100000') }
         },
         { description: '<1usd', limits: {
-            min:toWei('10000'),
+            min:toWei('1000'),
             max:toWei('250000000'),
             daily:toWei('500000000'),
             mediumAmount:toWei('1000000'),
             largeAmount:toWei('10000000') }
         },
         { description: '<1cent', limits: {
-            min:toWei('1000000'),
+            min:toWei('100000'),
             max:toWei('25000000000'),
             daily:toWei('50000000000'),
             mediumAmount:toWei('100000000'),

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/contracts/AllowTokensFactory.js

@@ -40,7 +40,6 @@ module.exports = class AllowTokensFactory {
         try {
             const bridgeContract = new this.mainWeb3.eth.Contract(abiBridge, this.config.mainchain.bridge);
             const allowTokensAddress = await utils.retry3Times(bridgeContract.methods.allowTokens().call);
-
             return await this.createInstance(
                 this.mainWeb3,
                 allowTokensAddress

federator/src/contracts/IAllowTokensV0.js

@@ -30,6 +30,7 @@ module.exports = class IAllowTokensV0 {
 
     async getLimits(tokenAddress) {
         return {
+            allowed: true,
             mediumAmount: -1,
             largeAmount: 0,
         };

federator/src/contracts/IAllowTokensV1.js

@@ -53,10 +53,13 @@ module.exports = class IAllowTokensV1 {
             if(!result) {
                 const infoAndLimits = await this.allowTokensContract.methods.getInfoAndLimits(tokenAddress).call();
                 result = {
+                    allowed: infoAndLimits.info.allowed,
                     mediumAmount: infoAndLimits.limit.mediumAmount,
                     largeAmount: infoAndLimits.limit.largeAmount,
                 };
-                this.mapTokenInfoAndLimits[tokenAddress] = result;
+                if (result.allowed) {
+                    this.mapTokenInfoAndLimits[tokenAddress] = result;
+                }
             }
             return result;
         } catch(err) {

federator/src/contracts/IBridge.js

@@ -29,4 +29,8 @@ module.exports = class IBridge {
     getVersion() {
         return this.bridgeContract.methods.version();
     }
+
+    getMappedToken(originalTokenAddress) {
+        return this.bridgeContract.methods.mappedTokens(originalTokenAddress);
+    }
 }

federator/src/lib/Federator.js

@@ -141,7 +141,7 @@ module.exports = class Federator {
 
             const isMember = await utils.retry3Times(fedContract.isMember(from).call);
             if (!isMember) throw new Error(`This Federator addr:${from} is not part of the federation`);
-            
+
             const {
                 mediumAmountConfirmations,
                 largeAmountConfirmations
@@ -168,17 +168,37 @@ module.exports = class Federator {
                     _typeId: typeId
                 } = log.returnValues;
 
-                const {
+                const mainBridge = await this.bridgeFactory.getMainBridgeContract();
+                const sideTokenAddress = await utils.retry3Times(mainBridge.getMappedToken(tokenAddress).call);
+                let allowed,
                     mediumAmount,
-                    largeAmount              
-                } = await allowTokens.getLimits(tokenAddress);
-                
+                    largeAmount
+                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}`);
+                    }
+                }
+
                 const BN = this.mainWeb3.utils.BN;
                 const mediumAmountBN = new BN(mediumAmount);
                 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)) {
@@ -214,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(
@@ -292,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,