Skip to content

Add proof to pool on transition #6825

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
merged 2 commits into from
Feb 20, 2025
Merged

Add proof to pool on transition #6825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e62702
add proof to pool on epoch transition
ssd04 Feb 20, 2025
2b19590
add proof only on verify header with proof
ssd04 Feb 20, 2025
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
1 change: 1 addition & 0 deletions factory/processing/processComponents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ func (pcf *processComponentsFactory) Create() (*processComponents, error) {
FallbackHeaderValidator: fallbackHeaderValidator,
EnableEpochsHandler: pcf.coreData.EnableEpochsHandler(),
HeadersPool: pcf.data.Datapool().Headers(),
ProofsPool: pcf.data.Datapool().Proofs(),
StorageService: pcf.data.StorageService(),
}
headerSigVerifier, err := headerCheck.NewHeaderSigVerifier(argsHeaderSig)
Expand Down
3 changes: 3 additions & 0 deletions integrationTests/testProcessorNodeWithMultisigner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/multiversx/mx-chain-go/testscommon"
"github.com/multiversx/mx-chain-go/testscommon/chainParameters"
"github.com/multiversx/mx-chain-go/testscommon/cryptoMocks"
"github.com/multiversx/mx-chain-go/testscommon/dataRetriever"
"github.com/multiversx/mx-chain-go/testscommon/enableEpochsHandlerMock"
"github.com/multiversx/mx-chain-go/testscommon/genericMocks"
"github.com/multiversx/mx-chain-go/testscommon/genesisMocks"
Expand Down Expand Up @@ -475,6 +476,7 @@ func CreateNodesWithNodesCoordinatorAndHeaderSigVerifier(
FallbackHeaderValidator: &testscommon.FallBackHeaderValidatorStub{},
EnableEpochsHandler: enableEpochsHandlerMock.NewEnableEpochsHandlerStub(),
HeadersPool: &mock.HeadersCacherStub{},
ProofsPool: &dataRetriever.ProofsPoolMock{},
StorageService: &genericMocks.ChainStorerMock{},
}
headerSig, _ := headerCheck.NewHeaderSigVerifier(&args)
Expand Down Expand Up @@ -621,6 +623,7 @@ func CreateNodesWithNodesCoordinatorKeygenAndSingleSigner(
FallbackHeaderValidator: &testscommon.FallBackHeaderValidatorStub{},
EnableEpochsHandler: enableEpochsHandlerMock.NewEnableEpochsHandlerStub(),
HeadersPool: &mock.HeadersCacherStub{},
ProofsPool: &dataRetriever.ProofsPoolMock{},
StorageService: &genericMocks.ChainStorerMock{},
}

Expand Down
15 changes: 14 additions & 1 deletion process/headerCheck/headerSignatureVerify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ type ArgsHeaderSigVerifier struct {
FallbackHeaderValidator process.FallbackHeaderValidator
EnableEpochsHandler common.EnableEpochsHandler
HeadersPool dataRetriever.HeadersPool
ProofsPool dataRetriever.ProofsPool
StorageService dataRetriever.StorageService
}

Expand All @@ -52,6 +53,7 @@ type HeaderSigVerifier struct {
fallbackHeaderValidator process.FallbackHeaderValidator
enableEpochsHandler common.EnableEpochsHandler
headersPool dataRetriever.HeadersPool
proofsPool dataRetriever.ProofsPool
storageService dataRetriever.StorageService
}

Expand All @@ -72,6 +74,7 @@ func NewHeaderSigVerifier(arguments *ArgsHeaderSigVerifier) (*HeaderSigVerifier,
fallbackHeaderValidator: arguments.FallbackHeaderValidator,
enableEpochsHandler: arguments.EnableEpochsHandler,
headersPool: arguments.HeadersPool,
proofsPool: arguments.ProofsPool,
storageService: arguments.StorageService,
}, nil
}
Expand Down Expand Up @@ -114,6 +117,9 @@ func checkArgsHeaderSigVerifier(arguments *ArgsHeaderSigVerifier) error {
if check.IfNil(arguments.HeadersPool) {
return process.ErrNilHeadersDataPool
}
if check.IfNil(arguments.ProofsPool) {
return process.ErrNilProofsPool
}
if check.IfNil(arguments.StorageService) {
return process.ErrNilStorageService
}
Expand Down Expand Up @@ -321,7 +327,14 @@ func (hsv *HeaderSigVerifier) VerifyHeaderWithProof(header data.HeaderHandler) e
return hsv.verifyHeaderProofAtTransition(prevProof)
}

return hsv.VerifyHeaderProof(prevProof)
err = hsv.VerifyHeaderProof(prevProof)
if err != nil {
return err
}

_ = hsv.proofsPool.AddProof(prevProof)

return nil
}

func (hsv *HeaderSigVerifier) getHeaderForProofAtTransition(proof data.HeaderProofHandler) (data.HeaderHandler, error) {
Expand Down
2 changes: 2 additions & 0 deletions process/headerCheck/headerSignatureVerify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/multiversx/mx-chain-go/storage"
"github.com/multiversx/mx-chain-go/testscommon"
"github.com/multiversx/mx-chain-go/testscommon/cryptoMocks"
dataRetrieverMocks "github.com/multiversx/mx-chain-go/testscommon/dataRetriever"
"github.com/multiversx/mx-chain-go/testscommon/enableEpochsHandlerMock"
"github.com/multiversx/mx-chain-go/testscommon/genericMocks"
"github.com/multiversx/mx-chain-go/testscommon/hashingMocks"
Expand Down Expand Up @@ -64,6 +65,7 @@ func createHeaderSigVerifierArgs() *ArgsHeaderSigVerifier {
}, nil
},
},
ProofsPool: &dataRetrieverMocks.ProofsPoolMock{},
StorageService: &genericMocks.ChainStorerMock{},
}
}
Expand Down