diff --git a/cmd/rpcdaemon/commands/debug_api.go b/cmd/rpcdaemon/commands/debug_api.go index 682c6a6e524..d757ddce2c2 100644 --- a/cmd/rpcdaemon/commands/debug_api.go +++ b/cmd/rpcdaemon/commands/debug_api.go @@ -205,8 +205,12 @@ func (api *PrivateDebugAPIImpl) GetModifiedAccountsByNumber(ctx context.Context, // getModifiedAccountsV3 returns a list of addresses that were modified in the block range // [startNum:endNum) func getModifiedAccountsV3(tx kv.TemporalTx, startTxNum, endTxNum uint64) ([]common.Address, error) { + it, err := tx.HistoryRange(temporal.AccountsHistory, int(startTxNum), int(endTxNum), order.Asc, -1) + if err != nil { + return nil, err + } + changedAddrs := make(map[common.Address]struct{}) - it, _ := tx.HistoryRange(temporal.AccountsHistory, int(startTxNum), int(endTxNum), order.Asc, -1) for it.HasNext() { k, _, err := it.Next() if err != nil { diff --git a/core/state/temporal/kv_temporal.go b/core/state/temporal/kv_temporal.go index 38cad43c2e5..fc86d125337 100644 --- a/core/state/temporal/kv_temporal.go +++ b/core/state/temporal/kv_temporal.go @@ -343,15 +343,19 @@ func (tx *Tx) HistoryRange(name kv.History, fromTs, toTs int, asc order.By, limi } switch name { case AccountsHistory: - it = tx.agg.AccountHistoryIterateChanged(fromTs, toTs, asc, limit, tx) - return it, nil + it, err = tx.agg.AccountHistoryIterateChanged(fromTs, toTs, asc, limit, tx) case StorageHistory: - it = tx.agg.StorageHistoryIterateChanged(fromTs, toTs, asc, limit, tx) - return it, nil + it, err = tx.agg.StorageHistoryIterateChanged(fromTs, toTs, asc, limit, tx) case CodeHistory: - it = tx.agg.CodeHistoryIterateChanged(fromTs, toTs, asc, limit, tx) - return it, nil + it, err = tx.agg.CodeHistoryIterateChanged(fromTs, toTs, asc, limit, tx) default: return nil, fmt.Errorf("unexpected history name: %s", name) } + if err != nil { + return nil, err + } + if closer, ok := it.(kv.Closer); ok { + tx.resourcesToClose = append(tx.resourcesToClose, closer) + } + return it, err }