Merge pull request #3525 from dessaya/fix-nil-pointer

jsonrpc: fix nil pointer when block by hash not found

Author: dessaya

packages/evm/jsonrpc/evmchain.go

@@ -258,6 +258,9 @@ func (e *EVMChain) iscStateFromEVMBlockNumberOrHash(blockNumberOrHash *rpc.Block
 	}
 	blockHash, _ := blockNumberOrHash.Hash()
 	block := e.BlockByHash(blockHash)
+	if block == nil {
+		return nil, fmt.Errorf("block with hash %s not found", blockHash)
+	}
 	return e.iscStateFromEVMBlockNumber(block.Number())
 }
 
@@ -808,7 +811,11 @@ func (e *EVMChain) TraceBlockByNumber(blockNumber uint64, config *tracers.TraceC
 
 func (e *EVMChain) getBlockByNumberOrHash(blockNrOrHash rpc.BlockNumberOrHash) (*types.Block, error) {
 	if h, ok := blockNrOrHash.Hash(); ok {
-		return e.BlockByHash(h), nil
+		block := e.BlockByHash(h)
+		if block == nil {
+			return nil, fmt.Errorf("block not found: %v", blockNrOrHash.String())
+		}
+		return block, nil
 	} else if n, ok := blockNrOrHash.Number(); ok {
 		switch n {
 		case rpc.LatestBlockNumber:

packages/evm/jsonrpc/jsonrpctest/jsonrpc_test.go

@@ -93,6 +93,12 @@ func newSoloTestEnv(t testing.TB) *soloTestEnv {
 func TestRPCGetBalance(t *testing.T) {
 	env := newSoloTestEnv(t)
 	_, emptyAddress := solo.NewEthereumAccount()
+
+	{
+		_, err := env.Client.BalanceAtHash(context.Background(), emptyAddress, common.Hash{})
+		require.ErrorContains(env.T, err, "not found")
+	}
+
 	require.Zero(t, env.Balance(emptyAddress).Uint64())
 	wallet, nonEmptyAddress := env.soloChain.NewEthereumAccountWithL2Funds()
 	require.Equal(

packages/evm/jsonrpc/service.go

@@ -424,6 +424,9 @@ func (e *EthService) NewHeads(ctx context.Context) (*rpc.Subscription, error) {
 }
 
 func (e *EthService) Logs(ctx context.Context, q *RPCFilterQuery) (*rpc.Subscription, error) {
+	if q == nil {
+		q = &RPCFilterQuery{}
+	}
 	notifier, supported := rpc.NotifierFromContext(ctx)
 	if !supported {
 		return &rpc.Subscription{}, rpc.ErrNotificationsUnsupported