From 8ae6f5bb643ff0c099a4e7a9f891f9d6d55ffccc Mon Sep 17 00:00:00 2001 From: miiu Date: Thu, 3 Apr 2025 10:18:21 +0300 Subject: [PATCH 1/3] remove prev proof --- data/block.go | 1 - process/elasticproc/block/blockProcessor.go | 7 ------ .../elasticproc/block/blockProcessor_test.go | 22 +------------------ 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/data/block.go b/data/block.go index 39b56a7b..e8720aa4 100644 --- a/data/block.go +++ b/data/block.go @@ -42,7 +42,6 @@ type Block struct { ScheduledData *ScheduledData `json:"scheduledData,omitempty"` EpochStartShardsData []*EpochStartShardData `json:"epochStartShardsData,omitempty"` Proof *api.HeaderProof `json:"proof,omitempty"` - PreviousHeaderProof *api.HeaderProof `json:"previousHeaderProof,omitempty"` RandSeed string `json:"randSeed,omitempty"` PrevRandSeed string `json:"prevRandSeed,omitempty"` Signature string `json:"signature,omitempty"` diff --git a/process/elasticproc/block/blockProcessor.go b/process/elasticproc/block/blockProcessor.go index c3b4942c..5b9cbb93 100644 --- a/process/elasticproc/block/blockProcessor.go +++ b/process/elasticproc/block/blockProcessor.go @@ -147,13 +147,6 @@ func addProofs(elasticBlock *data.Block, obh *outport.OutportBlockWithHeader) { elasticBlock.Proof = proofToAPIProof(obh.BlockData.HeaderProof) elasticBlock.PubKeyBitmap = elasticBlock.Proof.PubKeysBitmap } - - prevHeaderProof := obh.Header.GetPreviousProof() - if check.IfNilReflect(prevHeaderProof) { - return - } - elasticBlock.PreviousHeaderProof = proofToAPIProof(prevHeaderProof) - } func proofToAPIProof(headerProof coreData.HeaderProofHandler) *api.HeaderProof { diff --git a/process/elasticproc/block/blockProcessor_test.go b/process/elasticproc/block/blockProcessor_test.go index 94d096c2..8ca752ec 100644 --- a/process/elasticproc/block/blockProcessor_test.go +++ b/process/elasticproc/block/blockProcessor_test.go @@ -266,16 +266,6 @@ func TestBlockProcessor_PrepareBlockForDBEpochStartMeta(t *testing.T) { TxCount: 120, }, }, - PreviousHeaderProof: &dataBlock.HeaderProof{ - PubKeysBitmap: []byte("bitmap"), - AggregatedSignature: []byte("sig"), - HeaderHash: []byte("hash"), - HeaderEpoch: 1, - HeaderNonce: 3, - HeaderShardId: 2, - HeaderRound: 4, - IsStartOfEpoch: true, - }, } headerBytes, _ := bp.marshalizer.Marshal(header) @@ -321,7 +311,7 @@ func TestBlockProcessor_PrepareBlockForDBEpochStartMeta(t *testing.T) { Proposer: 0, Validators: nil, PubKeyBitmap: "6269746d617031", - Size: 1090, + Size: 925, SizeTxs: 0, Timestamp: 0, StateRootHash: "", @@ -369,16 +359,6 @@ func TestBlockProcessor_PrepareBlockForDBEpochStartMeta(t *testing.T) { HeaderRound: 2, IsStartOfEpoch: false, }, - PreviousHeaderProof: &api.HeaderProof{ - PubKeysBitmap: "6269746d6170", - AggregatedSignature: "736967", - HeaderHash: "68617368", - HeaderEpoch: 1, - HeaderNonce: 3, - HeaderShardId: 2, - HeaderRound: 4, - IsStartOfEpoch: true, - }, EpochStartShardsData: []*data.EpochStartShardData{ { ShardID: 1, From cb94570ac1a7b8871f2da93e3a7d0cdf48412da1 Mon Sep 17 00:00:00 2001 From: miiu Date: Fri, 4 Apr 2025 10:30:03 +0300 Subject: [PATCH 2/3] remove prev proof --- go.mod | 2 +- go.sum | 4 ++-- process/elasticproc/block/blockProcessor_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 4ee69aea..a441ab52 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/gin-gonic/gin v1.10.0 github.com/google/uuid v1.6.0 github.com/multiversx/mx-chain-communication-go v1.2.0 - github.com/multiversx/mx-chain-core-go v1.3.0 + github.com/multiversx/mx-chain-core-go v1.3.1-0.20250404072410-a7e6e011c70f github.com/multiversx/mx-chain-logger-go v1.0.15 github.com/multiversx/mx-chain-vm-common-go v1.5.16 github.com/prometheus/client_model v0.4.0 diff --git a/go.sum b/go.sum index bb3e6632..80de3ec6 100644 --- a/go.sum +++ b/go.sum @@ -253,8 +253,8 @@ github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/multiversx/mx-chain-communication-go v1.2.0 h1:0wOoLldiRbvaOPxwICbnRCqCpLqPewg8M/FMbC/0OXY= github.com/multiversx/mx-chain-communication-go v1.2.0/go.mod h1:wS3aAwkmHbC9mlzQdvL6p7l8Rqw3vmzhj7WZW1dTveA= -github.com/multiversx/mx-chain-core-go v1.3.0 h1:GhDlvwHAhG5AabgCoGxwdtTEzVCa0KPkGAKB+BtIgQ0= -github.com/multiversx/mx-chain-core-go v1.3.0/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE= +github.com/multiversx/mx-chain-core-go v1.3.1-0.20250404072410-a7e6e011c70f h1:Ma+t5PpKCsfcxGPEsW59okfEHk5Ojc0kCfcWaq21SvY= +github.com/multiversx/mx-chain-core-go v1.3.1-0.20250404072410-a7e6e011c70f/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE= github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk= github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc= github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ= diff --git a/process/elasticproc/block/blockProcessor_test.go b/process/elasticproc/block/blockProcessor_test.go index 8ca752ec..a4ca8a81 100644 --- a/process/elasticproc/block/blockProcessor_test.go +++ b/process/elasticproc/block/blockProcessor_test.go @@ -311,7 +311,7 @@ func TestBlockProcessor_PrepareBlockForDBEpochStartMeta(t *testing.T) { Proposer: 0, Validators: nil, PubKeyBitmap: "6269746d617031", - Size: 925, + Size: 898, SizeTxs: 0, Timestamp: 0, StateRootHash: "", From a26fb7ffa7b0083b3f88c688332336bf9a30a6a1 Mon Sep 17 00:00:00 2001 From: Sorin Stanculeanu Date: Fri, 9 May 2025 18:42:13 +0300 Subject: [PATCH 3/3] update core go --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a441ab52..e1a24574 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/gin-gonic/gin v1.10.0 github.com/google/uuid v1.6.0 github.com/multiversx/mx-chain-communication-go v1.2.0 - github.com/multiversx/mx-chain-core-go v1.3.1-0.20250404072410-a7e6e011c70f + github.com/multiversx/mx-chain-core-go v1.3.1 github.com/multiversx/mx-chain-logger-go v1.0.15 github.com/multiversx/mx-chain-vm-common-go v1.5.16 github.com/prometheus/client_model v0.4.0 diff --git a/go.sum b/go.sum index 80de3ec6..a5313de0 100644 --- a/go.sum +++ b/go.sum @@ -253,8 +253,8 @@ github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/multiversx/mx-chain-communication-go v1.2.0 h1:0wOoLldiRbvaOPxwICbnRCqCpLqPewg8M/FMbC/0OXY= github.com/multiversx/mx-chain-communication-go v1.2.0/go.mod h1:wS3aAwkmHbC9mlzQdvL6p7l8Rqw3vmzhj7WZW1dTveA= -github.com/multiversx/mx-chain-core-go v1.3.1-0.20250404072410-a7e6e011c70f h1:Ma+t5PpKCsfcxGPEsW59okfEHk5Ojc0kCfcWaq21SvY= -github.com/multiversx/mx-chain-core-go v1.3.1-0.20250404072410-a7e6e011c70f/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE= +github.com/multiversx/mx-chain-core-go v1.3.1 h1:r8DAkl9a9t6z38jjbtGNrz295pBeM6fwTq91TP8xX6U= +github.com/multiversx/mx-chain-core-go v1.3.1/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE= github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk= github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc= github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ=