Eval: Prefetch better

ledger/acctupdates.go

@@ -1169,9 +1169,9 @@ func (au *accountUpdates) lookupResource(rnd basics.Round, addr basics.Address,
 			return macct.AccountResource(), rnd, nil
 		}
 
-		// check baseAccoiunts again to see if it does not exist
+		// check baseResources again to see if it does not exist
 		if au.baseResources.readNotFound(addr, aidx) {
-			// it seems the account doesnt exist
+			// it seems the resource doesn't exist
 			return ledgercore.AccountResource{}, rnd, nil
 		}
 
@@ -1388,9 +1388,9 @@ func (au *accountUpdates) lookupWithoutRewards(rnd basics.Round, addr basics.Add
 			return macct.AccountData.GetLedgerCoreAccountData(), rnd, rewardsVersion, rewardsLevel, nil
 		}
 
-		// check baseAccoiunts again to see if it does not exist
+		// check baseAccounts again to see if it does not exist
 		if au.baseAccounts.readNotFound(addr) {
-			// it seems the account doesnt exist
+			// it seems the account doesn't exist
 			return ledgercore.AccountData{}, rnd, rewardsVersion, rewardsLevel, nil
 		}
 

ledger/eval/eval.go

@@ -129,7 +129,7 @@ type roundCowBase struct {
 	// execution. The AccountData is always an historical one, then therefore won't be changing.
 	// The underlying (accountupdates) infrastructure may provide additional cross-round caching which
 	// are beyond the scope of this cache.
-	// The account data store here is always the account data without the rewards.
+	// The account data stored here is always the account data without the rewards.
 	accounts map[basics.Address]ledgercore.AccountData
 
 	// The online accounts that we've already accessed during this round evaluation. This is a
@@ -2018,8 +2018,7 @@ func (validator *evalTxValidator) run() {
 		RewardsPool: validator.block.BlockHeader.RewardsPool,
 	}
 
-	var unverifiedTxnGroups [][]transactions.SignedTxn
-	unverifiedTxnGroups = make([][]transactions.SignedTxn, 0, len(validator.txgroups))
+	unverifiedTxnGroups := make([][]transactions.SignedTxn, 0, len(validator.txgroups))
 	for _, group := range validator.txgroups {
 		signedTxnGroup := make([]transactions.SignedTxn, len(group))
 		for j, txn := range group {
@@ -2076,7 +2075,7 @@ func Eval(ctx context.Context, l LedgerForEvaluator, blk bookkeeping.Block, vali
 	}
 
 	accountLoadingCtx, accountLoadingCancel := context.WithCancel(ctx)
-	preloadedTxnsData := prefetcher.PrefetchAccounts(accountLoadingCtx, l, blk.Round()-1, paysetgroups, blk.BlockHeader.FeeSink, blk.ConsensusProtocol())
+	preloadedTxnsData := prefetcher.BlockReferences(accountLoadingCtx, l, blk.Round()-1, paysetgroups, blk.BlockHeader.FeeSink, blk.ConsensusProtocol())
 	// ensure that before we exit from this method, the account loading is no longer active.
 	defer func() {
 		accountLoadingCancel()
@@ -2163,6 +2162,11 @@ transactionGroupLoop:
 						}
 					}
 				}
+				for _, lkv := range txgroup.KVs {
+					if _, have := base.kvStore[lkv.Key]; !have {
+						base.kvStore[lkv.Key] = lkv.Value
+					}
+				}
 			}
 			err = eval.TransactionGroup(txgroup.TxnGroup...)
 			if err != nil {