[workingset] add GetDirty() to retrieve latest value

db/kvstorewithbuffer.go

@@ -24,6 +24,7 @@ type (
 	// and transaction with multiple writes
 	KVStoreWithBuffer interface {
 		KVStore
+		GetDirty(string, []byte) ([]byte, bool)
 		withBuffer
 	}
 
@@ -176,6 +177,13 @@ func (kvb *kvStoreWithBuffer) Get(ns string, key []byte) ([]byte, error) {
 	return value, err
 }
 
+func (kvb *kvStoreWithBuffer) GetDirty(ns string, key []byte) ([]byte, bool) {
+	if value, err := kvb.buffer.Get(ns, key); err == nil {
+		return value, true
+	}
+	return nil, false
+}
+
 func (kvb *kvStoreWithBuffer) Put(ns string, key, value []byte) error {
 	kvb.buffer.Put(ns, key, value, fmt.Sprintf("faild to put %x in %s", key, ns))
 	return nil

state/factory/factory.go

@@ -356,7 +356,7 @@ func (sf *factory) Validate(ctx context.Context, blk *block.Block) error {
 		if err := ws.ValidateBlock(ctx, blk); err != nil {
 			return errors.Wrap(err, "failed to validate block with workingset in factory")
 		}
-		sf.putIntoWorkingSets(key, ws)
+		sf.workingsets.Add(key, ws)
 	}
 	receipts, err := ws.Receipts()
 	if err != nil {
@@ -398,7 +398,7 @@ func (sf *factory) NewBlockBuilder(
 
 	blkCtx := protocol.MustGetBlockCtx(ctx)
 	key := generateWorkingSetCacheKey(blkBuilder.GetCurrentBlockHeader(), blkCtx.Producer.String())
-	sf.putIntoWorkingSets(key, ws)
+	sf.workingsets.Add(key, ws)
 	return blkBuilder, nil
 }
 
@@ -591,9 +591,3 @@ func (sf *factory) getFromWorkingSets(ctx context.Context, key hash.Hash256) (*w
 	}
 	return ws, false, nil
 }
-
-func (sf *factory) putIntoWorkingSets(key hash.Hash256, ws *workingSet) {
-	sf.mutex.Lock()
-	defer sf.mutex.Unlock()
-	sf.workingsets.Add(key, ws)
-}

state/factory/workingset.go

@@ -114,34 +114,6 @@ func (ws *workingSet) validate(ctx context.Context) error {
 	return nil
 }
 
-func (ws *workingSet) runActions(
-	ctx context.Context,
-	elps []*action.SealedEnvelope,
-) ([]*action.Receipt, error) {
-	// Handle actions
-	receipts := make([]*action.Receipt, 0)
-	blkCtx := protocol.MustGetBlockCtx(ctx)
-	fCtx := protocol.MustGetFeatureCtx(ctx)
-	for _, elp := range elps {
-		ctxWithActionContext, err := withActionCtx(ctx, elp)
-		if err != nil {
-			return nil, err
-		}
-		receipt, err := ws.runAction(protocol.WithBlockCtx(ctxWithActionContext, blkCtx), elp)
-		if err != nil {
-			return nil, errors.Wrap(err, "error when run action")
-		}
-		receipts = append(receipts, receipt)
-		if fCtx.EnableDynamicFeeTx && receipt.PriorityFee() != nil {
-			(&blkCtx.AccumulatedTips).Add(&blkCtx.AccumulatedTips, receipt.PriorityFee())
-		}
-	}
-	if fCtx.CorrectTxLogIndex {
-		updateReceiptIndex(receipts)
-	}
-	return receipts, nil
-}
-
 func withActionCtx(ctx context.Context, selp *action.SealedEnvelope) (context.Context, error) {
 	var actionCtx protocol.ActionCtx
 	var err error

state/factory/workingsetstore.go

@@ -15,6 +15,7 @@ import (
 type (
 	workingSetStore interface {
 		db.KVStoreBasic
+		GetDirty(string, []byte) ([]byte, bool)
 		Commit() error
 		States(string, [][]byte) ([][]byte, [][]byte, error)
 		Digest() hash.Hash256
@@ -39,6 +40,10 @@ func (store *workingSetStoreCommon) WriteView(name string, value interface{}) er
 	return store.view.Write(name, value)
 }
 
+func (store *workingSetStoreCommon) GetDirty(ns string, key []byte) ([]byte, bool) {
+	return store.flusher.KVStoreWithBuffer().GetDirty(ns, key)
+}
+
 func (store *workingSetStoreCommon) Put(ns string, key []byte, value []byte) error {
 	store.flusher.KVStoreWithBuffer().MustPut(ns, key, value)
 	return nil