Add totalDifficulty field to JSON-RPC schema of Celo1 block #310
+95
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
piersy
reviewed
Jan 16, 2025
internal/ethapi/celo_api_test.go
Outdated
Comment on lines
576
to
606
| getExpectedJson := func(t *testing.T, expectedTd string) string { | ||
| data := map[string]interface{}{ | ||
| "difficulty": "0x0", | ||
| "extraData": "0x", | ||
| "gasLimit": "0x0", | ||
| "gasUsed": "0x0", | ||
| "hash": "0xd8371db7c48c7538a9cdf3e9211510e423039c0af3e1aa61d0a40960214d2101", | ||
| "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", | ||
| "miner": "0x0000000000000000000000000000000000000000", | ||
| "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", | ||
| "nonce": "0x0000000000000000", | ||
| "number": "0x64", | ||
| "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", | ||
| "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", | ||
| "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", | ||
| "size": "0x1f7", | ||
| "stateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", | ||
| "timestamp": "0x3e8", | ||
| "transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", | ||
| "uncles": []interface{}{}, | ||
| } | ||
|
|
||
| if expectedTd != "" { | ||
| data["totalDifficulty"] = expectedTd | ||
| } | ||
|
|
||
| marshaled, err := json.Marshal(&data) | ||
| require.NoError(t, err) | ||
|
|
||
| return string(marshaled) | ||
| } |
There was a problem hiding this comment.
I don't think we need to be checking the whole marshalled json here. RPCMarshalBlock returns a map of string to interface which is encoded to json in a standard way by the go json package, so we don't need to re-test that. I think it is sufficient to call RPCMarshalBlock and simply check the value of the "totalDifficulty" key.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes https://github.com/celo-org/celo-blockchain-planning/issues/849
This PR adds the
totalDifficultyfield to the JSON-RPC response for Celo1 blocks.The
totalDifficultyis no longer present ingethandop-geth, as described in the following references:However, Celo2 requires RPC compatibility support for Celo1 blocks. Therefore, this PR adds
totalDifficultyfield specifically for Celo1 blocks.During my investigation, I discovered that snap sync does not store total difficulty into local database. As a result, the
totalDifficultyvalue in the RPC response is derived from the block height