Tweaks

internal/api/v3/event.go

@@ -77,8 +77,12 @@ func (s *EventService) didCommitBlock(e events.DidCommitBlock) error {
 func (s *EventService) loadBlockInfo(batch *database.Batch, e *api.BlockEvent) {
 	defer batch.Discard()
 
+	// Check for an entry in the new block ledger. If the conversion process is
+	// incomplete there will be empty entries, so we also need to check for that
+	// (hence l1.Index == 0). If there is not an entry in the new block ledger
+	// or it is empty, check for an old block ledger account.
 	var entries []*protocol.BlockEntry
-	if _, l1, e1 := batch.Account(s.partition.Ledger()).BlockLedger().Find(record.NewKey(e.Index)).Exact().Get(); e1 == nil {
+	if _, l1, e1 := batch.Account(s.partition.Ledger()).BlockLedger().Find(record.NewKey(e.Index)).Exact().Get(); e1 == nil || l1.Index == 0 {
 		entries = l1.Entries
 	} else if l2, e2 := batch.Account(s.partition.BlockLedger(e.Index)).Main().Get(); e2 == nil && l2.Type() == protocol.AccountTypeBlockLedger {
 		entries = l2.(*protocol.BlockLedger).Entries

internal/core/execute/v2/block/block_end.go

@@ -317,7 +317,8 @@ func (b *Block) executePostUpdateActions() error {
 				if err != nil {
 					return errors.UnknownError.WithFormat("add ledger entry for block %d: %w", i+j, err)
 				}
-				err = b.Batch.BPT().Delete(b.Batch.Account(b.Executor.Describe.BlockLedger(entry.BlockIndex)).Key())
+				blockLedgerAccount := b.Batch.Account(b.Executor.Describe.BlockLedger(entry.BlockIndex))
+				err = b.Batch.BPT().Delete(blockLedgerAccount.Key())
 				if err != nil {
 					return errors.UnknownError.WithFormat("delete BPT entry for block ledger %d: %w", i+j, err)
 				}

pkg/database/indexing/value.go

@@ -34,6 +34,7 @@ func (v *Value[V]) Get() (V, error) {
 	dec := binDecPool.Get(bytes.NewReader(v.data))
 	defer binDecPool.Put(dec)
 	err := dec.Decode(&v.value)
+	v.valueOk = err == nil
 	return v.value, err
 }