Deploy to mainnet

Update addresses from the deploy
Add small fixes in the deploy script for mainnet

Author: pedro

bridge/deployed/deployHelper.js

@@ -1,5 +1,9 @@
 const fs = require('fs')
 
+function isMainnet(network) {
+    return network.toLowerCase().includes('mainnet')
+}
+
 function isLocalNetwork(network) {
     return !network.toLowerCase().includes('mainnet')
         && !network.toLowerCase().includes('kovan')
@@ -25,5 +29,6 @@ function saveDeployed(deployJson) {
 module.exports = {
     isLocalNetwork: isLocalNetwork,
     getDeployed: getDeployed,
-    saveDeployed: saveDeployed
+    saveDeployed: saveDeployed,
+    isMainnet: isMainnet,
 };

bridge/deployed/ethmainnet.json

@@ -3,13 +3,15 @@
     "MultiSig": "0x040007b1804ad78a97f541bebed377dcb60e4138",
     "ProxyAdmin": "0xe4d351911a6d599f91a3db1843e2ecb0f851e7e6",
     "Utils": "0x5f989f2f323a1732a565c9a3f694f2Fa8f0b6120",
-    "Federation": "0x479F86eCbE766073D2712EF418acEb56d5362a2B",
-    "SideTokenFactory": "0x578a80AD3f6D56f873da81b73B8D192aB6BfB063",
-    "AllowTokens": "0xe4aa0f414725C9322a1a9D80d469c5e234786653",
+    "Federation": "0x5631a6ac95b6bde690807085aaa70e3b2d9d76c5",
+    "SideTokenFactory": "0xf73c60863bf2930bde2c69df4cb8fe700ae713fb",
+    "AllowTokens": "0x118522603dc0b8490fec2b8db92e6f1c66cd697c",
     "BridgeProxy": "0x12ed69359919fc775bc2674860e8fe2d2b6a7b5d",
-    "Bridge": "0x8582f510817731Be46e6A8380cF4eEFfc05aa5f1",
+    "Bridge": "0x9f29f9bda2052884d39f0f032b68aaa14fc363d8",
     "smallAmountConfirmations": "120",
     "mediumAmountConfirmations": "240",
     "largeAmountConfirmations": "5760",
-    "WrappedCurrency": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
+    "WrappedCurrency": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+    "AllowTokensProxy": "0xa3fc98e0a7a979677bc14d541be770b2cb0a15f3",
+    "FederationProxy": "0x5e29c223d99648c88610519f96e85e627b3abe17"
 }

bridge/deployed/rskmainnet.json

@@ -1,15 +1,17 @@
 {
     "network": "rskmainnet",
-    "MultiSig": "0x040007b1804aD78A97f541bEBED377dcb60E4138",
+    "MultiSig": "0x040007b1804ad78a97f541bebed377dcb60e4138",
     "ProxyAdmin": "0x12ed69359919fc775bc2674860e8fe2d2b6a7b5d",
-    "Utils": "0x95eD2b8D3115bAE6c0Ce539781B7D44119e019Bc",
-    "Federation": "0xE37b6516F4FE2A27569a2751C1aD50F6340DF369",
-    "SideTokenFactory": "0x75c6e15702ebacd51177154ff383df9695e1b1da",
-    "AllowTokens": "0xe4aa0f414725c9322a1a9d80d469c5e234786653",
-    "Bridge": "0x3b4353D80464af08Cc0787eA9C45BbC50f8c5cCE",
-    "BridgeProxy": "0x9d11937E2179dC5270Aa86A3f8143232D6DA0E69",
+    "Utils": "0x95ed2b8d3115bae6c0ce539781b7d44119e019bc",
+    "Federation": "0x950a384d950ea319f7d634cabac41ffee49320f0",
+    "SideTokenFactory": "0x44fcd0854d745efdef4cfe9868efe4d4eb51ecd6",
+    "AllowTokens": "0x882846c2792a999cee1d080e89bec9e17f885bdd",
+    "Bridge": "0x4e159f565555fc4eb27d864ff0bd308f1cefa0ac",
+    "BridgeProxy": "0x9d11937e2179dc5270aa86a3f8143232d6da0e69",
     "smallAmountConfirmations": "60",
     "mediumAmountConfirmations": "120",
     "largeAmountConfirmations": "2880",
-    "WrappedCurrency": "0x967f8799af07df1534d48a95a5c9febe92c53ae0"
+    "WrappedCurrency": "0x967f8799af07df1534d48a95a5c9febe92c53ae0",
+    "AllowTokensProxy": "0xcb789036894a83a008a2aa5b3c2dde41d0605a9a",
+    "FederationProxy": "0x7ecfda6072942577d36f939ad528b366b020004b"
 }

bridge/migrations/21_deploy_allowTokens.js

@@ -224,7 +224,7 @@ async function setTokensEthereum(allowTokens) {
         { token: '0x8d3e855f3f55109d473735ab76f753218400fe96', typeId: '3' }, //BUND
         { token: '0xf04a8ac553fcedb5ba99a64799155826c136b0be', typeId: '6' }, //FLIXX
         { token: '0xa1d6Df714F91DeBF4e0802A542E13067f31b8262', typeId: '6' }, //RFOX
-        { token: '0xca0e7269600d353f70b14ad118a49575455c0f2f', typeId: '7' }, //AMLT
+        { token: '0xca0e7269600d353f70b14ad118a49575455c0f2f', typeId: '6' }, //AMLT
         // Side Tokens
         { token: '0x2acc95758f8b5f583470ba265eb685a8f45fc9d5', typeId: '5' }, //eRIF
         { token: '0xe700691da7b9851f2f35f8b8182c69c53ccad9db', typeId: '4' }, //eDOC

bridge/migrations/24_deploy_bridge.js

@@ -19,7 +19,9 @@ module.exports = async (deployer, networkName, accounts) => {
     const proxyAdmin = await ProxyAdmin.at(deployedJson.ProxyAdmin);
 
     let methodCall = proxyAdmin.contract.methods.upgrade(deployedJson.BridgeProxy, deployedJson.Bridge);
-    await methodCall.call({from:deployedJson.MultiSig})
+    if (!deployHelper.isMainnet(networkName)) {
+        await methodCall.call({from:deployedJson.MultiSig});
+    }
     await multiSig.submitTransaction(proxyAdmin.address, 0, methodCall.encodeABI(), { from: accounts[0] });
 
     const bridge = await Bridge.at(deployedJson.BridgeProxy);
@@ -38,10 +40,14 @@ module.exports = async (deployer, networkName, accounts) => {
         await multiSig.submitTransaction(allowTokens.address, 0, methodCall.encodeABI(), { from: accounts[0] });
     } else {
         methodCall = bridge.contract.methods.setWrappedCurrency(deployedJson.WrappedCurrency);
-        await methodCall.call({from:deployedJson.MultiSig})
+        if (!deployHelper.isMainnet(networkName)) {
+            await methodCall.call({from:deployedJson.MultiSig});
+        }
         await multiSig.submitTransaction(bridge.address, 0, methodCall.encodeABI(), { from: accounts[0] });
     }
     methodCall = bridge.contract.methods.initDomainSeparator();
-    await methodCall.call({from:deployedJson.MultiSig})
+    if (!deployHelper.isMainnet(networkName)) {
+        await methodCall.call({from:deployedJson.MultiSig});
+    }
     await multiSig.submitTransaction(bridge.address, 0, methodCall.encodeABI(), { from: accounts[0] });
 };

bridge/migrations/25_transfer_federation.js

@@ -9,7 +9,10 @@ module.exports = async (deployer, networkName, accounts) => {
     const bridge = new web3.eth.Contract(Bridge.abi, deployedJson.BridgeProxy);
     const methodCall = bridge.methods.changeFederation(deployedJson.FederationProxy);
 
-    await methodCall.call({ from: deployedJson.MultiSig });
+    if (!deployHelper.isMainnet(networkName)) {
+        // Check before sending the transaction as it eats the error
+        await methodCall.call({ from: deployedJson.MultiSig });
+    }
     await multiSig.submitTransaction(deployedJson.BridgeProxy, 0, methodCall.encodeABI(), { from: accounts[0] });
 
 }

bridge/migrations/26_transfer_sideTokenFactory.js

@@ -10,6 +10,9 @@ module.exports = async (deployer, networkName, accounts) => {
     const bridge = new web3.eth.Contract(Bridge.abi, deployedJson.BridgeProxy);
     const methodCall = bridge.methods.changeSideTokenFactory(deployedJson.SideTokenFactory);
 
-    await bridge.methods.changeSideTokenFactory(deployedJson.SideTokenFactory).call({ from: deployedJson.MultiSig });
+    if (!deployHelper.isMainnet(networkName)) {
+        // Check before sending the transaction as it eats the error
+        await methodCall.call({ from: deployedJson.MultiSig });
+    }
     await multiSig.submitTransaction(deployedJson.BridgeProxy, 0, methodCall.encodeABI(), { from: accounts[0] });
 }

bridge/migrations/27_transfer_allowTokens.js

@@ -10,7 +10,9 @@ module.exports = async (deployer, networkName, accounts) => {
     const bridge = new web3.eth.Contract(Bridge.abi, deployedJson.BridgeProxy);
     const methodCall = bridge.methods.changeAllowTokens(deployedJson.AllowTokensProxy);
 
-    //Check before sending the transaction as it eats the error
-    await methodCall.call({ from: deployedJson.MultiSig });
+    if (!deployHelper.isMainnet(networkName)) {
+        // Check before sending the transaction as it eats the error
+        await methodCall.call({ from: deployedJson.MultiSig });
+    }
     await multiSig.submitTransaction(deployedJson.BridgeProxy, 0, methodCall.encodeABI(), { from: accounts[0] });
 }