Skip to content

Conduit: adhoc by pass block validation #129

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

Draft
trantienduchn wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Conduit: adhoc by pass block validation #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a85968
REBASED_FROM_#128
trantienduchn Nov 6, 2025
c88aabd
core: force persist on-the-fly updated L2 block
trantienduchn Nov 27, 2025
ed5633a
ignore snapshot validation on L2 block
trantienduchn Nov 27, 2025
b03eb80
fix: resolve conflict
TuDo1403 Feb 2, 2026
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
2 changes: 1 addition & 1 deletion consensus/consortium/v2/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func (s *Snapshot) apply(headers []*types.Header, chain consensus.ChainHeaderRea
if err != nil {
return nil, err
}
if !snap.inInValidatorSet(validator) {
if !snap.inInValidatorSet(validator) && !s.chainConfig.IsL2Migration(header.Number) {
return nil, errUnauthorizedValidator
}
for _, recent := range snap.Recents {
Expand Down
6 changes: 6 additions & 0 deletions core/blockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2174,6 +2174,12 @@ func (bc *BlockChain) processBlock(block *types.Block, statedb *state.StateDB, s

// Validate the state using the default validator
substart = time.Now()
// support Conduit to force persist L2 block, after alloc updates,
// state root has been changed and it breaks validations
if bc.chainConfig.IsL2Migration(block.Number()) {
root := statedb.IntermediateRoot(bc.chainConfig.IsEIP158(block.Header().Number))
block.SetStateRoot(root)
}
if err := bc.validator.ValidateState(block, statedb, receipts, usedGas); err != nil {
bc.reportBlock(block, receipts, err)
return nil, err
Expand Down
9 changes: 9 additions & 0 deletions core/types/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,4 +652,13 @@ func (b *Block) Hash() common.Hash {
return v
}

// SetStateRoot
// Warning: support only for Conduit migration
func (b *Block) SetStateRoot(root common.Hash) common.Hash {
b.header.Root = root
v := b.header.Hash()
b.hash.Store(v)
return v
}

type Blocks []*Block