Goerli migration

README.md

@@ -23,7 +23,7 @@ The bridges on each contract are upgradeable, this would enable a smooth transit
 You can use the ['Token Bridge Dapp'](https://tokenbridge.rsk.co/) together with [Nifty Wallet](https://chrome.google.com/webstore/detail/nifty-wallet/jbdaocneiiinmjbjlgalhcelgbejmnid) or [Metamask with custom network](https://github.com/rsksmart/rskj/wiki/Configure-Metamask-to-connect-with-RSK) to move tokens between networks. This is the [Dapp guide](https://developers.rsk.co/tools/tokenbridge/dappguide/) if you don't know how to use it.
 Or you can use a wallet with the abi of the contracts. See the ['interaction guide using MyCrypto'](https://developers.rsk.co/tools/tokenbridge/usingmycrypto/) for more information on how to use the bridge.
 
-## Contracts deployed on RSK, Ethereum, RSK Testnet and Kovan
+## Contracts deployed on RSK, Ethereum, RSK Testnet and Goerli
 
 Here are the ['addresses'](./docs/ContractAddresses.md) of the deployed contracts in the different networks.
 

bridge/.gitignore

@@ -8,7 +8,7 @@ etherscan.key
 #Truffle
 .openzeppelin/.session
 .openzeppelin/dev-*.json
-.openzeppelin/kovan.json
+.openzeppelin/goerli.json
 .openzeppelin/mainnet.json
 coverage/
 coverage.json

bridge/contracts/zeppelin/upgradable/README.md

@@ -7,7 +7,7 @@
 
 **OpenZeppelin Contracts is a library for secure smart contract development.** It provides implementations of standards like ERC20 and ERC721 which you can deploy as-is or extend to suit your needs, as well as Solidity components to build custom contracts and more complex decentralized systems.
 
-This fork of OpenZeppelin is set up as a **reusable Ethereum Package**. It is deployed to the kovan, rinkeby, and ropsten test networks, as well as to the main Ethereum network. You can reuse any of the pre-deployed on-chain contracts by simply linking to them using the [OpenZeppelin SDK](https://github.com/openzeppelin/openzeppelin-sdk), or reuse their Solidity source code as with the [vanilla version of OpenZeppelin Contracts](https://github.com/OpenZeppelin/openzeppelin-contracts).
+This fork of OpenZeppelin is set up as a **reusable Ethereum Package**. It is deployed to the goerli, rinkeby, and ropsten test networks, as well as to the main Ethereum network. You can reuse any of the pre-deployed on-chain contracts by simply linking to them using the [OpenZeppelin SDK](https://github.com/openzeppelin/openzeppelin-sdk), or reuse their Solidity source code as with the [vanilla version of OpenZeppelin Contracts](https://github.com/OpenZeppelin/openzeppelin-contracts).
 
 ## Differences with openzeppelin-contracts
 
@@ -30,7 +30,7 @@ npm install @openzeppelin/contracts-ethereum-package
 
 ## Using via the OpenZeppelin CLI
 
-You can easily create upgradeable instances of any of the logic contracts listed above using the OpenZeppelin CLI. This will rely on the pre-deployed instances in mainnet, kovan, ropsten, or rinkeby, greatly reducing your gas deployment costs. To do this, just [create a new OpenZeppelin SDK project](https://docs.zeppelinos.org/docs/deploying.html) and [link to this package](https://docs.zeppelinos.org/docs/linking.html).
+You can easily create upgradeable instances of any of the logic contracts listed above using the OpenZeppelin CLI. This will rely on the pre-deployed instances in mainnet, goerli, ropsten, or rinkeby, greatly reducing your gas deployment costs. To do this, just [create a new OpenZeppelin SDK project](https://docs.zeppelinos.org/docs/deploying.html) and [link to this package](https://docs.zeppelinos.org/docs/linking.html).
 
 ```bash
 $ npm install -g @openzeppelin/cli

bridge/deploy/01_deploy_multiSigWallet.js

@@ -1,4 +1,5 @@
 const {deploy1820} = require('@thinkanddev/deploy-eip-1820-web3-rsk');
+const {web3} = require("hardhat");
 
 module.exports = async function({getNamedAccounts, deployments, network}) { // HardhatRuntimeEnvironment
   const {deployer, multiSig} = await getNamedAccounts();

bridge/deploy/02_deploy_proxyAdmin.js

@@ -1,4 +1,5 @@
 const address = require('../hardhat/helper/address');
+const chains = require("../hardhat/helper/chains");
 
 module.exports = async function(hre) { // HardhatRuntimeEnvironment
   const {getNamedAccounts, deployments} = hre;

bridge/deploy/04_deploy_bridge.js

@@ -1,9 +1,10 @@
 const address = require('../hardhat/helper/address');
 const chains = require("../hardhat/helper/chains");
+const {web3} = require("hardhat");
 
 module.exports = async function(hre) { // HardhatRuntimeEnvironment
   const {deployments, network} = hre;
-  const {deployer} = await getNamedAccounts();
+  const {deployer} = await hre.getNamedAccounts();
   const {deploy, log} = deployments;
   const BRIDGE_LAST_VERSION = 'v4'
 

bridge/deploy/05_deploy_bridgeProxy.js

@@ -1,5 +1,6 @@
 const chains = require('../hardhat/helper/chains');
 const address = require('../hardhat/helper/address');
+const {web3} = require("hardhat");
 
 module.exports = async function (hre) { // HardhatRuntimeEnvironment
   const {getNamedAccounts, deployments, network} = hre;
@@ -30,19 +31,21 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
     methodCall.encodeABI()
   ];
 
-  const deployProxyResult = await deploy('BridgeProxy', {
+  const deployResult = await deploy('BridgeProxy', {
     from: deployer,
     args: constructorArguments,
     log: true,
   });
-  if (deployProxyResult.newlyDeployed) {
-    log(`Contract BridgeProxy deployed at ${deployProxyResult.address} using ${deployProxyResult.receipt.gasUsed.toString()} gas`);
+
+  if (deployResult.newlyDeployed) {
+    log(`Contract BridgeProxy deployed at ${deployResult.address} using ${deployResult.receipt.gasUsed.toString()} gas`);
 
     if(network.live && !chains.isRSK(network)) {
       log(`Startig Verification of ${deployResult.address}`);
       await hre.run("verify:verify", {
         address: deployResult.address,
         constructorArguments: constructorArguments,
+        contract: 'contracts/Proxies.sol:BridgeProxy'
       });
     }
   }

bridge/deploy/06_deploy_federation.js

@@ -1,8 +1,9 @@
 const address = require('../hardhat/helper/address');
 const chains = require('../hardhat/helper/chains');
+const {web3} = require("hardhat");
 
 module.exports = async function(hre) { // HardhatRuntimeEnvironment
-  const {deployments, network} = hre;
+  const {deployments, network, getNamedAccounts} = hre;
   const {deployer} = await getNamedAccounts();
   const {deploy, log} = deployments;
   const FEDERATION_LAST_VERSION = 'v3'

bridge/deploy/07_deploy_federationProxy.js

@@ -58,7 +58,7 @@ module.exports.dependencies = ['MultiSigWallet', 'ProxyAdmin', 'Federation', 'Br
 
 function getFederationConf(deployer, network) {
   const networkName = network.name.toLowerCase();
-  if (networkName.includes('testnet') || networkName.includes('kovan') || networkName.includes('rinkeby')) {
+  if (networkName.includes('testnet') || networkName.includes('goerli') || networkName.includes('rinkeby')) {
     return {
       members: ['0x8f397ff074ff190fc650e5cab4da039a8163e12a'],
       required: 1,

bridge/deploy/08_deploy_allowToken.js

@@ -1,5 +1,6 @@
 const address = require('../hardhat/helper/address');
 const chains = require('../hardhat/helper/chains');
+const {web3} = require("hardhat");
 
 module.exports = async function(hre) { // HardhatRuntimeEnvironment
   const {getNamedAccounts, deployments, network} = hre;

bridge/deploy/09_deploy_allowTokensProxy.js

@@ -1,8 +1,9 @@
 // We are actually gonna use the latest Bridge but truffle only knows the address of the proxy
-const toWei = web3.utils.toWei;
 const deployHelper = require('../deployed/deployHelper');
 const chains = require('../hardhat/helper/chains');
 const address = require('../hardhat/helper/address');
+const {web3} = require("hardhat");
+const toWei = web3.utils.toWei;
 
 module.exports = async function(hre) { // HardhatRuntimeEnvironment
   const {getNamedAccounts, deployments, network} = hre;

bridge/deploy/10_transfer_setTokens_allowTokens.js

@@ -1,5 +1,6 @@
 const { tokensByChainId } = require("../hardhat/helper/tokens");
 const address = require('../hardhat/helper/address');
+const {web3} = require("hardhat");
 
 function formatToken(token) {
   return  {token: token.address, typeId: token.typeId};

bridge/deploy/11_transfer_sideTokenFactoryToBridge.js

@@ -1,3 +1,4 @@
+const {web3} = require("hardhat");
 const sideTokenFactoryName = 'SideTokenFactory';
 const bridgeProxyName = 'BridgeProxy';
 const GAS_LIMIT = 4000000;

bridge/deploy/12_transfer_federationToBridge.js

@@ -1,4 +1,5 @@
 const address = require('../hardhat/helper/address');
+const {web3} = require("hardhat");
 
 module.exports = async function (hre) { // HardhatRuntimeEnvironment
   const {getNamedAccounts, deployments} = hre;

bridge/deploy/13_transfer_allowTokensToBridge.js

@@ -1,4 +1,5 @@
 const address = require('../hardhat/helper/address');
+const {web3} = require("hardhat");
 
 module.exports = async function (hre) { // HardhatRuntimeEnvironment
   const {getNamedAccounts, deployments} = hre;

bridge/deploy/14_conditional_deploy_mainToken.js

@@ -1,3 +1,4 @@
+const {web3} = require("hardhat");
 module.exports = async function ({getNamedAccounts, deployments, network}) { // HardhatRuntimeEnvironment
     const {deployer} = await getNamedAccounts()
     const {deploy, log} = deployments

bridge/deploy/17_set_wrapped_currency.js

@@ -1,4 +1,5 @@
 const address = require('../hardhat/helper/address');
+const {web3} = require("hardhat");
 
 module.exports = async function (hre) { // HardhatRuntimeEnvironment
   const {getNamedAccounts, deployments, network} = hre;

bridge/deployed/deployHelper.js

@@ -6,7 +6,7 @@ function isMainnet(network) {
 
 function isLocalNetwork(network) {
   return !network.toLowerCase().includes('mainnet')
-    && !network.toLowerCase().includes('kovan')
+    && !network.toLowerCase().includes('goerli')
     && !network.toLowerCase().includes('testnet');
 }
 

bridge/deployed/kovan.json → bridge/deployed/goerli.json

@@ -1,5 +1,5 @@
 {
-    "network": "kovan",
+    "network": "goerli",
     "MultiSig": "0x040007b1804ad78a97f541bebed377dcb60e4138",
     "ProxyAdmin": "0xe4d351911a6d599f91a3db1843e2ecb0f851e7e6",
     "Utils": "0xE18b8fb2942493EA96BfC46a044e4F966f2dFaB6",

bridge/deployments/goerli/.chainId

@@ -0,0 +1 @@
+5