Pulled the contract updates from snapshots, removed by block filtering

pkg/blockchaininfo/blockchaininfo_test.go

@@ -104,7 +104,7 @@ func TestChangesGenerationNewEntries(t *testing.T) {
 	}
 
 	equal, changes, err := blockchaininfo.CompareBUpdatesInfo(currentBlockInfo, previousBlockInfo,
-		proto.TestNetScheme, 10)
+		proto.TestNetScheme)
 	if err != nil {
 		return
 	}
@@ -183,7 +183,7 @@ func TestChangesGenerationContainsPrevious(t *testing.T) {
 	}
 
 	equal, changes, err := blockchaininfo.CompareBUpdatesInfo(currentBlockInfo, previousBlockInfo,
-		proto.TestNetScheme, 10)
+		proto.TestNetScheme)
 	if err != nil {
 		return
 	}
@@ -245,7 +245,7 @@ func TestNoChangesGeneration(t *testing.T) {
 	}
 
 	equal, changes, err := blockchaininfo.CompareBUpdatesInfo(currentBlockInfo, previousBlockInfo,
-		proto.TestNetScheme, 10)
+		proto.TestNetScheme)
 	if err != nil {
 		return
 	}

pkg/blockchaininfo/nats_publisher.go

@@ -159,7 +159,6 @@ func handleBlockchainUpdate(updates BUpdatesInfo, bu *BUpdatesExtensionState, sc
 	bu.currentState = &updates
 	if bu.previousState == nil {
 		// publish initial updates
-
 		filteredDataEntries, err := filterDataEntries(updates.BlockUpdatesInfo.Height-bu.Limit,
 			updates.ContractUpdatesInfo.AllDataEntries)
 		if err != nil {

pkg/blockchaininfo/types.go

@@ -28,14 +28,13 @@ type BUpdatesInfo struct {
 // TODO wrap errors.
 
 func CompareBUpdatesInfo(current, previous BUpdatesInfo,
-	scheme proto.Scheme, heightLimit uint64) (bool, BUpdatesInfo, error) {
+	scheme proto.Scheme) (bool, BUpdatesInfo, error) {
 	changes := BUpdatesInfo{
 		BlockUpdatesInfo:    BlockUpdatesInfo{},
 		ContractUpdatesInfo: L2ContractDataEntries{},
 	}
 
 	equal := true
-	// todo REMOVE POINTERS
 	if current.BlockUpdatesInfo.Height != previous.BlockUpdatesInfo.Height {
 		equal = false
 		changes.BlockUpdatesInfo.Height = current.BlockUpdatesInfo.Height
@@ -58,22 +57,11 @@ func CompareBUpdatesInfo(current, previous BUpdatesInfo,
 		changes.BlockUpdatesInfo.BlockHeader = current.BlockUpdatesInfo.BlockHeader
 	}
 
-	previousFilteredDataEntries, err := filterDataEntries(previous.BlockUpdatesInfo.Height-heightLimit,
+	equalEntries, dataEntryChanges, err := compareDataEntries(current.ContractUpdatesInfo.AllDataEntries,
 		previous.ContractUpdatesInfo.AllDataEntries)
 	if err != nil {
 		return false, BUpdatesInfo{}, err
 	}
-	currentFilteredDataEntries, err := filterDataEntries(current.BlockUpdatesInfo.Height-heightLimit,
-		current.ContractUpdatesInfo.AllDataEntries)
-	if err != nil {
-		return false, BUpdatesInfo{}, err
-	}
-
-	equalEntries, dataEntryChanges, err := compareDataEntries(currentFilteredDataEntries,
-		previousFilteredDataEntries)
-	if err != nil {
-		return false, BUpdatesInfo{}, err
-	}
 	if !equalEntries {
 		equal = false
 		changes.ContractUpdatesInfo.AllDataEntries = dataEntryChanges
@@ -152,5 +140,5 @@ func compareDataEntries(current, previous proto.DataEntries) (bool, []proto.Data
 }
 
 func statesEqual(state BUpdatesExtensionState, scheme proto.Scheme) (bool, BUpdatesInfo, error) {
-	return CompareBUpdatesInfo(*state.currentState, *state.previousState, scheme, state.Limit)
+	return CompareBUpdatesInfo(*state.currentState, *state.previousState, scheme)
 }

pkg/state/appender.go

@@ -846,12 +846,7 @@ func (a *txAppender) appendBlock(params *appendBlockParams) error {
 	if a.bUpdatesExtension != nil && a.bUpdatesExtension.EnableBlockchainUpdatesPlugin() {
 		// TODO get info from block snapshot?
 
-		// blockSnapshot.TxSnapshots.
-
-		updtErr := a.updateBlockchainUpdateInfo(blockInfo, params.block)
-		if updtErr != nil {
-			return updtErr
-		}
+		a.updateBlockchainUpdateInfo(blockInfo, params.block, blockSnapshot)
 	}
 
 	// check whether the calculated snapshot state hash equals with the provided one
@@ -875,12 +870,8 @@ func (a *txAppender) appendBlock(params *appendBlockParams) error {
 	return a.blockDiffer.saveCurFeeDistr(params.block)
 }
 
-func (a *txAppender) updateBlockchainUpdateInfo(blockInfo *proto.BlockInfo, blockHeader *proto.BlockHeader) error {
-	// TODO improve this by using diffs instead grabbing all the records every time
-	dataEntries, err := a.ia.state.RetrieveEntries(proto.NewRecipientFromAddress(a.bUpdatesExtension.L2ContractAddress()))
-	if err != nil && !errors.Is(err, proto.ErrNotFound) {
-		return err
-	}
+func (a *txAppender) updateBlockchainUpdateInfo(blockInfo *proto.BlockInfo, blockHeader *proto.BlockHeader,
+	blockSnapshot proto.BlockSnapshot) {
 	blockID := blockHeader.BlockID()
 	bUpdatesInfo := blockchaininfo.BUpdatesInfo{
 		BlockUpdatesInfo: blockchaininfo.BlockUpdatesInfo{
@@ -890,12 +881,24 @@ func (a *txAppender) updateBlockchainUpdateInfo(blockInfo *proto.BlockInfo, bloc
 			BlockHeader: *blockHeader,
 		},
 		ContractUpdatesInfo: blockchaininfo.L2ContractDataEntries{
-			AllDataEntries: dataEntries,
+			AllDataEntries: nil,
 			Height:         blockInfo.Height,
 		},
 	}
+	// Write the L2 contract updates into the structure.
+	l2ContractCount := 0
+	for _, txSnapshots := range blockSnapshot.TxSnapshots {
+		for _, snapshot := range txSnapshots {
+			if dataEntriesSnapshot, ok := snapshot.(*proto.DataEntriesSnapshot); ok {
+				if dataEntriesSnapshot.Address == a.bUpdatesExtension.L2ContractAddress() {
+					l2ContractCount++
+					bUpdatesInfo.ContractUpdatesInfo.AllDataEntries = append(bUpdatesInfo.ContractUpdatesInfo.AllDataEntries,
+						dataEntriesSnapshot.DataEntries...)
+				}
+			}
+		}
+	}
 	a.bUpdatesExtension.WriteBUpdates(bUpdatesInfo)
-	return nil
 }
 
 func (a *txAppender) createCheckerInfo(params *appendBlockParams) (*checkerInfo, error) {