Merge pull request ethereum#75 from etclabscore/s1-params-agharta

params: activate agharta on classic 9573000
NoteGio · Dec 15, 2019 · a91d540 · a91d540
2 parents 015c270 + aedaa13
commit a91d540
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
@@ -561,27 +561,26 @@ var (
 // reward. The total reward consists of the static block reward and rewards for
 // included uncles. The coinbase of each uncle block is also rewarded.
 func accumulateRewards(config *params.ChainConfig, state *state.StateDB, header *types.Header, uncles []*types.Header) {
-	// Select the correct block reward based on chain progression
-	blockReward := FrontierBlockReward
-	if config.IsEIP649F(header.Number) {
-		blockReward = EIP649FBlockReward
-	}
-	if config.IsEIP1234F(header.Number) {
-		blockReward = EIP1234FBlockReward
-	}
-	if config.IsSocial(header.Number) {
-		blockReward = params.SocialBlockReward
-	}
-	if config.IsEthersocial(header.Number) {
-		blockReward = params.EthersocialBlockReward
-	}
 	if config.IsMCIP0(header.Number) {
 		musicoinBlockReward(config, state, header, uncles)
-		return
-	}
-	if config.IsECIP1017F(header.Number) {
+	} else if config.IsECIP1017F(header.Number) {
 		ecip1017BlockReward(config, state, header, uncles)
 	} else {
+		// Select the correct block reward based on chain progression
+		blockReward := FrontierBlockReward
+		if config.IsEIP649F(header.Number) {
+			blockReward = EIP649FBlockReward
+		}
+		if config.IsEIP1234F(header.Number) {
+			blockReward = EIP1234FBlockReward
+		}
+		if config.IsSocial(header.Number) {
+			blockReward = params.SocialBlockReward
+		}
+		if config.IsEthersocial(header.Number) {
+			blockReward = params.EthersocialBlockReward
+		}
+
 		// Accumulate the rewards for the miner and any included uncles
 		reward := new(big.Int).Set(blockReward)
 		r := new(big.Int)

diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go
@@ -229,7 +229,7 @@ func TestGatherForks(t *testing.T) {
 	}{
 		{
 			params.ClassicChainConfig,
-			[]uint64{1150000, 1920000, 2500000, 3000000, 5000000, 5900000, 8772000},
+			[]uint64{1150000, 1920000, 2500000, 3000000, 5000000, 5900000, 8772000, 9573000},
 		},
 	}
 	sliceContains := func (sl []uint64, u uint64) bool {

diff --git a/params/config_classic.go b/params/config_classic.go
@@ -36,7 +36,8 @@ var (
 		DisposalBlock:       big.NewInt(5900000),
 		SocialBlock:         nil,
 		EthersocialBlock:    nil,
-		ConstantinopleBlock: nil,
+		ConstantinopleBlock: big.NewInt(9573000),
+		PetersburgBlock:     big.NewInt(9573000),
 		ECIP1017FBlock:      big.NewInt(5000000),
 		ECIP1017EraRounds:   big.NewInt(5000000),
 		EIP160FBlock:        big.NewInt(3000000),