Merge master into rc/supernova 2026.04.24 by sstanculeanu · Pull Request #7837 · multiversx/mx-chain-go

sstanculeanu · 2026-04-28T08:19:28Z

Reasoning behind the pull request

Proposed changes

Testing procedure

Pre-requisites

Based on the Contributing Guidelines the PR author and the reviewers must check the following requirements are met:

was the PR targeted to the correct branch?
if this is a larger feature that probably needs more than one PR, is there a feat branch created?
if this is a feat branch merging, do all satellite projects have a proper tag inside go.mod?

Advisory fix 1

Co-authored-by: Darius <dariussuirab@gmail.com>

…iversx/mx-chain-go-ghsa-pm7x-xvmm-jpfw into advisory-fix

small fixes here and there. hardening.

update vm common

flags compressed

…to rc/supernova # Conflicts: # common/constants.go # common/enablers/enableEpochsHandler_test.go # config/config.go # config/tomlConfig_test.go # dataRetriever/requestHandlers/requestHandler.go # dataRetriever/requestHandlers/requestHandler_test.go # epochStart/bootstrap/metaStorageHandler.go # epochStart/bootstrap/metaStorageHandler_test.go # epochStart/bootstrap/process.go # epochStart/bootstrap/process_test.go # factory/processing/blockProcessorCreator.go # go.mod # go.sum # node/chainSimulator/process/processor.go # process/block/export_test.go # process/block/interceptedBlocks/interceptedEquivalentProof_test.go # process/block/metablock.go # process/block/metablock_test.go # process/block/pendingMb/pendingMiniBlocks.go # process/block/pendingMb/pendingMiniBlocks_test.go # process/common.go # process/coordinator/process.go # process/coordinator/process_test.go # process/errors.go # process/interceptors/factory/interceptedEquivalentProofsFactory_test.go # process/sync/baseSync_test.go

ssd04 · 2026-04-28T13:10:46Z

 	return bootstrapHdrInfo, nil
 }

-func (msh *metaStorageHandler) saveEpochStartMetaHdrs(components *ComponentsNeededForBootstrap) error {


not sure if we should remove this flow entirely, saveIntermediateMetaBlocksToStorage will save intermediate headers based on epoch start header, but i think in syncedHeaders there are also other headers that might need to be saved (from the other flows)

added back, I think this was a merge issue

Copilot

Pull request overview

Merges master into rc/supernova 2026.04.24, bringing in protocol- and bootstrap-related changes around proofs handling, epoch-start validation, shard-data validation, and error/flag gating.

Changes:

Tightens equivalent-proof handling by validating proofs against headers (introduces HeadersPool plumbing) and adds configurable delays for proof-by-nonce requests.
Adds/extends epoch-start and meta/shard processing validations (epoch-start miniblock types, shard-info constraints, shard-data vs header consistency).
Improves bootstrap/sync correctness (completing missing self-notarized headers, additional sync test coverage, miniblock execution checks).

Reviewed changes

Copilot reviewed 72 out of 73 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
vm/systemSmartContracts/validator.go	Adjusts error propagation under ConsumedGasInEconomicsFlag during BLS key registration.
testscommon/doubleTransactionsDetector.go	Reworks test double-tx detector to return an error instead of panicking.
process/sync/storageBootstrap/shardStorageBootstrapper.go	Adds no-op completeSelfNotarizedHeaders implementation for shard bootstrapper.
process/sync/storageBootstrap/metaStorageBootstrapper_test.go	Extends mocks for blockTracker last self-notarized header retrieval.
process/sync/storageBootstrap/metaStorageBootstrapper.go	Completes missing self-notarized headers during meta bootstrap from storage.
process/sync/storageBootstrap/interface.go	Extends bootstrapper handler interface with completeSelfNotarizedHeaders.
process/sync/storageBootstrap/baseStorageBootstrapper.go	Invokes completeSelfNotarizedHeaders after applying boot infos.
process/sync/baseSync_test.go	Adds tests ensuring missing proofs are requested and updates test stubs/imports.
process/sync/baseSync.go	Requests equivalent proofs when missing (hash/nonce confirmation paths).
process/smartContract/processorV2/process_test.go	Updates SCR-on-error tests to match new async parsing and fee behavior.
process/smartContract/processorV2/processV2.go	Fixes async-arg parsing, built-in execution error handling, fee accounting, and invariant handling (flag-gated).
process/interface.go	Updates DoubleTransactionDetector interface to return error; extends ProofsPool API.
process/interceptors/factory/interceptedShardHeaderDataFactory.go	Import formatting cleanup.
process/interceptors/factory/interceptedMetaHeaderDataFactory.go	Import formatting cleanup.
process/interceptors/factory/interceptedEquivalentProofsFactory_test.go	Adds HeadersPool to equivalent proofs factory args in tests.
process/interceptors/factory/interceptedEquivalentProofsFactory.go	Wires HeadersPool into equivalent proofs intercepted-data creation.
process/factory/interceptorscontainer/baseInterceptorsContainerFactory.go	Passes HeadersPool from datapool into equivalent proofs interceptor factory.
process/errors.go	Adds new process errors and fixes typo (“economics”).
process/coordinator/process_test.go	Updates tx coordinator tests for new detector behavior and miniblock validation.
process/coordinator/process.go	Makes double-tx detection return an error; adds miniblock shard/type validation.
process/coordinator/doubleTransactionsDetector_test.go	Renames/refactors detector tests for new constructor and error-returning API.
process/coordinator/doubleTransactionsDetector.go	Renames detector, adds critical-vs-not-critical behavior gated by flags, returns error when enforcement active.
process/common.go	Adds CompleteMissingSelfNotarizedHeaders + helpers (lookback derivation).
process/block/shardblock.go	Propagates errors from getIndexOfFirstMiniBlockToBeExecuted.
process/block/preprocess/validatorInfoPreProcessor_test.go	Updates peer miniblock receiver shard expectation to AllShardId.
process/block/preprocess/validatorInfoPreProcessor.go	Enforces peer miniblocks are meta->all.
process/block/preprocess/transactions.go	Formatting-only change.
process/block/pendingMb/nilPendingMiniblocks.go	Import formatting cleanup.
process/block/metablock_test.go	Updates tests for shard-data fields and blockTracker self-notarized behavior; adds shard-data verification gating tests.
process/block/metablockProposal.go	Validates epoch-start shard-info is empty and epoch-start miniblock types are allowed.
process/block/metablock.go	Adds epoch-start validations, shard-data/header full validation (flag-gated), refined cross-shard miniblock checks, and economics checks on epoch start.
process/block/interceptedBlocks/interceptedEquivalentProof_test.go	Adds HeadersPool usage and new validity-path tests.
process/block/interceptedBlocks/interceptedEquivalentProof.go	Validates equivalent proof against the referenced header via HeadersPool before accepting.
process/block/export_test.go	Exposes helpers for shard-data verification tests; updates GetIndexOfFirstMiniBlockToBeExecuted signature.
process/block/baseProcess_test.go	Adapts tests to new double-tx detector and new getIndex signature; adds scheduled execution stub.
process/block/baseProcess.go	Adds FullShardDataValidationFlag to compatibility list; strengthens header/body correlation; makes getIndex return (int, error) and checks executed state.
node/chainSimulator/configs/configs.go	Sets RequestProofByNonceDelayMs to 0 for simulator configs.
node/chainSimulator/chainSimulator.go	Reorders proof broadcast after header/MB/tx broadcast and adds a small delay.
integrationTests/vm/txsFee/scCalls_test.go	Adds an additional tx to assert accumulated fees behavior.
integrationTests/testProcessorNode.go	Updates requester creation signature; switches to new DoubleTransactionsDetector.
integrationTests/testInitializer.go	Changes proof creation/broadcast flow to broadcast after commit; removes pre-broadcast pool injection.
integrationTests/testHeartbeatNode.go	Updates requester creation signature.
integrationTests/multiShard/endOfEpoch/startInEpoch/startInEpoch_test.go	Extends blockTracker stub with GetLastSelfNotarizedHeader.
go.sum	Updates VM dependency checksums.
go.mod	Bumps mx-chain-vm-common-go and mx-chain-vm-go versions.
genesis/process/shardGenesisBlockCreator.go	Switches to NewDoubleTransactionsDetector constructor/args.
genesis/process/metaGenesisBlockCreator.go	Switches to NewDoubleTransactionsDetector constructor/args.
factory/processing/processComponents.go	Passes RequestProofByNonceDelayMs-derived duration into request handler creation.
factory/processing/blockProcessorCreator.go	Switches to NewDoubleTransactionsDetector constructor/args.
epochStart/errors.go	Adds ErrNilHeadersDataPool.
epochStart/bootstrap/syncEpochStartMeta_test.go	Passes HeadersPool into epoch-start syncer args.
epochStart/bootstrap/syncEpochStartMeta.go	Adds HeadersPool to equivalent proofs factory args.
epochStart/bootstrap/storageProcess.go	Passes HeadersPool; threads RequestProofByNonceDelayMs into requester creation.
epochStart/bootstrap/process_test.go	Adds extensive tests for header sync helpers and self-notarized meta syncing.
epochStart/bootstrap/process.go	Refactors header sync flow, syncs additional referenced metablocks, and adds self-notarized meta syncing helpers.
epochStart/bootstrap/metaStorageHandler_test.go	Adds tests for pending miniblocks derivation and intermediate meta storage save path.
epochStart/bootstrap/metaStorageHandler.go	Derives pending miniblocks from epoch-start data; saves intermediate meta blocks; adds helper for first-pending self-notarized meta.
epochStart/bootstrap/interface.go	Adds HeadersPool interface.
epochStart/bootstrap/epochStartMetaBlockProcessor_test.go	Extends constructor tests to cover nil proofs/headers pools.
epochStart/bootstrap/epochStartMetaBlockProcessor.go	Requires HeadersPool, registers meta header in pool before waiting for proof (Andromeda).
epochStart/bootstrap/baseStorageHandler.go	Removes legacy groupMiniBlocksByShard logic (replaced by computePendingMiniBlocks).
dataRetriever/resolvers/trieNodeResolver.go	Fixes chunkIndex bounds check (>= maxChunks).
dataRetriever/requestHandlers/requestHandler_test.go	Updates constructor calls and adapts tests for async proof-by-nonce requests.
dataRetriever/requestHandlers/requestHandler.go	Adds requestProofByNonceDelay and delays proof-by-nonce requests asynchronously.
consensus/spos/worker.go	Rejects headers on consensus topic after Andromeda flag activation.
config/tomlConfig_test.go	Adds ConsumedGasInEconomicsFixEnableEpoch and shifts Supernova epoch in test config.
config/epochConfig.go	Adds FullShardDataValidationEnableEpoch and ConsumedGasInEconomicsFixEnableEpoch fields.
config/config.go	Adds RequestProofByNonceDelayMs to requester config.
common/enablers/enableEpochsHandler_test.go	Updates enable-epochs test config and activation assertions for new flags.
common/enablers/enableEpochsHandler.go	Registers FullShardDataValidationFlag and ConsumedGasInEconomicsFlag.
common/constants.go	Adds metric + new enable-epoch flags for shard-data validation and economics gas fix.
cmd/node/config/enableEpochs.toml	Adds FullShardDataValidationEnableEpoch and ConsumedGasInEconomicsFixEnableEpoch defaults.
cmd/node/config/config.toml	Adds RequestProofByNonceDelayMs config entry.

Comments suppressed due to low confidence (1)

process/coordinator/doubleTransactionsDetector.go:67

checkArgsDoubleTransactionsDetector validates handler compatibility only for AddFailedRelayedTxToInvalidMBsFlag, but ProcessBlockBody also calls IsFlagEnabled(RelayedTransactionsV1V2DisableFlag). Include RelayedTransactionsV1V2DisableFlag in the compatibility check to prevent using an EnableEpochsHandler implementation that doesn’t define this flag.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-29T07:38:55Z

+	go func(requestEpoch uint32) {
+		key := common.GetEquivalentProofNonceShardKey(headerNonce, headerShard)
+		if !rrh.testIfRequestIsNeeded([]byte(key), uniqueEquivalentProofSuffix) {
+			return
+		}

-	log.Debug("requesting equivalent proof by nonce from network",
-		"headerNonce", headerNonce,
-		"headerShard", headerShard,
-		"epoch", epoch,
-	)
+		time.Sleep(rrh.requestProofByNonceDelay)

-	requester, err := rrh.getEquivalentProofsRequester(headerShard)
-	if err != nil {
-		log.Error("RequestEquivalentProofByNonceForEpoch.getEquivalentProofsRequester",
-			"error", err.Error(),
+		log.Debug("requesting equivalent proof by nonce from network",
 			"headerNonce", headerNonce,
+			"headerShard", headerShard,
+			"epoch", epoch,
 		)
-		return
-	}

-	proofsRequester, ok := requester.(EquivalentProofsRequester)
-	if !ok {
-		log.Warn("wrong assertion type when creating equivalent proofs requester")
-		return
-	}
+		requester, err := rrh.getEquivalentProofsRequester(headerShard)
+		if err != nil {
+			log.Error("RequestEquivalentProofByNonceForEpoch.getEquivalentProofsRequester",
+				"error", err.Error(),
+				"headerNonce", headerNonce,
+			)
+			return
+		}

-	rrh.whiteList.Add([][]byte{[]byte(key)})
+		proofsRequester, ok := requester.(EquivalentProofsRequester)
+		if !ok {
+			log.Warn("wrong assertion type when creating equivalent proofs requester")
+			return
+		}

-	err = proofsRequester.RequestDataFromNonce([]byte(key), epoch)
-	if err != nil {
-		log.Debug("RequestEquivalentProofByNonceForEpoch.RequestDataFromNonce",
-			"error", err.Error(),
-			"headerNonce", headerNonce,
-			"headerShard", headerShard,
-			"epoch", epoch,
-		)
-		return
-	}
+		rrh.whiteList.Add([][]byte{[]byte(key)})
+
+		err = proofsRequester.RequestDataFromNonce([]byte(key), epoch)
+		if err != nil {
+			log.Debug("RequestEquivalentProofByNonceForEpoch.RequestDataFromNonce",
+				"error", err.Error(),
+				"headerNonce", headerNonce,
+				"headerShard", headerShard,
+				"epoch", epoch,
+			)
+			return
+		}

-	rrh.addRequestedItems([][]byte{[]byte(key)}, uniqueEquivalentProofSuffix)
+		rrh.addRequestedItems([][]byte{[]byte(key)}, uniqueEquivalentProofSuffix)
+	}(epoch)


RequestEquivalentProofByNonceForEpoch now spawns a new goroutine per call and sleeps before requesting. This can create unbounded goroutine growth under load (and some callers already invoke RequestEquivalentProofByNonce in their own goroutines), increasing memory/CPU usage and making shutdown harder. Consider scheduling the delayed request via a shared timer/worker (e.g., time.AfterFunc with deduplication) instead of starting a goroutine on every request.

intended from master

Copilot · 2026-04-29T07:38:55Z

+		if !check.IfNil(pair.Proof) {
+			time.Sleep(time.Millisecond * 5) // small delay to ensure proof is not dropped as being received before header
+			err = s.nodes[shardID].GetBroadcastMessenger().BroadcastEquivalentProof(pair.Proof, pair.LeaderKey)
+			if err != nil {
+				return err
+			}


The chain simulator introduces a hard-coded 5ms sleep before broadcasting equivalent proofs to avoid them being dropped when received before the header. This timing-based workaround is fragile across different environments and can still flake under load/slow CI. Prefer an explicit ordering/ack mechanism (or reusing the configurable RequestProofByNonceDelayMs) rather than a fixed sleep.

intended from master

Copilot · 2026-04-29T07:38:55Z

+			if !v.enableEpochsHandler.IsFlagEnabled(common.ConsumedGasInEconomicsFlag) {
+				return nil, nil, err
+			}
+			return nil, nil, errExec


In the errExec != nil branch, the function returns err when ConsumedGasInEconomicsFlag is disabled. At this point err is the earlier error from getNewValidKeys (and is nil here), so this path can silently swallow the staking SC execution error and allow the caller to continue as if registration succeeded. Return the actual execution error (or another non-nil error that preserves legacy behavior) instead of err.

expected from master

Copilot · 2026-04-29T07:38:56Z

 	errCheck := sc.checkSCRSizeInvariant(scrTxs)
 	if errCheck != nil {
-		return nil, err
+		if !sc.enableEpochsHandler.IsFlagEnabled(common.ConsumedGasInEconomicsFlag) {
+			return nil, err
+		}
+		return nil, errCheck


errCheck is the result of checkSCRSizeInvariant, but when it’s non-nil the code returns err in the flag-disabled branch. Here err is the previous error variable and will be nil, so this can return (nil, nil) and hide an invariant violation. Return errCheck (or propagate it consistently) in this branch as well, and avoid returning a nil error with a nil SCR slice.

expected from master

BeniaminDrasovean · 2026-04-29T11:57:06Z

 			return err
 		}

+		if mbHdr.GetTypeInt32() != int32(miniBlock.Type) {


This check is missing from checkHeaderBodyCorrelationProposal which is used for Supernova

this is already handled in another fixes branch for Supernova

BeniaminDrasovean · 2026-04-29T12:16:22Z

 	return nil
 }

+func (tc *transactionCoordinator) checkMiniBlock(


For Supernova this is called from ProcessBlockProposal. Should it be also added or moved to VerifyBlockProposal?

added a TODO as it will require a bigger refactor

BeniaminDrasovean · 2026-04-29T12:58:34Z

+		return err
+	}
+
+	err = mp.verifyAccumulatedFeesInEpochOnEpochStart(header)


This check is also missing from the Supernova execution flow.

not needed for supernova

AdoAdoAdo and others added 30 commits April 3, 2026 21:28

additional hardening

17515fc

base process test adjustment

b9ef007

metablock tests adjustments

0ac84d9

fix verification - after processing

6cf9d73

revert verification after processing, add log on mismatch

dfbc414

fix verification and initialization of tracker at bootstrap

bac901a

move detection point of stale self notarized headers

4590d1d

change self notarized logic for start ub epoch

4eb392c

sync and save missing metablocks

88d5467

Merge commit from fork

13d5377

Advisory fix 1

drop proof early

c911664

remove header check

87790a1

extra delay on broadcast proof

6eb6c29

fix backward incompatibility

909e62e

Update interceptedEquivalentProof.go

a440f20

Co-authored-by: Darius <dariussuirab@gmail.com>

fix backwards compatibility

0447f9d

optimized request proof if missing

c402897

fix after review

6550098

Merge branch 'fix-backwards-compatibility' of https://github.com/mult…

9048d24

…iversx/mx-chain-go-ghsa-pm7x-xvmm-jpfw into advisory-fix

Merge branch 'refs/heads/advisory-fix' into advisory-fix-3

bacee95

fix tests

70fb21d

Merge remote-tracking branch 'origin/advisory-fix' into advisory-fix

c9c2b7c

replace stale detection with stale fix

692829e

cleanup, use common methods

72550c9

small fixes here and there. hardening.

c77f5ee

go mod tidy

960c5f3

enable epochs and hardening

7c76707

update

314c40b

new go mod

8bec0c7

new go mod

0227ce1

ssd04 and others added 17 commits April 20, 2026 16:41

peer block extra check

2186293

refactor filanames + unit tests

856fabc

fix and return error

d244420

bad constant

42f992f

fix blocked tests

8339150

test fix

bde3783

test fix

7415ad3

test fix

612676e

update check

567be95

proper tags

89b39b6

Merge commit from fork

df694e8

small fixes here and there. hardening.

update vm common

60958fd

Merge pull request #7833 from multiversx/new-vm-common

ce245f5

update vm common

flags compressed

2270ba4

Merge pull request #7835 from multiversx/v1.11.5-dev-config

7ba82b2

flags compressed

fixes after merge

c447f57

sstanculeanu self-assigned this Apr 28, 2026

sstanculeanu added the ignore-for-release-notes Do not include item in release notes label Apr 28, 2026

sstanculeanu added 2 commits April 28, 2026 11:44

fixes after merge

c74317c

test fizes after merge

ea9b5c5

ssd04 reviewed Apr 28, 2026

View reviewed changes

fix after review

7aef32b

BeniaminDrasovean requested review from BeniaminDrasovean and Copilot April 29, 2026 07:33

Copilot started reviewing on behalf of BeniaminDrasovean April 29, 2026 07:34 View session

Copilot AI reviewed Apr 29, 2026

View reviewed changes

BeniaminDrasovean reviewed Apr 29, 2026

View reviewed changes

added todo

396c5c2

BeniaminDrasovean approved these changes Apr 30, 2026

View reviewed changes

Conversation

sstanculeanu commented Apr 28, 2026

Reasoning behind the pull request

Proposed changes

Testing procedure

Pre-requisites

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 29, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 29, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 29, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 29, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants