From 978de46dca2bcfd98090da709d7feb9c3bfe87bc Mon Sep 17 00:00:00 2001 From: qybdyx Date: Thu, 6 Nov 2025 15:37:20 +0800 Subject: [PATCH] revert: revert the nano check in parlia --- consensus/parlia/parlia.go | 19 ------------------- core/state/statedb.go | 5 ----- core/state/statedb_hooked.go | 4 ---- core/vm/interface.go | 2 -- 4 files changed, 30 deletions(-) diff --git a/consensus/parlia/parlia.go b/consensus/parlia/parlia.go index e6d77c6c15..72c73589a0 100644 --- a/consensus/parlia/parlia.go +++ b/consensus/parlia/parlia.go @@ -1416,9 +1416,6 @@ func (p *Parlia) Finalize(chain consensus.ChainHeaderReader, header *types.Heade systemcontracts.TryUpdateBuildInSystemContract(p.chainConfig, header.Number, parent.Time, header.Time, state, false) - if err := p.checkNanoBlackList(state, header); err != nil { - return err - } if p.chainConfig.IsOnFeynman(header.Number, parent.Time, header.Time) { err := p.initializeFeynmanContract(state, header, cx, txs, receipts, systemTxs, usedGas, false, tracer) if err != nil { @@ -1518,10 +1515,6 @@ func (p *Parlia) FinalizeAndAssemble(chain consensus.ChainHeaderReader, header * systemcontracts.TryUpdateBuildInSystemContract(p.chainConfig, header.Number, parent.Time, header.Time, state, false) - if err := p.checkNanoBlackList(state, header); err != nil { - return nil, nil, err - } - if p.chainConfig.IsOnFeynman(header.Number, parent.Time, header.Time) { err := p.initializeFeynmanContract(state, header, cx, &body.Transactions, &receipts, nil, &header.GasUsed, true, tracer) if err != nil { @@ -2434,18 +2427,6 @@ func (p *Parlia) NextProposalBlock(chain consensus.ChainHeaderReader, header *ty return snap.nextProposalBlock(proposer) } -func (p *Parlia) checkNanoBlackList(state vm.StateDB, header *types.Header) error { - if p.chainConfig.IsNano(header.Number) { - for _, blackListAddr := range types.NanoBlackList { - if state.IsAddressInMutations(blackListAddr) { - log.Error("blacklisted address found", "address", blackListAddr) - return fmt.Errorf("block contains blacklisted address: %s", blackListAddr.Hex()) - } - } - } - return nil -} - func (p *Parlia) detectNewVersionWithFork(chain consensus.ChainHeaderReader, header *types.Header, state vm.StateDB) { // Ignore blocks that are considered too old const maxBlockReceiveDelay = 10 * time.Second diff --git a/core/state/statedb.go b/core/state/statedb.go index 11744ef91e..2623132f54 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -1687,11 +1687,6 @@ func (s *StateDB) AccessEvents() *AccessEvents { return s.accessEvents } -func (s *StateDB) IsAddressInMutations(addr common.Address) bool { - _, ok := s.mutations[addr] - return ok -} - func (s *StateDB) DumpAccessList(block *types.Block) { if s.blockAccessList == nil { return diff --git a/core/state/statedb_hooked.go b/core/state/statedb_hooked.go index c8e4511944..9597178a79 100644 --- a/core/state/statedb_hooked.go +++ b/core/state/statedb_hooked.go @@ -304,7 +304,3 @@ func (s *hookedStateDB) Finalise(deleteEmptyObjects bool) { func (s *hookedStateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash { return s.inner.IntermediateRoot(deleteEmptyObjects) } - -func (s *hookedStateDB) IsAddressInMutations(addr common.Address) bool { - return s.inner.IsAddressInMutations(addr) -} diff --git a/core/vm/interface.go b/core/vm/interface.go index 5aed16c144..d9bafdad2a 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -109,6 +109,4 @@ type StateDB interface { // Finalise must be invoked at the end of a transaction Finalise(bool) IntermediateRoot(deleteEmptyObjects bool) common.Hash - - IsAddressInMutations(addr common.Address) bool }