Skip to content

Commit 7f7d063

Browse files
author
Yeastplume
authored
Remove Merkle Proof Generation from Foreign API get_outputs (#3792) (#3793)
* Remove Merkle Proof Generation from Foreign API `get_outputs` (#3792) * Update versioning on master to 5.4.0-alpha.0 * Remove merkle proof generation from foreign API * version update for next build
1 parent aba564f commit 7f7d063

File tree

14 files changed

+76
-74
lines changed

14 files changed

+76
-74
lines changed

‎Cargo.lock‎

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grin"
3-
version = "5.3.1"
3+
version = "5.3.2"
44
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
55
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
66
license = "Apache-2.0"
@@ -32,14 +32,14 @@ serde_json = "1"
3232
log = "0.4"
3333
term = "0.6"
3434

35-
grin_api = { path = "./api", version = "5.3.1" }
36-
grin_config = { path = "./config", version = "5.3.1" }
37-
grin_chain = { path = "./chain", version = "5.3.1" }
38-
grin_core = { path = "./core", version = "5.3.1" }
39-
grin_keychain = { path = "./keychain", version = "5.3.1" }
40-
grin_p2p = { path = "./p2p", version = "5.3.1" }
41-
grin_servers = { path = "./servers", version = "5.3.1" }
42-
grin_util = { path = "./util", version = "5.3.1" }
35+
grin_api = { path = "./api", version = "5.3.2" }
36+
grin_config = { path = "./config", version = "5.3.2" }
37+
grin_chain = { path = "./chain", version = "5.3.2" }
38+
grin_core = { path = "./core", version = "5.3.2" }
39+
grin_keychain = { path = "./keychain", version = "5.3.2" }
40+
grin_p2p = { path = "./p2p", version = "5.3.2" }
41+
grin_servers = { path = "./servers", version = "5.3.2" }
42+
grin_util = { path = "./util", version = "5.3.2" }
4343

4444
[dependencies.cursive]
4545
version = "0.20"
@@ -50,5 +50,5 @@ features = ["pancurses-backend"]
5050
built = { version = "0.4", features = ["git2"]}
5151

5252
[dev-dependencies]
53-
grin_chain = { path = "./chain", version = "5.3.1" }
54-
grin_store = { path = "./store", version = "5.3.1" }
53+
grin_chain = { path = "./chain", version = "5.3.2" }
54+
grin_store = { path = "./store", version = "5.3.2" }

‎api/Cargo.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grin_api"
3-
version = "5.3.1"
3+
version = "5.3.2"
44
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
55
description = "APIs for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
66
license = "Apache-2.0"
@@ -30,9 +30,9 @@ rustls = "0.17"
3030
url = "2.1"
3131
bytes = "0.5"
3232

33-
grin_core = { path = "../core", version = "5.3.1" }
34-
grin_chain = { path = "../chain", version = "5.3.1" }
35-
grin_p2p = { path = "../p2p", version = "5.3.1" }
36-
grin_pool = { path = "../pool", version = "5.3.1" }
37-
grin_store = { path = "../store", version = "5.3.1" }
38-
grin_util = { path = "../util", version = "5.3.1" }
33+
grin_core = { path = "../core", version = "5.3.2" }
34+
grin_chain = { path = "../chain", version = "5.3.2" }
35+
grin_p2p = { path = "../p2p", version = "5.3.2" }
36+
grin_pool = { path = "../pool", version = "5.3.2" }
37+
grin_store = { path = "../store", version = "5.3.2" }
38+
grin_util = { path = "../util", version = "5.3.2" }

‎api/src/foreign.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,9 @@ where
236236
/// * `start_height` - start height to start the lookup.
237237
/// * `end_height` - end height to stop the lookup.
238238
/// * `include_proof` - whether or not to include the range proof in the response.
239-
/// * `include_merkle_proof` - whether or not to include the merkle proof in the response.
239+
/// * `include_merkle_proof` (currently ignored) - whether or not to include the merkle proof in the response.
240+
/// removed as it is not used and expensive to generate for historical blocks. See comments below to
241+
/// re-enable this feature at compile-time.
240242
///
241243
/// # Returns
242244
/// * Result Containing:
@@ -250,7 +252,7 @@ where
250252
start_height: Option<u64>,
251253
end_height: Option<u64>,
252254
include_proof: Option<bool>,
253-
include_merkle_proof: Option<bool>,
255+
_include_merkle_proof: Option<bool>,
254256
) -> Result<Vec<OutputPrintable>, Error> {
255257
let output_handler = OutputHandler {
256258
chain: self.chain.clone(),
@@ -260,7 +262,7 @@ where
260262
start_height,
261263
end_height,
262264
include_proof,
263-
include_merkle_proof,
265+
Some(false), // To re-enable merkle proof generation, change to _include_merkle_proof
264266
)
265267
}
266268

‎api/src/foreign_rpc.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ pub trait ForeignRpc: Sync + Send {
646646
{
647647
"block_height": 376151,
648648
"commit": "08ecd94ae293863286e99d37f4685f07369bc084ba74d5c59c7f15359a75c84c03",
649-
"merkle_proof": "6b2abbd334c9d75409461fba9c1acd4a8d7bc2ab0bc43143f42388b2a3a87b881505ccf8ffc8737fa6fd4fe412a082d974911bd223eae612d0d1d7ddcc09b5e6079c40b011405b2ccb49ce32473c93aea6d843488d5765fea114d3368d34cd05fcb8c2de3903fbaf39b1f064c809f9f1c0d47959d81a508957040eda55c6dce6dd8c43a79c72faffacfabe1d73055790b6249de2f7c603f186cb109eee58fb1426ea48cb781f88df9acd8996d235fe6bfe60e02aae6e3bfe38ed2599baca1430b3b637072d9bdcdc7644f873728e3cd38eff7124ea848cfad67f8e114cf8595c89a3686a4271cfb2b5098597c315c01d04270ca8f70262af967a947f49adacfa4aad8b6fd196dd0ef4e5cefa132c38c7e5f43db12b3d74f0a8d83c3404e73c6b25a12bff70a8ef4526c89b1558810bb744ede53f8c4cc8cc2555e953637722adb41ea5752281cf1f75599f7e59b17f11f5f9ce4f6b2da4141a3398f51d8b834cdc8b00f61915a41d200572a10bb2102cbae7e94aa7ced3c388dcd58282932c99a8fa66f6fc511ff3e8c60d442bbdb49cca1166328ca8c9bbc97d024570b4cc1ca6c7dba3db223e9e27fd9345b94d3cf10e2b54915b87c57e32965bc2db1b1f956d1962812738ca9b2c93fd7825adf4dffddc97aa85ca0f3f412f02d30678a816d2efbfb6778305fd5e610b6e8af30030bc059880c337bfde326b392d5dcd7c36cb0076fbccc7099b94f1f03bdb525d6e3818b6d50b93ced802957a4b03892c71b6679052bd35e92ceea71a96b22b2ed2c129755f0c74fa172f43da2790f3132a7e57e408d2fc5f1126b088cd0398e6dedcb237242e6720e12e8d7a5a1e196eda6241cfee1cc85e9d20af67f3f9bdf91160516ebcd0b8da6bb7b12229e1112b22c9f1aaef1d75441465cfee2ac1c47b5255514316ed4637e192b00ff28491168f2f2b00",
649+
"merkle_proof": null,
650650
"mmr_index": 4107711,
651651
"output_type": "Coinbase",
652652
"proof": "7083884b5f64e4e61fb910d2c3c603f7c94490716d95e7144b4c927d0ca6ccc0e069cc285e25f38ee90c402ef26005cad2b4073eeba17f0ae3ea2b87095106ef00634f321d8a49c2feaad485bc9ee552564a6a883c99886d0d3a85af3490d718f5a5cbc70f9dcc9bf5d987fb6072132a4c247d4bbd4af927532a887b1e4250b7277771f6b82f43f4fb5a48089ed58e7d3190a19197e07acfed650f8b2cd5f103e994fb3d3735c5727f06f302bd1f182586297dd57a7951ff296bdf6106704abedc39db77f1293effaa7496a77d19420a6208bc1c589b33dad9540cb6180cccf5e085006b01309419f931e54531d770e5fe00eca584072692a7e4883fd65ed4a7c460665608ab96bf0c7d564fe96a341f14066db413a6fddc359eb11f6f962aca70ca1414c35d7941ce06b77d0a0606081b78d5e64a4501f8e8eba9f0e0889042bc54b4cbfd71087a95af63e0306dba214084d4860b0ce66dc80af44224e5a6fef55800650b05cf1639f81bfdc30950f3634d1fd4375d50c22c7f13f3dfb690e5f155a535aff041b7f800bfe74c60f606e8ab47df60754a0e08221c2a50abe643bb086433afd040a7e6290d1d00b3fe657be3bb05c67f90eb183c2acb53c81e1ca15cd8d35fe9d7d52d8f455398e905bdc77ffb211697d477af25704cf9896e8ce797f4fed03e2ba1615e3ad5646eecaa698470f99437d01d5193f041201502763e8bde51e6dc830b5c676d05c8f7f87c4972c578b8d9d5922ba29f6e4a89a123311d02b5ac44a7d5307f7ed5e4e66aaf749afc76c6fc1114445d6fafeea816a0f985eeacdbe9e6d32a8514ca4aaf7faad4e9d43cde55327ac84bac4d70a9319840e136e713aa31d639e43302f3c71a79f08f4e5c9a19a48d4b46403734cd8f3cc9b67bc26ea8e2a01e63a6f5be6e044e8ed5db5f26d15d25de75f672a79315c5e2407e",
@@ -656,7 +656,7 @@ pub trait ForeignRpc: Sync + Send {
656656
{
657657
"block_height": 376154,
658658
"commit": "095c12db5e57e4a1ead0870219bda4ebfb1419f6ab1501386b9dd8dc9811a8c5ff",
659-
"merkle_proof": "00000000003eadc6000000000000000e13c509a17cbb0d81634215cd2482ab6d9eb58b332fcbe6b2c4fa458a63d3cb0dfe3614ebe6e52657870df225d132179fa1ea0fdc2105f0e51d03bc3765a9cd059c60d434a7cae0a3d669b37588c25410f57405c841312cfa50cf514678877a3f4ce8bd3e57723ba75a2b7d61027b2088fbabebdb7336b97ea88b00a7e809a6245def980eba18d987601f4cbd6c3cc9f12a5684fe7a1bc2565a9f8ab63c2db1afa8304f5e23d4754cd97f29c8b06dcb3de4f6d3a83079676b6e9941afe5553a7195384b564ecd6d37522cb5e452cc930d2b549af22698a8fd9bf6cad05a06b09e3f6e672b94e82c0255394b5c187ab76fda653a2491378997ba3d49f9d9c34ca93bc627fe5d98b327c03d429b5473f62672e9d73c4eafd9cb8f62e5158a1ec7eb56653696b10fb9ec205f5e4d1c7a1f3e2dd2994b12eeed93e84776d8dcd8a5d78aecd4f96ae95c0b090d104adf2aa84f0a1fbd8d319fea5476d1a306b2800716e60b00115a5cca678617361c5a89660b4536c56254bc8dd7035d96f05de62b042d16acaeff57c111fdf243b859984063e3fcfdf40c4c4a52889706857a7c3e90e264f30f40cc87bd20e74689f14284bc5ea0a540950dfcc8d33c503477eb1c60",
659+
"merkle_proof": null,
660660
"mmr_index": 4107717,
661661
"output_type": "Coinbase",
662662
"proof": "073593bc475478f1e4b648ab261df3b0a6e5a58a617176dd0c8f5e0e1d58b012b40eb9b341d16ee22baf3645ea37705895e731dee5c220b58b0f780d781806a10dfa33e870d0494fba18aaa8a7a709bfb3ddf9eb3e4e75a525b382df68dc6f710275cdffb623373c47c1310ae63479826f435ca4520fdc13bb0d995b7d9a10a7587d61bd4a51c9e32c87f3eb6b0f862cdff19a9ac6cb04d6f7fafb8e94508a851dcf5dc6acea4271bb40117a45319da5522b966091b089698f4f940842458b5b49e212d846be35e0c2b98a00ac3d0b7ceaf081272dbed8abd84fe8f26d57bac1340e8184602436ed8c4470ef9dc214df3405de0e71703abec4456b15e122a94706852bb476213ceadf00529d00d8d3b16dc57f4e4a9a86dacfa719e00366728de42f3f830e73f6113f1e391fab07eba1b40f6466203b0ce14701230e934f6138c575660a03dbb0e59d7295df3115a4fc0909a5520d74657b319fc83481079ad6c13400175e39fa2b86071ba563ce8836320713ef8f55d4e90bee3f57df96c7aef0f2e896f57192fae9675471cd9751bcaf2b15e5a65a9733a6f7f9b8147b8f6e8dac51d056018d411fd252225cf88e56f143143f49e8a0d2e43c10de0442dbc84966817532b1256b6769db987526790a389c371a1fe7a36eacffef82877b4db7a9b5e58722ffbd0fc4fdbd7624365ee326bb8b1e60b999f513715b30f37ef6116eabf53b3524b46c33a1fac49205b39e24aa388d823269c1fc43c3599a06b69433a0a47a03bd871321afb7846a6dbfd5891bd84f89c556231745c929d08445f66f332857bfda1c4f86ae58a01007b7303f870ac24e0ba72d84c0ef4903ac2ff777e2c2dcb4d8e303c74e0c8a559686b4d4c25024ee97601787d4e5a97224af41e5d35d91744292f5a41f64d4e1cae77bebebd77a473f3b54e86f7221aac230942f0468",
@@ -666,7 +666,7 @@ pub trait ForeignRpc: Sync + Send {
666666
{
667667
"block_height": 376153,
668668
"commit": "0948cb346b7affe004a6f84fa4b5b44995830f1c332b03537df4c258d51d1afb50",
669-
"merkle_proof": "00000000003eadc4000000000000000dfe3614ebe6e52657870df225d132179fa1ea0fdc2105f0e51d03bc3765a9cd059c60d434a7cae0a3d669b37588c25410f57405c841312cfa50cf514678877a3f4ce8bd3e57723ba75a2b7d61027b2088fbabebdb7336b97ea88b00a7e809a6245def980eba18d987601f4cbd6c3cc9f12a5684fe7a1bc2565a9f8ab63c2db1afa8304f5e23d4754cd97f29c8b06dcb3de4f6d3a83079676b6e9941afe5553a7195384b564ecd6d37522cb5e452cc930d2b549af22698a8fd9bf6cad05a06b09e3f6e672b94e82c0255394b5c187ab76fda653a2491378997ba3d49f9d9c34ca93bc627fe5d98b327c03d429b5473f62672e9d73c4eafd9cb8f62e5158a1ec7eb56653696b10fb9ec205f5e4d1c7a1f3e2dd2994b12eeed93e84776d8dcd8a5d78aecd4f96ae95c0b090d104adf2aa84f0a1fbd8d319fea5476d1a306b2800716e60b00115a5cca678617361c5a89660b4536c56254bc8dd7035d96f05de62b042d16acaeff57c111fdf243b859984063e3fcfdf40c4c4a52889706857a7c3e90e264f30f40cc87bd20e74689f14284bc5ea0a540950dfcc8d33c503477eb1c60",
669+
"merkle_proof": null,
670670
"mmr_index": 4107716,
671671
"output_type": "Coinbase",
672672
"proof": "72950da23ad7f0d0381e2f788bf0ac6b6bcb17aaccf0373534122a95714d2d0dbf6a24822b4aab0711a595c80bc36122957111c39292f2a36a973252fb88cbda0b1d61ea8ea84f5171a61f751cac97332637b7cf74cc73144b912ba700dedaa60895f06e947f1e42a8c79d70f924f45fdcb6df5d30289f36ff77d0ae368df5775a739b7a25cbfb63f0cdbdc167b046067c2a021fe0950c7b67515b185b9e4a00ce63b795d49ae184fe5cc726d72fc05d717c4fb55dd5f65967dc282d3c47cb6f8a92cb696e5a1d8cca21214bc766e3de6271791cebf646cda97ae77035da16606f3397f71e103137358c97b9943c3e15403184f61230bd0e3954c7681a0891aa7a0cc32e82d830fb7d8759a04d1da7058630a853508df095142f22158c28bd5e3f2477ad6c8990e63d0377a0fa3d588b6584453778eb38cbaec8a33c1d3772c97a826d4a2f6953c35342993b04567e9fea6fc64fb714653f934faa1a8f635d39eb2903de4bed960a3df07dce7c2e3ff517bbc15f467d0190a579bc07b0f1a910b23269d794835bbb34e8318dcc4fd4159f8f03faa77842d445cf61af9e33caf46aa5fae0812a6476a09c0757e929271a96a245701ab14c1fdd836b92b7e763afa623017f68f1bc4eb716ce735820a1311b743dd8d5c6bb275a2e4e7d2eff8f45417b60cc937086c3e7fd3b612ae064d7237eb6a7bd1a39d8575fac312068fa060bc1ceac4df0754601edaf04ecb1b89c0661ea01a593c3763e456bebbd8487edc0ff3bc6f203965cd92b1706070c59a3795f9dee23087cea0aaec015f1b7bfe4df81818d7a37af781ca7b757ace2fa489f85215ecb85976b1c74c7f1df6d834a8bc63e887407ef6e233c55ea040bc5f2471e99ebc92f2283ff592ff751d9226bd105e68e187c91ecb236c9fa4fb060ae4d706c571ac2123da1debd12737d98be118578",

‎chain/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grin_chain"
3-
version = "5.3.1"
3+
version = "5.3.2"
44
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
55
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
66
license = "Apache-2.0"
@@ -23,10 +23,10 @@ chrono = "0.4.11"
2323
lru-cache = "0.1"
2424
lazy_static = "1"
2525

26-
grin_core = { path = "../core", version = "5.3.1" }
27-
grin_keychain = { path = "../keychain", version = "5.3.1" }
28-
grin_store = { path = "../store", version = "5.3.1" }
29-
grin_util = { path = "../util", version = "5.3.1" }
26+
grin_core = { path = "../core", version = "5.3.2" }
27+
grin_keychain = { path = "../keychain", version = "5.3.2" }
28+
grin_store = { path = "../store", version = "5.3.2" }
29+
grin_util = { path = "../util", version = "5.3.2" }
3030

3131
[dev-dependencies]
3232
env_logger = "0.7"

‎config/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grin_config"
3-
version = "5.3.1"
3+
version = "5.3.2"
44
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
55
description = "Configuration for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
66
license = "Apache-2.0"
@@ -16,10 +16,10 @@ serde_derive = "1"
1616
toml = "0.5"
1717
dirs = "2.0"
1818

19-
grin_core = { path = "../core", version = "5.3.1" }
20-
grin_servers = { path = "../servers", version = "5.3.1" }
21-
grin_p2p = { path = "../p2p", version = "5.3.1" }
22-
grin_util = { path = "../util", version = "5.3.1" }
19+
grin_core = { path = "../core", version = "5.3.2" }
20+
grin_servers = { path = "../servers", version = "5.3.2" }
21+
grin_p2p = { path = "../p2p", version = "5.3.2" }
22+
grin_util = { path = "../util", version = "5.3.2" }
2323

2424
[dev-dependencies]
2525
pretty_assertions = "0.6.1"

‎core/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grin_core"
3-
version = "5.3.1"
3+
version = "5.3.2"
44
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
55
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
66
license = "Apache-2.0"
@@ -28,8 +28,8 @@ chrono = { version = "0.4.11", features = ["serde"] }
2828
zeroize = { version = "1.1", features =["zeroize_derive"] }
2929
bytes = "0.5"
3030

31-
keychain = { package = "grin_keychain", path = "../keychain", version = "5.3.1" }
32-
util = { package = "grin_util", path = "../util", version = "5.3.1" }
31+
keychain = { package = "grin_keychain", path = "../keychain", version = "5.3.2" }
32+
util = { package = "grin_util", path = "../util", version = "5.3.2" }
3333

3434
[dev-dependencies]
3535
serde_json = "1"

‎keychain/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grin_keychain"
3-
version = "5.3.1"
3+
version = "5.3.2"
44
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
55
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
66
license = "Apache-2.0"
@@ -26,4 +26,4 @@ ripemd160 = "0.9"
2626
sha2 = "0.9"
2727
pbkdf2 = "0.8"
2828

29-
grin_util = { path = "../util", version = "5.3.1" }
29+
grin_util = { path = "../util", version = "5.3.2" }

‎p2p/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grin_p2p"
3-
version = "5.3.1"
3+
version = "5.3.2"
44
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
55
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
66
license = "Apache-2.0"
@@ -22,10 +22,10 @@ log = "0.4"
2222
chrono = { version = "0.4.11", features = ["serde"] }
2323
bytes = "0.5"
2424

25-
grin_core = { path = "../core", version = "5.3.1" }
26-
grin_store = { path = "../store", version = "5.3.1" }
27-
grin_util = { path = "../util", version = "5.3.1" }
28-
grin_chain = { path = "../chain", version = "5.3.1" }
25+
grin_core = { path = "../core", version = "5.3.2" }
26+
grin_store = { path = "../store", version = "5.3.2" }
27+
grin_util = { path = "../util", version = "5.3.2" }
28+
grin_chain = { path = "../chain", version = "5.3.2" }
2929

3030
[dev-dependencies]
31-
grin_pool = { path = "../pool", version = "5.3.1" }
31+
grin_pool = { path = "../pool", version = "5.3.2" }

0 commit comments

Comments
 (0)