Merge pull request #368 from Dominikkq/redeploy

Sepolia + rsktestnet redeploy

Author: MaximStanciu8

bridge/abi/Federation.json

@@ -5,19 +5,19 @@ module.exports = async function(hre) { // HardhatRuntimeEnvironment
   const {deployments, network} = hre;
   const {deployer} = await getNamedAccounts();
   const {deploy, log} = deployments;
-  const BRIDGE_LAST_VERSION = 'v4'
+  const BRIDGE_LAST_VERSION = 'v3'
 
   const bridgeProxyAddress = await address.getBridgeProxyAddress(hre);
   if (bridgeProxyAddress) {
-    const Bridge = await deployments.getArtifact('Bridge');
+    const Bridge = await deployments.getArtifact('BridgeV3');
     const bridge = new web3.eth.Contract(Bridge.abi, bridgeProxyAddress);
     const currentBridgeVersion = bridge.methods.version().call();
     if (currentBridgeVersion === BRIDGE_LAST_VERSION) {
       return;
     }
   }
 
-  const deployResult = await deploy('Bridge', {
+  const deployResult = await deploy('BridgeV3', {
     from: deployer,
     log: true,
   });
@@ -35,4 +35,4 @@ module.exports = async function(hre) { // HardhatRuntimeEnvironment
   }
 };
 module.exports.id = 'deploy_bridge'; // id required to prevent reexecution
-module.exports.tags = ['Bridge', 'Upgrade', 'DeployFromScratch', 'IntegrationTest'];
+module.exports.tags = ['BridgeV3', 'Upgrade', 'DeployFromScratch', 'IntegrationTest'];

bridge/deploy/04_deploy_bridge.js

@@ -10,7 +10,7 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
     return;
   }
 
-  const Bridge = await deployments.get('Bridge');
+  const Bridge = await deployments.get('BridgeV3');
   const multiSigAddress = await address.getMultiSigAddress(hre);
   const proxyAdminAddress = await address.getProxyAdminAddress(hre);
   const sideTokenFactoryAddress = await address.getSideTokenFactoryAddress(hre);
@@ -20,7 +20,8 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
     multiSigAddress,
     deployer,
     deployer,
-    sideTokenFactoryAddress
+    sideTokenFactoryAddress,
+    'r'
   );
   await methodCall.call({ from: deployer })
 
@@ -50,4 +51,4 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
 };
 module.exports.id = 'deploy_bridge_proxy'; // id required to prevent reexecution
 module.exports.tags = ['BridgeProxy', 'DeployFromScratch', 'IntegrationTest'];
-module.exports.dependencies = ['Bridge', 'MultiSigWallet', 'ProxyAdmin', 'SideTokenFactory'];
+module.exports.dependencies = ['BridgeV3', 'MultiSigWallet', 'ProxyAdmin', 'SideTokenFactory'];

bridge/deploy/05_deploy_bridgeProxy.js

@@ -5,19 +5,19 @@ module.exports = async function(hre) { // HardhatRuntimeEnvironment
   const {deployments, network} = hre;
   const {deployer} = await getNamedAccounts();
   const {deploy, log} = deployments;
-  const FEDERATION_LAST_VERSION = 'v3'
+  const FEDERATION_LAST_VERSION = 'v2'
 
   const federationProxyAddress = await address.getFederationProxyAddress(hre);
   if (federationProxyAddress) {
-    const Federation = await deployments.getArtifact('Federation');
+    const Federation = await deployments.getArtifact('FederationV2');
     const federation = new web3.eth.Contract(Federation.abi, federationProxyAddress);
     const currentFederationVersion = federation.methods.version().call();
     if (currentFederationVersion === FEDERATION_LAST_VERSION) {
       return;
     }
   }
 
-  const deployResult = await deploy('Federation', {
+  const deployResult = await deploy('FederationV2', {
     from: deployer,
     log: true
   });
@@ -35,4 +35,4 @@ module.exports = async function(hre) { // HardhatRuntimeEnvironment
   }
 };
 module.exports.id = 'deploy_federation'; // id required to prevent reexecution
-module.exports.tags = ['Federation', 'Upgrade', 'DeployFromScratch', 'IntegrationTest'];
+module.exports.tags = ['FederationV2', 'Upgrade', 'DeployFromScratch', 'IntegrationTest'];

bridge/deploy/06_deploy_federation.js

@@ -11,7 +11,7 @@ module.exports = async function(hre) { // HardhatRuntimeEnvironment
     return;
   }
 
-  const Federation = await deployments.get('Federation');
+  const Federation = await deployments.get('FederationV2');
   const proxyAdminAddress = await address.getProxyAdminAddress(hre);
   const multiSigAddress = await address.getMultiSigAddress(hre);
   const bridgeProxyAddress = await address.getBridgeProxyAddress(hre);
@@ -54,13 +54,13 @@ module.exports = async function(hre) { // HardhatRuntimeEnvironment
 };
 module.exports.id = 'deploy_federation_proxy'; // id required to prevent reexecution
 module.exports.tags = ['FederationProxy', 'DeployFromScratch', 'IntegrationTest'];
-module.exports.dependencies = ['MultiSigWallet', 'ProxyAdmin', 'Federation', 'BridgeProxy'];
+module.exports.dependencies = ['MultiSigWallet', 'ProxyAdmin', 'FederationV2', 'BridgeProxy'];
 
 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('kovan') || networkName.includes('rinkeby') ) {
     return {
-      members: ['0x8f397ff074ff190fc650e5cab4da039a8163e12a'],
+      members: ['0xD1B27867E42E3DE1A32217Ff773B32b48888fb3B'],
       required: 1,
     };
   }

bridge/deploy/07_deploy_federationProxy.js

@@ -9,7 +9,7 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
     return;
   }
 
-  const Bridge = await deployments.getArtifact('Bridge');
+  const Bridge = await deployments.getArtifact('BridgeV3');
   const MultiSigWallet = await deployments.getArtifact('MultiSigWallet');
 
   const bridgeProxyAddress = await address.getBridgeProxyAddress(hre);
@@ -26,4 +26,4 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
 };
 module.exports.id = 'transfer_federation_to_bridge'; // id required to prevent reexecution
 module.exports.tags = ['TransferFederationToBridge', 'DeployFromScratch', 'IntegrationTest'];
-module.exports.dependencies = ['Bridge', 'BridgeProxy', 'FederationProxy', 'MultiSigWallet'];
+module.exports.dependencies = ['BridgeV3', 'BridgeProxy', 'FederationProxy', 'MultiSigWallet'];

bridge/deploy/12_transfer_federationToBridge.js

@@ -9,7 +9,7 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
     return;
   }
 
-  const Bridge = await deployments.getArtifact('Bridge');
+  const Bridge = await deployments.getArtifact('BridgeV3');
   const MultiSigWallet = await deployments.getArtifact('MultiSigWallet');
 
   const multiSigAddress =  await address.getMultiSigAddress(hre);
@@ -26,4 +26,4 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
 };
 module.exports.id = 'transfer_allow_tokens'; // id required to prevent reexecution
 module.exports.tags = ['TransferAllowTokensToBridge', 'DeployFromScratch', 'IntegrationTest'];
-module.exports.dependencies = ['Bridge', 'BridgeProxy', 'AllowTokensProxy', 'MultiSigWallet'];
+module.exports.dependencies = ['BridgeV3', 'BridgeProxy', 'AllowTokensProxy', 'MultiSigWallet'];

bridge/deploy/13_transfer_allowTokensToBridge.js

@@ -9,7 +9,7 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
     return;
   }
 
-  const Bridge = await deployments.getArtifact('Bridge');
+  const Bridge = await deployments.getArtifact('BridgeV3');
   const BridgeProxy = await deployments.get('BridgeProxy');
   const MultiSigWallet = await deployments.getArtifact('MultiSigWallet');
 
@@ -48,5 +48,5 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
 module.exports.id = 'set_bridge_wrapped_currency'; // id required to prevent reexecution
 module.exports.tags = ['BridgeSetWrappedCurrency', 'DeployFromScratch', 'IntegrationTest'];
 module.exports.dependencies = [
-  'AllowTokensProxy', 'AllowTokens', 'Bridge', 'BridgeProxy', 'MultiSigWallet'
+  'AllowTokensProxy', 'AllowTokens', 'BridgeV3', 'BridgeProxy', 'MultiSigWallet'
 ];

bridge/deploy/17_set_wrapped_currency.js

@@ -5,7 +5,7 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
   const {deployer, bridgeProxy, proxyAdmin, multiSig} = await getNamedAccounts();
   const {log} = deployments;
 
-  const bridgeDeployed = await deployments.get('Bridge');
+  const bridgeDeployed = await deployments.get('BridgeV3');
   const proxyAdminArtifact = await deployments.getArtifact('ProxyAdmin');
   const multiSigWalletArtifact = await deployments.getArtifact('MultiSigWallet');
 
@@ -23,4 +23,4 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
 };
 module.exports.id = 'upgrade_bridge'; // id required to prevent reexecution
 module.exports.tags = ['UpgradeBridge', 'Upgrade'];
-module.exports.dependencies = ['Bridge'];
+module.exports.dependencies = ['BridgeV3'];

bridge/deploy/upgrades/01_upgrade_bridge.js

@@ -5,7 +5,7 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
   const {deployer, federationProxy, proxyAdmin, multiSig} = await getNamedAccounts();
   const {log} = deployments;
 
-  const federationDeployed = await deployments.get('Federation');
+  const federationDeployed = await deployments.get('FederationV2');
   const proxyAdminArtifact = await deployments.getArtifact('ProxyAdmin');
   const multiSigWalletDeployment = await deployments.getArtifact('MultiSigWallet');
 
@@ -23,4 +23,4 @@ module.exports = async function (hre) { // HardhatRuntimeEnvironment
 };
 module.exports.id = 'upgrade_federation'; // id required to prevent reexecution
 module.exports.tags = ['UpgradeFederation', 'Upgrade'];
-module.exports.dependencies = ['Federation'];
+module.exports.dependencies = ['FederationV2'];