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

Extend miniblocks and operations index #265

Draft
wants to merge 6 commits into
base: rc/v1.7.0
Choose a base branch
from
Draft

Extend miniblocks and operations index #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
556e18d
extend miniblock structure
miiu96 Feb 28, 2024
7a79942
fix unit tests
miiu96 Feb 28, 2024
1ce5f51
fix miniblocks integration tests
miiu96 Feb 28, 2024
3eebceb
Merge branch 'rc/v1.7.0' into extend-miniblocks-and-operations-index
miiu96 Apr 8, 2024
07e198d
Merge branch 'rc/v1.7.0' into extend-miniblocks-and-operations-index
miiu96 Apr 8, 2024
ec4b31d
Merge branch 'rc/v1.7.0' into extend-miniblocks-and-operations-index
miiu96 Sep 13, 2024
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
2 changes: 1 addition & 1 deletion cmd/elasticindexer/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ VERSION:
// Usage examples:
// linux/mac:
//
// go build -v -ldflags="-X main.appVersion=$(git describe --tags --long --dirty)"
// go build -v -ldflags="-X main.version=$(git describe --tags --long --dirty)"
//
// windows:
//
Expand Down
2 changes: 2 additions & 0 deletions data/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ type Miniblock struct {
Hash string `json:"hash,omitempty"`
SenderShardID uint32 `json:"senderShard"`
ReceiverShardID uint32 `json:"receiverShard"`
SenderBlockNonce uint64 `json:"senderBlockNonce,omitempty"`
ReceiverBlockNonce uint64 `json:"receiverBlockNonce,omitempty"`
SenderBlockHash string `json:"senderBlockHash,omitempty"`
ReceiverBlockHash string `json:"receiverBlockHash,omitempty"`
Type string `json:"type"`
Expand Down
4 changes: 4 additions & 0 deletions integrationtests/miniblocks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ func TestIndexMiniBlocksOnSourceAndDestination(t *testing.T) {

// index on the source shard
header := &dataBlock.Header{
Nonce: 112,
ShardID: 1,
TimeStamp: 1234,
}
Expand All @@ -48,6 +49,7 @@ func TestIndexMiniBlocksOnSourceAndDestination(t *testing.T) {
marshaller := &marshal.GogoProtoMarshalizer{}
mbhrBytes, _ := marshaller.Marshal(mbhr)
header = &dataBlock.Header{
Nonce: 911,
ShardID: 2,
TimeStamp: 1234,
MiniBlockHeaders: []dataBlock.MiniBlockHeader{
Expand Down Expand Up @@ -82,6 +84,7 @@ func TestIndexMiniBlockFirstOnDestinationAndAfterSource(t *testing.T) {
mbhrBytes, _ := marshaller.Marshal(mbhr)
header := &dataBlock.Header{
ShardID: 0,
Nonce: 100,
TimeStamp: 54321,
MiniBlockHeaders: []dataBlock.MiniBlockHeader{
{
Expand Down Expand Up @@ -111,6 +114,7 @@ func TestIndexMiniBlockFirstOnDestinationAndAfterSource(t *testing.T) {
}
mbhrBytes, _ = marshaller.Marshal(mbhr)
header.ShardID = 2
header.Nonce = 200
header.MiniBlockHeaders = []dataBlock.MiniBlockHeader{
{
Reserved: mbhrBytes,
Expand Down
5 changes: 3 additions & 2 deletions integrationtests/testdata/miniblocks/cross-miniblock-on-destination-first.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"procTypeD": "Processed",
"receiverShard": 0,
"senderShard": 2,
"receiverBlockHash": "b36435faaa72390772da84f418348ce0d477c74432579519bf0ffea1dc4c36e9",
"receiverBlockHash": "973e2f160d7d3bf8cacafcfd8c9cacf9b4a2c5e16285d1dbb6d5319a25975b6e",
"type": "TxBlock",
"timestamp": 54321
"timestamp": 54321,
"receiverBlockNonce": 100
}
8 changes: 5 additions & 3 deletions integrationtests/testdata/miniblocks/cross-miniblock-on-destination.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"procTypeS": "Normal",
"senderBlockHash": "3fede8a9a3c4f2ba6d7e6e01541813606cd61c4d3af2940f8e089827b5d94e50",
"senderBlockHash": "ef2151306f3ca2e3df6315ee236fada727849348d3660dd9900a28462f77561e",
"receiverShard": 2,
"senderShard": 1,
"type": "TxBlock",
"timestamp": 1234,
"receiverBlockHash": "d7f1e8003a45c7adbd87bbbb269cb4af3d1f4aedd0c214973bfc096dd0f3b65e",
"procTypeD": "Scheduled"
"receiverBlockHash": "796e8ecf22c47a224af7447336f39b389f4f9a7c09d61188ee7cb295599a2ce6",
"procTypeD": "Scheduled",
"senderBlockNonce":112,
"receiverBlockNonce": 911
}
8 changes: 5 additions & 3 deletions integrationtests/testdata/miniblocks/cross-miniblock-on-source-second.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
"procTypeD": "Processed",
"receiverShard": 0,
"senderShard": 2,
"receiverBlockHash": "b36435faaa72390772da84f418348ce0d477c74432579519bf0ffea1dc4c36e9",
"receiverBlockHash": "973e2f160d7d3bf8cacafcfd8c9cacf9b4a2c5e16285d1dbb6d5319a25975b6e",
"type": "TxBlock",
"timestamp": 54321,
"senderBlockHash": "b601381e1f41df2aa3da9f2b8eb169f14c86418229e30fc65f9e6b37b7f0d902",
"procTypeS": "Normal"
"senderBlockHash": "d5cf284717b96415ff9a0659ee5dc7c4fb2ebb1ddafec0dcfb9d3599da72a775",
"procTypeS": "Normal",
"receiverBlockNonce": 100,
"senderBlockNonce":200
}
5 changes: 3 additions & 2 deletions integrationtests/testdata/miniblocks/cross-miniblock-on-source.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"procTypeS": "Normal",
"senderBlockHash": "3fede8a9a3c4f2ba6d7e6e01541813606cd61c4d3af2940f8e089827b5d94e50",
"senderBlockHash": "ef2151306f3ca2e3df6315ee236fada727849348d3660dd9900a28462f77561e",
"receiverShard": 2,
"senderShard": 1,
"type": "TxBlock",
"timestamp": 1234
"timestamp": 1234,
"senderBlockNonce": 112
}
5 changes: 4 additions & 1 deletion process/elasticproc/miniblocks/miniblocksProcessor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ func (mp *miniblocksProcessor) prepareMiniblockForDB(

processingType, _ := mp.computeProcessingTypeAndConstructionState(mbIndex, header)
dbMiniblock.ProcessingTypeOnDestination = processingType
dbMiniblock.ReceiverBlockNonce = header.GetNonce()
dbMiniblock.ReceiverBlockHash = encodedHeaderHash

return dbMiniblock, nil
Expand All @@ -114,21 +115,23 @@ func (mp *miniblocksProcessor) setFieldsMBIntraShardAndCrossFromMe(
isIntraShard bool,
) {
processingType, constructionState := mp.computeProcessingTypeAndConstructionState(mbIndex, header)

dbMiniblock.SenderBlockNonce = header.GetNonce()
dbMiniblock.ProcessingTypeOnSource = processingType
switch {
case constructionState == int32(block.Final) && processingType == block.Normal.String():
dbMiniblock.SenderBlockHash = headerHash
dbMiniblock.ProcessingTypeOnSource = processingType
if isIntraShard {
dbMiniblock.ReceiverBlockHash = headerHash
dbMiniblock.ReceiverBlockNonce = header.GetNonce()
dbMiniblock.ProcessingTypeOnDestination = processingType
}
case constructionState == int32(block.Proposed) && processingType == block.Scheduled.String():
dbMiniblock.SenderBlockHash = headerHash
dbMiniblock.ProcessingTypeOnSource = processingType
case constructionState == int32(block.Final) && processingType == block.Processed.String():
dbMiniblock.ReceiverBlockHash = headerHash
dbMiniblock.ReceiverBlockNonce = header.GetNonce()
dbMiniblock.ProcessingTypeOnDestination = processingType
}
}
Expand Down
7 changes: 5 additions & 2 deletions process/elasticproc/miniblocks/miniblocksProcessor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ func TestMiniblocksProcessor_PrepareScheduledMB(t *testing.T) {
mbhrBytes, _ := marshalizer.Marshal(mbhr)

header := &dataBlock.Header{
Nonce: 100,
MiniBlockHeaders: []dataBlock.MiniBlockHeader{
{
Reserved: []byte{0},
Expand Down Expand Up @@ -114,11 +115,13 @@ func TestMiniblocksProcessor_PrepareScheduledMB(t *testing.T) {
Hash: "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
SenderShardID: 0,
ReceiverShardID: 0,
SenderBlockHash: "84b80cbf612d067201b5260b4c6f90fa7b5c11e898fa9c1c65f4c75e61e41619",
ReceiverBlockHash: "84b80cbf612d067201b5260b4c6f90fa7b5c11e898fa9c1c65f4c75e61e41619",
SenderBlockHash: "3e8098a9a58ec272b1a400d155b04d9e9488539ff93b1f746b410c3e07e1c6a4",
ReceiverBlockHash: "3e8098a9a58ec272b1a400d155b04d9e9488539ff93b1f746b410c3e07e1c6a4",
ProcessingTypeOnSource: dataBlock.Normal.String(),
ProcessingTypeOnDestination: dataBlock.Normal.String(),
Type: dataBlock.TxBlock.String(),
SenderBlockNonce: 100,
ReceiverBlockNonce: 100,
}, miniblocks[2])
}

Expand Down
2 changes: 2 additions & 0 deletions process/elasticproc/miniblocks/serialize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@ func (mp *miniblocksProcessor) prepareMiniblockData(miniblockDB *data.Miniblock,
} else {
if (params.npos) {
ctx._source.senderBlockHash = params.mb.senderBlockHash;
ctx._source.senderBlockNonce = params.mb.senderBlockNonce;
ctx._source.procTypeS = params.mb.procTypeS;
} else {
ctx._source.receiverBlockHash = params.mb.receiverBlockHash;
ctx._source.receiverBlockNonce = params.mb.receiverBlockNonce;
ctx._source.procTypeD = params.mb.procTypeD;
}
}
Expand Down
14 changes: 7 additions & 7 deletions process/elasticproc/miniblocks/serialize_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ func TestMiniblocksProcessor_SerializeBulkMiniBlocks(t *testing.T) {
mp.SerializeBulkMiniBlocks(miniblocks, buffSlice, "miniblocks", 0)

expectedBuff := `{ "update" : {"_index":"miniblocks", "_id" : "h1" } }
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":0,"receiverShard":1,"type":"","timestamp":0}, "npos": true }},"upsert": {}}
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.senderBlockNonce = params.mb.senderBlockNonce;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.receiverBlockNonce = params.mb.receiverBlockNonce;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":0,"receiverShard":1,"type":"","timestamp":0}, "npos": true }},"upsert": {}}
{ "update" : {"_index":"miniblocks", "_id" : "h2" } }
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":0,"receiverShard":2,"type":"","timestamp":0}, "npos": true }},"upsert": {}}
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.senderBlockNonce = params.mb.senderBlockNonce;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.receiverBlockNonce = params.mb.receiverBlockNonce;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":0,"receiverShard":2,"type":"","timestamp":0}, "npos": true }},"upsert": {}}
`
require.Equal(t, expectedBuff, buffSlice.Buffers()[0].String())
}
Expand All @@ -44,9 +44,9 @@ func TestMiniblocksProcessor_SerializeBulkMiniBlocksInDB(t *testing.T) {
mp.SerializeBulkMiniBlocks(miniblocks, buffSlice, "miniblocks", 0)

expectedBuff := `{ "update" : {"_index":"miniblocks", "_id" : "h1" } }
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":0,"receiverShard":1,"type":"","timestamp":0}, "npos": true }},"upsert": {}}
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.senderBlockNonce = params.mb.senderBlockNonce;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.receiverBlockNonce = params.mb.receiverBlockNonce;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":0,"receiverShard":1,"type":"","timestamp":0}, "npos": true }},"upsert": {}}
{ "update" : {"_index":"miniblocks", "_id" : "h2" } }
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":0,"receiverShard":2,"type":"","timestamp":0}, "npos": true }},"upsert": {}}
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.senderBlockNonce = params.mb.senderBlockNonce;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.receiverBlockNonce = params.mb.receiverBlockNonce;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":0,"receiverShard":2,"type":"","timestamp":0}, "npos": true }},"upsert": {}}
`
require.Equal(t, expectedBuff, buffSlice.Buffers()[0].String())
}
Expand All @@ -62,7 +62,7 @@ func TestSerializeMiniblock_CrossShardNormal(t *testing.T) {
mp.SerializeBulkMiniBlocks(miniblocks, buffSlice, "miniblocks", 1)

expectedBuff := `{ "update" : {"_index":"miniblocks", "_id" : "h1" } }
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":0,"receiverShard":1,"receiverBlockHash":"receiverBlock","type":"","timestamp":0}, "npos": false }},"upsert": {}}
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.senderBlockNonce = params.mb.senderBlockNonce;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.receiverBlockNonce = params.mb.receiverBlockNonce;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":0,"receiverShard":1,"receiverBlockHash":"receiverBlock","type":"","timestamp":0}, "npos": false }},"upsert": {}}
`
require.Equal(t, expectedBuff, buffSlice.Buffers()[0].String())
}
Expand All @@ -79,7 +79,7 @@ func TestSerializeMiniblock_IntraShardScheduled(t *testing.T) {
mp.SerializeBulkMiniBlocks(miniblocks, buffSlice, "miniblocks", 1)

expectedBuff := `{ "update" : {"_index":"miniblocks", "_id" : "h1" } }
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":1,"receiverShard":1,"senderBlockHash":"senderBlock","type":"","procTypeS":"Scheduled","timestamp":0}, "npos": true }},"upsert": {}}
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.senderBlockNonce = params.mb.senderBlockNonce;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.receiverBlockNonce = params.mb.receiverBlockNonce;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":1,"receiverShard":1,"senderBlockHash":"senderBlock","type":"","procTypeS":"Scheduled","timestamp":0}, "npos": true }},"upsert": {}}
`
require.Equal(t, expectedBuff, buffSlice.Buffers()[0].String())

Expand All @@ -92,7 +92,7 @@ func TestSerializeMiniblock_IntraShardScheduled(t *testing.T) {
mp.SerializeBulkMiniBlocks(miniblocks, buffSlice, "miniblocks", 1)

expectedBuff = `{ "update" : {"_index":"miniblocks", "_id" : "h1" } }
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":1,"receiverShard":1,"receiverBlockHash":"receiverBlock","type":"","procTypeD":"Processed","timestamp":0}, "npos": false }},"upsert": {}}
{"scripted_upsert": true, "script": {"source": "if ('create' == ctx.op) {ctx._source = params.mb} else {if (params.npos) {ctx._source.senderBlockHash = params.mb.senderBlockHash;ctx._source.senderBlockNonce = params.mb.senderBlockNonce;ctx._source.procTypeS = params.mb.procTypeS;} else {ctx._source.receiverBlockHash = params.mb.receiverBlockHash;ctx._source.receiverBlockNonce = params.mb.receiverBlockNonce;ctx._source.procTypeD = params.mb.procTypeD;}}","lang": "painless","params": { "mb": {"senderShard":1,"receiverShard":1,"receiverBlockHash":"receiverBlock","type":"","procTypeD":"Processed","timestamp":0}, "npos": false }},"upsert": {}}
`
require.Equal(t, expectedBuff, buffSlice.Buffers()[0].String())
}
Loading