add metadata to common block #300
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HagarMeir
force-pushed
the
common-block-metadata
branch
2 times, most recently
from
418aeb1 to
ba3186a
Compare
HagarMeir
force-pushed
the
common-block-metadata
branch
4 times, most recently
from
b6d94c1 to
b292849
Compare
tock-ibm
force-pushed
the
common-block-metadata
branch
from
b292849 to
769e144
Compare
tock-ibm
reviewed
Oct 27, 2025
| return nil, fmt.Errorf("proposed common block header number %d in index %d isn't equal to computed number %d", hdr.AvailableCommonBlocks[i].Header.Number, i, lastBlockNumber) | ||
| } | ||
|
|
||
| blockMetadata, err := ledger.AssemblerBlockMetadataToBytes(ba[0], &state.OrderingInformation{DecisionNum: arma_types.DecisionNum(md.LatestSequence), BatchCount: len(attestations), BatchIndex: i}, 0) |
There was a problem hiding this comment.
Calculate the TX count, or tests will break when you switch to use this metadata instead of creating it in the assembler.
In addition, right now we are not signing the metadata when we sign the block, but in fabric they do. One more reason to have the orderer metadata computed correctly here.
There was a problem hiding this comment.
I can add this in the next PR
| lastBlockNumber++ | ||
| availableCommonBlocks[i] = protoutil.NewBlock(lastBlockNumber, prevHash) | ||
| availableCommonBlocks[i].Header.DataHash = ba[0].Digest() | ||
| blockMetadata, err := ledger.AssemblerBlockMetadataToBytes(ba[0], &state.OrderingInformation{DecisionNum: arma_types.DecisionNum(md.LatestSequence), BatchCount: len(attestations), BatchIndex: i}, 0) |
node/consensus/consensus_builder.go
Outdated
|
|
||
| protoutil.InitBlockMetadata(availableCommonBlocks[0]) | ||
|
|
||
| blockMetadata, err := ledger.AssemblerBlockMetadataToBytes(state.NewAvailableBatch(0, arma_types.ShardIDConsensus, 0, genesisDigest), &state.OrderingInformation{DecisionNum: 0, BatchCount: 1, BatchIndex: 0}, 0) |
Comment on lines
+117
to
+122
| primary, shard, seq, _, _, _, _, err := ledger.AssemblerBlockMetadataFromBytes(acb.Metadata.Metadata[common.BlockMetadataIndex_ORDERER]) | ||
| if err != nil { | ||
| cr.logger.Panicf("Failed extracting info from metadata: %s", err) | ||
| } | ||
|
|
||
| acbBatch := state.NewAvailableBatch(primary, shard, seq, acb.Header.DataHash) |
There was a problem hiding this comment.
We could probably bundle this into a method "AssemblerBatchIDFromBlock" and put it in utils...
But I suspect we will have to streamline here anyway.
Signed-off-by: Hagar Meir <hagar.meir@ibm.com>
Signed-off-by: Hagar Meir <hagar.meir@ibm.com>
Signed-off-by: Hagar Meir <hagar.meir@ibm.com>
Signed-off-by: Hagar Meir <hagar.meir@ibm.com>
HagarMeir
force-pushed
the
common-block-metadata
branch
from
769e144 to
2667ce3
Compare
Signed-off-by: Hagar Meir <hagar.meir@ibm.com>
tock-ibm
approved these changes
Oct 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#193