From a93a215dfa07ef65c64a6edbff018603a4d58dde Mon Sep 17 00:00:00 2001 From: Romain Ruetschi Date: Fri, 16 Jul 2021 15:13:07 +0200 Subject: [PATCH] Specify default value for `tendermint::block::Size` (#931) * Specify default value for `tendermint::block::Size` * Add .changelog entry * Add test for `time_iota_ms` default (#933) * Bump supported rpc-probe version of Tendermint to v0.34.9 * Regenerate kvstore fixtures using Tendermint v0.34.9 * Update kvstore tests to test #931 * Expose Size::default_time_iota_ms to access from integration test * Implement test for #931 Co-authored-by: Thane Thomson --- .../bug-fixes/930-newblock-event-parse.md | 2 + rpc/tests/kvstore_fixtures.rs | 6 +- .../kvstore_fixtures/incoming/abci_info.json | 4 +- .../abci_query_with_existing_key.json | 4 +- .../abci_query_with_non_existent_key.json | 4 +- .../incoming/block_at_height_0.json | 2 +- .../incoming/block_at_height_1.json | 14 +- .../incoming/block_at_height_10.json | 30 +-- .../incoming/block_results_at_height_10.json | 2 +- .../incoming/blockchain_from_1_to_10.json | 186 +++++++++--------- .../incoming/broadcast_tx_async.json | 2 +- .../incoming/broadcast_tx_commit.json | 4 +- .../incoming/broadcast_tx_sync.json | 2 +- .../incoming/commit_at_height_10.json | 26 +-- .../incoming/consensus_state.json | 8 +- .../kvstore_fixtures/incoming/genesis.json | 11 +- .../kvstore_fixtures/incoming/net_info.json | 2 +- .../kvstore_fixtures/incoming/status.json | 20 +- .../incoming/subscribe_malformed.json | 2 +- .../incoming/subscribe_newblock_0.json | 30 +-- .../incoming/subscribe_newblock_1.json | 30 +-- .../incoming/subscribe_newblock_2.json | 30 +-- .../incoming/subscribe_newblock_3.json | 30 +-- .../incoming/subscribe_newblock_4.json | 30 +-- .../incoming/subscribe_txs.json | 2 +- .../incoming/subscribe_txs_0.json | 6 +- .../incoming/subscribe_txs_1.json | 7 +- .../incoming/subscribe_txs_2.json | 7 +- .../incoming/subscribe_txs_3.json | 6 +- .../incoming/subscribe_txs_4.json | 6 +- .../subscribe_txs_broadcast_tx_0.json | 2 +- .../subscribe_txs_broadcast_tx_1.json | 2 +- .../subscribe_txs_broadcast_tx_2.json | 2 +- .../subscribe_txs_broadcast_tx_3.json | 2 +- .../subscribe_txs_broadcast_tx_4.json | 2 +- .../subscribe_txs_broadcast_tx_5.json | 2 +- .../incoming/tx_search_no_prove.json | 22 +-- .../incoming/tx_search_with_prove.json | 46 ++--- .../kvstore_fixtures/outgoing/abci_info.json | 2 +- .../abci_query_with_existing_key.json | 2 +- .../abci_query_with_non_existent_key.json | 2 +- .../outgoing/block_at_height_0.json | 2 +- .../outgoing/block_at_height_1.json | 2 +- .../outgoing/block_at_height_10.json | 2 +- .../outgoing/block_results_at_height_10.json | 2 +- .../outgoing/blockchain_from_1_to_10.json | 2 +- .../outgoing/broadcast_tx_async.json | 2 +- .../outgoing/broadcast_tx_commit.json | 2 +- .../outgoing/broadcast_tx_sync.json | 2 +- .../outgoing/commit_at_height_10.json | 2 +- .../outgoing/consensus_state.json | 2 +- .../kvstore_fixtures/outgoing/genesis.json | 2 +- .../kvstore_fixtures/outgoing/net_info.json | 2 +- .../kvstore_fixtures/outgoing/status.json | 2 +- .../outgoing/subscribe_malformed.json | 2 +- .../outgoing/subscribe_newblock.json | 2 +- .../outgoing/subscribe_txs.json | 2 +- .../subscribe_txs_broadcast_tx_0.json | 2 +- .../subscribe_txs_broadcast_tx_1.json | 2 +- .../subscribe_txs_broadcast_tx_2.json | 2 +- .../subscribe_txs_broadcast_tx_3.json | 2 +- .../subscribe_txs_broadcast_tx_4.json | 2 +- .../subscribe_txs_broadcast_tx_5.json | 2 +- .../outgoing/tx_search_no_prove.json | 2 +- .../outgoing/tx_search_with_prove.json | 2 +- tendermint/src/block/size.rs | 11 +- tools/rpc-probe/Makefile.toml | 2 +- 67 files changed, 337 insertions(+), 325 deletions(-) create mode 100644 .changelog/unreleased/bug-fixes/930-newblock-event-parse.md diff --git a/.changelog/unreleased/bug-fixes/930-newblock-event-parse.md b/.changelog/unreleased/bug-fixes/930-newblock-event-parse.md new file mode 100644 index 000000000..3fcd5bd31 --- /dev/null +++ b/.changelog/unreleased/bug-fixes/930-newblock-event-parse.md @@ -0,0 +1,2 @@ +- Fix bug where `NewBlock` events emitted by Tendermint could not be parsed because of a missing field ([#930](https://github.com/informalsystems/tendermint-rs/issues/930)) + diff --git a/rpc/tests/kvstore_fixtures.rs b/rpc/tests/kvstore_fixtures.rs index 3bc16f726..3a761dec8 100644 --- a/rpc/tests/kvstore_fixtures.rs +++ b/rpc/tests/kvstore_fixtures.rs @@ -670,6 +670,10 @@ fn incoming_fixtures() { assert_eq!(result.genesis.validators[0].power(), 10); assert!(result.genesis.validators[0].pub_key.ed25519().is_some()); assert_eq!(result.genesis.validators[0].proposer_priority.value(), 0); + assert_eq!( + result.genesis.consensus_params.block.time_iota_ms, + tendermint::block::Size::default_time_iota_ms(), + ); } "net_info" => { let result = endpoint::net_info::Response::from_string(content).unwrap(); @@ -703,7 +707,7 @@ fn incoming_fixtures() { app: 1 } ); - assert_eq!(result.node_info.version.to_string(), "v0.34.0"); + assert_eq!(result.node_info.version.to_string(), "v0.34.9"); assert!(!result.sync_info.catching_up); assert_eq!(result.sync_info.latest_app_hash.value(), [0; 8]); assert!(!result.sync_info.latest_block_hash.is_empty()); diff --git a/rpc/tests/kvstore_fixtures/incoming/abci_info.json b/rpc/tests/kvstore_fixtures/incoming/abci_info.json index e1e84a004..a94f499fa 100644 --- a/rpc/tests/kvstore_fixtures/incoming/abci_info.json +++ b/rpc/tests/kvstore_fixtures/incoming/abci_info.json @@ -1,12 +1,12 @@ { - "id": "8a289a02-d7e4-45ed-a0db-97445ff3825a", + "id": "48e82c4a-4018-433e-9557-c40ac927676f", "jsonrpc": "2.0", "result": { "response": { "app_version": "1", "data": "{\"size\":0}", "last_block_app_hash": "AAAAAAAAAAA=", - "last_block_height": "14", + "last_block_height": "32", "version": "0.17.0" } } diff --git a/rpc/tests/kvstore_fixtures/incoming/abci_query_with_existing_key.json b/rpc/tests/kvstore_fixtures/incoming/abci_query_with_existing_key.json index 033433558..fee2a734a 100644 --- a/rpc/tests/kvstore_fixtures/incoming/abci_query_with_existing_key.json +++ b/rpc/tests/kvstore_fixtures/incoming/abci_query_with_existing_key.json @@ -1,11 +1,11 @@ { - "id": "6e4d4855-631f-4cf9-b341-d6460eab88a3", + "id": "ae5b4026-3be4-46ea-876e-2177b74e79a7", "jsonrpc": "2.0", "result": { "response": { "code": 0, "codespace": "", - "height": "26", + "height": "44", "index": "0", "info": "", "key": "dHgw", diff --git a/rpc/tests/kvstore_fixtures/incoming/abci_query_with_non_existent_key.json b/rpc/tests/kvstore_fixtures/incoming/abci_query_with_non_existent_key.json index 67ed4b626..3bda4fb05 100644 --- a/rpc/tests/kvstore_fixtures/incoming/abci_query_with_non_existent_key.json +++ b/rpc/tests/kvstore_fixtures/incoming/abci_query_with_non_existent_key.json @@ -1,11 +1,11 @@ { - "id": "fbd10e8a-a975-4e47-8f9a-97646da4cb38", + "id": "a8a36384-95f9-481f-8fc5-4a820176e869", "jsonrpc": "2.0", "result": { "response": { "code": 0, "codespace": "", - "height": "14", + "height": "32", "index": "0", "info": "", "key": "bm9uX2V4aXN0ZW50X2tleQ==", diff --git a/rpc/tests/kvstore_fixtures/incoming/block_at_height_0.json b/rpc/tests/kvstore_fixtures/incoming/block_at_height_0.json index ac98523fc..5ab877e36 100644 --- a/rpc/tests/kvstore_fixtures/incoming/block_at_height_0.json +++ b/rpc/tests/kvstore_fixtures/incoming/block_at_height_0.json @@ -4,6 +4,6 @@ "data": "height must be greater than 0, but got 0", "message": "Internal error" }, - "id": "8becc1c0-0c44-4b0d-bb95-8f3ff2f9893e", + "id": "c0ba0ff6-0afd-4d18-bc15-0891696d42f2", "jsonrpc": "2.0" } \ No newline at end of file diff --git a/rpc/tests/kvstore_fixtures/incoming/block_at_height_1.json b/rpc/tests/kvstore_fixtures/incoming/block_at_height_1.json index c9dc65ff5..2635e49aa 100644 --- a/rpc/tests/kvstore_fixtures/incoming/block_at_height_1.json +++ b/rpc/tests/kvstore_fixtures/incoming/block_at_height_1.json @@ -1,5 +1,5 @@ { - "id": "5be87751-4f5a-4e31-b4db-91a2562a92ea", + "id": "0166b641-4967-4b3c-a36a-73ea4e5a737a", "jsonrpc": "2.0", "result": { "block": { @@ -25,10 +25,10 @@ }, "last_commit_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:05:55.8988413Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:29.232984022Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -48,9 +48,9 @@ } }, "block_id": { - "hash": "F313BFEE2921709CA1DACF5BB55367FE293194F9C5A9827970C88993D97D47DC", + "hash": "44C37753BF31FD4238227E19213F042699F62416D4E5422BBA59095FC4BEE039", "parts": { - "hash": "693DBA913A007C963FBF674A99BC79B05A4C0A872E4F839B1B1FD2D7D1B588CD", + "hash": "13EEDAF51D61F7FF513FCD1B6387E0A3E306E49E5DCEA43CAFE77FB7B951DD4B", "total": 1 } } diff --git a/rpc/tests/kvstore_fixtures/incoming/block_at_height_10.json b/rpc/tests/kvstore_fixtures/incoming/block_at_height_10.json index 569d2fb90..f085fcfe5 100644 --- a/rpc/tests/kvstore_fixtures/incoming/block_at_height_10.json +++ b/rpc/tests/kvstore_fixtures/incoming/block_at_height_10.json @@ -1,5 +1,5 @@ { - "id": "9428b752-8b5a-4dc6-b751-0ab12e3bc4f6", + "id": "d01f0a06-172c-48b8-a9ce-5db74af08ad1", "jsonrpc": "2.0", "result": { "block": { @@ -17,18 +17,18 @@ "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "height": "10", "last_block_id": { - "hash": "904729E98E9468E2430B3691020ABDA34291EF7F95F15667C0F6EC957432C893", + "hash": "4AED585851DEE548A0143C8B41FA72FDA0597CA304807BEF06222D335EDD404D", "parts": { - "hash": "6D2590541B2FDF59A60B062BB17AFA5AE0903211E33F632A17DB22C591889DFC", + "hash": "B2A89B0BAC1FEF0C15D3ED44105E75DB7F8DB42ECEA33E32B3B820AEDAB132BD", "total": 1 } }, - "last_commit_hash": "68092239B80DAFDF43C01657159CA708A2BE923B7B14F8F7DD771CA51D596F7B", + "last_commit_hash": "515DAA8790FBC39D93EA23229826BA45205DAF178F8BD9A7D4835AA07C663C68", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:06:00.5796845Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:33.997760354Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -36,9 +36,9 @@ }, "last_commit": { "block_id": { - "hash": "904729E98E9468E2430B3691020ABDA34291EF7F95F15667C0F6EC957432C893", + "hash": "4AED585851DEE548A0143C8B41FA72FDA0597CA304807BEF06222D335EDD404D", "parts": { - "hash": "6D2590541B2FDF59A60B062BB17AFA5AE0903211E33F632A17DB22C591889DFC", + "hash": "B2A89B0BAC1FEF0C15D3ED44105E75DB7F8DB42ECEA33E32B3B820AEDAB132BD", "total": 1 } }, @@ -47,17 +47,17 @@ "signatures": [ { "block_id_flag": 2, - "signature": "PcfqCfcTs9C+N9h/R6zC2xdu+C7fVCSWLxhEj7h0+tVe48fCxOP4HO51MV0iplHi7Og3dz6DMVXVyYQ27R+XAg==", - "timestamp": "2020-12-21T07:06:00.5796845Z", - "validator_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF" + "signature": "V0pC4gdCnBBhIoidoAPEuUWP9QTYtTc7EN5VZuXUdSDmYhM8NCcezy9+IxGXqAd7TUBV1aPT/SVv8KFH98u9Ag==", + "timestamp": "2021-07-16T12:16:33.997760354Z", + "validator_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D" } ] } }, "block_id": { - "hash": "84F558CDCCA7D7D7B26F4BB02862C0DA72607F74937C549AEB0ACFDEC599C877", + "hash": "223B6924AC98CE99678027C712954C565D4359507C3DECFF9D2D5B5A9E4231F6", "parts": { - "hash": "B5647568016ECDEF740E897D95EEF5CD17A6E20221B7A58CEC7F3DFABA63C7C7", + "hash": "F2FC723B88EFD18C4599BDF9441AA962F19C146C8601ED0854973189D11816DE", "total": 1 } } diff --git a/rpc/tests/kvstore_fixtures/incoming/block_results_at_height_10.json b/rpc/tests/kvstore_fixtures/incoming/block_results_at_height_10.json index d81743f38..8e928660c 100644 --- a/rpc/tests/kvstore_fixtures/incoming/block_results_at_height_10.json +++ b/rpc/tests/kvstore_fixtures/incoming/block_results_at_height_10.json @@ -1,5 +1,5 @@ { - "id": "c8effc20-13ec-4724-b788-ac8994b21f5c", + "id": "421a030f-0b5d-4adb-bb17-537d11228040", "jsonrpc": "2.0", "result": { "begin_block_events": null, diff --git a/rpc/tests/kvstore_fixtures/incoming/blockchain_from_1_to_10.json b/rpc/tests/kvstore_fixtures/incoming/blockchain_from_1_to_10.json index 9e2a1370c..b7d8e0ae4 100644 --- a/rpc/tests/kvstore_fixtures/incoming/blockchain_from_1_to_10.json +++ b/rpc/tests/kvstore_fixtures/incoming/blockchain_from_1_to_10.json @@ -1,13 +1,13 @@ { - "id": "5566a2c8-97d5-46fc-86b8-ebe77071b499", + "id": "7f156511-df54-4ede-8821-d6932c878ca2", "jsonrpc": "2.0", "result": { "block_metas": [ { "block_id": { - "hash": "84F558CDCCA7D7D7B26F4BB02862C0DA72607F74937C549AEB0ACFDEC599C877", + "hash": "223B6924AC98CE99678027C712954C565D4359507C3DECFF9D2D5B5A9E4231F6", "parts": { - "hash": "B5647568016ECDEF740E897D95EEF5CD17A6E20221B7A58CEC7F3DFABA63C7C7", + "hash": "F2FC723B88EFD18C4599BDF9441AA962F19C146C8601ED0854973189D11816DE", "total": 1 } }, @@ -20,18 +20,18 @@ "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "height": "10", "last_block_id": { - "hash": "904729E98E9468E2430B3691020ABDA34291EF7F95F15667C0F6EC957432C893", + "hash": "4AED585851DEE548A0143C8B41FA72FDA0597CA304807BEF06222D335EDD404D", "parts": { - "hash": "6D2590541B2FDF59A60B062BB17AFA5AE0903211E33F632A17DB22C591889DFC", + "hash": "B2A89B0BAC1FEF0C15D3ED44105E75DB7F8DB42ECEA33E32B3B820AEDAB132BD", "total": 1 } }, - "last_commit_hash": "68092239B80DAFDF43C01657159CA708A2BE923B7B14F8F7DD771CA51D596F7B", + "last_commit_hash": "515DAA8790FBC39D93EA23229826BA45205DAF178F8BD9A7D4835AA07C663C68", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:06:00.5796845Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:33.997760354Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -41,13 +41,13 @@ }, { "block_id": { - "hash": "904729E98E9468E2430B3691020ABDA34291EF7F95F15667C0F6EC957432C893", + "hash": "4AED585851DEE548A0143C8B41FA72FDA0597CA304807BEF06222D335EDD404D", "parts": { - "hash": "6D2590541B2FDF59A60B062BB17AFA5AE0903211E33F632A17DB22C591889DFC", + "hash": "B2A89B0BAC1FEF0C15D3ED44105E75DB7F8DB42ECEA33E32B3B820AEDAB132BD", "total": 1 } }, - "block_size": "569", + "block_size": "571", "header": { "app_hash": "0000000000000000", "chain_id": "dockerchain", @@ -56,18 +56,18 @@ "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "height": "9", "last_block_id": { - "hash": "5E7B81ED16D9F8D4A0B20150E900C7CE5E08FA8C3E9D8AE8660505F7F370B5BC", + "hash": "10D7A9EF7E80D0F8DF3E77E95D7C35017CA19E48515038CAC6DC5BC926D6EA7C", "parts": { - "hash": "9220CD585430B68EAB37BE1DFB345689D3EF3C3EFE8116AA3E02444C96D73852", + "hash": "A96E9C8E2759D7A95FBAB150DDA26A4ECFC3D656D9545F373833172FDCB1B191", "total": 1 } }, - "last_commit_hash": "500CA7357C1D5F76D68360A2CB0BB743FC210F6F82749E205CA76F91EE0A038E", + "last_commit_hash": "0A8375B1547930A7AD121381359A0D43384E04B14EC07FB8BF3E6A3124E455BA", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:06:00.0688893Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:33.479129116Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -77,9 +77,9 @@ }, { "block_id": { - "hash": "5E7B81ED16D9F8D4A0B20150E900C7CE5E08FA8C3E9D8AE8660505F7F370B5BC", + "hash": "10D7A9EF7E80D0F8DF3E77E95D7C35017CA19E48515038CAC6DC5BC926D6EA7C", "parts": { - "hash": "9220CD585430B68EAB37BE1DFB345689D3EF3C3EFE8116AA3E02444C96D73852", + "hash": "A96E9C8E2759D7A95FBAB150DDA26A4ECFC3D656D9545F373833172FDCB1B191", "total": 1 } }, @@ -92,18 +92,18 @@ "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "height": "8", "last_block_id": { - "hash": "7FCF67C066B3DF5A3F960F85D47F437F3364AF51B95D6751C7C39FF5334F3ABF", + "hash": "7BBDEBAACD6175DC04ED02E00CA187B47AA2BA31E14B56F1EDD81711EA2D0E9E", "parts": { - "hash": "EF72FA2678BC5B83160C9C4B3E36E85215D9A0E520BD42C7CD55343038E6F355", + "hash": "47F94ADC5CC798B665E963B38FD92CE0A5028B776C3F8CB8A888DB9BCB135255", "total": 1 } }, - "last_commit_hash": "EF1260BCFA1FA9212138ABEC3751F41446AE58E92D05AB9B1225923A3F6C4BBF", + "last_commit_hash": "68BA536B3600124E7B34E2B5655143A9FBE492D2EB801BD6B707E775C704F7AC", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:05:59.5531608Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:32.960708562Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -113,13 +113,13 @@ }, { "block_id": { - "hash": "7FCF67C066B3DF5A3F960F85D47F437F3364AF51B95D6751C7C39FF5334F3ABF", + "hash": "7BBDEBAACD6175DC04ED02E00CA187B47AA2BA31E14B56F1EDD81711EA2D0E9E", "parts": { - "hash": "EF72FA2678BC5B83160C9C4B3E36E85215D9A0E520BD42C7CD55343038E6F355", + "hash": "47F94ADC5CC798B665E963B38FD92CE0A5028B776C3F8CB8A888DB9BCB135255", "total": 1 } }, - "block_size": "569", + "block_size": "571", "header": { "app_hash": "0000000000000000", "chain_id": "dockerchain", @@ -128,18 +128,18 @@ "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "height": "7", "last_block_id": { - "hash": "5232E39EA19D61ED3CC46966D1AB6895F0B47930B31B0ABEE77EBD2400BA9060", + "hash": "8937F69C6E345E565B0CA1903B47B0F7870D28054330C8DFFF8FC62A4A669E71", "parts": { - "hash": "10F4CAE77632DF696025731F840FE8B487A599DBE1E68372D6FA512B0E9CC2A5", + "hash": "63FFACB6E280BE2A4F7BF4D0067F3ADB7EFA9A28B9A5CD3A9DCE39376E184611", "total": 1 } }, - "last_commit_hash": "E7A298D27E5AA0FFD9DCEAD163BD3EFC52618DB9FC19F98F5E6F5C194E9D14EA", + "last_commit_hash": "06AA328E6DEBDCDEDB3289AC1AF5CAD14C129E2EDBB10DC5E4DD2299DD68DE1F", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:05:59.0360035Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:32.441854222Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -149,9 +149,9 @@ }, { "block_id": { - "hash": "5232E39EA19D61ED3CC46966D1AB6895F0B47930B31B0ABEE77EBD2400BA9060", + "hash": "8937F69C6E345E565B0CA1903B47B0F7870D28054330C8DFFF8FC62A4A669E71", "parts": { - "hash": "10F4CAE77632DF696025731F840FE8B487A599DBE1E68372D6FA512B0E9CC2A5", + "hash": "63FFACB6E280BE2A4F7BF4D0067F3ADB7EFA9A28B9A5CD3A9DCE39376E184611", "total": 1 } }, @@ -164,18 +164,18 @@ "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "height": "6", "last_block_id": { - "hash": "B7C27C2EE82BA3F0B5D503B76412E397E85224F6463EC75D649B485DFDF4AD9C", + "hash": "85789949436D56D8A68944C59B3604F48FE87DA4A437EBB8735EA57B2CC84199", "parts": { - "hash": "1BD8BC0D414DE2D7802A3A8C81750936945677AB8F749BA0339F470C38D553FF", + "hash": "D5545141E42C0EBBF174EDD2601C8589C2116111D11EFF270B9D467E7E86E7F5", "total": 1 } }, - "last_commit_hash": "C920D49236C9AE260507F6AC28769CB37D3457FB39D97145F72401162C758183", + "last_commit_hash": "1DB4A22544F7794F63034F983540FC08766CACF4A26F7983EA217AE537512282", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:05:58.5209135Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:31.914193769Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -185,13 +185,13 @@ }, { "block_id": { - "hash": "B7C27C2EE82BA3F0B5D503B76412E397E85224F6463EC75D649B485DFDF4AD9C", + "hash": "85789949436D56D8A68944C59B3604F48FE87DA4A437EBB8735EA57B2CC84199", "parts": { - "hash": "1BD8BC0D414DE2D7802A3A8C81750936945677AB8F749BA0339F470C38D553FF", + "hash": "D5545141E42C0EBBF174EDD2601C8589C2116111D11EFF270B9D467E7E86E7F5", "total": 1 } }, - "block_size": "569", + "block_size": "571", "header": { "app_hash": "0000000000000000", "chain_id": "dockerchain", @@ -200,18 +200,18 @@ "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "height": "5", "last_block_id": { - "hash": "CB8696C91AB6F3EE49CEAD10C7B261A09634036E859419ED24C5B0E0D6EA9BB0", + "hash": "C61290C168222DF1A8DE7835BFF17B10C61E4ED9277F122442FA4046A960635A", "parts": { - "hash": "0347294AF558B8EE4E8A77105B6F632B5E111159C0ABAE92243EBF711D104EFA", + "hash": "A674EB61DCDE24F367A742F15DA620D3A66E6496FB257EB0676C893E56AEBE38", "total": 1 } }, - "last_commit_hash": "670329B628F459B8D8F31753B9524F35834749B72995CE95A9CDD29724BE711B", + "last_commit_hash": "38BF789B0DF166078B7EB4AEF33C83730E2B051D72985C30535128200F047B6A", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:05:58.006814Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:31.388034944Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -221,9 +221,9 @@ }, { "block_id": { - "hash": "CB8696C91AB6F3EE49CEAD10C7B261A09634036E859419ED24C5B0E0D6EA9BB0", + "hash": "C61290C168222DF1A8DE7835BFF17B10C61E4ED9277F122442FA4046A960635A", "parts": { - "hash": "0347294AF558B8EE4E8A77105B6F632B5E111159C0ABAE92243EBF711D104EFA", + "hash": "A674EB61DCDE24F367A742F15DA620D3A66E6496FB257EB0676C893E56AEBE38", "total": 1 } }, @@ -236,18 +236,18 @@ "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "height": "4", "last_block_id": { - "hash": "A9EA8A118A40054B04B55976F36643BD25DAB7F600980A0A09A521066D391A06", + "hash": "2C2BA16F686527DC10F0A3CCCA2215CB45B56ED6F51A28E74F7657048CEB3CBF", "parts": { - "hash": "D035E1F343D3C22A8B82353630CDD52FA5272D21573C9728400ABCB16D1B5F71", + "hash": "5E44D35FBB14FDD5D3320D7FDDBA077CC3D8AAE9491D67D52D304B41BBA671CA", "total": 1 } }, - "last_commit_hash": "AE1F78279C0B6A636DF22695D42E61621E3770623A85ED951893A0656FAB2355", + "last_commit_hash": "8312F3A5282B121B1C118F44B3448F440B749D4555777641416ED3EB17600FF9", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:05:57.4918647Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:30.863905197Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -257,9 +257,9 @@ }, { "block_id": { - "hash": "A9EA8A118A40054B04B55976F36643BD25DAB7F600980A0A09A521066D391A06", + "hash": "2C2BA16F686527DC10F0A3CCCA2215CB45B56ED6F51A28E74F7657048CEB3CBF", "parts": { - "hash": "D035E1F343D3C22A8B82353630CDD52FA5272D21573C9728400ABCB16D1B5F71", + "hash": "5E44D35FBB14FDD5D3320D7FDDBA077CC3D8AAE9491D67D52D304B41BBA671CA", "total": 1 } }, @@ -272,18 +272,18 @@ "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "height": "3", "last_block_id": { - "hash": "B42CFAC8D53F6DB831D88B1A352403E233EF261F3A6FD7889208A802376D33D3", + "hash": "0636CC84AB264C5A91852C21A8C337C216A3F98184489A28F329B378DE301691", "parts": { - "hash": "7309734E845F1734C7AD06EB7AEB723874B7DB38BD8E2AD2D77688AE791F1626", + "hash": "92B62BF5935DCE75CBE38CD522F4372AF07A4F36DD09DCC9BE516D11719B9748", "total": 1 } }, - "last_commit_hash": "9E88293FCBE19EFF78F01F5ED61AB2A56F75A0D43BD02DC3705989C4FCE02DF9", + "last_commit_hash": "F5B94D8A51A6627FBBB0EFA45C3FF6981B8F80EAA753A21ECCE51BD9CEAFAC93", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:05:56.9736892Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:30.340443692Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -293,9 +293,9 @@ }, { "block_id": { - "hash": "B42CFAC8D53F6DB831D88B1A352403E233EF261F3A6FD7889208A802376D33D3", + "hash": "0636CC84AB264C5A91852C21A8C337C216A3F98184489A28F329B378DE301691", "parts": { - "hash": "7309734E845F1734C7AD06EB7AEB723874B7DB38BD8E2AD2D77688AE791F1626", + "hash": "92B62BF5935DCE75CBE38CD522F4372AF07A4F36DD09DCC9BE516D11719B9748", "total": 1 } }, @@ -308,18 +308,18 @@ "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "height": "2", "last_block_id": { - "hash": "F313BFEE2921709CA1DACF5BB55367FE293194F9C5A9827970C88993D97D47DC", + "hash": "44C37753BF31FD4238227E19213F042699F62416D4E5422BBA59095FC4BEE039", "parts": { - "hash": "693DBA913A007C963FBF674A99BC79B05A4C0A872E4F839B1B1FD2D7D1B588CD", + "hash": "13EEDAF51D61F7FF513FCD1B6387E0A3E306E49E5DCEA43CAFE77FB7B951DD4B", "total": 1 } }, - "last_commit_hash": "551A552C005A4E2D77B72411F2F037578C1916DBA6067E73153199E016FC150A", + "last_commit_hash": "FFD940CAE430CC36EF47D79A2A4D82ECE4B6148EBFD57718676E63A430728090", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:05:56.4580898Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:29.814665301Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -329,13 +329,13 @@ }, { "block_id": { - "hash": "F313BFEE2921709CA1DACF5BB55367FE293194F9C5A9827970C88993D97D47DC", + "hash": "44C37753BF31FD4238227E19213F042699F62416D4E5422BBA59095FC4BEE039", "parts": { - "hash": "693DBA913A007C963FBF674A99BC79B05A4C0A872E4F839B1B1FD2D7D1B588CD", + "hash": "13EEDAF51D61F7FF513FCD1B6387E0A3E306E49E5DCEA43CAFE77FB7B951DD4B", "total": 1 } }, - "block_size": "312", + "block_size": "311", "header": { "app_hash": "", "chain_id": "dockerchain", @@ -352,10 +352,10 @@ }, "last_commit_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:05:55.8988413Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:29.232984022Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -364,6 +364,6 @@ "num_txs": "0" } ], - "last_height": "15" + "last_height": "33" } } \ No newline at end of file diff --git a/rpc/tests/kvstore_fixtures/incoming/broadcast_tx_async.json b/rpc/tests/kvstore_fixtures/incoming/broadcast_tx_async.json index 3d0594442..628b32193 100644 --- a/rpc/tests/kvstore_fixtures/incoming/broadcast_tx_async.json +++ b/rpc/tests/kvstore_fixtures/incoming/broadcast_tx_async.json @@ -1,5 +1,5 @@ { - "id": "712dcbed-2068-4471-b68e-12427d3fb93a", + "id": "4efd497c-5b42-458f-b136-b101e764071d", "jsonrpc": "2.0", "result": { "code": 0, diff --git a/rpc/tests/kvstore_fixtures/incoming/broadcast_tx_commit.json b/rpc/tests/kvstore_fixtures/incoming/broadcast_tx_commit.json index 76e55f493..f553bae58 100644 --- a/rpc/tests/kvstore_fixtures/incoming/broadcast_tx_commit.json +++ b/rpc/tests/kvstore_fixtures/incoming/broadcast_tx_commit.json @@ -1,5 +1,5 @@ { - "id": "6eaad3fa-2aa7-4c41-99e1-33e76acd1353", + "id": "c32535b9-bec5-4549-9f90-7aa25d6d6a12", "jsonrpc": "2.0", "result": { "check_tx": { @@ -49,6 +49,6 @@ "log": "" }, "hash": "D63F9C23791E610410B576D8C27BB5AEAC93CC1A58522428A7B32A1276085860", - "height": "16" + "height": "34" } } \ No newline at end of file diff --git a/rpc/tests/kvstore_fixtures/incoming/broadcast_tx_sync.json b/rpc/tests/kvstore_fixtures/incoming/broadcast_tx_sync.json index c06e5f8a6..c84bbc76a 100644 --- a/rpc/tests/kvstore_fixtures/incoming/broadcast_tx_sync.json +++ b/rpc/tests/kvstore_fixtures/incoming/broadcast_tx_sync.json @@ -1,5 +1,5 @@ { - "id": "8e851ab5-3182-4518-ab31-799b80c612ce", + "id": "59795aed-7cb3-4997-803e-f747b8f2cc2f", "jsonrpc": "2.0", "result": { "code": 0, diff --git a/rpc/tests/kvstore_fixtures/incoming/commit_at_height_10.json b/rpc/tests/kvstore_fixtures/incoming/commit_at_height_10.json index 9ecb7726f..33a44fadd 100644 --- a/rpc/tests/kvstore_fixtures/incoming/commit_at_height_10.json +++ b/rpc/tests/kvstore_fixtures/incoming/commit_at_height_10.json @@ -1,14 +1,14 @@ { - "id": "51a22a83-7fa7-4363-81ff-9be5666c2406", + "id": "21ad34a1-45a5-4766-a917-d5492b24f941", "jsonrpc": "2.0", "result": { "canonical": true, "signed_header": { "commit": { "block_id": { - "hash": "84F558CDCCA7D7D7B26F4BB02862C0DA72607F74937C549AEB0ACFDEC599C877", + "hash": "223B6924AC98CE99678027C712954C565D4359507C3DECFF9D2D5B5A9E4231F6", "parts": { - "hash": "B5647568016ECDEF740E897D95EEF5CD17A6E20221B7A58CEC7F3DFABA63C7C7", + "hash": "F2FC723B88EFD18C4599BDF9441AA962F19C146C8601ED0854973189D11816DE", "total": 1 } }, @@ -17,9 +17,9 @@ "signatures": [ { "block_id_flag": 2, - "signature": "uCvfz2FBzbsWEov80wT/9nYW0dlfFwYH/9KMB+02kc2qIWEjUkxuMfq14CJEOMscbTb980SiuZcKB+kV6M6LDA==", - "timestamp": "2020-12-21T07:06:01.0940072Z", - "validator_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF" + "signature": "XcYXbxMIxFjL5s+oD4XGi7KkzPAFHH1j6IWcX8odqWKgZkjxAk/ACDufwCqA3CwiQDO946qTo2dhZ7B2Ull3DA==", + "timestamp": "2021-07-16T12:16:34.512439966Z", + "validator_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D" } ] }, @@ -31,18 +31,18 @@ "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "height": "10", "last_block_id": { - "hash": "904729E98E9468E2430B3691020ABDA34291EF7F95F15667C0F6EC957432C893", + "hash": "4AED585851DEE548A0143C8B41FA72FDA0597CA304807BEF06222D335EDD404D", "parts": { - "hash": "6D2590541B2FDF59A60B062BB17AFA5AE0903211E33F632A17DB22C591889DFC", + "hash": "B2A89B0BAC1FEF0C15D3ED44105E75DB7F8DB42ECEA33E32B3B820AEDAB132BD", "total": 1 } }, - "last_commit_hash": "68092239B80DAFDF43C01657159CA708A2BE923B7B14F8F7DD771CA51D596F7B", + "last_commit_hash": "515DAA8790FBC39D93EA23229826BA45205DAF178F8BD9A7D4835AA07C663C68", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:06:00.5796845Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:33.997760354Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" diff --git a/rpc/tests/kvstore_fixtures/incoming/consensus_state.json b/rpc/tests/kvstore_fixtures/incoming/consensus_state.json index 7b275e078..e86eb66f3 100644 --- a/rpc/tests/kvstore_fixtures/incoming/consensus_state.json +++ b/rpc/tests/kvstore_fixtures/incoming/consensus_state.json @@ -1,9 +1,9 @@ { - "id": "a5cbed41-8e85-4d22-92c5-db28d88646a2", + "id": "523312c6-ea35-4274-b521-401e724bb344", "jsonrpc": "2.0", "result": { "round_state": { - "height/round/step": "16/0/1", + "height/round/step": "34/0/1", "height_vote_set": [ { "precommits": [ @@ -20,10 +20,10 @@ "locked_block_hash": "", "proposal_block_hash": "", "proposer": { - "address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", + "address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", "index": 0 }, - "start_time": "2020-12-21T07:06:04.171573Z", + "start_time": "2021-07-16T12:16:46.916066071Z", "valid_block_hash": "" } } diff --git a/rpc/tests/kvstore_fixtures/incoming/genesis.json b/rpc/tests/kvstore_fixtures/incoming/genesis.json index 8b22434b0..904207f53 100644 --- a/rpc/tests/kvstore_fixtures/incoming/genesis.json +++ b/rpc/tests/kvstore_fixtures/incoming/genesis.json @@ -1,5 +1,5 @@ { - "id": "c6ca9b93-048b-479e-b44a-a21b92d584a8", + "id": "9f71da58-c631-4141-be10-a9dac3496af0", "jsonrpc": "2.0", "result": { "genesis": { @@ -8,8 +8,7 @@ "consensus_params": { "block": { "max_bytes": "22020096", - "max_gas": "-1", - "time_iota_ms": "500" + "max_gas": "-1" }, "evidence": { "max_age_duration": "172800000000000", @@ -23,16 +22,16 @@ }, "version": {} }, - "genesis_time": "2020-12-21T07:05:55.8988413Z", + "genesis_time": "2021-07-16T12:16:29.232984022Z", "initial_height": "1", "validators": [ { - "address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", + "address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", "name": "", "power": "10", "pub_key": { "type": "tendermint/PubKeyEd25519", - "value": "oDr9j9k0ntj2lTvyMWZEEIBIp1MZNodIKLmjSYLRJqQ=" + "value": "f+7sWZojwd8xbxZ+GJL+x/zKr1wyM0NMJkp8tCnA4t0=" } } ] diff --git a/rpc/tests/kvstore_fixtures/incoming/net_info.json b/rpc/tests/kvstore_fixtures/incoming/net_info.json index 033f03f3a..057baa3f7 100644 --- a/rpc/tests/kvstore_fixtures/incoming/net_info.json +++ b/rpc/tests/kvstore_fixtures/incoming/net_info.json @@ -1,5 +1,5 @@ { - "id": "b1d19ed4-397b-42a0-8cfc-e261826dc66a", + "id": "a01a558c-a893-415a-8f57-21f104d1aa46", "jsonrpc": "2.0", "result": { "listeners": [ diff --git a/rpc/tests/kvstore_fixtures/incoming/status.json b/rpc/tests/kvstore_fixtures/incoming/status.json index 3b0c894de..fdc868cd1 100644 --- a/rpc/tests/kvstore_fixtures/incoming/status.json +++ b/rpc/tests/kvstore_fixtures/incoming/status.json @@ -1,10 +1,10 @@ { - "id": "371b107e-adb7-42b5-9f9a-15577c560290", + "id": "7acd6adc-648a-4e73-88de-911fb2db10c5", "jsonrpc": "2.0", "result": { "node_info": { "channels": "40202122233038606100", - "id": "49d238c84786e2e5fda8b5cbfaaeae217e9198f8", + "id": "eb277d0093f0a454f87558b962ae0ba6a0675691", "listen_addr": "tcp://0.0.0.0:26656", "moniker": "dockernode", "network": "dockerchain", @@ -17,24 +17,24 @@ "block": "11", "p2p": "8" }, - "version": "v0.34.0" + "version": "v0.34.9" }, "sync_info": { "catching_up": false, "earliest_app_hash": "", - "earliest_block_hash": "F313BFEE2921709CA1DACF5BB55367FE293194F9C5A9827970C88993D97D47DC", + "earliest_block_hash": "44C37753BF31FD4238227E19213F042699F62416D4E5422BBA59095FC4BEE039", "earliest_block_height": "1", - "earliest_block_time": "2020-12-21T07:05:55.8988413Z", + "earliest_block_time": "2021-07-16T12:16:29.232984022Z", "latest_app_hash": "0000000000000000", - "latest_block_hash": "0841B9258E07365306288BAE1D3B0F9B0E8F74CAF5ED188CCA7C3F9BD1036861", - "latest_block_height": "16", - "latest_block_time": "2020-12-21T07:06:03.6688721Z" + "latest_block_hash": "D18444A13CC9F798A4B57FDCD3C486EB7FF1F4EF73DF6234764226DDED75A394", + "latest_block_height": "34", + "latest_block_time": "2021-07-16T12:16:46.411375512Z" }, "validator_info": { - "address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", + "address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", "pub_key": { "type": "tendermint/PubKeyEd25519", - "value": "oDr9j9k0ntj2lTvyMWZEEIBIp1MZNodIKLmjSYLRJqQ=" + "value": "f+7sWZojwd8xbxZ+GJL+x/zKr1wyM0NMJkp8tCnA4t0=" }, "voting_power": "10" } diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_malformed.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_malformed.json index 40b2aea50..a916a9a5c 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_malformed.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_malformed.json @@ -4,6 +4,6 @@ "data": "failed to parse query: \nparse error near PegText (line 1 symbol 2 - line 1 symbol 11):\n\"malformed\"\n", "message": "Internal error" }, - "id": "89ea2fbb-981d-4df2-a8b4-aa5e0c1ecead", + "id": "b23346ae-3330-4024-9286-933c350249c1", "jsonrpc": "2.0" } \ No newline at end of file diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_0.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_0.json index b17491196..7a2553da1 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_0.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_0.json @@ -1,5 +1,5 @@ { - "id": "19228bf5-c042-4f98-8901-e271e38f1f68", + "id": "4375b246-297f-42cc-937f-a9cf69a538e2", "jsonrpc": "2.0", "result": { "data": { @@ -18,20 +18,20 @@ "consensus_hash": "048091BC7DDC283F77BFBF91D73C44DA58C3DF8A9CBC867405D8B7F3DAADA22F", "data_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "height": "17", + "height": "35", "last_block_id": { - "hash": "0841B9258E07365306288BAE1D3B0F9B0E8F74CAF5ED188CCA7C3F9BD1036861", + "hash": "D18444A13CC9F798A4B57FDCD3C486EB7FF1F4EF73DF6234764226DDED75A394", "parts": { - "hash": "E5752FBFF1EF94718A48DA0A96F252B092EC7BFE646E2B13A1292DFF8500BC25", + "hash": "DCECC31BE4B7F69DC5038571F4410EDF538A602BF9B3C85045702DD7A868C708", "total": 1 } }, - "last_commit_hash": "4C7F06AB50C1A37FDDAAAD9A9F5C8D14C0CD3F8D927D7B780FE9829E4073D1B0", + "last_commit_hash": "EE7456BBB24313A5C10EDD10ABC6C61C69FFA5C69BB24221BFE655FD6801E83D", "last_results_hash": "4837665DFE640A370E7496C691987562D02462142C5F34F59E185911A12370EA", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:06:04.1847324Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:46.930356271Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -39,20 +39,20 @@ }, "last_commit": { "block_id": { - "hash": "0841B9258E07365306288BAE1D3B0F9B0E8F74CAF5ED188CCA7C3F9BD1036861", + "hash": "D18444A13CC9F798A4B57FDCD3C486EB7FF1F4EF73DF6234764226DDED75A394", "parts": { - "hash": "E5752FBFF1EF94718A48DA0A96F252B092EC7BFE646E2B13A1292DFF8500BC25", + "hash": "DCECC31BE4B7F69DC5038571F4410EDF538A602BF9B3C85045702DD7A868C708", "total": 1 } }, - "height": "16", + "height": "34", "round": 0, "signatures": [ { "block_id_flag": 2, - "signature": "XU26NUohlGMx7vOegrykz2YkyQCLJNATR1QJ0CokK3teH71jQI+bzhdsAo9Pr1JLAX9MA2ao7vMFfIxE9jOmBA==", - "timestamp": "2020-12-21T07:06:04.1847324Z", - "validator_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF" + "signature": "xlPAgX+MKydn8/rjQCRCbAqbrffyJlA4PNtXO9SRqD2L4fQsvqXbPZIFuJlu4nT1gwS6dMJvxHtkAgaDMNEYDQ==", + "timestamp": "2021-07-16T12:16:46.930356271Z", + "validator_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D" } ] } diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_1.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_1.json index 9043ce869..66e281821 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_1.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_1.json @@ -1,5 +1,5 @@ { - "id": "19228bf5-c042-4f98-8901-e271e38f1f68", + "id": "4375b246-297f-42cc-937f-a9cf69a538e2", "jsonrpc": "2.0", "result": { "data": { @@ -18,20 +18,20 @@ "consensus_hash": "048091BC7DDC283F77BFBF91D73C44DA58C3DF8A9CBC867405D8B7F3DAADA22F", "data_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "height": "18", + "height": "36", "last_block_id": { - "hash": "EE802862B5FF1E544AFD3A4223A629491415E715086649E0613CE75165F0B631", + "hash": "DA3E9C0ABE252FF76E932F411993920222A47D7B1A080A37508802E1FC66D01D", "parts": { - "hash": "DE69ACA137D3532B315838044E98EB7B31445C4EB508E7A81A838CA7A75CAE36", + "hash": "01A0B7D0054F27DFE276467353FD590ADCB7CDCF2DD288862E35E555A5CA6369", "total": 1 } }, - "last_commit_hash": "CC5D6D940F59DC13C3542DD9C6F2B427BC2B97DB1CA47D91EB5244E5B428471D", + "last_commit_hash": "3EF3F938C94A61FD308F3B4B154C146EC051D6A31490C0C783F1C5F87211821F", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:06:04.7048212Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:47.455836102Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -39,20 +39,20 @@ }, "last_commit": { "block_id": { - "hash": "EE802862B5FF1E544AFD3A4223A629491415E715086649E0613CE75165F0B631", + "hash": "DA3E9C0ABE252FF76E932F411993920222A47D7B1A080A37508802E1FC66D01D", "parts": { - "hash": "DE69ACA137D3532B315838044E98EB7B31445C4EB508E7A81A838CA7A75CAE36", + "hash": "01A0B7D0054F27DFE276467353FD590ADCB7CDCF2DD288862E35E555A5CA6369", "total": 1 } }, - "height": "17", + "height": "35", "round": 0, "signatures": [ { "block_id_flag": 2, - "signature": "N8IW1teDCJWYk7Q/yQufJQtTE9aXP6Wj5kdnQ66x+nJmi4KFTdZFAQTsuu7Ck2KL8iNSGQXyudz4tdV2hxRqDA==", - "timestamp": "2020-12-21T07:06:04.7048212Z", - "validator_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF" + "signature": "oKLVAMNvXRv7irGzr6xmXvCIZ1e0XQigskO1nPXmNm6btYKWomMYcIwTqZzt9e3S/6lGp5rxRd9AIxSzXywgDA==", + "timestamp": "2021-07-16T12:16:47.455836102Z", + "validator_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D" } ] } diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_2.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_2.json index 1e04f3cfb..6f57c49eb 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_2.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_2.json @@ -1,5 +1,5 @@ { - "id": "19228bf5-c042-4f98-8901-e271e38f1f68", + "id": "4375b246-297f-42cc-937f-a9cf69a538e2", "jsonrpc": "2.0", "result": { "data": { @@ -18,20 +18,20 @@ "consensus_hash": "048091BC7DDC283F77BFBF91D73C44DA58C3DF8A9CBC867405D8B7F3DAADA22F", "data_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "height": "19", + "height": "37", "last_block_id": { - "hash": "EC7EBFEBD4C04B0ECE3DE07AAC1C5C38D45B162A972CA034DE327130BABEE4D1", + "hash": "231E2122BB41CCF58E6C05B93AF30571725120F0034C7ACEBB790B41FF967681", "parts": { - "hash": "815235B4251567E655BE23045952E0EAC0262A1C9E562542A2BC0B23A845B5A6", + "hash": "D7324EFCD611A77E82F51D76DD618A1B8A66E3E230CD86BBEA75A838DC06F832", "total": 1 } }, - "last_commit_hash": "2E590386A70DEFD8092348ADB8E0C62D893571DC76C0256812BF2F6966637A1E", + "last_commit_hash": "3EC5A6297B9190B0BB510B9473D646B81D50B005B7585CB9DD1ECF6904757D6A", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:06:05.2201755Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:47.983741392Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -39,20 +39,20 @@ }, "last_commit": { "block_id": { - "hash": "EC7EBFEBD4C04B0ECE3DE07AAC1C5C38D45B162A972CA034DE327130BABEE4D1", + "hash": "231E2122BB41CCF58E6C05B93AF30571725120F0034C7ACEBB790B41FF967681", "parts": { - "hash": "815235B4251567E655BE23045952E0EAC0262A1C9E562542A2BC0B23A845B5A6", + "hash": "D7324EFCD611A77E82F51D76DD618A1B8A66E3E230CD86BBEA75A838DC06F832", "total": 1 } }, - "height": "18", + "height": "36", "round": 0, "signatures": [ { "block_id_flag": 2, - "signature": "RWFrklOcrWE0zJRcA+HELR5+wTiYmfYMDLNB9+0jAfC2CAcOegfRcb6e/tNP4JRkw5trnYHBYSL08vavpZldAA==", - "timestamp": "2020-12-21T07:06:05.2201755Z", - "validator_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF" + "signature": "xq3AtJ1K/QfZ7vAnRjgOSRJoOMFUgLIIKvBtuC1Qgf6PFi3a70H/zWOOezaGPbQDhPVEF5zDba4ju/WzF0dEDQ==", + "timestamp": "2021-07-16T12:16:47.983741392Z", + "validator_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D" } ] } diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_3.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_3.json index b30e9e12e..a4e8be854 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_3.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_3.json @@ -1,5 +1,5 @@ { - "id": "19228bf5-c042-4f98-8901-e271e38f1f68", + "id": "4375b246-297f-42cc-937f-a9cf69a538e2", "jsonrpc": "2.0", "result": { "data": { @@ -18,20 +18,20 @@ "consensus_hash": "048091BC7DDC283F77BFBF91D73C44DA58C3DF8A9CBC867405D8B7F3DAADA22F", "data_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "height": "20", + "height": "38", "last_block_id": { - "hash": "5663C5B1AD248DDC0E7B36F9B399CF59FE52D761E37F0F71B3519EE88FEAEC64", + "hash": "4CE8485379A321DDF901AB2E319757E981EC87EB94BA971E89659047C7BEA6BA", "parts": { - "hash": "3D3C07C430AEE862E095E43C0200598DDF36DE89EE0D9DB3709402448A8DD887", + "hash": "E04B8A765D3DAB72215AC2ACFEF67F7543E9B7E18AC4C4A8A548A9538D8B0D90", "total": 1 } }, - "last_commit_hash": "A2ED309E7952EA3F5728F244089A40E5942D20A54DDB4F2395A2D213EC94ADD9", + "last_commit_hash": "89FB87B79CA66FC19193CDE2441B0B58398C78954C2E169D525547EEB432A76D", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:06:05.7366561Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:48.513039779Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -39,20 +39,20 @@ }, "last_commit": { "block_id": { - "hash": "5663C5B1AD248DDC0E7B36F9B399CF59FE52D761E37F0F71B3519EE88FEAEC64", + "hash": "4CE8485379A321DDF901AB2E319757E981EC87EB94BA971E89659047C7BEA6BA", "parts": { - "hash": "3D3C07C430AEE862E095E43C0200598DDF36DE89EE0D9DB3709402448A8DD887", + "hash": "E04B8A765D3DAB72215AC2ACFEF67F7543E9B7E18AC4C4A8A548A9538D8B0D90", "total": 1 } }, - "height": "19", + "height": "37", "round": 0, "signatures": [ { "block_id_flag": 2, - "signature": "vL39A5WdMZFKl7v4p0GhVC6C+0okjsETppCr/k/9B8NUqc3VuBQMUsvg7JPNxApHGHIxexu85xsqnVYTaJQXCA==", - "timestamp": "2020-12-21T07:06:05.7366561Z", - "validator_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF" + "signature": "7l0EDmZewcp4oxDBcLLS/4tw55nwIu78lqMzGA9u07eLu7xvNOJALPZ+DwY4X2VFEc+BUec+tRojA6LegximCQ==", + "timestamp": "2021-07-16T12:16:48.513039779Z", + "validator_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D" } ] } diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_4.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_4.json index 24b94758b..a4eec3d85 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_4.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_newblock_4.json @@ -1,5 +1,5 @@ { - "id": "19228bf5-c042-4f98-8901-e271e38f1f68", + "id": "4375b246-297f-42cc-937f-a9cf69a538e2", "jsonrpc": "2.0", "result": { "data": { @@ -18,20 +18,20 @@ "consensus_hash": "048091BC7DDC283F77BFBF91D73C44DA58C3DF8A9CBC867405D8B7F3DAADA22F", "data_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "height": "21", + "height": "39", "last_block_id": { - "hash": "0AB2207DD4C3D8293FC7CA17BD9FA6CE8E5B63252E7BDEDA54D04B2422FAE39A", + "hash": "918A56A7225058ECC03A4A06CD6E856266C5866524E9BA9322A16E688F53A846", "parts": { - "hash": "D82E91C8E3B83CC6DFACBDD15116D635F8ADAB660CD478E00C7C2E5AFDDA748B", + "hash": "0F0E36E6E15F271AAD7511715A58B38CA021527D1A6E68E86C132954EF484684", "total": 1 } }, - "last_commit_hash": "61B4825C1CBDC5CCF56CD777150AFC9C93D54CB6E51B619EE582AAAC9FD69DA7", + "last_commit_hash": "40CE1250F271BB17FBF5E6D67CA8E1D25D1CA5A5BDFDAF54295EF36228373DA3", "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", - "next_validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", - "proposer_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF", - "time": "2020-12-21T07:06:06.2567232Z", - "validators_hash": "518FD4E4CCE99DB15463EA5EBAD3B2BEE1030C31D53065F2FD7C53F8A7BC3E7C", + "next_validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", + "proposer_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D", + "time": "2021-07-16T12:16:49.037360939Z", + "validators_hash": "ADFA3B40824D69EAD7828B9A78D16D80DFA93499D1DB0EC362916AE61182A64D", "version": { "app": "1", "block": "11" @@ -39,20 +39,20 @@ }, "last_commit": { "block_id": { - "hash": "0AB2207DD4C3D8293FC7CA17BD9FA6CE8E5B63252E7BDEDA54D04B2422FAE39A", + "hash": "918A56A7225058ECC03A4A06CD6E856266C5866524E9BA9322A16E688F53A846", "parts": { - "hash": "D82E91C8E3B83CC6DFACBDD15116D635F8ADAB660CD478E00C7C2E5AFDDA748B", + "hash": "0F0E36E6E15F271AAD7511715A58B38CA021527D1A6E68E86C132954EF484684", "total": 1 } }, - "height": "20", + "height": "38", "round": 0, "signatures": [ { "block_id_flag": 2, - "signature": "b7EweHIJFJ9gXmTyfTS4L+A7bHF2SkLYTZOEs0koMwT7+0SNrEgHVWYiB5N5RdVPV9CX7K5WZi12Joh0xvq/BA==", - "timestamp": "2020-12-21T07:06:06.2567232Z", - "validator_address": "ABAF73F9A1D15E78CA39C1E066E07D3F3B3BAFAF" + "signature": "hMmRj3S/M7jVToUZmeRxH8g17fTxLI3CZgkS55T41+MMsn2YZ3j42CyxOtONPpdUDhyZ2Ja1fqAHVIM2jgiqCQ==", + "timestamp": "2021-07-16T12:16:49.037360939Z", + "validator_address": "ABA577531E6D6F4119E7E1E0EE1909B908A8346D" } ] } diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs.json index 71fd87513..5aa08ece8 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs.json @@ -1,5 +1,5 @@ { - "id": "4ce9362f-4166-4557-a8dd-4b6b5a5ace50", + "id": "5cc8e426-b6d1-49f1-845c-d93415a93f93", "jsonrpc": "2.0", "result": {} } \ No newline at end of file diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_0.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_0.json index 21dd66722..3f1748d47 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_0.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_0.json @@ -1,12 +1,12 @@ { - "id": "4ce9362f-4166-4557-a8dd-4b6b5a5ace50", + "id": "5cc8e426-b6d1-49f1-845c-d93415a93f93", "jsonrpc": "2.0", "result": { "data": { "type": "tendermint/event/Tx", "value": { "TxResult": { - "height": "23", + "height": "41", "result": { "events": [ { @@ -60,7 +60,7 @@ "FCB86F71C4EFF43E13C51FA12791F6DD1DDB8600A51131BE2289614D6882F6BE" ], "tx.height": [ - "23" + "41" ] }, "query": "tm.event = 'Tx'" diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_1.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_1.json index 11d9f4501..835057872 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_1.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_1.json @@ -1,12 +1,13 @@ { - "id": "4ce9362f-4166-4557-a8dd-4b6b5a5ace50", + "id": "5cc8e426-b6d1-49f1-845c-d93415a93f93", "jsonrpc": "2.0", "result": { "data": { "type": "tendermint/event/Tx", "value": { "TxResult": { - "height": "24", + "height": "41", + "index": 1, "result": { "events": [ { @@ -60,7 +61,7 @@ "9F424A8E634AAF63CFA61151A306AA788C9CC792F16B370F7867ED0BD972476C" ], "tx.height": [ - "24" + "41" ] }, "query": "tm.event = 'Tx'" diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_2.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_2.json index 8f407e788..f6d9e251f 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_2.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_2.json @@ -1,13 +1,12 @@ { - "id": "4ce9362f-4166-4557-a8dd-4b6b5a5ace50", + "id": "5cc8e426-b6d1-49f1-845c-d93415a93f93", "jsonrpc": "2.0", "result": { "data": { "type": "tendermint/event/Tx", "value": { "TxResult": { - "height": "24", - "index": 1, + "height": "42", "result": { "events": [ { @@ -61,7 +60,7 @@ "C9D123E2CF19B9F0EC3CA1F64CD3BF0735397C84778B40B3EB5C49A752D53BF4" ], "tx.height": [ - "24" + "42" ] }, "query": "tm.event = 'Tx'" diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_3.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_3.json index 8f0c0a1f4..f92f0da5a 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_3.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_3.json @@ -1,12 +1,12 @@ { - "id": "4ce9362f-4166-4557-a8dd-4b6b5a5ace50", + "id": "5cc8e426-b6d1-49f1-845c-d93415a93f93", "jsonrpc": "2.0", "result": { "data": { "type": "tendermint/event/Tx", "value": { "TxResult": { - "height": "25", + "height": "43", "result": { "events": [ { @@ -60,7 +60,7 @@ "73117D6A783E4A37C1D9AD48744AD9FCC0D094C48AB8322FA11CD901C5174CFD" ], "tx.height": [ - "25" + "43" ] }, "query": "tm.event = 'Tx'" diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_4.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_4.json index 0803dd4d5..0a284fae4 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_4.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_4.json @@ -1,12 +1,12 @@ { - "id": "4ce9362f-4166-4557-a8dd-4b6b5a5ace50", + "id": "5cc8e426-b6d1-49f1-845c-d93415a93f93", "jsonrpc": "2.0", "result": { "data": { "type": "tendermint/event/Tx", "value": { "TxResult": { - "height": "26", + "height": "44", "result": { "events": [ { @@ -60,7 +60,7 @@ "C349F213F04B4E8E749C6656E4C299E3BF22F4FAF141291A5C083336AD1A413B" ], "tx.height": [ - "26" + "44" ] }, "query": "tm.event = 'Tx'" diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_0.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_0.json index 10ad1d267..83fc9c49f 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_0.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_0.json @@ -1,5 +1,5 @@ { - "id": "ba50ea50-9d3f-4f77-b04d-4450f406b998", + "id": "f04ffeb5-9cfa-4248-a17c-787453bae43a", "jsonrpc": "2.0", "result": { "code": 0, diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_1.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_1.json index 6945a4dd1..9d7b00117 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_1.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_1.json @@ -1,5 +1,5 @@ { - "id": "251f4042-77c5-4152-a98f-d21a0b8c2d4d", + "id": "7fc1c81c-5c8a-43f0-aaeb-f862c3eea928", "jsonrpc": "2.0", "result": { "code": 0, diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_2.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_2.json index 88a8f64fd..c70a882eb 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_2.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_2.json @@ -1,5 +1,5 @@ { - "id": "26d89226-c90b-49b3-b764-b24a79d73d3d", + "id": "d0d77026-920a-4686-87a2-bf9206615722", "jsonrpc": "2.0", "result": { "code": 0, diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_3.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_3.json index 902bc09ae..9324b08af 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_3.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_3.json @@ -1,5 +1,5 @@ { - "id": "29965dd5-cccf-43c0-bbb8-65ae6671163c", + "id": "2af206dc-f501-4c7b-9024-fad410875334", "jsonrpc": "2.0", "result": { "code": 0, diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_4.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_4.json index 7c20e810e..3f69222e7 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_4.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_4.json @@ -1,5 +1,5 @@ { - "id": "71a6cab9-62d5-4c41-a404-5f90f36ed77a", + "id": "349fb5d9-5af4-42c2-acc0-656ce0fd6127", "jsonrpc": "2.0", "result": { "code": 0, diff --git a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_5.json b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_5.json index 990d5a661..75c1a33e3 100644 --- a/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_5.json +++ b/rpc/tests/kvstore_fixtures/incoming/subscribe_txs_broadcast_tx_5.json @@ -1,5 +1,5 @@ { - "id": "ac35b95a-c8f3-4a2a-9466-159552d83e23", + "id": "eceb3ffc-0324-4897-8ccd-eea89ae80fd2", "jsonrpc": "2.0", "result": { "code": 0, diff --git a/rpc/tests/kvstore_fixtures/incoming/tx_search_no_prove.json b/rpc/tests/kvstore_fixtures/incoming/tx_search_no_prove.json index ac64b61a4..8983e7f1f 100644 --- a/rpc/tests/kvstore_fixtures/incoming/tx_search_no_prove.json +++ b/rpc/tests/kvstore_fixtures/incoming/tx_search_no_prove.json @@ -1,12 +1,12 @@ { - "id": "68c7ee1b-a94b-4762-ba46-b42f5a82fa68", + "id": "9ee74828-e8f1-429d-9d53-254c833bae00", "jsonrpc": "2.0", "result": { "total_count": "8", "txs": [ { "hash": "9F28904F9C0F3AB74A81CBA48E39124DA1C680B47FBFCBA0126870DB722BCC30", - "height": "16", + "height": "34", "index": 0, "tx": "YXN5bmMta2V5PXZhbHVl", "tx_result": { @@ -48,7 +48,7 @@ }, { "hash": "57018296EE0919C9D351F2FFEA82A8D28DE223724D79965FC8D00A7477ED48BC", - "height": "16", + "height": "34", "index": 1, "tx": "c3luYy1rZXk9dmFsdWU=", "tx_result": { @@ -90,7 +90,7 @@ }, { "hash": "D63F9C23791E610410B576D8C27BB5AEAC93CC1A58522428A7B32A1276085860", - "height": "16", + "height": "34", "index": 2, "tx": "Y29tbWl0LWtleT12YWx1ZQ==", "tx_result": { @@ -132,7 +132,7 @@ }, { "hash": "FCB86F71C4EFF43E13C51FA12791F6DD1DDB8600A51131BE2289614D6882F6BE", - "height": "23", + "height": "41", "index": 0, "tx": "dHgwPXZhbHVl", "tx_result": { @@ -174,8 +174,8 @@ }, { "hash": "9F424A8E634AAF63CFA61151A306AA788C9CC792F16B370F7867ED0BD972476C", - "height": "24", - "index": 0, + "height": "41", + "index": 1, "tx": "dHgxPXZhbHVl", "tx_result": { "code": 0, @@ -216,8 +216,8 @@ }, { "hash": "C9D123E2CF19B9F0EC3CA1F64CD3BF0735397C84778B40B3EB5C49A752D53BF4", - "height": "24", - "index": 1, + "height": "42", + "index": 0, "tx": "dHgyPXZhbHVl", "tx_result": { "code": 0, @@ -258,7 +258,7 @@ }, { "hash": "73117D6A783E4A37C1D9AD48744AD9FCC0D094C48AB8322FA11CD901C5174CFD", - "height": "25", + "height": "43", "index": 0, "tx": "dHgzPXZhbHVl", "tx_result": { @@ -300,7 +300,7 @@ }, { "hash": "C349F213F04B4E8E749C6656E4C299E3BF22F4FAF141291A5C083336AD1A413B", - "height": "26", + "height": "44", "index": 0, "tx": "dHg0PXZhbHVl", "tx_result": { diff --git a/rpc/tests/kvstore_fixtures/incoming/tx_search_with_prove.json b/rpc/tests/kvstore_fixtures/incoming/tx_search_with_prove.json index 2b0ed9bc4..906773ce6 100644 --- a/rpc/tests/kvstore_fixtures/incoming/tx_search_with_prove.json +++ b/rpc/tests/kvstore_fixtures/incoming/tx_search_with_prove.json @@ -1,12 +1,12 @@ { - "id": "8784e541-4cdc-4b8e-a5f4-d445e21f9a32", + "id": "1cfb0a9f-749f-418a-8f01-34a3268b6b7f", "jsonrpc": "2.0", "result": { "total_count": "8", "txs": [ { "hash": "9F28904F9C0F3AB74A81CBA48E39124DA1C680B47FBFCBA0126870DB722BCC30", - "height": "16", + "height": "34", "index": 0, "proof": { "data": "YXN5bmMta2V5PXZhbHVl", @@ -61,7 +61,7 @@ }, { "hash": "57018296EE0919C9D351F2FFEA82A8D28DE223724D79965FC8D00A7477ED48BC", - "height": "16", + "height": "34", "index": 1, "proof": { "data": "c3luYy1rZXk9dmFsdWU=", @@ -116,7 +116,7 @@ }, { "hash": "D63F9C23791E610410B576D8C27BB5AEAC93CC1A58522428A7B32A1276085860", - "height": "16", + "height": "34", "index": 2, "proof": { "data": "Y29tbWl0LWtleT12YWx1ZQ==", @@ -170,17 +170,19 @@ }, { "hash": "FCB86F71C4EFF43E13C51FA12791F6DD1DDB8600A51131BE2289614D6882F6BE", - "height": "23", + "height": "41", "index": 0, "proof": { "data": "dHgwPXZhbHVl", "proof": { - "aunts": [], + "aunts": [ + "QnwQk7ERU9NjeD1GlLa4H8lscIRFD3evj6SZulKp3T8=" + ], "index": "0", "leaf_hash": "3UnhxGnCw+sKtov5uD2YZbCP79vHFwLMc1ZPTaVocKQ=", - "total": "1" + "total": "2" }, - "root_hash": "DD49E1C469C2C3EB0AB68BF9B83D9865B08FEFDBC71702CC73564F4DA56870A4" + "root_hash": "C77CB763CB27048A8D9F09DA707B7A19ECF4B40C967A57CF16CEDEE1A5130A8F" }, "tx": "dHgwPXZhbHVl", "tx_result": { @@ -222,19 +224,19 @@ }, { "hash": "9F424A8E634AAF63CFA61151A306AA788C9CC792F16B370F7867ED0BD972476C", - "height": "24", - "index": 0, + "height": "41", + "index": 1, "proof": { "data": "dHgxPXZhbHVl", "proof": { "aunts": [ - "0eF/BEMF82Y/mIMIM0HX/isU2jI44Z2rAor5MA0PrKM=" + "3UnhxGnCw+sKtov5uD2YZbCP79vHFwLMc1ZPTaVocKQ=" ], - "index": "0", + "index": "1", "leaf_hash": "QnwQk7ERU9NjeD1GlLa4H8lscIRFD3evj6SZulKp3T8=", "total": "2" }, - "root_hash": "05E17857792BBFE205D9F8C2498F6C05A3603D046EDF57C50D037D36804F35D1" + "root_hash": "C77CB763CB27048A8D9F09DA707B7A19ECF4B40C967A57CF16CEDEE1A5130A8F" }, "tx": "dHgxPXZhbHVl", "tx_result": { @@ -276,19 +278,17 @@ }, { "hash": "C9D123E2CF19B9F0EC3CA1F64CD3BF0735397C84778B40B3EB5C49A752D53BF4", - "height": "24", - "index": 1, + "height": "42", + "index": 0, "proof": { "data": "dHgyPXZhbHVl", "proof": { - "aunts": [ - "QnwQk7ERU9NjeD1GlLa4H8lscIRFD3evj6SZulKp3T8=" - ], - "index": "1", + "aunts": [], + "index": "0", "leaf_hash": "0eF/BEMF82Y/mIMIM0HX/isU2jI44Z2rAor5MA0PrKM=", - "total": "2" + "total": "1" }, - "root_hash": "05E17857792BBFE205D9F8C2498F6C05A3603D046EDF57C50D037D36804F35D1" + "root_hash": "D1E17F044305F3663F9883083341D7FE2B14DA3238E19DAB028AF9300D0FACA3" }, "tx": "dHgyPXZhbHVl", "tx_result": { @@ -330,7 +330,7 @@ }, { "hash": "73117D6A783E4A37C1D9AD48744AD9FCC0D094C48AB8322FA11CD901C5174CFD", - "height": "25", + "height": "43", "index": 0, "proof": { "data": "dHgzPXZhbHVl", @@ -382,7 +382,7 @@ }, { "hash": "C349F213F04B4E8E749C6656E4C299E3BF22F4FAF141291A5C083336AD1A413B", - "height": "26", + "height": "44", "index": 0, "proof": { "data": "dHg0PXZhbHVl", diff --git a/rpc/tests/kvstore_fixtures/outgoing/abci_info.json b/rpc/tests/kvstore_fixtures/outgoing/abci_info.json index 1890d0c7d..5d743fbf8 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/abci_info.json +++ b/rpc/tests/kvstore_fixtures/outgoing/abci_info.json @@ -1,5 +1,5 @@ { - "id": "8a289a02-d7e4-45ed-a0db-97445ff3825a", + "id": "48e82c4a-4018-433e-9557-c40ac927676f", "jsonrpc": "2.0", "method": "abci_info", "params": null diff --git a/rpc/tests/kvstore_fixtures/outgoing/abci_query_with_existing_key.json b/rpc/tests/kvstore_fixtures/outgoing/abci_query_with_existing_key.json index cabc1c8ee..14b1208b7 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/abci_query_with_existing_key.json +++ b/rpc/tests/kvstore_fixtures/outgoing/abci_query_with_existing_key.json @@ -1,5 +1,5 @@ { - "id": "6e4d4855-631f-4cf9-b341-d6460eab88a3", + "id": "ae5b4026-3be4-46ea-876e-2177b74e79a7", "jsonrpc": "2.0", "method": "abci_query", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/abci_query_with_non_existent_key.json b/rpc/tests/kvstore_fixtures/outgoing/abci_query_with_non_existent_key.json index f8fa593cd..21f71df75 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/abci_query_with_non_existent_key.json +++ b/rpc/tests/kvstore_fixtures/outgoing/abci_query_with_non_existent_key.json @@ -1,5 +1,5 @@ { - "id": "fbd10e8a-a975-4e47-8f9a-97646da4cb38", + "id": "a8a36384-95f9-481f-8fc5-4a820176e869", "jsonrpc": "2.0", "method": "abci_query", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/block_at_height_0.json b/rpc/tests/kvstore_fixtures/outgoing/block_at_height_0.json index 8386cea70..d5749794c 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/block_at_height_0.json +++ b/rpc/tests/kvstore_fixtures/outgoing/block_at_height_0.json @@ -1,5 +1,5 @@ { - "id": "8becc1c0-0c44-4b0d-bb95-8f3ff2f9893e", + "id": "c0ba0ff6-0afd-4d18-bc15-0891696d42f2", "jsonrpc": "2.0", "method": "block", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/block_at_height_1.json b/rpc/tests/kvstore_fixtures/outgoing/block_at_height_1.json index 397285336..25a3ad803 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/block_at_height_1.json +++ b/rpc/tests/kvstore_fixtures/outgoing/block_at_height_1.json @@ -1,5 +1,5 @@ { - "id": "5be87751-4f5a-4e31-b4db-91a2562a92ea", + "id": "0166b641-4967-4b3c-a36a-73ea4e5a737a", "jsonrpc": "2.0", "method": "block", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/block_at_height_10.json b/rpc/tests/kvstore_fixtures/outgoing/block_at_height_10.json index 0098c80d0..332870b8a 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/block_at_height_10.json +++ b/rpc/tests/kvstore_fixtures/outgoing/block_at_height_10.json @@ -1,5 +1,5 @@ { - "id": "9428b752-8b5a-4dc6-b751-0ab12e3bc4f6", + "id": "d01f0a06-172c-48b8-a9ce-5db74af08ad1", "jsonrpc": "2.0", "method": "block", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/block_results_at_height_10.json b/rpc/tests/kvstore_fixtures/outgoing/block_results_at_height_10.json index 5d9e40125..639bef55e 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/block_results_at_height_10.json +++ b/rpc/tests/kvstore_fixtures/outgoing/block_results_at_height_10.json @@ -1,5 +1,5 @@ { - "id": "c8effc20-13ec-4724-b788-ac8994b21f5c", + "id": "421a030f-0b5d-4adb-bb17-537d11228040", "jsonrpc": "2.0", "method": "block_results", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/blockchain_from_1_to_10.json b/rpc/tests/kvstore_fixtures/outgoing/blockchain_from_1_to_10.json index cf8478b0a..93e1f51ae 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/blockchain_from_1_to_10.json +++ b/rpc/tests/kvstore_fixtures/outgoing/blockchain_from_1_to_10.json @@ -1,5 +1,5 @@ { - "id": "5566a2c8-97d5-46fc-86b8-ebe77071b499", + "id": "7f156511-df54-4ede-8821-d6932c878ca2", "jsonrpc": "2.0", "method": "blockchain", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/broadcast_tx_async.json b/rpc/tests/kvstore_fixtures/outgoing/broadcast_tx_async.json index df006de89..755d233dd 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/broadcast_tx_async.json +++ b/rpc/tests/kvstore_fixtures/outgoing/broadcast_tx_async.json @@ -1,5 +1,5 @@ { - "id": "712dcbed-2068-4471-b68e-12427d3fb93a", + "id": "4efd497c-5b42-458f-b136-b101e764071d", "jsonrpc": "2.0", "method": "broadcast_tx_async", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/broadcast_tx_commit.json b/rpc/tests/kvstore_fixtures/outgoing/broadcast_tx_commit.json index 025dbb734..5c381e329 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/broadcast_tx_commit.json +++ b/rpc/tests/kvstore_fixtures/outgoing/broadcast_tx_commit.json @@ -1,5 +1,5 @@ { - "id": "6eaad3fa-2aa7-4c41-99e1-33e76acd1353", + "id": "c32535b9-bec5-4549-9f90-7aa25d6d6a12", "jsonrpc": "2.0", "method": "broadcast_tx_commit", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/broadcast_tx_sync.json b/rpc/tests/kvstore_fixtures/outgoing/broadcast_tx_sync.json index a6c036cfa..29500d5ac 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/broadcast_tx_sync.json +++ b/rpc/tests/kvstore_fixtures/outgoing/broadcast_tx_sync.json @@ -1,5 +1,5 @@ { - "id": "8e851ab5-3182-4518-ab31-799b80c612ce", + "id": "59795aed-7cb3-4997-803e-f747b8f2cc2f", "jsonrpc": "2.0", "method": "broadcast_tx_sync", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/commit_at_height_10.json b/rpc/tests/kvstore_fixtures/outgoing/commit_at_height_10.json index 38d087f24..256e154c7 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/commit_at_height_10.json +++ b/rpc/tests/kvstore_fixtures/outgoing/commit_at_height_10.json @@ -1,5 +1,5 @@ { - "id": "51a22a83-7fa7-4363-81ff-9be5666c2406", + "id": "21ad34a1-45a5-4766-a917-d5492b24f941", "jsonrpc": "2.0", "method": "commit", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/consensus_state.json b/rpc/tests/kvstore_fixtures/outgoing/consensus_state.json index 63b1b54df..942985640 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/consensus_state.json +++ b/rpc/tests/kvstore_fixtures/outgoing/consensus_state.json @@ -1,5 +1,5 @@ { - "id": "a5cbed41-8e85-4d22-92c5-db28d88646a2", + "id": "523312c6-ea35-4274-b521-401e724bb344", "jsonrpc": "2.0", "method": "consensus_state", "params": null diff --git a/rpc/tests/kvstore_fixtures/outgoing/genesis.json b/rpc/tests/kvstore_fixtures/outgoing/genesis.json index 382594b73..b0d63b1e4 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/genesis.json +++ b/rpc/tests/kvstore_fixtures/outgoing/genesis.json @@ -1,5 +1,5 @@ { - "id": "c6ca9b93-048b-479e-b44a-a21b92d584a8", + "id": "9f71da58-c631-4141-be10-a9dac3496af0", "jsonrpc": "2.0", "method": "genesis", "params": null diff --git a/rpc/tests/kvstore_fixtures/outgoing/net_info.json b/rpc/tests/kvstore_fixtures/outgoing/net_info.json index 3b3b20844..3588ea1fd 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/net_info.json +++ b/rpc/tests/kvstore_fixtures/outgoing/net_info.json @@ -1,5 +1,5 @@ { - "id": "b1d19ed4-397b-42a0-8cfc-e261826dc66a", + "id": "a01a558c-a893-415a-8f57-21f104d1aa46", "jsonrpc": "2.0", "method": "net_info", "params": null diff --git a/rpc/tests/kvstore_fixtures/outgoing/status.json b/rpc/tests/kvstore_fixtures/outgoing/status.json index 9c56942eb..b2e090c93 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/status.json +++ b/rpc/tests/kvstore_fixtures/outgoing/status.json @@ -1,5 +1,5 @@ { - "id": "371b107e-adb7-42b5-9f9a-15577c560290", + "id": "7acd6adc-648a-4e73-88de-911fb2db10c5", "jsonrpc": "2.0", "method": "status", "params": null diff --git a/rpc/tests/kvstore_fixtures/outgoing/subscribe_malformed.json b/rpc/tests/kvstore_fixtures/outgoing/subscribe_malformed.json index b7e94600a..8964332fc 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/subscribe_malformed.json +++ b/rpc/tests/kvstore_fixtures/outgoing/subscribe_malformed.json @@ -1,5 +1,5 @@ { - "id": "99d7825c-2069-420e-88ab-c8c400500522", + "id": "502f1307-1edc-45d8-9495-5c41a61c1885", "jsonrpc": "2.0", "method": "subscribe", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/subscribe_newblock.json b/rpc/tests/kvstore_fixtures/outgoing/subscribe_newblock.json index befe82f0f..6d4434699 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/subscribe_newblock.json +++ b/rpc/tests/kvstore_fixtures/outgoing/subscribe_newblock.json @@ -1,5 +1,5 @@ { - "id": "b02501eb-7a5e-4217-a5de-fba6bf5deb39", + "id": "8fd4ce82-da4b-439b-b6a2-013dd31b33fc", "jsonrpc": "2.0", "method": "subscribe", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs.json b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs.json index af897e03d..8e2910d9a 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs.json +++ b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs.json @@ -1,5 +1,5 @@ { - "id": "f273d8cf-1cc4-44fc-a64a-8a89bd4deae6", + "id": "30306628-9f5c-4846-acc2-08a7e1843afc", "jsonrpc": "2.0", "method": "subscribe", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_0.json b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_0.json index 451dd5e3c..3602d6eaf 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_0.json +++ b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_0.json @@ -1,5 +1,5 @@ { - "id": "ba50ea50-9d3f-4f77-b04d-4450f406b998", + "id": "f04ffeb5-9cfa-4248-a17c-787453bae43a", "jsonrpc": "2.0", "method": "broadcast_tx_async", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_1.json b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_1.json index 84ad3be74..76e92bc2d 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_1.json +++ b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_1.json @@ -1,5 +1,5 @@ { - "id": "251f4042-77c5-4152-a98f-d21a0b8c2d4d", + "id": "7fc1c81c-5c8a-43f0-aaeb-f862c3eea928", "jsonrpc": "2.0", "method": "broadcast_tx_async", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_2.json b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_2.json index 27dc85cbf..57651cf54 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_2.json +++ b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_2.json @@ -1,5 +1,5 @@ { - "id": "26d89226-c90b-49b3-b764-b24a79d73d3d", + "id": "d0d77026-920a-4686-87a2-bf9206615722", "jsonrpc": "2.0", "method": "broadcast_tx_async", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_3.json b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_3.json index 9954cab77..7050a8751 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_3.json +++ b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_3.json @@ -1,5 +1,5 @@ { - "id": "29965dd5-cccf-43c0-bbb8-65ae6671163c", + "id": "2af206dc-f501-4c7b-9024-fad410875334", "jsonrpc": "2.0", "method": "broadcast_tx_async", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_4.json b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_4.json index cd5246053..429ddc28a 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_4.json +++ b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_4.json @@ -1,5 +1,5 @@ { - "id": "71a6cab9-62d5-4c41-a404-5f90f36ed77a", + "id": "349fb5d9-5af4-42c2-acc0-656ce0fd6127", "jsonrpc": "2.0", "method": "broadcast_tx_async", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_5.json b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_5.json index 95c0b831a..b88b0fa07 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_5.json +++ b/rpc/tests/kvstore_fixtures/outgoing/subscribe_txs_broadcast_tx_5.json @@ -1,5 +1,5 @@ { - "id": "ac35b95a-c8f3-4a2a-9466-159552d83e23", + "id": "eceb3ffc-0324-4897-8ccd-eea89ae80fd2", "jsonrpc": "2.0", "method": "broadcast_tx_async", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/tx_search_no_prove.json b/rpc/tests/kvstore_fixtures/outgoing/tx_search_no_prove.json index 24e25fd56..117d7537c 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/tx_search_no_prove.json +++ b/rpc/tests/kvstore_fixtures/outgoing/tx_search_no_prove.json @@ -1,5 +1,5 @@ { - "id": "68c7ee1b-a94b-4762-ba46-b42f5a82fa68", + "id": "9ee74828-e8f1-429d-9d53-254c833bae00", "jsonrpc": "2.0", "method": "tx_search", "params": { diff --git a/rpc/tests/kvstore_fixtures/outgoing/tx_search_with_prove.json b/rpc/tests/kvstore_fixtures/outgoing/tx_search_with_prove.json index d151befc7..f910032df 100644 --- a/rpc/tests/kvstore_fixtures/outgoing/tx_search_with_prove.json +++ b/rpc/tests/kvstore_fixtures/outgoing/tx_search_with_prove.json @@ -1,5 +1,5 @@ { - "id": "8784e541-4cdc-4b8e-a5f4-d445e21f9a32", + "id": "1cfb0a9f-749f-418a-8f01-34a3268b6b7f", "jsonrpc": "2.0", "method": "tx_search", "params": { diff --git a/tendermint/src/block/size.rs b/tendermint/src/block/size.rs index d20140c22..9f033a15c 100644 --- a/tendermint/src/block/size.rs +++ b/tendermint/src/block/size.rs @@ -21,10 +21,17 @@ pub struct Size { pub max_gas: i64, /// This parameter has no value anymore in Tendermint-core - #[serde(with = "serializers::from_str")] + #[serde(with = "serializers::from_str", default = "Size::default_time_iota_ms")] pub time_iota_ms: i64, } +impl Size { + /// The default value for the `time_iota_ms` parameter. + pub fn default_time_iota_ms() -> i64 { + 1000 + } +} + impl Protobuf for Size {} impl TryFrom for Size { @@ -37,7 +44,7 @@ impl TryFrom for Size { .try_into() .map_err(|_| Self::Error::from(Kind::IntegerOverflow))?, max_gas: value.max_gas, - time_iota_ms: 1000, + time_iota_ms: Self::default_time_iota_ms(), }) } } diff --git a/tools/rpc-probe/Makefile.toml b/tools/rpc-probe/Makefile.toml index f1eb9b284..1b21fabc1 100644 --- a/tools/rpc-probe/Makefile.toml +++ b/tools/rpc-probe/Makefile.toml @@ -1,6 +1,6 @@ [env] CONTAINER_NAME = "kvstore-rpc-probe" -DOCKER_IMAGE = "informaldev/tendermint:0.34.0" +DOCKER_IMAGE = "informaldev/tendermint:0.34.9" HOST_RPC_PORT = 26657 CARGO_MAKE_WAIT_MILLISECONDS = 3500