Merge pull request #128 from rsksmart/deploy

Fix npm sub dependencies, Fix web3 750s error

bridge/.openzeppelin/project.json

@@ -10,7 +10,7 @@
     "manager": "openzeppelin",
     "solcVersion": "0.5.17",
     "compilerSettings": {
-      "evmVersion": "petersburg",
+      "evmVersion": "istanbul",
       "optimizer": {
         "enabled": false,
         "runs": "200"

bridge/package.json

@@ -10,7 +10,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",
+    "prepare": "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": [
@@ -27,32 +27,36 @@
   "dependencies": {
     "npm-force-resolutions": "0.0.3",
     "@openzeppelin/cli": "^2.8.2",
-    "@openzeppelin/test-helpers": "^0.5.4",
+    "@openzeppelin/test-helpers": "^0.5.6",
     "@openzeppelin/upgrades": "^2.8.0",
-    "@truffle/hdwallet-provider": "^1.0.40",
-    "chalk": "^3.0.0",
+    "@truffle/hdwallet-provider": "^1.0.43",
+    "chalk": "^4.1.0",
     "eth-gas-reporter": "^0.2.17",
     "ethlint": "^1.2.5",
     "resolve": "^1.13.0",
-    "solidity-coverage": "^0.7.9",
-    "table": "^5.4.6",
+    "solidity-coverage": "^0.7.10",
+    "table": "^6.0.3",
     "truffle": "^5.1.42",
     "truffle-assertions": "^0.9.2"
   },
   "devDependencies": {
-    "yargs-parser": "^13.1.2",
-    "elliptic": "^6.5.3",
+    "yargs-parser": ">=13.1.2",
+    "elliptic": ">=6.5.3",
     "minimist": "^1.2.5",
-    "mem": "^4.0.0",
-    "kind-of": "^6.0.3",
-    "bl": "^2.2.1"
+    "mem": ">=4.0.0",
+    "kind-of": ">=6.0.3",
+    "bl": ">=2.2.1",
+    "tree-kill": ">=1.2.2",
+    "decompress": ">=4.2.1"
   },
   "resolutions": {
-    "yargs-parser": "^13.1.2",
-    "elliptic": "^6.5.3",
+    "yargs-parser": ">=13.1.2",
+    "elliptic": ">=6.5.3",
     "minimist": "^1.2.5",
-    "mem": "^4.0.0",
-    "kind-of": "^6.0.3",
-    "bl": "^2.2.1"
+    "mem": ">=4.0.0",
+    "kind-of": ">=6.0.3",
+    "bl": ">=2.2.1",
+    "tree-kill": ">=1.2.2",
+    "decompress": ">=4.2.1"
   }
 }

bridge/truffle-config.js

@@ -85,8 +85,8 @@ module.exports = {
     ethmainnet: {
       provider: () => new HDWalletProvider(MNEMONIC, "https://mainnet.infura.io/v3/" + INFURA_API_KEY),
       network_id: 1,
-      gas: 6300000,
-      gasPrice: 3500000000,
+      gas: 6700000,
+      gasPrice: 250000000000,
       skipDryRun: true
     },
   },

docs/ContractAddresses.md

@@ -7,14 +7,14 @@
 ## List of Addresses
 ### On RSk
   - "bridge": [0x9d11937e2179dc5270aa86a3f8143232d6da0e69](https://explorer.rsk.co/address/0x9d11937e2179dc5270aa86a3f8143232d6da0e69)
-  - "federation": [0xac42761c37d4467ff69082249b9e67d6b35d50cb](https://explorer.rsk.co/address/0xac42761c37d4467ff69082249b9e67d6b35d50cb)
+  - "federation": [0xE37b6516F4FE2A27569a2751C1aD50F6340DF369](https://explorer.rsk.co/address/0xE37b6516F4FE2A27569a2751C1aD50F6340DF369)
   - "allowTokens": [0xe4aa0f414725c9322a1a9d80d469c5e234786653](https://explorer.rsk.co/address/0xe4aa0f414725c9322a1a9d80d469c5e234786653)
   - "multiSigWallet": [0x040007b1804ad78a97f541bebed377dcb60e4138](https://explorer.rsk.co/address/0x040007b1804ad78a97f541bebed377dcb60e4138)
   - "RIF": [0x2acc95758f8b5f583470ba265eb685a8f45fc9d5](https://explorer.rsk.co/address/0x2acc95758f8b5f583470ba265eb685a8f45fc9d5)
 
 ### On Ethereum
   - "bridge": ["0x12ed69359919fc775bc2674860e8fe2d2b6a7b5d"](https://etherscan.io/address/0x12ed69359919fc775bc2674860e8fe2d2b6a7b5d)
-  - "federation": ["0x8c1901c031cdf42a846c0c422a3b5a2c943f4944"](https://etherscan.io/address/0x8c1901c031cdf42a846c0c422a3b5a2c943f4944)
+  - "federation": ["0x479F86eCbE766073D2712EF418acEb56d5362a2B"](https://etherscan.io/address/0x479F86eCbE766073D2712EF418acEb56d5362a2B)
   - "allowTokens": [0xe4aa0f414725c9322a1a9d80d469c5e234786653](https://etherscan.io/address/0xe4aa0f414725c9322a1a9d80d469c5e234786653)
   - "multiSigWallet": [0x040007b1804ad78a97f541bebed377dcb60e4138](https://etherscan.io/address/0x040007b1804ad78a97f541bebed377dcb60e4138)
 

federator/.gitignore

@@ -7,4 +7,5 @@ db
 config/federator.key
 federator.log
 test/lib/*.txt
-coverage
+coverage
+manuallyCheck.txt

federator/config/ethmainnet.json

@@ -1,8 +1,8 @@
 {
     "bridge": "0x12ed69359919fc775bc2674860e8fe2d2b6a7b5d",
-    "federation": "0x8c1901c031cdf42a846c0c422a3b5a2c943f4944",
+    "federation": "0x479f86ecbe766073d2712ef418aceb56d5362a2b",
     "multiSig": "0x040007b1804ad78a97f541bebed377dcb60e4138",
     "allowTokens": "0xe4aa0f414725c9322a1a9d80d469c5e234786653",
     "host": "<YOUR HOST URL AND PORT>",
-    "fromBlock": 9172502
+    "fromBlock": 10823910
 }

federator/config/rskmainnet.json

@@ -1,8 +1,8 @@
 {
     "bridge": "0x9d11937e2179dc5270aa86a3f8143232d6da0e69",
-    "federation": "0xac42761c37d4467ff69082249b9e67d6b35d50cb",
+    "federation": "0xe37b6516f4fe2a27569a2751c1ad50f6340df369",
     "multiSig": "0x040007b1804ad78a97f541bebed377dcb60e4138",
     "allowTokens": "0xe4aa0f414725c9322a1a9d80d469c5e234786653",
     "host": "YOUR HOST URL AND PORT",
-    "fromBlock": 1988180
+    "fromBlock": 2683829
 }

federator/integrationTest/fundFederators.js

@@ -28,7 +28,7 @@ if (scriptPath.indexOf('fundFederators') !== -1) {
 
 async function fundFederators(host, keys, privateKey, amount) {
     const web3 = new Web3(host);
-    const transactionSender = new TransactionSender(web3, logger);
+    const transactionSender = new TransactionSender(web3, logger, {});
 
     for (let i = 0; i < keys.length; i++) {
         try {

federator/integrationTest/integrationTest.js

@@ -97,8 +97,8 @@ async function transfer(originFederators, destinationFederators, config, origin,
         let destinationWeb3 = new Web3(config.sidechain.host);
 
         const originTokenContract = new originWeb3.eth.Contract(abiMainToken, config.mainchain.testToken);
-        const transactionSender = new TransactionSender(originWeb3, logger);
-        const destinationTransactionSender = new TransactionSender(destinationWeb3, logger);
+        const transactionSender = new TransactionSender(originWeb3, logger, config);
+        const destinationTransactionSender = new TransactionSender(destinationWeb3, logger, config);
 
         const originBridgeAddress = config.mainchain.bridge;
         const amount = originWeb3.utils.toWei('1');

federator/integrationTest/transfer.js

@@ -24,7 +24,7 @@ async function run() {
         let ethWeb3 = new Web3(config.sidechain.host);
 
         const mainTokenContract = new rskWeb3.eth.Contract(erc20TokenAbi, config.mainchain.testToken);
-        const transactionSender = new TransactionSender(rskWeb3, logger);
+        const transactionSender = new TransactionSender(rskWeb3, logger, config);
 
         const bridgeAddress = config.mainchain.bridge;
         let amount = rskWeb3.utils.toWei('1');