diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/Scalars.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/Scalars.java index 251f4815bf2..45f9ffb6fce 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/Scalars.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/Scalars.java @@ -299,20 +299,19 @@ public Bytes32 parseLiteral( } }; - private static final Coercing LONG_COERCING = + private static final Coercing LONG_COERCING = new Coercing<>() { @Override - public Number serialize( + public String serialize( final Object input, final GraphQLContext graphQLContext, final Locale locale) throws CoercingSerializeException { if (input instanceof Number number) { - return number; + return Bytes.ofUnsignedLong(number.longValue()).toQuantityHexString(); } else if (input instanceof String string) { - final String value = string.toLowerCase(); - if (value.startsWith("0x")) { - return Bytes.fromHexStringLenient(value).toLong(); + if (string.startsWith("0x")) { + return string; } else { - return Long.parseLong(value); + return "0x" + string; } } throw new CoercingSerializeException("Unable to serialize " + input + " as an Long"); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceTest.java index 55eed120eb0..59aaff11d32 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceTest.java @@ -280,8 +280,8 @@ public void query_untypedPost() throws Exception { @Test public void getSocketAddressWhenActive() { final InetSocketAddress socketAddress = service.socketAddress(); - Assertions.assertThat("127.0.0.1").isEqualTo(socketAddress.getAddress().getHostAddress()); - Assertions.assertThat(socketAddress.getPort() > 0).isTrue(); + Assertions.assertThat(socketAddress.getAddress().getHostAddress()).isEqualTo("127.0.0.1"); + Assertions.assertThat(socketAddress.getPort()).isPositive(); } @Test @@ -289,9 +289,9 @@ public void getSocketAddressWhenStoppedIsEmpty() throws Exception { final GraphQLHttpService service = createGraphQLHttpService(); final InetSocketAddress socketAddress = service.socketAddress(); - Assertions.assertThat("0.0.0.0").isEqualTo(socketAddress.getAddress().getHostAddress()); - Assertions.assertThat(0).isEqualTo(socketAddress.getPort()); - Assertions.assertThat("").isEqualTo(service.url()); + Assertions.assertThat(socketAddress.getAddress().getHostAddress()).isEqualTo("0.0.0.0"); + Assertions.assertThat(socketAddress.getPort()).isZero(); + Assertions.assertThat(service.url()).isEmpty(); } @Test @@ -303,8 +303,8 @@ public void getSocketAddressWhenBindingToAllInterfaces() throws Exception { try { final InetSocketAddress socketAddress = service.socketAddress(); - Assertions.assertThat("0.0.0.0").isEqualTo(socketAddress.getAddress().getHostAddress()); - Assertions.assertThat(socketAddress.getPort() > 0).isTrue(); + Assertions.assertThat(socketAddress.getAddress().getHostAddress()).isEqualTo("0.0.0.0"); + Assertions.assertThat(socketAddress.getPort()).isPositive(); Assertions.assertThat(!service.url().contains("0.0.0.0")).isTrue(); } finally { service.stop().join(); @@ -331,12 +331,11 @@ public void ethGetUncleCountByBlockHash() throws Exception { @SuppressWarnings("unchecked") final List list = Mockito.mock(List.class); - Mockito.when(blockchainQueries.blockByHash(ArgumentMatchers.eq(blockHash))) - .thenReturn(Optional.of(block)); + Mockito.when(blockchainQueries.blockByHash(blockHash)).thenReturn(Optional.of(block)); Mockito.when(block.getOmmers()).thenReturn(list); Mockito.when(list.size()).thenReturn(uncleCount); - final String query = "{block(hash:\"" + blockHash.toString() + "\") {ommerCount}}"; + final String query = "{block(hash:\"" + blockHash + "\") {ommerCount}}"; final RequestBody body = RequestBody.create(query, GRAPHQL); try (final Response resp = client.newCall(buildPostRequest(body)).execute()) { @@ -344,8 +343,9 @@ public void ethGetUncleCountByBlockHash() throws Exception { final String jsonStr = resp.body().string(); final JsonObject json = new JsonObject(jsonStr); testHelper.assertValidGraphQLResult(json); - final int result = json.getJsonObject("data").getJsonObject("block").getInteger("ommerCount"); - Assertions.assertThat(result).isEqualTo(uncleCount); + final String result = + json.getJsonObject("data").getJsonObject("block").getString("ommerCount"); + Assertions.assertThat(Bytes.fromHexStringLenient(result).toInt()).isEqualTo(uncleCount); } } @@ -370,8 +370,9 @@ public void ethGetUncleCountByBlockNumber() throws Exception { final String jsonStr = resp.body().string(); final JsonObject json = new JsonObject(jsonStr); testHelper.assertValidGraphQLResult(json); - final int result = json.getJsonObject("data").getJsonObject("block").getInteger("ommerCount"); - Assertions.assertThat(result).isEqualTo(uncleCount); + final String result = + json.getJsonObject("data").getJsonObject("block").getString("ommerCount"); + Assertions.assertThat(Bytes.fromHexStringLenient(result).toInt()).isEqualTo(uncleCount); } } @@ -395,8 +396,9 @@ public void ethGetUncleCountByBlockLatest() throws Exception { final String jsonStr = resp.body().string(); final JsonObject json = new JsonObject(jsonStr); testHelper.assertValidGraphQLResult(json); - final int result = json.getJsonObject("data").getJsonObject("block").getInteger("ommerCount"); - Assertions.assertThat(result).isEqualTo(uncleCount); + final String result = + json.getJsonObject("data").getJsonObject("block").getString("ommerCount"); + Assertions.assertThat(Bytes.fromHexStringLenient(result).toInt()).isEqualTo(uncleCount); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/LongScalarTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/LongScalarTest.java index 119ce81ce0d..3a0861fa84e 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/LongScalarTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/LongScalarTest.java @@ -75,7 +75,7 @@ public void serializeLongTest() { scalar .getCoercing() .serialize(value, GraphQLContext.newContext().build(), Locale.ENGLISH)) - .isEqualTo(value); + .isEqualTo(str); } @Test @@ -84,7 +84,7 @@ public void serializeStringTest() { scalar .getCoercing() .serialize(str, GraphQLContext.newContext().build(), Locale.ENGLISH)) - .isEqualTo(value); + .isEqualTo(str); } @Test diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals.json index 024f465a3b3..d24ae7f6a17 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals.json @@ -1,18 +1,18 @@ { - "request": - "{ block (number: 33) { number withdrawalsRoot withdrawals { index amount validator address } } }", - + "request": "{ block (number: 33) { number withdrawalsRoot withdrawals { index amount validator address } } }", "response": { - "data" : { - "block" : { - "number" : 33, + "data": { + "block": { + "number": "0x21", "withdrawalsRoot": "0x37945ab58d2712a26df2a38d217e822694927e29b30d5993d7a53ccea618d1f3", - "withdrawals": [{ - "index": 0, - "amount": 10000000000, - "validator": 10, - "address": "0x0000000000000000000000000000000000000dad" - }] + "withdrawals": [ + { + "index": "0x0", + "amount": "0x2540be400", + "validator": "0xa", + "address": "0x0000000000000000000000000000000000000dad" + } + ] } } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals_pre_shanghai.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals_pre_shanghai.json index dd50acb5fe0..dcd0b1834c3 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals_pre_shanghai.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals_pre_shanghai.json @@ -1,11 +1,9 @@ { - "request": - "{ block (number: 32) { number withdrawalsRoot withdrawals { index amount } } }", - + "request": "{ block (number: 32) { number withdrawalsRoot withdrawals { index amount } } }", "response": { - "data" : { - "block" : { - "number" : 32, + "data": { + "block": { + "number": "0x20", "withdrawalsRoot": null, "withdrawals": null } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_blockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_blockNumber.json index b061e7e656f..247ec0146e5 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_blockNumber.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_blockNumber.json @@ -1,11 +1,9 @@ { - "request": - "{ block { number } }", - - "response": { - "data" : { - "block" : { - "number" : 33 + "request": "{ block { number } }", + "response": { + "data": { + "block": { + "number": "0x21" } } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8.json index 26a2eb4a457..ce54a411f62 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8.json @@ -1,13 +1,12 @@ { - "request": "{block(number :\"0x8\") {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}}}" - , - "response":{ - "data" : { - "block" : { - "number" : 8, - "call" : { - "data" : "0x0000000000000000000000000000000000000000000000000000000000000000", - "status" : 1 + "request": "{block(number :\"0x8\") {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}}}", + "response": { + "data": { + "block": { + "number": "0x8", + "call": { + "data": "0x0000000000000000000000000000000000000000000000000000000000000000", + "status": "0x1" } } } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8_invalidHexBytesData.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8_invalidHexBytesData.json index 4693fc3df57..942849e3339 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8_invalidHexBytesData.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8_invalidHexBytesData.json @@ -1,6 +1,5 @@ { - "request": "{block(number :\"0x8\") {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"12a7b914\"}){data status}}}" - , + "request": "{block(number :\"0x8\") {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"12a7b914\"}){data status}}}", "response": { "errors": [ { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_BlockLatest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_BlockLatest.json index 7c4a16df7c7..9b5bb2fd89c 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_BlockLatest.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_BlockLatest.json @@ -1,13 +1,12 @@ { - "request": "{block {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}}}" - , - "response":{ - "data" : { - "block" : { - "number" : 33, - "call" : { - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001", - "status" : 1 + "request": "{block {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}}}", + "response": { + "data": { + "block": { + "number": "0x21", + "call": { + "data": "0x0000000000000000000000000000000000000000000000000000000000000001", + "status": "0x1" } } } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_from_contract.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_from_contract.json index 9904c248c4c..211a97be18f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_from_contract.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_from_contract.json @@ -1,13 +1,12 @@ { - "request": "{block {number call (data : {from : \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", to: \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", data :\"0x123456\"}){data status}}}" - , - "response":{ - "data" : { - "block" : { - "number" : 33, - "call" : { - "data" : "0x", - "status" : 1 + "request": "{block {number call (data : {from : \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", to: \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", data :\"0x123456\"}){data status}}}", + "response": { + "data": { + "block": { + "number": "0x21", + "call": { + "data": "0x", + "status": "0x1" } } } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_contractDeploy.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_contractDeploy.json index fda2392515b..664a0e0135d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_contractDeploy.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_contractDeploy.json @@ -1,10 +1,9 @@ { - - "request" :"{block{estimateGas (data: {from :\"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", data :\"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029\"})}}", - "response":{ - "data" : { - "block" : { - "estimateGas" : 127129 + "request": "{block{estimateGas (data: {from :\"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", data :\"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029\"})}}", + "response": { + "data": { + "block": { + "estimateGas": "0x1f099" } } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_from_contract.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_from_contract.json index 776b5e0bec8..0836cf0dc3c 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_from_contract.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_from_contract.json @@ -1,9 +1,9 @@ { - "request" :"{block{estimateGas (data : {from : \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", to: \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", data :\"0x123456\"})}}", - "response":{ - "data" : { - "block" : { - "estimateGas" : 21048 + "request": "{block{estimateGas (data : {from : \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", to: \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", data :\"0x123456\"})}}", + "response": { + "data": { + "block": { + "estimateGas": "0x5238" } } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_noParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_noParams.json index 60a6408aeb3..54a84b893e6 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_noParams.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_noParams.json @@ -1,12 +1,11 @@ { - "request" :"{block{ estimateGas(data:{}) }}", - "response":{ - "data" : { - "block" : { - "estimateGas" : 53000 + "request": "{block{ estimateGas(data:{}) }}", + "response": { + "data": { + "block": { + "estimateGas": "0xcf08" } } }, - "statusCode": 200 } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_transfer.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_transfer.json index 6bf9c20f9ed..e30ffcf607c 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_transfer.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_transfer.json @@ -1,9 +1,9 @@ { - "request" :"{block{estimateGas (data: {from :\"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to :\"0x8888f1f195afa192cfee860698584c030f4c9db1\"})}}", - "response":{ - "data" : { - "block" : { - "estimateGas" : 21000 + "request": "{block{estimateGas (data: {from :\"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to :\"0x8888f1f195afa192cfee860698584c030f4c9db1\"})}}", + "response": { + "data": { + "block": { + "estimateGas": "0x5208" } } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_gasPrice.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_gasPrice.json index 8961bc6b582..744e7ea98b9 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_gasPrice.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_gasPrice.json @@ -1,10 +1,8 @@ { - "request": - "{ gasPrice maxPriorityFeePerGas }", - + "request": "{ gasPrice maxPriorityFeePerGas }", "response": { - "data" : { - "gasPrice" : "0x1", + "data": { + "gasPrice": "0x1", "maxPriorityFeePerGas": "0x0" } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_0x19.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_0x19.json index a7633f591d6..ffb6f29b19c 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_0x19.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_0x19.json @@ -1,10 +1,10 @@ { "request": "{ block(number:\"0x19\") { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } } }", "response": { - "data" : { + "data": { "block": { - "account" : { - "balance" : "0xfa" + "account": { + "balance": "0xfa" } } } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json index 90c59996777..f8a30f59f0f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json @@ -4,7 +4,7 @@ "data": { "pending": { "account": { - "balance": "0x0" + "balance": "0x0" } } } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_latest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_latest.json index be18be251bb..018772a9e8a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_latest.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_latest.json @@ -1,8 +1,8 @@ { "request": "{ pending { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } } }", "response": { - "data" : { - "pending" : { + "data": { + "pending": { "account": { "balance": "0x140" } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json index 9ee5053e36a..a744313b7e8 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json @@ -1,13 +1,9 @@ { - "request": - - "{block (hash : \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\") {transactionCount}} ", - - - "response": { - "data" : { - "block" : { - "transactionCount" : 1 + "request": "{block (hash : \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\") {transactionCount}} ", + "response": { + "data": { + "block": { + "transactionCount": "0x1" } } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json index 5bdbe5ba596..fa694a254a8 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json @@ -1,31 +1,29 @@ { - "request": - - "{block (number : \"0x1e\") {transactions{hash} timestamp difficulty totalDifficulty gasUsed gasLimit hash nonce ommerCount logsBloom mixHash ommerHash extraData stateRoot receiptsRoot transactionCount transactionsRoot}} ", - - - "response": { - "data" : { - "block" : { - "transactions" : [ { - "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" - } ], - "timestamp" : 1444660022, - "difficulty" : "0x20740", - "totalDifficulty" : "0x3e6cc0", - "gasUsed" : 23585, - "gasLimit" : 3141592, - "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", - "nonce" : "0x5c321bd9e9f040f1", - "ommerCount" : 0, - "logsBloom" : "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000", - "mixHash" : "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c", - "ommerHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "extraData" : "0x", - "stateRoot" : "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e", - "receiptsRoot" : "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d", - "transactionCount" : 1, - "transactionsRoot" : "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01" + "request": "{block (number : \"0x1e\") {transactions{hash} timestamp difficulty totalDifficulty gasUsed gasLimit hash nonce ommerCount logsBloom mixHash ommerHash extraData stateRoot receiptsRoot transactionCount transactionsRoot}} ", + "response": { + "data": { + "block": { + "transactions": [ + { + "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" + } + ], + "timestamp": "0x561bc336", + "difficulty": "0x20740", + "totalDifficulty": "0x3e6cc0", + "gasUsed": "0x5c21", + "gasLimit": "0x2fefd8", + "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", + "nonce": "0x5c321bd9e9f040f1", + "ommerCount": "0x0", + "logsBloom": "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000", + "mixHash": "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c", + "ommerHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + "extraData": "0x", + "stateRoot": "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e", + "receiptsRoot": "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d", + "transactionCount": "0x1", + "transactionsRoot": "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01" } } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash.json index 94b8df0ea58..2c88617ee68 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash.json @@ -1,32 +1,30 @@ { - "request": - - "{block (hash : \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\") {number transactions{hash} timestamp difficulty totalDifficulty gasUsed gasLimit hash nonce ommerCount logsBloom mixHash ommerHash extraData stateRoot receiptsRoot transactionCount transactionsRoot}} ", - - - "response": { - "data" : { - "block" : { - "number" : 30, - "transactions" : [ { - "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" - } ], - "timestamp" : 1444660022, - "difficulty" : "0x20740", - "totalDifficulty" : "0x3e6cc0", - "gasUsed" : 23585, - "gasLimit" : 3141592, - "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", - "nonce" : "0x5c321bd9e9f040f1", - "ommerCount" : 0, - "logsBloom" : "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000", - "mixHash" : "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c", - "ommerHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "extraData" : "0x", - "stateRoot" : "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e", - "receiptsRoot" : "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d", - "transactionCount" : 1, - "transactionsRoot" : "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01" + "request": "{block (hash : \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\") {number transactions{hash} timestamp difficulty totalDifficulty gasUsed gasLimit hash nonce ommerCount logsBloom mixHash ommerHash extraData stateRoot receiptsRoot transactionCount transactionsRoot}} ", + "response": { + "data": { + "block": { + "number": "0x1e", + "transactions": [ + { + "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" + } + ], + "timestamp": "0x561bc336", + "difficulty": "0x20740", + "totalDifficulty": "0x3e6cc0", + "gasUsed": "0x5c21", + "gasLimit": "0x2fefd8", + "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", + "nonce": "0x5c321bd9e9f040f1", + "ommerCount": "0x0", + "logsBloom": "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000", + "mixHash": "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c", + "ommerHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + "extraData": "0x", + "stateRoot": "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e", + "receiptsRoot": "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d", + "transactionCount": "0x1", + "transactionsRoot": "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01" } } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHashInvalid.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHashInvalid.json index 1824755037a..a1ec74511c3 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHashInvalid.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHashInvalid.json @@ -18,7 +18,9 @@ } } ], - "data": {"block": null} + "data": { + "block": null + } }, "statusCode": 400 } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumber.json index d6c2481117f..f9c9c7ece8c 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumber.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumber.json @@ -1,41 +1,39 @@ { - "request": - - "{block (number : \"0x1e\") {transactions{hash} timestamp difficulty totalDifficulty gasUsed gasLimit hash nonce ommerCount logsBloom mixHash ommerHash extraData stateRoot receiptsRoot transactionCount transactionsRoot ommers{hash} ommerAt(index : 1){hash} miner{address} account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\"){balance} parent{hash} }} ", - - - "response":{ - "data" : { - "block" : { - "transactions" : [ { - "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" - } ], - "timestamp" : 1444660022, - "difficulty" : "0x20740", - "totalDifficulty" : "0x3e6cc0", - "gasUsed" : 23585, - "gasLimit" : 3141592, - "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", - "nonce" : "0x5c321bd9e9f040f1", - "ommerCount" : 0, - "logsBloom" : "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000", - "mixHash" : "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c", - "ommerHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "extraData" : "0x", - "stateRoot" : "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e", - "receiptsRoot" : "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d", - "transactionCount" : 1, - "transactionsRoot" : "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01", - "ommers" : [ ], - "ommerAt" : null, - "miner" : { - "address" : "0x8888f1f195afa192cfee860698584c030f4c9db1" + "request": "{block (number : \"0x1e\") {transactions{hash} timestamp difficulty totalDifficulty gasUsed gasLimit hash nonce ommerCount logsBloom mixHash ommerHash extraData stateRoot receiptsRoot transactionCount transactionsRoot ommers{hash} ommerAt(index : 1){hash} miner{address} account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\"){balance} parent{hash} }} ", + "response": { + "data": { + "block": { + "transactions": [ + { + "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" + } + ], + "timestamp": "0x561bc336", + "difficulty": "0x20740", + "totalDifficulty": "0x3e6cc0", + "gasUsed": "0x5c21", + "gasLimit": "0x2fefd8", + "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", + "nonce": "0x5c321bd9e9f040f1", + "ommerCount": "0x0", + "logsBloom": "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000", + "mixHash": "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c", + "ommerHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + "extraData": "0x", + "stateRoot": "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e", + "receiptsRoot": "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d", + "transactionCount": "0x1", + "transactionsRoot": "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01", + "ommers": [], + "ommerAt": null, + "miner": { + "address": "0x8888f1f195afa192cfee860698584c030f4c9db1" }, - "account" : { - "balance" : "0x12c" + "account": { + "balance": "0x12c" }, - "parent" : { - "hash" : "0xf8cfa377bd766cdf22edb388dd08cc149e85d24f2796678c835f3c54ab930803" + "parent": { + "hash": "0xf8cfa377bd766cdf22edb388dd08cc149e85d24f2796678c835f3c54ab930803" } } } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_shanghai.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_shanghai.json index 099460a8e83..3e98251971b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_shanghai.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_shanghai.json @@ -1,8 +1,8 @@ { "request": "{block (number : 33) { baseFeePerGas difficulty extraData miner { address } mixHash nonce stateRoot totalDifficulty withdrawalsRoot withdrawals { address amount index validator } }} ", - "response":{ - "data" : { - "block" : { + "response": { + "data": { + "block": { "baseFeePerGas": "0x3b9aca00", "difficulty": "0x0", "extraData": "0x", @@ -17,9 +17,9 @@ "withdrawals": [ { "address": "0x0000000000000000000000000000000000000dad", - "amount": 10000000000, - "index": 0, - "validator": 10 + "amount": "0x2540be400", + "index": "0x0", + "validator": "0xa" } ] } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode.json index 94a3eea09a1..e9e1ea45576 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode.json @@ -1,8 +1,7 @@ { - "request" : "{ pending { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { code } } }", - + "request": "{ pending { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { code } } }", "response": { - "data" : { + "data": { "pending": { "account": { "code": "0x6000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56" @@ -10,6 +9,5 @@ } } }, - "statusCode": 200 } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode_noCode.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode_noCode.json index 16f50cd8195..55dad6d0ffa 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode_noCode.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode_noCode.json @@ -1,16 +1,13 @@ { - "request" : "{ pending { account(address: \"0x8888f1f195afa192cfee860698584c030f4c9db1\") { code } } }", - + "request": "{ pending { account(address: \"0x8888f1f195afa192cfee860698584c030f4c9db1\") { code } } }", "response": { - "data" : { + "data": { "pending": { - "account" :{ - "code" :"0x" + "account": { + "code": "0x" } } } }, - "statusCode": 200 - } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_emptyListParam.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_emptyListParam.json index 5a8b9756206..f4d645018d9 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_emptyListParam.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_emptyListParam.json @@ -1,26 +1,27 @@ { "request": "{ block(number: \"0x20\") { logs( filter: { topics : [[], [\"0x000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b\"]]}) { index topics data account{address} transaction{hash} } } }", "response": { - "data" : { - "block" : { - "logs" : [ { - "index" : 0, - "topics": [ - "0x0000000000000000000000000000000000000000000000000000000000000001", - "0x000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b", - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ], - "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9000000000000000000000000000000000000000000000000000000000000002a", - "account" : { - "address" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" - }, - "transaction" : { - "hash" : "0xcef53f2311d7c80e9086d661e69ac11a5f3d081e28e02a9ba9b66749407ac310" + "data": { + "block": { + "logs": [ + { + "index": "0x0", + "topics": [ + "0x0000000000000000000000000000000000000000000000000000000000000001", + "0x000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + ], + "data": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9000000000000000000000000000000000000000000000000000000000000002a", + "account": { + "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" + }, + "transaction": { + "hash": "0xcef53f2311d7c80e9086d661e69ac11a5f3d081e28e02a9ba9b66749407ac310" + } } - } ] + ] } } }, - "statusCode": 200 } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchAnyTopic.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchAnyTopic.json index b8d897bee79..eb56dccac12 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchAnyTopic.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchAnyTopic.json @@ -1,22 +1,25 @@ { "request": "{ block(number: \"0x17\") { logs( filter: { topics : []}) { index topics data account{address} transaction{hash} } } }", "response": { - "data" : { - "block" : { - "logs" : [ { - "index" : 0, - "topics" : [ "0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580" ], - "data" : "0x000000000000000000000000000000000000000000000000000000000000002a", - "account" : { - "address" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" - }, - "transaction" : { - "hash" : "0x97a385bf570ced7821c6495b3877ddd2afd5c452f350f0d4876e98d9161389c6" + "data": { + "block": { + "logs": [ + { + "index": "0x0", + "topics": [ + "0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580" + ], + "data": "0x000000000000000000000000000000000000000000000000000000000000002a", + "account": { + "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" + }, + "transaction": { + "hash": "0x97a385bf570ced7821c6495b3877ddd2afd5c452f350f0d4876e98d9161389c6" + } } - } ] + ] } } }, - "statusCode": 200 } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchTopic.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchTopic.json index 46f79ccd757..7a674cd57b8 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchTopic.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchTopic.json @@ -1,22 +1,25 @@ { "request": "{ block(number: \"0x17\") { logs( filter: { topics : [[\"0x000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b\", \"0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580\"]]}) { index topics data account{address} transaction{hash} } } }", "response": { - "data" : { - "block" : { - "logs" : [ { - "index" : 0, - "topics" : [ "0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580" ], - "data" : "0x000000000000000000000000000000000000000000000000000000000000002a", - "account" : { - "address" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" - }, - "transaction" : { - "hash" : "0x97a385bf570ced7821c6495b3877ddd2afd5c452f350f0d4876e98d9161389c6" + "data": { + "block": { + "logs": [ + { + "index": "0x0", + "topics": [ + "0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580" + ], + "data": "0x000000000000000000000000000000000000000000000000000000000000002a", + "account": { + "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" + }, + "transaction": { + "hash": "0x97a385bf570ced7821c6495b3877ddd2afd5c452f350f0d4876e98d9161389c6" + } } - } ] + ] } } }, - "statusCode": 200 } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_range.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_range.json index 34416ddb867..1d54cdf6285 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_range.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_range.json @@ -4,7 +4,7 @@ "data": { "logs": [ { - "index": 0, + "index": "0x0", "topics": [ "0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580" ], @@ -15,12 +15,12 @@ "transaction": { "hash": "0x97a385bf570ced7821c6495b3877ddd2afd5c452f350f0d4876e98d9161389c6", "block": { - "number": 23 + "number": "0x17" } } }, { - "index": 0, + "index": "0x0", "topics": [], "data": "0x000000000000000000000000000000000000000000000000000000000000002a", "account": { @@ -29,7 +29,7 @@ "transaction": { "hash": "0x5ecd942096ab3f70c5bcc8f3a98f88c4ff0a3bd986417df9948eb1819db76d0e", "block": { - "number": 24 + "number": "0x18" } } } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt.json index 09d2569e80b..591be7bfd5b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt.json @@ -1,15 +1,13 @@ { - "request" :"{ pending { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { storage(slot: \"0x00000000000000000000000000000004\") } } }", - + "request": "{ pending { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { storage(slot: \"0x00000000000000000000000000000004\") } } }", "response": { - "data" : { + "data": { "pending": { - "account" :{ - "storage" :"0xaabbccffffffffffffffffffffffffffffffffffffffffffffffffffffffffee" + "account": { + "storage": "0xaabbccffffffffffffffffffffffffffffffffffffffffffffffffffffffffee" } } } }, - "statusCode": 200 } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json index 77155a8d264..85d7d8ce9d7 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json @@ -1,15 +1,13 @@ { - "request" :"{ pending { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { storage(slot: \"0x00000000000000000000000000000021\") } } }", - - "response":{ - "data" : { + "request": "{ pending { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { storage(slot: \"0x00000000000000000000000000000021\") } } }", + "response": { + "data": { "pending": { - "account" : { - "storage" : "0x0000000000000000000000000000000000000000000000000000000000000000" + "account": { + "storage": "0x0000000000000000000000000000000000000000000000000000000000000000" } } } }, - "statusCode": 200 } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionCount.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionCount.json index 990fbf74773..a1fc9e307c2 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionCount.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionCount.json @@ -1,15 +1,13 @@ { - "request" :"{ pending { account(address: \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\") { transactionCount } } }", - + "request": "{ pending { account(address: \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\") { transactionCount } } }", "response": { - "data" : { + "data": { "pending": { - "account" :{ - "transactionCount" : 33 + "account": { + "transactionCount": "0x21" } } } }, - "statusCode": 200 } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionReceipt.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionReceipt.json index 4d58d0a8a4a..983b460f617 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionReceipt.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionReceipt.json @@ -1,29 +1,27 @@ -{ - "request" : "{ transaction(hash: \"0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed\") {block{hash logsBloom} hash createdContract{address} cumulativeGasUsed gas gasUsed logs{topics} from{address} to{address} index } }", - - "response":{ - "data" : { - "transaction" : { - "block" : { - "hash" : "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9", - "logsBloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" +{ + "request": "{ transaction(hash: \"0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed\") {block{hash logsBloom} hash createdContract{address} cumulativeGasUsed gas gasUsed logs{topics} from{address} to{address} index } }", + "response": { + "data": { + "transaction": { + "block": { + "hash": "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" }, - "hash" : "0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed", - "createdContract" : { - "address":"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" + "hash": "0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed", + "createdContract": { + "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" }, - "cumulativeGasUsed" : 493172, - "gas" : 3141592, - "gasUsed" : 493172, - "logs" : [ ], - "from" : { - "address" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" + "cumulativeGasUsed": "0x78674", + "gas": "0x2fefd8", + "gasUsed": "0x78674", + "logs": [], + "from": { + "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" }, - "to" : null, - "index" : 0 + "to": null, + "index": "0x0" } } }, - "statusCode": 200 } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json index 50c82e95365..649015ff2c7 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json @@ -1,20 +1,16 @@ { - "request": - - "{ block(hash: \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\") { transactionAt(index: 0) {block{hash} hash } } }", - - "response":{ - "data" : { - "block" : { - "transactionAt" : { - "block" : { - "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6" + "request": "{ block(hash: \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\") { transactionAt(index: 0) {block{hash} hash } } }", + "response": { + "data": { + "block": { + "transactionAt": { + "block": { + "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6" }, - "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" + "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" } } } }, - "statusCode": 200 } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json index 84f8b19b323..c6cfbfcf7ec 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json @@ -1,20 +1,16 @@ { - "request": - - "{ block(number: \"0x1e\") { transactionAt(index: 0) {block{hash} hash} } }", - - "response":{ - "data" : { - "block" : { - "transactionAt" : { - "block" : { - "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6" + "request": "{ block(number: \"0x1e\") { transactionAt(index: 0) {block{hash} hash} } }", + "response": { + "data": { + "block": { + "transactionAt": { + "block": { + "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6" }, - "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" + "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" } } } }, - "statusCode": 200 } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json index b15fe8df6d6..1fd7694f7db 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json @@ -1,12 +1,9 @@ { - "request": - - "{ block(number: \"0x1e\") { transactionAt(index: 1) {block{hash} hash} } }", - - "response":{ - "data" : { - "block" : { - "transactionAt" : null + "request": "{ block(number: \"0x1e\") { transactionAt(index: 1) {block{hash} hash} } }", + "response": { + "data": { + "block": { + "transactionAt": null } } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHash.json index 307a94cdd3a..63623394019 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHash.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHash.json @@ -1,30 +1,31 @@ { - "request": - "{transaction (hash : \"0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4\") { block{hash} gas gasPrice hash inputData nonce index value from {address} to {address} logs{index} status createdContract{address} } } ", - "response": { - "data" : { - "transaction" : { - "block" : { - "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6" + "request": "{transaction (hash : \"0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4\") { block{hash} gas gasPrice hash inputData nonce index value from {address} to {address} logs{index} status createdContract{address} } } ", + "response": { + "data": { + "transaction": { + "block": { + "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6" }, - "gas" : 314159, - "gasPrice" : "0x1", - "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4", - "inputData" : "0xe8beef5b", - "nonce" : 29, - "index" : 0, - "value" : "0xa", - "from" : { - "address" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" + "gas": "0x4cb2f", + "gasPrice": "0x1", + "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4", + "inputData": "0xe8beef5b", + "nonce": "0x1d", + "index": "0x0", + "value": "0xa", + "from": { + "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" }, - "to" : { - "address" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" + "to": { + "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" }, - "logs" : [ { - "index" : 0 - } ], - "status" : null, - "createdContract" : null + "logs": [ + { + "index": "0x0" + } + ], + "status": null, + "createdContract": null } } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHashNull.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHashNull.json index d7386982f4a..85fcda84846 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHashNull.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHashNull.json @@ -1,12 +1,8 @@ { - "request": - - "{transaction (hash : \"0xffc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4\") { block{hash} gas gasPrice hash inputData nonce index value }} ", - - + "request": "{transaction (hash : \"0xffc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4\") { block{hash} gas gasPrice hash inputData nonce index value }} ", "response": { - "data" : { - "transaction" : null + "data": { + "transaction": null } }, "statusCode": 200 diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_type2.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_type2.json index b910e159cc6..d88f5f51554 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_type2.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_type2.json @@ -3,15 +3,19 @@ "response": { "data": { "transaction": { - "accessList": [{ - "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f", - "storageKeys": ["0x0000000000000000000000000000000000000000000000000000000000000000"] - }], + "accessList": [ + { + "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f", + "storageKeys": [ + "0x0000000000000000000000000000000000000000000000000000000000000000" + ] + } + ], "maxFeePerGas": "0xb2d05e00", "maxPriorityFeePerGas": "0x3b9aca00", - "nonce": 32, - "type": 2, - "status": 1 + "nonce": "0x20", + "type": "0x2", + "status": "0x1" } } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json index 12370766ba0..dfa916e71c5 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json @@ -1,8 +1,8 @@ { - "request" : "mutation { sendRawTransaction(data: \"0xf901ca0685174876e800830fffff8080b90177608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb00291ca00297f7489c9e70447d917f7069a145c9fd0543633bec0a17ac072f1e07ab7f24a0185bd6435c17603b85fd84b8b45605988e855238fe2bbc6ea1f7e9ee6a5fc15f\") }", - "response":{ - "data" : { - "sendRawTransaction" : "0x84df486b376e7eaf35792d710fc38ce110e62ab9cdb73a45d191da74c2190617" + "request": "mutation { sendRawTransaction(data: \"0xf901ca0685174876e800830fffff8080b90177608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb00291ca00297f7489c9e70447d917f7069a145c9fd0543633bec0a17ac072f1e07ab7f24a0185bd6435c17603b85fd84b8b45605988e855238fe2bbc6ea1f7e9ee6a5fc15f\") }", + "response": { + "data": { + "sendRawTransaction": "0x84df486b376e7eaf35792d710fc38ce110e62ab9cdb73a45d191da74c2190617" } }, "statusCode": 200 diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json index 3ef2372b3f8..cccd1cd4d56 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json @@ -1,10 +1,9 @@ { - "request" : "mutation { sendRawTransaction(data: \"0xf8690885174876e800830fffff94450b61224a7df4d8a70f3e20d4fd6a6380b920d180843bdab8bf1ba0efcd6b9df2054a4e8599c0967f8e1e45bca79e2998ed7e8bafb4d29aba7dd5c2a01097184ba24f20dc097f1915fbb5f6ac955bbfc014f181df4d80bf04f4a1cfa5\") }", - "response":{ - "data" : { - "sendRawTransaction" : "0xaa6e6646456c576edcd712dbb3f30bf46c3d8310b203960c1e675534553b2daf" + "request": "mutation { sendRawTransaction(data: \"0xf8690885174876e800830fffff94450b61224a7df4d8a70f3e20d4fd6a6380b920d180843bdab8bf1ba0efcd6b9df2054a4e8599c0967f8e1e45bca79e2998ed7e8bafb4d29aba7dd5c2a01097184ba24f20dc097f1915fbb5f6ac955bbfc014f181df4d80bf04f4a1cfa5\") }", + "response": { + "data": { + "sendRawTransaction": "0xaa6e6646456c576edcd712dbb3f30bf46c3d8310b203960c1e675534553b2daf" } }, - "statusCode": 200 } \ No newline at end of file diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json index 4b19d37e46c..df0ffba5ec7 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json @@ -1,8 +1,8 @@ { - "request" : "mutation { sendRawTransaction(data: \"0xf86d0485174876e800830222e0945aae326516b4f8fe08074b7e972e40a713048d62880de0b6b3a7640000801ba05d4e7998757264daab67df2ce6f7e7a0ae36910778a406ca73898c9899a32b9ea0674700d5c3d1d27f2e6b4469957dfd1a1c49bf92383d80717afc84eb05695d5b\") }", - "response":{ - "data" : { - "sendRawTransaction" : "0xbaabcc1bd699e7378451e4ce5969edb9bdcae76cb79bdacae793525c31e423c7" + "request": "mutation { sendRawTransaction(data: \"0xf86d0485174876e800830222e0945aae326516b4f8fe08074b7e972e40a713048d62880de0b6b3a7640000801ba05d4e7998757264daab67df2ce6f7e7a0ae36910778a406ca73898c9899a32b9ea0674700d5c3d1d27f2e6b4469957dfd1a1c49bf92383d80717afc84eb05695d5b\") }", + "response": { + "data": { + "sendRawTransaction": "0xbaabcc1bd699e7378451e4ce5969edb9bdcae76cb79bdacae793525c31e423c7" } }, "statusCode": 200 diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_syncing.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_syncing.json index b1f420a0b64..8bc752caa36 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_syncing.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_syncing.json @@ -1,13 +1,11 @@ { - "request": - "{ syncing {startingBlock currentBlock highestBlock } }", - + "request": "{ syncing {startingBlock currentBlock highestBlock } }", "response": { - "data" : { - "syncing" : { - "startingBlock" : 1, - "currentBlock" : 2, - "highestBlock" : 3 + "data": { + "syncing": { + "startingBlock": "0x1", + "currentBlock": "0x2", + "highestBlock": "0x3" } } }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byFrom.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byFrom.json index 7ba8b74a41c..800542adbc0 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byFrom.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byFrom.json @@ -4,16 +4,16 @@ "data": { "blocks": [ { - "number": 30 + "number": "0x1e" }, { - "number": 31 + "number": "0x1f" }, { - "number": 32 + "number": "0x20" }, { - "number": 33 + "number": "0x21" } ] } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byRange.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byRange.json index 10f3e100224..b61f27e85ae 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byRange.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byRange.json @@ -1,39 +1,39 @@ { - "request": - - "{blocks (from : \"0x1e\", to: \"0x20\") { number gasUsed gasLimit hash nonce stateRoot receiptsRoot transactionCount }} ", - - - "response":{ - "data" : { - "blocks" : [ { - "number" : 30, - "gasUsed" : 23585, - "gasLimit" : 3141592, - "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", - "nonce" : "0x5c321bd9e9f040f1", - "stateRoot" : "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e", - "receiptsRoot" : "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d", - "transactionCount" : 1 - }, { - "number" : 31, - "gasUsed" : 24303, - "gasLimit" : 3141592, - "hash" : "0x0f765087745aa259d9e5ac39c367c57432a16ed98e3b0d81c5b51d10f301dc49", - "nonce" : "0xd3a27a3001616468", - "stateRoot" : "0xa80997cf804269d64f2479baf535cf8f9090b70fbf515741c6995564f1e678bd", - "receiptsRoot" : "0x2440c44a3f75ad8b0425a73e7be2f61a5171112465cfd14e62e735b56d7178e6", - "transactionCount" : 1 - }, { - "number" : 32, - "gasUsed" : 23705, - "gasLimit" : 3141592, - "hash" : "0x71d59849ddd98543bdfbe8548f5eed559b07b8aaf196369f39134500eab68e53", - "nonce" : "0xdb063000b00e8026", - "stateRoot" : "0xf65f3dd13f72f5fa5607a5224691419969b4f4bae7a00a6cdb853f2ca9eeb1be", - "receiptsRoot" : "0xa50a7e67e833f4502524371ee462ccbcc6c6cabd2aeb1555c56150007a53183c", - "transactionCount" : 1 - } ] + "request": "{blocks (from : \"0x1e\", to: \"0x20\") { number gasUsed gasLimit hash nonce stateRoot receiptsRoot transactionCount }} ", + "response": { + "data": { + "blocks": [ + { + "number": "0x1e", + "gasUsed": "0x5c21", + "gasLimit": "0x2fefd8", + "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", + "nonce": "0x5c321bd9e9f040f1", + "stateRoot": "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e", + "receiptsRoot": "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d", + "transactionCount": "0x1" + }, + { + "number": "0x1f", + "gasUsed": "0x5eef", + "gasLimit": "0x2fefd8", + "hash": "0x0f765087745aa259d9e5ac39c367c57432a16ed98e3b0d81c5b51d10f301dc49", + "nonce": "0xd3a27a3001616468", + "stateRoot": "0xa80997cf804269d64f2479baf535cf8f9090b70fbf515741c6995564f1e678bd", + "receiptsRoot": "0x2440c44a3f75ad8b0425a73e7be2f61a5171112465cfd14e62e735b56d7178e6", + "transactionCount": "0x1" + }, + { + "number": "0x20", + "gasUsed": "0x5c99", + "gasLimit": "0x2fefd8", + "hash": "0x71d59849ddd98543bdfbe8548f5eed559b07b8aaf196369f39134500eab68e53", + "nonce": "0xdb063000b00e8026", + "stateRoot": "0xf65f3dd13f72f5fa5607a5224691419969b4f4bae7a00a6cdb853f2ca9eeb1be", + "receiptsRoot": "0xa50a7e67e833f4502524371ee462ccbcc6c6cabd2aeb1555c56150007a53183c", + "transactionCount": "0x1" + } + ] } }, "statusCode": 200 diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_pending.json index c12410e10af..e4a13259d10 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_pending.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_pending.json @@ -1,24 +1,22 @@ { - "request": - "{ pending { transactionCount transactions { nonce gas } account(address:\"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance} estimateGas(data:{}) call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}} }", - + "request": "{ pending { transactionCount transactions { nonce gas } account(address:\"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance} estimateGas(data:{}) call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}} }", "response": { "data": { "pending": { - "transactionCount": 0, + "transactionCount": "0x0", "transactions": [ { - "nonce": 42, - "gas": 654321 + "nonce": "0x2a", + "gas": "0x9fbf1" } ], "account": { "balance": "0x140" }, - "estimateGas": 53000, + "estimateGas": "0xcf08", "call": { "data": "0x0000000000000000000000000000000000000000000000000000000000000001", - "status": 1 + "status": "0x1" } } } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes.json index c65dc75e41c..a5d0a0d2676 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes.json @@ -1,9 +1,9 @@ { - "variables" : "{ \"data\": \"0xf86d0485174876e800830222e0945aae326516b4f8fe08074b7e972e40a713048d62880de0b6b3a7640000801ba05d4e7998757264daab67df2ce6f7e7a0ae36910778a406ca73898c9899a32b9ea0674700d5c3d1d27f2e6b4469957dfd1a1c49bf92383d80717afc84eb05695d5b\"}", - "request" : "mutation postTransaction($data: Bytes!) { sendRawTransaction(data: $data) }", - "response":{ - "data" : { - "sendRawTransaction" : "0xbaabcc1bd699e7378451e4ce5969edb9bdcae76cb79bdacae793525c31e423c7" + "variables": "{ \"data\": \"0xf86d0485174876e800830222e0945aae326516b4f8fe08074b7e972e40a713048d62880de0b6b3a7640000801ba05d4e7998757264daab67df2ce6f7e7a0ae36910778a406ca73898c9899a32b9ea0674700d5c3d1d27f2e6b4469957dfd1a1c49bf92383d80717afc84eb05695d5b\"}", + "request": "mutation postTransaction($data: Bytes!) { sendRawTransaction(data: $data) }", + "response": { + "data": { + "sendRawTransaction": "0xbaabcc1bd699e7378451e4ce5969edb9bdcae76cb79bdacae793525c31e423c7" } }, "statusCode": 200 diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes32.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes32.json index 1512cbdc402..80ea297f164 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes32.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes32.json @@ -4,7 +4,7 @@ "response": { "data": { "block": { - "number": 30 + "number": "0x1e" } } },