[rpc-test] erigon_getBalanceChangesInBlock upper bound (#12642)

erigontech · Nov 8, 2024 · 26c9140 · 26c9140
1 parent 9e4ba4c
commit 26c9140
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/scripts/run_rpc_tests.sh b/.github/workflows/scripts/run_rpc_tests.sh
@@ -19,9 +19,8 @@ disabled_tests=(
     # remove this line after https://github.com/erigontech/rpc-tests/pull/282
     eth_getBlockByHash/test_10.json
     eth_getBlockByNumber/test_12.json
-    # Erigon bugs: https://github.com/erigontech/erigon/pull/12609
+    # Erigon bugs
     debug_accountRange
-    debug_storageRangeAt
     # need update rpc-test - because Erigon is correct (@AskAlexSharov will do after https://github.com/erigontech/erigon/pull/12634)
     # remove this line after https://github.com/erigontech/rpc-tests/pull/273
     debug_getModifiedAccountsByHash
@@ -51,7 +50,6 @@ disabled_tests=(
     engine_exchangeCapabilities/test_1.json
     engine_exchangeTransitionConfigurationV1/test_01.json
     engine_getClientVersionV1/test_1.json
-    erigon_getBalanceChangesInBlock
     trace_replayBlockTransactions/test_29.tar
     # do these perhaps require Erigon up?
     admin_nodeInfo/test_01.json

diff --git a/erigon-lib/state/history_stream.go b/erigon-lib/state/history_stream.go
@@ -441,7 +441,6 @@ func (hi *HistoryChangesIterFiles) Next() ([]byte, []byte, error) {
 	if err := hi.advance(); err != nil {
 		return nil, nil, err
 	}
-	fmt.Printf("[dbg] hist.Next: %x\n", hi.kBackup)
 	return hi.kBackup, hi.vBackup, nil
 }
 

diff --git a/turbo/jsonrpc/erigon_block.go b/turbo/jsonrpc/erigon_block.go
@@ -231,8 +231,15 @@ func (api *ErigonImpl) GetBalanceChangesInBlock(ctx context.Context, blockNrOrHa
 		return nil, err
 	}
 
-	minTxNum, _ := txNumsReader.Min(tx, blockNumber)
-	it, err := tx.(kv.TemporalTx).HistoryRange(kv.AccountsDomain, int(minTxNum), -1, order.Asc, -1)
+	minTxNum, err := txNumsReader.Min(tx, blockNumber)
+	if err != nil {
+		return nil, err
+	}
+	maxTxNum, err := txNumsReader.Max(tx, blockNumber)
+	if err != nil {
+		return nil, err
+	}
+	it, err := tx.(kv.TemporalTx).HistoryRange(kv.AccountsDomain, int(minTxNum), int(maxTxNum+1), order.Asc, -1)
 	if err != nil {
 		return nil, err
 	}

diff --git a/turbo/jsonrpc/storage_range.go b/turbo/jsonrpc/storage_range.go
@@ -50,7 +50,7 @@ func storageRangeAt(ttx kv.TemporalTx, contractAddress libcommon.Address, start
 		return StorageRangeResult{}, err
 	}
 	defer r.Close()
-	for i := 0; i < maxResult && r.HasNext(); i++ {
+	for len(result.Storage) < maxResult && r.HasNext() {
 		k, v, err := r.Next()
 		if err != nil {
 			return StorageRangeResult{}, err