Skip to content
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

Jump to bottom

sovereign extra header verifier in runtype components #6140

Merged
merged 11 commits into from
May 13, 2024
Merged

sovereign extra header verifier in runtype components #6140

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5646b5d
sovereign extra header verifier in runtype components
axenteoctavian Apr 24, 2024
5957136
unit tests fixes
axenteoctavian Apr 24, 2024
678786d
Merge branch 'MX-15315-refactor-sov-runtype-comp-14' into MX-15315-re…
axenteoctavian Apr 26, 2024
d52308b
Merge branch 'MX-15315-refactor-sov-runtype-comp-14' into MX-15315-re…
axenteoctavian Apr 26, 2024
c865bd1
Merge branch 'MX-15315-refactor-sov-runtype-comp-14' into MX-15315-re…
axenteoctavian Apr 29, 2024
c8bfccc
Merge branch 'MX-15315-refactor-sov-runtype-comp-14' into MX-15315-re…
axenteoctavian Apr 29, 2024
d91e5e0
Merge branch 'MX-15315-refactor-sov-runtype-comp-14' into MX-15315-re…
axenteoctavian May 9, 2024
8a7a9e1
some refactor
axenteoctavian May 10, 2024
86d389d
rename to ExtraHeaderSigVerifierHolder
axenteoctavian May 10, 2024
ea22298
fix after review
axenteoctavian May 13, 2024
24e8879
Merge branch 'feat/refactor-runtype-components' into MX-15315-refacto…
axenteoctavian May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions cmd/sovereignnode/sovereignNodeRunner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ import (
"github.com/multiversx/mx-chain-go/node/metrics"
trieIteratorsFactory "github.com/multiversx/mx-chain-go/node/trieIterators/factory"
"github.com/multiversx/mx-chain-go/process"
"github.com/multiversx/mx-chain-go/process/headerCheck"
"github.com/multiversx/mx-chain-go/process/interceptors"
"github.com/multiversx/mx-chain-go/process/rating"
"github.com/multiversx/mx-chain-go/sharding"
Expand Down Expand Up @@ -1639,17 +1638,11 @@ func (snr *sovereignNodeRunner) CreateSovereignArgsRunTypeComponents(coreCompone
return nil, err
}

sovHeaderSigVerifier, err := headerCheck.NewSovereignHeaderSigVerifier(cryptoComponents.BlockSigner())
if err != nil {
return nil, err
}

return &runType.ArgsSovereignRunTypeComponents{
RunTypeComponentsFactory: runTypeComponentsFactory,
Config: *snr.configs.SovereignExtraConfig,
DataCodec: dataCodecHandler,
TopicsChecker: incomingHeader.NewTopicsChecker(),
ExtraVerifier: sovHeaderSigVerifier,
}, nil
}

Expand Down
2 changes: 1 addition & 1 deletion factory/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ type RunTypeComponentsHolder interface {
InterceptorsContainerFactoryCreator() interceptorscontainer.InterceptorsContainerFactoryCreator
ShardResolversContainerFactoryCreator() resolverscontainer.ShardResolversContainerFactoryCreator
TxPreProcessorCreator() preprocess.TxPreProcessorCreator
ExtraHeaderSigVerifierHandler() headerCheck.ExtraHeaderSigVerifierHolder
ExtraHeaderSigVerifierHolder() headerCheck.ExtraHeaderSigVerifierHolder
GenesisBlockCreatorFactory() processComp.GenesisBlockCreatorFactory
GenesisMetaBlockCheckerCreator() processComp.GenesisMetaBlockChecker
Create() error
Expand Down
4 changes: 2 additions & 2 deletions factory/processing/processComponents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ func (pcf *processComponentsFactory) Create() (*processComponents, error) {
SingleSigVerifier: pcf.crypto.BlockSigner(),
KeyGen: pcf.crypto.BlockSignKeyGen(),
FallbackHeaderValidator: fallbackHeaderValidator,
ExtraHeaderSigVerifierHolder: pcf.runTypeComponents.ExtraHeaderSigVerifierHandler(),
ExtraHeaderSigVerifierHolder: pcf.runTypeComponents.ExtraHeaderSigVerifierHolder(),
}
headerSigVerifier, err := headerCheck.NewHeaderSigVerifier(argsHeaderSig)
if err != nil {
Expand Down Expand Up @@ -2113,7 +2113,7 @@ func checkProcessComponentsArgs(args ProcessComponentsFactoryArgs) error {
if check.IfNil(args.RunTypeComponents.TxPreProcessorCreator()) {
return fmt.Errorf("%s: %w", baseErrMessage, errorsMx.ErrNilTxPreProcessorCreator)
}
if check.IfNil(args.RunTypeComponents.ExtraHeaderSigVerifierHandler()) {
if check.IfNil(args.RunTypeComponents.ExtraHeaderSigVerifierHolder()) {
return fmt.Errorf("%s: %w", baseErrMessage, errorsMx.ErrNilExtraHeaderSigVerifierHolder)
}
if check.IfNil(args.RunTypeComponents.GenesisBlockCreatorFactory()) {
Expand Down
2 changes: 1 addition & 1 deletion factory/processing/processComponents_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ func getRunTypeComponents(rt runType.RunTypeComponentsHolder) *mainFactoryMocks.
InterceptorsContainerFactory: rt.InterceptorsContainerFactoryCreator(),
ShardResolversContainerFactory: rt.ShardResolversContainerFactoryCreator(),
TxPreProcessorFactory: rt.TxPreProcessorCreator(),
ExtraHeaderSigVerifier: rt.ExtraHeaderSigVerifierHandler(),
ExtraHeaderSigVerifier: rt.ExtraHeaderSigVerifierHolder(),
GenesisBlockFactory: rt.GenesisBlockCreatorFactory(),
GenesisMetaBlockChecker: rt.GenesisMetaBlockCheckerCreator(),
}
Expand Down
6 changes: 3 additions & 3 deletions factory/runType/runTypeComponents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ type runTypeComponents struct {
interceptorsContainerFactoryCreator interceptorscontainer.InterceptorsContainerFactoryCreator
shardResolversContainerFactoryCreator resolverscontainer.ShardResolversContainerFactoryCreator
txPreProcessorCreator preprocess.TxPreProcessorCreator
extraHeaderSigVerifierHandler headerCheck.ExtraHeaderSigVerifierHolder
extraHeaderSigVerifierHolder headerCheck.ExtraHeaderSigVerifierHolder
genesisBlockCreatorFactory processGenesis.GenesisBlockCreatorFactory
genesisMetaBlockCheckerCreator processGenesis.GenesisMetaBlockChecker
}
Expand Down Expand Up @@ -239,6 +239,7 @@ func (rcf *runTypeComponentsFactory) Create() (*runTypeComponents, error) {
consensusModel: consensus.ConsensusModelV1,
vmContainerMetaFactory: vmContainerMetaCreator,
vmContainerShardFactory: vmContainerShardCreator,
accountsParser: accountsParser,
accountsCreator: accountsCreator,
outGoingOperationsPoolHandler: disabled.NewDisabledOutGoingOperationPool(),
dataCodecHandler: disabled.NewDisabledDataCodec(),
Expand All @@ -249,10 +250,9 @@ func (rcf *runTypeComponentsFactory) Create() (*runTypeComponents, error) {
interceptorsContainerFactoryCreator: interceptorscontainer.NewShardInterceptorsContainerFactoryCreator(),
shardResolversContainerFactoryCreator: resolverscontainer.NewShardResolversContainerFactoryCreator(),
txPreProcessorCreator: preprocess.NewTxPreProcessorCreator(),
extraHeaderSigVerifierHandler: headerCheck.NewExtraHeaderSigVerifierHolder(),
extraHeaderSigVerifierHolder: headerCheck.NewExtraHeaderSigVerifierHolder(),
genesisBlockCreatorFactory: processGenesis.NewGenesisBlockCreatorFactory(),
genesisMetaBlockCheckerCreator: processGenesis.NewGenesisMetaBlockChecker(),
accountsParser: accountsParser,
}, nil
}

Expand Down
8 changes: 4 additions & 4 deletions factory/runType/runTypeComponentsHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ func (mrc *managedRunTypeComponents) CheckSubcomponents() error {
if check.IfNil(mrc.txPreProcessorCreator) {
return errors.ErrNilTxPreProcessorCreator
}
if check.IfNil(mrc.extraHeaderSigVerifierHandler) {
if check.IfNil(mrc.extraHeaderSigVerifierHolder) {
return errors.ErrNilExtraHeaderSigVerifierHolder
}
if check.IfNil(mrc.genesisBlockCreatorFactory) {
Expand Down Expand Up @@ -544,16 +544,16 @@ func (mrc *managedRunTypeComponents) TxPreProcessorCreator() preprocess.TxPrePro
return mrc.runTypeComponents.txPreProcessorCreator
}

// ExtraHeaderSigVerifierHandler returns the extra header sig verifier handler
func (mrc *managedRunTypeComponents) ExtraHeaderSigVerifierHandler() headerCheck.ExtraHeaderSigVerifierHolder {
// ExtraHeaderSigVerifierHolder returns the extra header sig verifier handler
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// ExtraHeaderSigVerifierHolder returns the extra header sig verifier handler
// ExtraHeaderSigVerifierHolder returns the extra header sig verifier holder

func (mrc *managedRunTypeComponents) ExtraHeaderSigVerifierHolder() headerCheck.ExtraHeaderSigVerifierHolder {
mrc.mutRunTypeComponents.RLock()
defer mrc.mutRunTypeComponents.RUnlock()

if check.IfNil(mrc.runTypeComponents) {
return nil
}

return mrc.runTypeComponents.extraHeaderSigVerifierHandler
return mrc.runTypeComponents.extraHeaderSigVerifierHolder
}

// GenesisBlockCreatorFactory returns the genesis block factory
Expand Down
6 changes: 4 additions & 2 deletions factory/runType/runTypeComponentsHandler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/multiversx/mx-chain-go/common"
"github.com/multiversx/mx-chain-go/config"
"github.com/multiversx/mx-chain-go/consensus"
"github.com/multiversx/mx-chain-go/consensus/mock"
"github.com/multiversx/mx-chain-go/errors"
"github.com/multiversx/mx-chain-go/factory"
"github.com/multiversx/mx-chain-go/factory/runType"
Expand Down Expand Up @@ -82,7 +83,7 @@ func TestManagedRunTypeComponents_Create(t *testing.T) {
require.Nil(t, managedRunTypeComponents.InterceptorsContainerFactoryCreator())
require.Nil(t, managedRunTypeComponents.ShardResolversContainerFactoryCreator())
require.Nil(t, managedRunTypeComponents.TxPreProcessorCreator())
require.Nil(t, managedRunTypeComponents.ExtraHeaderSigVerifierHandler())
require.Nil(t, managedRunTypeComponents.ExtraHeaderSigVerifierHolder())
require.Nil(t, managedRunTypeComponents.GenesisBlockCreatorFactory())
require.Nil(t, managedRunTypeComponents.GenesisMetaBlockCheckerCreator())

Expand Down Expand Up @@ -117,7 +118,7 @@ func TestManagedRunTypeComponents_Create(t *testing.T) {
require.NotNil(t, managedRunTypeComponents.InterceptorsContainerFactoryCreator())
require.NotNil(t, managedRunTypeComponents.ShardResolversContainerFactoryCreator())
require.NotNil(t, managedRunTypeComponents.TxPreProcessorCreator())
require.NotNil(t, managedRunTypeComponents.ExtraHeaderSigVerifierHandler())
require.NotNil(t, managedRunTypeComponents.ExtraHeaderSigVerifierHolder())
require.NotNil(t, managedRunTypeComponents.GenesisBlockCreatorFactory())
require.NotNil(t, managedRunTypeComponents.GenesisMetaBlockCheckerCreator())

Expand Down Expand Up @@ -201,6 +202,7 @@ func createArgsRunTypeComponents() runType.ArgsRunTypeComponents {
},
CryptoComponents: &mockCoreComp.CryptoComponentsStub{
TxKeyGen: &mockCoreComp.KeyGenMock{},
BlockSig: &mock.SingleSignerMock{},
},
Configs: config.Configs{
EconomicsConfig: &config.EconomicsConfig{
Expand Down
16 changes: 7 additions & 9 deletions factory/runType/sovereignRunTypeComponents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (
"github.com/multiversx/mx-chain-go/genesis"
"github.com/multiversx/mx-chain-go/genesis/parsing"
processComp "github.com/multiversx/mx-chain-go/genesis/process"
"github.com/multiversx/mx-chain-go/process"
"github.com/multiversx/mx-chain-go/process/block"
"github.com/multiversx/mx-chain-go/process/block/preprocess"
"github.com/multiversx/mx-chain-go/process/block/sovereign"
"github.com/multiversx/mx-chain-go/process/coordinator"
"github.com/multiversx/mx-chain-go/process/factory/interceptorscontainer"
"github.com/multiversx/mx-chain-go/process/headerCheck"
"github.com/multiversx/mx-chain-go/process/peer"
"github.com/multiversx/mx-chain-go/process/smartContract/hooks"
"github.com/multiversx/mx-chain-go/process/smartContract/processorV2"
Expand All @@ -42,15 +42,13 @@ type ArgsSovereignRunTypeComponents struct {
Config config.SovereignConfig
DataCodec sovereign.DataCodecHandler
TopicsChecker sovereign.TopicsCheckerHandler
ExtraVerifier process.ExtraHeaderSigVerifierHandler
}

type sovereignRunTypeComponentsFactory struct {
*runTypeComponentsFactory
sovConfig config.SovereignConfig
dataCodec sovereign.DataCodecHandler
topicsChecker sovereign.TopicsCheckerHandler
extraVerifier process.ExtraHeaderSigVerifierHandler
}

// NewSovereignRunTypeComponentsFactory will return a new instance of runTypeComponentsFactory
Expand All @@ -64,16 +62,12 @@ func NewSovereignRunTypeComponentsFactory(args ArgsSovereignRunTypeComponents) (
if check.IfNil(args.TopicsChecker) {
return nil, errors.ErrNilTopicsChecker
}
if check.IfNil(args.ExtraVerifier) {
return nil, errors.ErrNilExtraSubRoundSigner
}

return &sovereignRunTypeComponentsFactory{
runTypeComponentsFactory: args.RunTypeComponentsFactory,
sovConfig: args.Config,
dataCodec: args.DataCodec,
topicsChecker: args.TopicsChecker,
extraVerifier: args.ExtraVerifier,
}, nil
}

Expand Down Expand Up @@ -212,7 +206,11 @@ func (rcf *sovereignRunTypeComponentsFactory) Create() (*runTypeComponents, erro

expiryTime := time.Second * time.Duration(rcf.sovConfig.OutgoingSubscribedEvents.TimeToWaitForUnconfirmedOutGoingOperationInSeconds)

err = rtc.extraHeaderSigVerifierHandler.RegisterExtraHeaderSigVerifier(rcf.extraVerifier)
sovHeaderSigVerifier, err := headerCheck.NewSovereignHeaderSigVerifier(rcf.cryptoComponents.BlockSigner())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this also removed from normal run type ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Normal RunType doesn't use an extra header sig verifier, it's just:
extraHeaderSigVerifierHandler: headerCheck.NewExtraHeaderSigVerifierHolder(),

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name of the variable was wrong and confused me;
extraHeaderSigVerifierHandler -> this is a holder, not a handler, please rename it

if err != nil {
return nil, fmt.Errorf("sovereignRunTypeComponentsFactory - NewSovereignHeaderSigVerifier failed: %w", err)
}
err = rtc.extraHeaderSigVerifierHolder.RegisterExtraHeaderSigVerifier(sovHeaderSigVerifier)
if err != nil {
return nil, fmt.Errorf("sovereignRunTypeComponentsFactory - RegisterExtraHeaderSigVerifier failed: %w", err)
}
Expand Down Expand Up @@ -247,7 +245,7 @@ func (rcf *sovereignRunTypeComponentsFactory) Create() (*runTypeComponents, erro
interceptorsContainerFactoryCreator: interceptorscontainer.NewSovereignShardInterceptorsContainerFactoryCreator(),
shardResolversContainerFactoryCreator: resolverscontainer.NewSovereignShardResolversContainerFactoryCreator(),
txPreProcessorCreator: preprocess.NewSovereignTxPreProcessorCreator(),
extraHeaderSigVerifierHandler: rtc.extraHeaderSigVerifierHandler,
extraHeaderSigVerifierHolder: rtc.extraHeaderSigVerifierHolder,
genesisBlockCreatorFactory: processComp.NewSovereignGenesisBlockCreatorFactory(),
genesisMetaBlockCheckerCreator: processComp.NewSovereignGenesisMetaBlockChecker(),
}, nil
Expand Down
2 changes: 0 additions & 2 deletions factory/runType/sovereignRunTypeComponents_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"github.com/multiversx/mx-chain-go/config"
"github.com/multiversx/mx-chain-go/errors"
"github.com/multiversx/mx-chain-go/factory/runType"
"github.com/multiversx/mx-chain-go/testscommon/headerSigVerifier"
"github.com/multiversx/mx-chain-go/testscommon/sovereign"

"github.com/stretchr/testify/require"
Expand All @@ -24,7 +23,6 @@ func createSovRunTypeArgs() runType.ArgsSovereignRunTypeComponents {
},
DataCodec: &sovereign.DataCodecMock{},
TopicsChecker: &sovereign.TopicsCheckerMock{},
ExtraVerifier: &headerSigVerifier.ExtraHeaderSigVerifierHandlerMock{},
}
}

Expand Down
2 changes: 1 addition & 1 deletion integrationTests/testProcessorNode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3331,7 +3331,7 @@ func GetDefaultRunTypeComponents(consensusModel consensus.ConsensusModel) *mainF
InterceptorsContainerFactory: rt.InterceptorsContainerFactoryCreator(),
ShardResolversContainerFactory: rt.ShardResolversContainerFactoryCreator(),
TxPreProcessorFactory: rt.TxPreProcessorCreator(),
ExtraHeaderSigVerifier: rt.ExtraHeaderSigVerifierHandler(),
ExtraHeaderSigVerifier: rt.ExtraHeaderSigVerifierHolder(),
GenesisBlockFactory: rt.GenesisBlockCreatorFactory(),
GenesisMetaBlockChecker: rt.GenesisMetaBlockCheckerCreator(),
}
Expand Down
6 changes: 3 additions & 3 deletions testscommon/components/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/multiversx/mx-chain-go/common"
commonFactory "github.com/multiversx/mx-chain-go/common/factory"
"github.com/multiversx/mx-chain-go/config"
mockConsensus "github.com/multiversx/mx-chain-go/consensus/mock"
"github.com/multiversx/mx-chain-go/consensus/spos"
"github.com/multiversx/mx-chain-go/consensus/spos/bls"
"github.com/multiversx/mx-chain-go/dataRetriever"
Expand Down Expand Up @@ -43,7 +44,6 @@ import (
"github.com/multiversx/mx-chain-go/testscommon/dblookupext"
"github.com/multiversx/mx-chain-go/testscommon/enableEpochsHandlerMock"
"github.com/multiversx/mx-chain-go/testscommon/hashingMocks"
"github.com/multiversx/mx-chain-go/testscommon/headerSigVerifier"
"github.com/multiversx/mx-chain-go/testscommon/mainFactoryMocks"
"github.com/multiversx/mx-chain-go/testscommon/marshallerMock"
"github.com/multiversx/mx-chain-go/testscommon/shardingMocks"
Expand Down Expand Up @@ -1023,6 +1023,7 @@ func createArgsRunTypeComponents() runType.ArgsRunTypeComponents {
},
CryptoComponents: &mockCoreComp.CryptoComponentsStub{
TxKeyGen: &mockCoreComp.KeyGenMock{},
BlockSig: &mockConsensus.SingleSignerMock{},
},
Configs: config.Configs{
EconomicsConfig: &config.EconomicsConfig{
Expand Down Expand Up @@ -1067,7 +1068,7 @@ func GetRunTypeComponentsStub(rt factory.RunTypeComponentsHandler) *mainFactoryM
InterceptorsContainerFactory: rt.InterceptorsContainerFactoryCreator(),
ShardResolversContainerFactory: rt.ShardResolversContainerFactoryCreator(),
TxPreProcessorFactory: rt.TxPreProcessorCreator(),
ExtraHeaderSigVerifier: rt.ExtraHeaderSigVerifierHandler(),
ExtraHeaderSigVerifier: rt.ExtraHeaderSigVerifierHolder(),
GenesisBlockFactory: rt.GenesisBlockCreatorFactory(),
GenesisMetaBlockChecker: rt.GenesisMetaBlockCheckerCreator(),
}
Expand Down Expand Up @@ -1149,7 +1150,6 @@ func createSovRunTypeArgs() runType.ArgsSovereignRunTypeComponents {
},
DataCodec: &sovereign.DataCodecMock{},
TopicsChecker: &sovereign.TopicsCheckerMock{},
ExtraVerifier: &headerSigVerifier.ExtraHeaderSigVerifierHandlerMock{},
}
}

Expand Down
4 changes: 2 additions & 2 deletions testscommon/mainFactoryMocks/runTypeComponentStub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ func (r *RunTypeComponentsStub) TxPreProcessorCreator() preprocess.TxPreProcesso
return r.TxPreProcessorFactory
}

// ExtraHeaderSigVerifierHandler -
func (r *RunTypeComponentsStub) ExtraHeaderSigVerifierHandler() headerCheck.ExtraHeaderSigVerifierHolder {
// ExtraHeaderSigVerifierHolder -
func (r *RunTypeComponentsStub) ExtraHeaderSigVerifierHolder() headerCheck.ExtraHeaderSigVerifierHolder {
return r.ExtraHeaderSigVerifier
}

Expand Down