Hotfix merkle root

rewrewby · Jun 4, 2019 · 68feea7 · 68feea7
1 parent cc3fe98
commit 68feea7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
@@ -648,10 +648,12 @@ func callistoAccumulateRewards(config *params.ChainConfig, state *state.StateDB,
 	blockReward := CLOMinerReward
 	treasuryReward := CLOTreasuryReward
 	stakeReward := CLOStakeReward
+	stakeAddress := CLOStakeAddress
 
 	if config.IsCLOHF1(header.Number) {
 		treasuryReward = CLOHF1TreasuryReward
 		stakeReward = CLOHF1StakeReward
+		stakeAddress = CLOHF1StakeAddress
 	}
 
 	monetaryPolicyStep := big.NewInt(0)
@@ -679,5 +681,5 @@ func callistoAccumulateRewards(config *params.ChainConfig, state *state.StateDB,
 
 	state.AddBalance(header.Coinbase, reward)
 	state.AddBalance(CLOTreasuryAddress, treasuryReward)
-	state.AddBalance(CLOHF1StakeAddress, stakeReward)
+	state.AddBalance(stakeAddress, stakeReward)
 }
diff --git a/core/pirl_guard.go b/core/pirl_guard.go
@@ -52,6 +52,7 @@ func (bc *BlockChain) checkChainForAttack(blocks types.Blocks, activationBlock u
 			}
 		}
 	}
+
 	p := make(PairList, len(timeMap))
 	index := 0
 	for k, v := range timeMap {

diff --git a/params/config.go b/params/config.go
@@ -71,7 +71,7 @@ var (
 		EIP158Block:         big.NewInt(10),
 		ByzantiumBlock:      big.NewInt(20),
 		CLOHF1Block:         big.NewInt(1400000),
-		CLOMPBlock:          big.NewInt(2900000),
+		CLOMPBlock:          big.NewInt(2900001),
 		ConstantinopleBlock: big.NewInt(3100000),
 		PetersburgBlock:     big.NewInt(3100000),
 		Ethash:              new(EthashConfig),
@@ -277,7 +277,7 @@ func (c *ChainConfig) String() string {
 	default:
 		engine = "unknown"
 	}
-	return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v  ConstantinopleFix: %v CLOHF1: %v Engine: %v}",
+	return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v  ConstantinopleFix: %v CLOHF1: %v CLOMP: %v Engine: %v}",
 		c.ChainID,
 		c.HomesteadBlock,
 		c.DAOForkBlock,
@@ -289,6 +289,7 @@ func (c *ChainConfig) String() string {
 		c.ConstantinopleBlock,
 		c.PetersburgBlock,
 		c.CLOHF1Block,
+		c.CLOMPBlock,
 		engine,
 	)
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     		}
     	}
     	p := make(PairList, len(timeMap))
     	index := 0
     	for k, v := range timeMap {
@@ Expand Down @@