[FAB-10747] Fix endorsedAt block in transientstore

Transient store uses simulation block height to determine
purging schedule for orphaned (uncommitted) private data in transient
store.

There was a problem where endorser was not passing the simulation
block height to transient store persist function, causing 0 to be
used as the simulation height. The impact was that all private data
was getting purged from transient store at each purge cycle,
including private data for recent in-flight transactions.

This commit passes the simulation height to the transient
store, and removes SimulationBlkHt from TxSimulationResults, as
it was never set or used as initially intended.

Change-Id: I28523d503c1233f2c0221fb8efcc9890f89fae3a
Signed-off-by: David Enyeart <enyeart@us.ibm.com>

Author: denyeart

core/endorser/endorser.go

@@ -316,10 +316,11 @@ func (e *Endorser) SimulateProposal(ctx context.Context, chainID string, txid st
 			}
 			// Add ledger height at which transaction was endorsed,
 			// `endorsedAt` is obtained from the block storage and at times this could be 'endorsement Height + 1'.
-			// However, since we use this height only to select the configuration, this works for now.
+			// However, since we use this height only to select the configuration (3rd parameter in distributePrivateData) and
+			// manage transient store purge for orphaned private writesets (4th parameter in distributePrivateData), this works for now.
 			// Ideally, ledger should add support in the simulator as a first class function `GetHeight()`.
 			pvtDataWithConfig.EndorsedAt = endorsedAt
-			if err := e.distributePrivateData(chainID, txid, pvtDataWithConfig, simResult.SimulationBlkHt); err != nil {
+			if err := e.distributePrivateData(chainID, txid, pvtDataWithConfig, endorsedAt); err != nil {
 				return nil, nil, nil, nil, err
 			}
 		}

core/ledger/ledger_interface.go

@@ -245,12 +245,9 @@ func (filter PvtNsCollFilter) Has(ns string, coll string) bool {
 }
 
 // TxSimulationResults captures the details of the simulation results
-// the field 'SimulationBlkHt' captures the approximate height of the blockchain on which
-// the transaction is simulated - this is used to decide when to expire the 'PvtDataSimulationResults' from transient storage
 type TxSimulationResults struct {
 	PubSimulationResults *rwset.TxReadWriteSet
 	PvtSimulationResults *rwset.TxPvtReadWriteSet
-	SimulationBlkHt      uint64
 }
 
 // GetPubSimulationBytes returns the serialized bytes of public readwrite set

core/transientstore/store.go

@@ -142,7 +142,7 @@ func (provider *storeProvider) Close() {
 func (s *store) Persist(txid string, blockHeight uint64,
 	privateSimulationResults *rwset.TxPvtReadWriteSet) error {
 
-	logger.Debugf("Persisting private data to transient store for txid = %s", txid)
+	logger.Debugf("Persisting private data to transient store for txid [%s] at block height [%d]", txid, blockHeight)
 
 	dbBatch := leveldbhelper.NewUpdateBatch()
 
@@ -190,7 +190,7 @@ func (s *store) Persist(txid string, blockHeight uint64,
 func (s *store) PersistWithConfig(txid string, blockHeight uint64,
 	privateSimulationResultsWithConfig *transientstore.TxPvtReadWriteSetWithConfigInfo) error {
 
-	logger.Debugf("Persisting private data to transient store for txid = %s", txid)
+	logger.Debugf("Persisting private data to transient store for txid [%s] at block height [%d]", txid, blockHeight)
 
 	dbBatch := leveldbhelper.NewUpdateBatch()
 
@@ -320,6 +320,8 @@ func (s *store) PurgeByHeight(maxBlockNumToRetain uint64) error {
 		// Remove private write set
 		compositeKeyPurgeIndexByHeight := iter.Key()
 		txid, uuid, blockHeight := splitCompositeKeyOfPurgeIndexByHeight(compositeKeyPurgeIndexByHeight)
+		logger.Debugf("Purging from transient store private data simulated at block [%d]: txid [%s] uuid [%s]", blockHeight, txid, uuid)
+
 		compositeKeyPvtRWSet := createCompositeKeyForPvtRWSet(txid, uuid, blockHeight)
 		dbBatch.Delete(compositeKeyPvtRWSet)