(Update) Prepare to HF2 in Core

poanetwork · Oct 5, 2018 · e1e8a67 · e1e8a67
1 parent e6e04e9
commit e1e8a67
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 45 deletions.
diff --git a/migrations/2_deploy_contract.js b/migrations/2_deploy_contract.js
@@ -207,7 +207,8 @@ module.exports = function(deployer, network, accounts) {
           "PROXY_ADDRESS": proxyStorage.address,
           "POA_ADDRESS": poaNetworkConsensusAddress,
           "EMISSION_FUNDS_ADDRESS": emissionFunds.address,
-          "REWARD_BY_BLOCK_ADDRESS": rewardByBlock.address
+          "REWARD_BY_BLOCK_ADDRESS": rewardByBlock.address,
+          "MOC": masterOfCeremony
         };
 
         fs.writeFileSync('./contracts.json', JSON.stringify(contracts, null, 2));

diff --git a/scripts/migrate/migrateAll.js b/scripts/migrate/migrateAll.js
@@ -241,9 +241,9 @@ async function main() {
 		console.log('');
 
 		console.log('VotingToManageEmissionFunds.init...');
-		const distributionThreshold = 259200; // three days, in seconds
-		const emissionReleaseThreshold = 604800; // seven days, in seconds
-		const emissionReleaseTime = Math.floor(new Date() / 1000) + emissionReleaseThreshold; // now plus emissionReleaseThreshold (unix timestamp)
+		const distributionThreshold = 604800; // seven days, in seconds
+		const emissionReleaseThreshold = 7776000; // three months, in seconds
+		const emissionReleaseTime = 1550509200; // Monday, 18-Feb-2019 17:00:00 UTC (unix timestamp)
 		init = votingToManageEmissionFundsInstance.methods.init(
 			emissionReleaseTime,
 			emissionReleaseThreshold,
@@ -282,9 +282,11 @@ async function main() {
 		emissionFundsAddress.should.be.equal(
 			EthereumUtil.toChecksumAddress(await rewardByBlockInstance.methods.emissionFunds().call())
 		);
-		'0x0000000000000000000000000000000000000000'.should.be.equal(
-			await rewardByBlockInstance.methods.bridgeContract().call()
-		);
+		(await rewardByBlockInstance.methods.bridgesAllowed().call()).should.be.deep.equal([
+			'0x0000000000000000000000000000000000000000',
+			'0x0000000000000000000000000000000000000000',
+			'0x0000000000000000000000000000000000000000'
+		]);
 		process.env.PROXY_STORAGE_NEW_ADDRESS.should.be.equal(
 			await rewardByBlockInstance.methods.proxyStorage().call()
 		);

diff --git a/scripts/migrate/migrateVotings.js b/scripts/migrate/migrateVotings.js
@@ -263,9 +263,15 @@ async function votingToChangeMigrateAndCheck(sender, key, chainId, contractName)
 
 			console.log('  Set miningByVoting...');
 			let miningByVoting = {};
-			events = await keysManagerInstance.getPastEvents('ValidatorInitialized', {fromBlock: 0, toBlock: 'latest'});
-			for (i = 0; i < events.length; i++) {
-				miningByVoting[events[i].returnValues.votingKey] = events[i].returnValues.miningKey;
+			try {
+				events = await keysManagerInstance.getPastEvents('ValidatorInitialized', {fromBlock: 0, toBlock: 'latest'});
+				for (i = 0; i < events.length; i++) {
+					miningByVoting[events[i].returnValues.votingKey] = events[i].returnValues.miningKey;
+				}
+			} catch (events_err) {
+				if (events_err.message.indexOf('Returned values aren\'t valid') < 0) {
+					throw events_err;
+				}
 			}
 			events = await keysManagerInstance.getPastEvents('VotingKeyChanged', {fromBlock: 0, toBlock: 'latest'});
 			for (i = 0; i < events.length; i++) {

diff --git a/scripts/migrate/package-lock.json b/scripts/migrate/package-lock.json