Skip to content

P
plugin
Commit ece1e32f authored by mdj33's avatar mdj33 Committed by 33cn
Browse files
Options

add dapp fork

parent 04d03dd3
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
plugin/consensus/para/parasync.go
View file @ ece1e32f
...@@ -438,7 +438,7 @@ func (client *blockSyncClient) addBlock(lastBlock *types.Block, localBlock *pt.P ...@@ -438,7 +438,7 @@ func (client *blockSyncClient) addBlock(lastBlock *types.Block, localBlock *pt.P
newBlock.Txs = types.TransactionSort(newBlock.Txs) newBlock.Txs = types.TransactionSort(newBlock.Txs)
} }
//在之前版本中CalcMerkleRoot的height是未初始化的MainHeight，等于0，在这个平行链的分叉ForkParaRootHash高度后统一采用新高度 //在之前版本中CalcMerkleRoot的height是未初始化的MainHeight，等于0，在这个平行链的分叉ForkParaRootHash高度后统一采用新高度
if cfg.IsFork(newBlock.Height, pt.ForkParaRootHash) { if cfg.IsDappFork(newBlock.Height, pt.ParaX, pt.ForkParaRootHash) {
newBlock.TxHash = merkle.CalcMerkleRoot(cfg, newBlock.GetMainHeight(), newBlock.Txs) newBlock.TxHash = merkle.CalcMerkleRoot(cfg, newBlock.GetMainHeight(), newBlock.Txs)
} else { } else {
newBlock.TxHash = merkle.CalcMerkleRoot(cfg, 0, newBlock.Txs) newBlock.TxHash = merkle.CalcMerkleRoot(cfg, 0, newBlock.Txs)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment