Keep gasLimit in RPC response if in block header

See also #2062 (comment)

e2e_test/e2e_test.go

@@ -619,8 +619,7 @@ func TestEthersJSCompatibilityDisable(t *testing.T) {
 	err = network[0].WsClient.GetRPCClient().CallContext(ctx, &result, "eth_getBlockByNumber", "latest", true)
 	require.NoError(t, err)
 
-	_, ok = result["gasLimit"]
-	assert.False(t, ok, "gasLimit field should not be present on RPC block")
+	// gasLimit can be in the response, depending on whether it is in the block header or not
 	_, ok = result["baseFeePerGas"]
 	assert.False(t, ok, "baseFeePerGas field should not be present on RPC block")
 }

internal/ethapi/api.go

@@ -709,17 +709,13 @@ func (s *PublicBlockChainAPI) GetBlockByNumber(ctx context.Context, number rpc.B
 	if block != nil && err == nil {
 		response, err := s.rpcMarshalBlock(ctx, block, true, fullTx)
 
-		if err == nil {
-			if s.b.RPCEthCompatibility() {
-				addEthCompatibilityFields(ctx, response, s.b, block.Header())
-				if number == rpc.PendingBlockNumber {
-					// Pending blocks need to nil out a few fields
-					for _, field := range []string{"hash", "nonce", "miner"} {
-						response[field] = nil
-					}
+		if err == nil && s.b.RPCEthCompatibility() {
+			addEthCompatibilityFields(ctx, response, s.b, block.Header())
+			if number == rpc.PendingBlockNumber {
+				// Pending blocks need to nil out a few fields
+				for _, field := range []string{"hash", "nonce", "miner"} {
+					response[field] = nil
 				}
-			} else {
-				delete(response, "gasLimit")
 			}
 		}
 		return response, err
@@ -738,8 +734,6 @@ func (s *PublicBlockChainAPI) GetBlockByHash(ctx context.Context, hash common.Ha
 		}
 		if s.b.RPCEthCompatibility() {
 			addEthCompatibilityFields(ctx, result, s.b, block.Header())
-		} else {
-			delete(result, "gasLimit")
 		}
 		return result, nil
 	}