diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/05_get_latest_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/05_get_latest_block.json index bbb0826a465..f4bade25001 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/05_get_latest_block.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/05_get_latest_block.json @@ -18,7 +18,6 @@ "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "difficulty": "0x0", - "totalDifficulty": "0x400000000", "extraData": "0x", "baseFeePerGas": "0x7", "size": "0x1fa", diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/07_get_latest_block_after_replay_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/07_get_latest_block_after_replay_block.json index 5b2d2ca5db7..8369fab27e9 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/07_get_latest_block_after_replay_block.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/07_get_latest_block_after_replay_block.json @@ -18,7 +18,6 @@ "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "difficulty" : "0x0", - "totalDifficulty" : "0x400000000", "extraData" : "0x", "baseFeePerGas" : "0x7", "size" : "0x1fa", diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/05_get_latest_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/05_get_latest_block.json index bbb0826a465..f4bade25001 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/05_get_latest_block.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/05_get_latest_block.json @@ -18,7 +18,6 @@ "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "difficulty": "0x0", - "totalDifficulty": "0x400000000", "extraData": "0x", "baseFeePerGas": "0x7", "size": "0x1fa", diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/07_get_latest_block_after_set_head.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/07_get_latest_block_after_set_head.json index 5b2d2ca5db7..8369fab27e9 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/07_get_latest_block_after_set_head.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/07_get_latest_block_after_set_head.json @@ -18,7 +18,6 @@ "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "difficulty" : "0x0", - "totalDifficulty" : "0x400000000", "extraData" : "0x", "baseFeePerGas" : "0x7", "size" : "0x1fa", diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/cancun/test-cases/block-production/09_cancun_get_chainhead.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/cancun/test-cases/block-production/09_cancun_get_chainhead.json index 96ae1236426..61e533f5d0f 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/cancun/test-cases/block-production/09_cancun_get_chainhead.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/cancun/test-cases/block-production/09_cancun_get_chainhead.json @@ -24,7 +24,6 @@ "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner": "0x0000000000000000000000000000000000000000", "difficulty": "0x0", - "totalDifficulty": "0x0", "extraData": "0x", "baseFeePerGas": "0x3b9aca00", "size": "0x244", diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/prague/test-cases/00_get_genesis_block_info.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/prague/test-cases/00_get_genesis_block_info.json index ca9c3ef7e75..b99be416adb 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/prague/test-cases/00_get_genesis_block_info.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/prague/test-cases/00_get_genesis_block_info.json @@ -23,7 +23,6 @@ "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner" : "0x0000000000000000000000000000000000000000", "difficulty" : "0x400000000", - "totalDifficulty" : "0x400000000", "extraData" : "0x0000000000000000000000000000000000000000000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "baseFeePerGas" : "0x7", "size" : "0x2ba", diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/05_get_genesis_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/05_get_genesis_block.json index 4a4e8abee58..1757427aed0 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/05_get_genesis_block.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/05_get_genesis_block.json @@ -18,7 +18,6 @@ "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner" : "0x0000000000000000000000000000000000000000", "difficulty" : "0x400000000", - "totalDifficulty" : "0x400000000", "extraData":"0x0000000000000000000000000000000000000000000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "baseFeePerGas" : "0x7", "size" : "0x275", diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/06_get_last_paris_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/06_get_last_paris_block.json index f81c9b64964..d4d7bd92e61 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/06_get_last_paris_block.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/06_get_last_paris_block.json @@ -18,7 +18,6 @@ "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "difficulty" : "0x0", - "totalDifficulty" : "0x400000000", "extraData" : "0x", "baseFeePerGas" : "0x7", "size" : "0x1fa", diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/07_get_first_shanghai_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/07_get_first_shanghai_block.json index de9d681fd13..ecbcb32943c 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/07_get_first_shanghai_block.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/07_get_first_shanghai_block.json @@ -18,7 +18,6 @@ "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "difficulty" : "0x0", - "totalDifficulty" : "0x400000000", "extraData" : "0x", "baseFeePerGas" : "0x7", "size" : "0x21c", diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/08_get_latest_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/08_get_latest_block.json index dc3eaf96370..295beda28db 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/08_get_latest_block.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/08_get_latest_block.json @@ -18,7 +18,6 @@ "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "difficulty" : "0x0", - "totalDifficulty" : "0x400000000", "extraData" : "0x", "baseFeePerGas" : "0x7", "size" : "0x24e", diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/09_get_last_paris_block_by_hash.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/09_get_last_paris_block_by_hash.json index a7392e9414d..81aab2484d0 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/09_get_last_paris_block_by_hash.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/09_get_last_paris_block_by_hash.json @@ -18,7 +18,6 @@ "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "difficulty" : "0x0", - "totalDifficulty" : "0x400000000", "extraData" : "0x", "baseFeePerGas" : "0x7", "size" : "0x1fa", diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/10_get_first_shanghai_block_by_hash.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/10_get_first_shanghai_block_by_hash.json index 8ef5aa2095b..64693efc78e 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/10_get_first_shanghai_block_by_hash.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/10_get_first_shanghai_block_by_hash.json @@ -18,7 +18,6 @@ "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "difficulty" : "0x0", - "totalDifficulty" : "0x400000000", "extraData" : "0x", "baseFeePerGas" : "0x7", "size" : "0x21c", diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/11_get_latest_block_by_hash.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/11_get_latest_block_by_hash.json index 8b886204742..622f9f97998 100644 --- a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/11_get_latest_block_by_hash.json +++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/11_get_latest_block_by_hash.json @@ -18,7 +18,6 @@ "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "difficulty" : "0x0", - "totalDifficulty" : "0x400000000", "extraData" : "0x", "baseFeePerGas" : "0x7", "size" : "0x24e", diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java index f1a953481f3..982a83486d0 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java @@ -21,7 +21,6 @@ import org.hyperledger.besu.ethereum.api.query.TransactionReceiptWithMetadata; import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata; import org.hyperledger.besu.ethereum.core.BlockHeader; -import org.hyperledger.besu.ethereum.core.Difficulty; import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; import java.util.ArrayList; @@ -65,15 +64,6 @@ public Optional getTransactionCount() { return Optional.of(blockWithMetaData.getTransactions().size()); } - /** - * Returns the total difficulty of the block. - * - * @return the total difficulty of the block. - */ - public Difficulty getTotalDifficulty() { - return blockWithMetaData.getTotalDifficulty(); - } - /** * Returns the ommer count of the block. * diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java index e8225c70e38..3c9fa6a470a 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java @@ -46,7 +46,6 @@ "receiptsRoot", "miner", "difficulty", - "totalDifficulty", "extraData", "baseFeePerGas", "size", @@ -73,7 +72,6 @@ public class BlockResult implements JsonRpcResult { private final String receiptsRoot; private final String miner; private final String difficulty; - private final String totalDifficulty; private final String extraData; private final String baseFeePerGas; private final String size; @@ -133,7 +131,6 @@ public BlockResult( this.receiptsRoot = header.getReceiptsRoot().toString(); this.miner = header.getCoinbase().toString(); this.difficulty = Quantity.create(header.getDifficulty()); - this.totalDifficulty = Quantity.create(totalDifficulty); this.extraData = header.getExtraData().toString(); this.baseFeePerGas = header.getBaseFee().map(Quantity::create).orElse(null); this.size = Quantity.create(size); @@ -217,11 +214,6 @@ public String getDifficulty() { return difficulty; } - @JsonGetter(value = "totalDifficulty") - public String getTotalDifficulty() { - return totalDifficulty; - } - @JsonGetter(value = "extraData") public String getExtraData() { return extraData; diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java index f919a5cf359..e035600395c 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java @@ -706,7 +706,7 @@ public void getBlockByHashWithTransactions() throws Exception { testHelper.assertValidJsonRpcResult(json, id); // Check result final JsonObject result = json.getJsonObject("result"); - verifyBlockResult(block, blockWMetadata.getTotalDifficulty(), result, false); + verifyBlockResult(block, result, false); } } @@ -738,7 +738,7 @@ public void getBlockByHashWithTransactionHashes() throws Exception { testHelper.assertValidJsonRpcResult(json, id); // Check result final JsonObject result = json.getJsonObject("result"); - verifyBlockResult(block, blockWMetadata.getTotalDifficulty(), result, true); + verifyBlockResult(block, result, true); } } @@ -928,7 +928,7 @@ public void getBlockByNumberWithTransactions() throws Exception { testHelper.assertValidJsonRpcResult(json, id); // Check result final JsonObject result = json.getJsonObject("result"); - verifyBlockResult(block, blockWithMetadata.getTotalDifficulty(), result, false); + verifyBlockResult(block, result, false); } } @@ -960,7 +960,7 @@ public void getBlockByNumberWithTransactionHashes() throws Exception { testHelper.assertValidJsonRpcResult(json, id); // Check result final JsonObject result = json.getJsonObject("result"); - verifyBlockResult(block, blockWithMetadata.getTotalDifficulty(), result, true); + verifyBlockResult(block, result, true); } } @@ -1012,7 +1012,7 @@ public void getBlockByNumberForEarliest() throws Exception { testHelper.assertValidJsonRpcResult(json, id); // Check result final JsonObject result = json.getJsonObject("result"); - verifyBlockResult(block, blockWithMetadata.getTotalDifficulty(), result, false); + verifyBlockResult(block, result, false); } } @@ -1041,7 +1041,7 @@ public void getBlockByNumberForBlockNumberZero() throws Exception { testHelper.assertValidJsonRpcResult(json, id); // Check result final JsonObject result = json.getJsonObject("result"); - verifyBlockResult(block, blockWithMetadata.getTotalDifficulty(), result, false); + verifyBlockResult(block, result, false); } } @@ -1074,7 +1074,7 @@ public void getBlockByNumberForLatest() throws Exception { testHelper.assertValidJsonRpcResult(json, id); // Check result final JsonObject result = json.getJsonObject("result"); - verifyBlockResult(block, blockWithMetadata.getTotalDifficulty(), result, false); + verifyBlockResult(block, result, false); } } @@ -1106,7 +1106,7 @@ public void getBlockByNumberForPending() throws Exception { testHelper.assertValidJsonRpcResult(json, id); // Check result final JsonObject result = json.getJsonObject("result"); - verifyBlockResult(block, blockWithMetadata.getTotalDifficulty(), result, false); + verifyBlockResult(block, result, false); } } @@ -1632,17 +1632,10 @@ public void emptyBatchRequest() throws Exception { } private void verifyBlockResult( - final Block block, - final Difficulty td, - final JsonObject result, - final boolean shouldTransactionsBeHashed) { + final Block block, final JsonObject result, final boolean shouldTransactionsBeHashed) { assertBlockResultMatchesBlock(result, block); - if (td == null) { - assertThat(result.getJsonObject("totalDifficulty")).isNull(); - } else { - assertThat(Difficulty.fromHexString(result.getString("totalDifficulty"))).isEqualTo(td); - } + assertThat(result.getJsonObject("totalDifficulty")).isNull(); // Check ommers final JsonArray ommersResult = result.getJsonArray("uncles"); 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 fa694a254a8..adda26b19d7 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 @@ -10,7 +10,6 @@ ], "timestamp": "0x561bc336", "difficulty": "0x20740", - "totalDifficulty": "0x3e6cc0", "gasUsed": "0x5c21", "gasLimit": "0x2fefd8", "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", 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 2c88617ee68..123c1c7c8e8 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 @@ -11,7 +11,6 @@ ], "timestamp": "0x561bc336", "difficulty": "0x20740", - "totalDifficulty": "0x3e6cc0", "gasUsed": "0x5c21", "gasLimit": "0x2fefd8", "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", 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 f9c9c7ece8c..6eaf02a1dab 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 @@ -10,7 +10,6 @@ ], "timestamp": "0x561bc336", "difficulty": "0x20740", - "totalDifficulty": "0x3e6cc0", "gasUsed": "0x5c21", "gasLimit": "0x2fefd8", "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_cancun.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_cancun.json index 3f5dc4dc406..c35a8abbc0f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_cancun.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_cancun.json @@ -12,7 +12,6 @@ "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "stateRoot": "0x34727aff24d1c51cd63fdc14515b15ddaa156fa0671c58a96c72b1553819945d", - "totalDifficulty": "0x427c00", "withdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "withdrawals": [], "blobGasUsed": "0x40000", diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_frontier.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_frontier.json index 335121ac896..39f41133a98 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_frontier.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_frontier.json @@ -11,7 +11,6 @@ "mixHash": "0x4edd77bfff565659bb0ae09421918e4def65d938a900eb94230eb01f5ce80c99", "nonce": "0xdb063000b00e8026", "stateRoot": "0xf65f3dd13f72f5fa5607a5224691419969b4f4bae7a00a6cdb853f2ca9eeb1be", - "totalDifficulty": "0x427c00", "transactions": [ { "gasPrice": "0x1", 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 add2edd6507..4500efa31eb 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 @@ -12,7 +12,6 @@ "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "stateRoot": "0x0d3c456bb68669bad05da3a1a766daab236c9df1da8f74edf5ebe9383f00084c", - "totalDifficulty": "0x427c00", "transactions": [ { "r": "0x8abbfbd4c5f2a13a8d5ed394ac50bac7d678f83a23f645818492f76e8ee17ab3", diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json index f0f41a697dd..b8f9e1e180a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json @@ -24,7 +24,6 @@ "receiptsRoot": "0x3e5fff5f6eaeee82841547e049b6bdb980c4e6bd8539fb072a346a30ee72a25d", "miner": "0x8888f1f195afa192cfee860698584c030f4c9db1", "difficulty": "0x203c0", - "totalDifficulty": "0x221e00", "extraData": "0x", "size": "0x288", "gasLimit": "0x2fefd8", diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete_cancun.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete_cancun.json index 0350202a00b..f7e5e2984fe 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete_cancun.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete_cancun.json @@ -24,7 +24,6 @@ "receiptsRoot": "0xb56f5313fa6822e1ee3f84487b5b2f12c5e1746778ad39f9a89e5f0239cc9b83", "miner": "0x0000000000000000000000000000000000000000", "difficulty": "0x0", - "totalDifficulty": "0x427c00", "extraData": "0x", "baseFeePerGas": "0x3437004a", "size": "0x308", diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete_shanghai.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete_shanghai.json index fb77fccd598..57ecac30a74 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete_shanghai.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete_shanghai.json @@ -24,7 +24,6 @@ "receiptsRoot": "0xd8f831982345c98e4189e8e76c303d833d1dc22f51efa20d717e31b9337a43cb", "miner": "0x0000000000000000000000000000000000000000", "difficulty": "0x0", - "totalDifficulty": "0x427c00", "extraData": "0x", "baseFeePerGas": "0x3b9aca00", "size": "0x2f0", diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_hashes.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_hashes.json index 204e0ecbc72..6dc0725695f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_hashes.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_hashes.json @@ -24,7 +24,6 @@ "receiptsRoot": "0x3e5fff5f6eaeee82841547e049b6bdb980c4e6bd8539fb072a346a30ee72a25d", "miner": "0x8888f1f195afa192cfee860698584c030f4c9db1", "difficulty": "0x203c0", - "totalDifficulty": "0x221e00", "extraData": "0x", "size": "0x288", "gasLimit": "0x2fefd8",