Skip to content

revert: revert the nano check in parlia #3436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzzckck merged 1 commit into from
Nov 6, 2025
Merged

revert: revert the nano check in parlia #3436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions consensus/parlia/parlia.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions core/state/statedb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions core/state/statedb_hooked.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 0 additions & 2 deletions core/vm/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}