cmd/rpctest: fix debug_accountRange bench encoding and start key size (erigontech#21774)

## Summary

- `request_generator.go`: replace `base64.StdEncoding.EncodeToString`
with `hexutil.Encode` for the `start` parameter — the server expects a
`0x`-prefixed hex string, not base64
- `bench1.go`, `bench3.go`, `bench9.go`, `account_range_verify.go`:
replace the initial page cursor from `common.Hash{}[:]` (32 bytes,
rejected by the server) to `common.Address{}[:]` (20 bytes)
- `request_generator_test.go`: update test cases to use 20-byte
addresses and hex-encoded expected strings

## Test plan

- [ ] `go test ./cmd/rpctest/rpctest/... -run
TestRequestGenerator_accountRange` passes
- [ ] `go test ./rpc/jsonrpc/... -run TestAccountRange` passes
- [ ] `make lint` clean

Author: lupin012

cmd/rpctest/rpctest/account_range_verify.go

@@ -88,7 +88,8 @@ func CompareAccountRange(logger log.Logger, erigonURL, gethURL, tmpDataDir, geth
 	f := func(url string, db kv.RwTx) error {
 		i := uint64(0)
 		reqGen := &RequestGenerator{}
-		next := []byte{}
+		var nextAddr common.Address
+		next := nextAddr[:]
 		for {
 			ar := DebugAccountRange{}
 			req := reqGen.accountRange(blockFrom, next, 256)

cmd/rpctest/rpctest/bench1.go

@@ -255,9 +255,9 @@ func Bench1(erigonURL, gethURL string, needCompare bool, fullTest bool, blockFro
 			}
 			fmt.Printf("Done blocks %d-%d, modified accounts: %d\n", prevBn, bn, len(mag.Result))
 
-			zeroHash := common.Hash{}
-			page := zeroHash[:]
-			pageGeth := zeroHash[:]
+			zeroAddr := common.Address{}
+			page := zeroAddr[:]
+			pageGeth := zeroAddr[:]
 
 			var accRangeErigon map[common.Address]state.DumpAccount
 			var accRangeGeth map[common.Address]state.DumpAccount

cmd/rpctest/rpctest/bench3.go

@@ -17,12 +17,12 @@
 package rpctest
 
 import (
-	"encoding/base64"
 	"errors"
 	"fmt"
 	"maps"
 
 	"github.com/erigontech/erigon/common"
+	"github.com/erigontech/erigon/common/hexutil"
 	"github.com/erigontech/erigon/execution/state"
 )
 
@@ -35,15 +35,14 @@ func Bench3(erigon_url, geth_url string) error {
 	req_id++
 	template := `{ "jsonrpc": "2.0", "method": "debug_accountRange", "params": ["0x1", "%s", %d, true, true, true], "id":%d}`
 
-	zeroHash := common.Hash{}
-	page := zeroHash[:]
+	zeroAddr := common.Address{}
+	page := zeroAddr[:]
 
 	accRangeTG := make(map[common.Address]state.DumpAccount)
 
 	for len(page) > 0 {
-		encodedKey := base64.StdEncoding.EncodeToString(page)
 		var sr DebugAccountRange
-		if err := post(client, erigon_url, fmt.Sprintf(template, encodedKey, pageSize, req_id), &sr); err != nil {
+		if err := post(client, erigon_url, fmt.Sprintf(template, hexutil.Encode(page), pageSize, req_id), &sr); err != nil {
 			return fmt.Errorf("Could not get accountRange: %v\n", err)
 		}
 		if sr.Error != nil {
@@ -57,19 +56,18 @@ func Bench3(erigon_url, geth_url string) error {
 
 	accRangeGeth := make(map[common.Address]state.DumpAccount)
 
-	page = zeroHash[:]
+	page = zeroAddr[:]
 	for len(page) > 0 {
-		encodedKey := base64.StdEncoding.EncodeToString(page)
 		var sr DebugAccountRange
-		if err := post(client, geth_url, fmt.Sprintf(template, encodedKey, pageSize, req_id), &sr); err != nil {
+		if err := post(client, geth_url, fmt.Sprintf(template, hexutil.Encode(page), pageSize, req_id), &sr); err != nil {
 			return fmt.Errorf("Could not get accountRange: %v\n", err)
 		}
 		if sr.Error != nil {
 			fmt.Printf("Error getting accountRange: %d %s\n", sr.Error.Code, sr.Error.Message)
 			break
 		} else {
 			page = sr.Result.Next
-			maps.Copy(accRangeTG, sr.Result.Accounts)
+			maps.Copy(accRangeGeth, sr.Result.Accounts)
 		}
 	}
 

cmd/rpctest/rpctest/bench9.go

@@ -43,8 +43,8 @@ func Bench9(erigonURL, gethURL string, needCompare, latest bool) error {
 	fmt.Printf("Last block: %d\n", lastBlock)
 	// Go back 256 blocks
 	bn := uint64(lastBlock) - 256
-	zeroHash := common.Hash{}
-	page := zeroHash[:]
+	zeroAddr := common.Address{}
+	page := zeroAddr[:]
 
 	var resultsCh chan CallResult = nil
 	if !needCompare {

cmd/rpctest/rpctest/request_generator.go

@@ -17,7 +17,6 @@
 package rpctest
 
 import (
-	"encoding/base64"
 	"fmt"
 	"net/http"
 	"strings"
@@ -179,8 +178,7 @@ func (g *RequestGenerator) getOverlayLogs2(prevBn uint64, bn uint64, account com
 
 func (g *RequestGenerator) accountRange(bn uint64, page []byte, num int) string { //nolint
 	const template = `{ "jsonrpc": "2.0", "method": "debug_accountRange", "params": ["0x%x", "%s", %d, false, false], "id":%d}`
-	encodedKey := base64.StdEncoding.EncodeToString(page)
-	return fmt.Sprintf(template, bn, encodedKey, num, g.reqID.Add(1))
+	return fmt.Sprintf(template, bn, hexutil.Encode(page), num, g.reqID.Add(1))
 }
 
 func (g *RequestGenerator) getProof(bn uint64, account common.Address, storageList []common.Hash) string {

cmd/rpctest/rpctest/request_generator_test.go

@@ -414,9 +414,9 @@ func TestRequestGenerator_getLogs2(t *testing.T) {
 }
 
 func TestRequestGenerator_accountRange(t *testing.T) {
-	hash1 := common.HexToHash("0x6f9e34c00812a80fa87df26208bbe69411e36d6a9f00b35444ef4181f6c483ca")
-	hash2 := common.HexToHash("0x1cfe7ce95a1694d8969365cb472ce4a0d3eed812c540fd7708bbe6941e34c4de")
-	hash3 := common.HexToHash("0x1cd73c7adf5b31f3cf94c67b9e251e699559d91c27664463fb5978b97f8b2d1b")
+	addr1 := common.HexToAddress("0x6f9e34c00812a80fa87df26208bbe69411e36d6a")
+	addr2 := common.HexToAddress("0x1cfe7ce95a1694d8969365cb472ce4a0d3eed812")
+	addr3 := common.HexToAddress("0x1cd73c7adf5b31f3cf94c67b9e251e699559d91c")
 	testCases := []struct {
 		reqId    int
 		blockNum uint64
@@ -427,23 +427,23 @@ func TestRequestGenerator_accountRange(t *testing.T) {
 		{
 			1,
 			4756370,
-			hash1[:],
+			addr1[:],
 			1,
-			`{ "jsonrpc": "2.0", "method": "debug_accountRange", "params": ["0x489392", "b540wAgSqA+offJiCLvmlBHjbWqfALNURO9BgfbEg8o=", 1, false, false], "id":1}`,
+			`{ "jsonrpc": "2.0", "method": "debug_accountRange", "params": ["0x489392", "0x6f9e34c00812a80fa87df26208bbe69411e36d6a", 1, false, false], "id":1}`,
 		},
 		{
 			2,
 			0,
-			hash2[:],
+			addr2[:],
 			2,
-			`{ "jsonrpc": "2.0", "method": "debug_accountRange", "params": ["0x0", "HP586VoWlNiWk2XLRyzkoNPu2BLFQP13CLvmlB40xN4=", 2, false, false], "id":2}`,
+			`{ "jsonrpc": "2.0", "method": "debug_accountRange", "params": ["0x0", "0x1cfe7ce95a1694d8969365cb472ce4a0d3eed812", 2, false, false], "id":2}`,
 		},
 		{
 			3,
 			1234567,
-			hash3[:],
+			addr3[:],
 			3,
-			`{ "jsonrpc": "2.0", "method": "debug_accountRange", "params": ["0x12d687", "HNc8et9bMfPPlMZ7niUeaZVZ2RwnZkRj+1l4uX+LLRs=", 3, false, false], "id":3}`,
+			`{ "jsonrpc": "2.0", "method": "debug_accountRange", "params": ["0x12d687", "0x1cd73c7adf5b31f3cf94c67b9e251e699559d91c", 3, false, false], "id":3}`,
 		},
 	}