Handle transactions towards metachain in DbLookupExtensions #2256
Conversation
data/transaction/status.go
Outdated
| TransactionData []byte | ||
| SelfShard uint32 | ||
| MiniblockType block.Type | ||
| IsMiniblockFullyNotarized bool |
There was a problem hiding this comment.
@sasurobert Isn't the block finalized only at n+1 ?
There was a problem hiding this comment.
IsMiniBlockFully notarized is for when even the destination processes the miniblock and the result of the process is finalized, included on meta, and meta is finalized.
| @@ -228,27 +239,45 @@ func (hr *historyRepository) onNotarizedBlocks(shardID uint32, headers []data.He | |||
| for i, header := range headers { | |||
| headerHash := headersHashes[i] | |||
|
|
|||
| metaBlock, ok := header.(*block.MetaBlock) | |||
| if !ok { | |||
| asMetaBlock, isMetaBlock := header.(*block.MetaBlock) | |||
There was a problem hiding this comment.
metaBlock, isMetaBlock
| return | ||
| } | ||
|
|
||
| for _, shardData := range metaBlock.ShardInfo { | ||
| hr.onNotarizedBlock(metaBlock.GetNonce(), headerHash, shardData) | ||
| asBlock, isBlock := header.(*block.Header) |
| hr.onNotarizedBlock(metaBlock.GetNonce(), headerHash, shardData) | ||
| asBlock, isBlock := header.(*block.Header) | ||
| if isBlock { | ||
| if asBlock.GetShardID() != core.MetachainShardId { |
There was a problem hiding this comment.
This condition is always true
There was a problem hiding this comment.
Removed then.
| if isMetaBlock { | ||
| for _, shardData := range asMetaBlock.ShardInfo { | ||
| hr.onNotarizedInMetaBlock(asMetaBlock.GetNonce(), headerHash, &shardData) | ||
| } | ||
| return |
There was a problem hiding this comment.
You don't need to iterate the whole list ?
There was a problem hiding this comment.
@SebastianMarian, not sure what you mean - we iterate on the whole list of ShardInfos. What is not needed, it's discarded in onNotarizedMiniblock, of course - see logic around iDontCare.
There was a problem hiding this comment.
I referred to the whole list of headers, as you call return after the iteration of all the shardData from first headerHandler. It is ok ? I mean that this return should not be replaced with continue ?
There was a problem hiding this comment.
Oh, now I see. Will fix.
| continue | ||
| } | ||
|
|
||
| hr.onNotarizedInRegularBlockOfMeta(asMetaBlock.GetNonce(), headerHash, asBlock) |
There was a problem hiding this comment.
asBlock instead asMetaBlock? asMetaBlock will be nil and the code will panic here if asBlock is not nil and isBlock is true
There was a problem hiding this comment.
Good catch 🥳
My unit test was hiding that - see what I've changed there 🤯
(wasn't panicking, it returned 0 - also hidden in our system tests, because we were looking at destination for hyperblock coordinates, at source they would have been bad, nonce = 0)
| } | ||
| } | ||
|
|
||
| func (hr *historyRepository) onNotarizedBlock(metaBlockNonce uint64, metaBlockHash []byte, blockHeader block.ShardData) { | ||
| func (hr *historyRepository) onNotarizedInMetaBlock(metaBlockNonce uint64, metaBlockHash []byte, blockHeader *block.ShardData) { |
There was a problem hiding this comment.
shardData instead blockHeader
| if tx, ok := txObj.(*transaction.Transaction); ok { | ||
| return n.prepareNormalTx(tx) | ||
| } | ||
| case transaction.TxTypeInvalid: | ||
| if tx, ok := txObj.(*transaction.Transaction); ok { | ||
| return n.prepareInvalidTx(tx) |
andreibancioiu
dismissed stale reviews from iulianpascalau, LucianMincu, and sasurobert
via
74484ea
The metachain directly notarizes miniblocks towards it - at commit block time. Therefore, there's the time to set the hyperblock coordinates for the miniblocks in question. At the source shard, the "block notarized" notifications arrive in a slightly different manner - the payload is a
block.Header, not ablock.MetaBlock.Therefore,
nodeTransactions.gounsignedtransactions (e.g. return message, original transaction hash)DatabaseLookupExtensionsare enabled (that is, returnexecutedif hyperblock coordinates are fully set, that is, if parent miniblock is fully notarized)DatabaseLookupExtensions, and miniblock metadata is present.How to test: