From e3080c170c47b9d8462d337801f5d68c03375a13 Mon Sep 17 00:00:00 2001 From: philip-morlier Date: Tue, 6 Dec 2022 16:37:18 -0800 Subject: [PATCH] Altered injection comments for consistencey --- core/blockchain.go | 9 +++++---- core/state/statedb.go | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/blockchain.go b/core/blockchain.go index b590b8916..5c1e08592 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -1393,7 +1393,8 @@ func (bc *BlockChain) writeBlockAndSetHead(block *types.Block, receipts []*types } else { pluginNewSideBlock(block, block.Hash(), logs) bc.chainSideFeed.Send(ChainSideEvent{Block: block}) - } // end PluGeth code injection + // end PluGeth code injection + } return status, nil } @@ -2089,7 +2090,7 @@ func (bc *BlockChain) reorg(oldBlock, newBlock *types.Block) error { } //begin PluGeth code injection pluginReorg(commonBlock, oldChain, newChain) - //begin Plugeth code injection + //end PluGeth code injection logFn(msg, "number", commonBlock.Number(), "hash", commonBlock.Hash(), "drop", len(oldChain), "dropfrom", oldChain[0].Hash(), "add", len(newChain), "addfrom", newChain[0].Hash()) blockReorgAddMeter.Mark(int64(len(newChain))) @@ -2214,14 +2215,14 @@ func (bc *BlockChain) SetCanonical(head *types.Block) (common.Hash, error) { if len(logs) > 0 { bc.logsFeed.Send(logs) } - // begin plugeth code injection + // begin PluGeth code injection ptd := bc.GetTd(head.ParentHash(), head.NumberU64()-1) externTd := ptd if ptd != nil { externTd = new(big.Int).Add(head.Difficulty(), ptd) } pluginNewHead(head, head.Hash(), logs, externTd) - // end plugeth code injection + // end PluGeth code injection bc.chainHeadFeed.Send(ChainHeadEvent{Block: head}) context := []interface{}{ diff --git a/core/state/statedb.go b/core/state/statedb.go index 9565a89cb..e89d891b7 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -917,18 +917,18 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, error) { storageTrieNodes int nodes = trie.NewMergedNodeSet() ) - // PluGeth injection + // begin PluGeth injection codeUpdates := make(map[common.Hash][]byte) - // PluGeth injection + // end PluGeth injection codeWriter := s.db.TrieDB().DiskDB().NewBatch() for addr := range s.stateObjectsDirty { if obj := s.stateObjects[addr]; !obj.deleted { // Write any contract code associated with the state object if obj.code != nil && obj.dirtyCode { rawdb.WriteCode(codeWriter, common.BytesToHash(obj.CodeHash()), obj.code) - // PluGeth injection + // begin PluGeth injection codeUpdates[common.BytesToHash(obj.CodeHash())] = obj.code - // PluGeth injection + // end PluGeth injection obj.dirtyCode = false } // Write any storage changes in the state object to its storage trie