Change Utils contract to check for the ERC777 interface

We do this before asking for granularity to avoid a warning in etherscan

Author: pedro

abis/AllowTokens.json

@@ -1,10 +1,16 @@
 pragma solidity ^0.5.0;
 
 import "./zeppelin/math/SafeMath.sol";
+import "./zeppelin/introspection/IERC1820Registry.sol";
+import "./zeppelin/token/ERC777/IERC777.sol";
 
 contract Utils {
     using SafeMath for uint256;
 
+    IERC1820Registry constant private _erc1820 = IERC1820Registry(0x1820a4B7618BdE71Dce8cdc73aAB6C95905faD24);
+    // keccak256("ERC777Token")
+    bytes32 constant private TOKENS_ERC777_HASH = 0xac7fbab5f54a3ca8194167523c6753bfeb96a445279294b6125b68cce2177054;
+
     function getTokenInfo(address tokenToUse) external view returns (uint8 decimals, uint256 granularity, string memory symbol) {
         decimals = getDecimals(tokenToUse);
         granularity = getGranularity(tokenToUse);
@@ -37,11 +43,11 @@ contract Utils {
     }
 
     function getGranularity(address tokenToUse) public view returns (uint256 granularity) {
-        //support granularity if ERC777
-        (bool success, bytes memory data) = tokenToUse.staticcall(abi.encodeWithSignature("granularity()"));
         granularity = 1;
-        if(success) {
-            granularity = abi.decode(data, (uint256));
+        //support granularity if ERC777
+        address implementer = _erc1820.getInterfaceImplementer(tokenToUse, TOKENS_ERC777_HASH);
+        if (implementer != address(0)) {
+            granularity = IERC777(implementer).granularity();
             //Verify granularity is power of 10 to keep it compatible with ERC20 decimals
             granularityToDecimals(granularity);
         }

abis/Bridge.json

@@ -0,0 +1,13 @@
+const fs = require('fs');
+
+const allowTokensBuild = require('./build/contracts/AllowTokens');
+fs.writeFileSync('../abis/AllowTokens.json', JSON.stringify(allowTokensBuild.abi));
+
+const bridgeBuild = require('./build/contracts/Bridge_v1');
+fs.writeFileSync('../abis/Bridge.json', JSON.stringify(bridgeBuild.abi));
+
+const federationBuild = require('./build/contracts/Federation_v1');
+fs.writeFileSync('../abis/Federation.json', JSON.stringify(federationBuild.abi));
+
+const sideTokenBuild = require('./build/contracts/SideToken_v1');
+fs.writeFileSync('../abis/SideToken.json', JSON.stringify(sideTokenBuild.abi));

abis/Federation.json

@@ -1,7 +1,7 @@
 {
   "name": "bridge",
   "private": true,
-  "version": "1.1.0",
+  "version": "1.0.0",
   "description": "Decentralized Bridge Contracts",
   "dependencies": {
     "@openzeppelin/cli": "^2.8.2",
@@ -20,6 +20,7 @@
     "migrate": "rm -rf ./build && rm -f ./.openzeppelin/dev-5777.json && npx truffle migrate --reset",
     "test": "npx truffle test",
     "coverage": "npx truffle run coverage",
+    "prepublish": "npx truffle compile && node ./datagen.js",
     "deployIntegrationTest": "rm -f ./.openzeppelin/dev-5777.json && rm -f ./.openzeppelin/dev-33.json && rm -rf ./build && npx truffle migrate --reset --network rskregtest && npx truffle migrate --reset --network development"
   },
   "keywords": [

abis/SideToken.json

@@ -116,10 +116,6 @@ contract('Utils Contract', async function (accounts) {
             assert.equal(resultGranularity.toString(), granularity);
         });
 
-        it('Throw if is not a contract', async function () {
-            await utils.expectThrow(this.utilsLib.getGranularity(owner));
-        });
-
         it('granularity = 1 if does not have granularity()', async function () {
             let result = await this.utilsLib.getGranularity(this.utilsLib.address);
             assert.equal(result, '1');

bridge/contracts/Utils.sol

@@ -14,7 +14,6 @@
 const HDWalletProvider = require("@truffle/hdwallet-provider");
 const fs = require('fs');
 
-//resulting address 0x170346689cC312D8E19959Bc68c3AD03E72C9850
 let MNEMONIC = fs.existsSync('./mnemonic.key') ? fs.readFileSync('./mnemonic.key', { encoding: 'utf8' }) : "";// Your metamask's recovery words
 const INFURA_API_KEY = fs.existsSync('./infura.key') ? fs.readFileSync('./infura.key',{ encoding: 'utf8' }) : "";// Your Infura API Key after its registration
 
@@ -106,8 +105,7 @@ module.exports = {
             // Lower values will optimize more for initial deployment cost, higher
             // values will optimize more for high-frequency usage.
             runs: 200
-          },
-          evmVersion: "petersburg"
+          }
         }
       }
   }

bridge/datagen.js

@@ -40,14 +40,14 @@ Between Rsk Mainnet and Ethereum [https://tokenbridge.rsk.co/](https://tokenbrid
 
 ### On RSK Testnet
   - "bridge": [0x684a8a976635fb7ad74a0134ace990a6a0fcce84](https://explorer.testnet.rsk.co/address/0x684a8a976635fb7ad74a0134ace990a6a0fcce84)
-  - "federation": [0x36c893a955399cf15a4a2fbef04c0e06d4d9b379](https://explorer.testnet.rsk.co/address/0x36c893a955399cf15a4a2fbef04c0e06d4d9b379)
+  - "federation": [0x925606edc5863c079b712daed560c31eff8335b9](https://explorer.testnet.rsk.co/address/0x925606edc5863c079b712daed560c31eff8335b9)
   - "allowTokens": [0x952b706a9ab5fd2d3b36205648ed7852676afbe7](https://explorer.testnet.rsk.co/address/0x952b706a9ab5fd2d3b36205648ed7852676afbe7)
   - "multiSigWallet": [0x88f6b2bc66f4c31a3669b9b1359524abf79cfc4a](https://explorer.testnet.rsk.co/address/0x88f6b2bc66f4c31a3669b9b1359524abf79cfc4a)
   - "tRIF": [0x19f64674d8a5b4e652319f5e239efd3bc969a1fe](https://explorer.testnet.rsk.co/address/0x19f64674d8a5b4e652319f5e239efd3bc969a1fe)
 
 ### On Kovan
   - "bridge": ["0x12ed69359919fc775bc2674860e8fe2d2b6a7b5d"](https://kovan.etherscan.io/address/0x12ed69359919fc775bc2674860e8fe2d2b6a7b5d)
-  - "federation": ["0x8c1901c031cdf42a846c0c422a3b5a2c943f4944"](https://kovan.etherscan.io/address/0x8c1901c031cdf42a846c0c422a3b5a2c943f4944)
+  - "federation": ["0xDa2295255633c26EaadBacE5269b6e8bD2648ca0"](https://kovan.etherscan.io/address/0xDa2295255633c26EaadBacE5269b6e8bD2648ca0)
   - "allowTokens": [0xe4aa0f414725c9322a1a9d80d469c5e234786653](https://kovan.etherscan.io/address/0xe4aa0f414725c9322a1a9d80d469c5e234786653)
   - "multiSigWallet": [0x040007b1804ad78a97f541bebed377dcb60e4138](https://kovan.etherscan.io/address/0x040007b1804ad78a97f541bebed377dcb60e4138)
   - "etRIF": [0x69f6d4d4813f8e2e618dae7572e04b6d5329e207](https://kovan.etherscan.io/address/0x69f6d4d4813f8e2e618dae7572e04b6d5329e207)

bridge/package-lock.json

@@ -609,8 +609,9 @@ <h5 class="modal-title">log in</h5>
                         navlink.prop('href', 'https://faucet.rsk.co/');
                     }
 
-                    if(!/chrom(e|ium)/.test(navigator.userAgent.toLowerCase())){
-                        alert('This site will only work correctly under chrome or chromium');
+                    if(!/chrom(e|ium)/.test(navigator.userAgent.toLowerCase())
+                        && navigator.userAgent.indexOf("Firefox") == -1 ) {
+                        alert('This site will only work correctly under chrome, chromium or firefox');
                     }
 
                     disableInputs(true);