From 2556de0a1985c0ec9c53aa000bdf9b24b012dce3 Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Wed, 19 Feb 2020 20:42:16 +0100 Subject: [PATCH 1/3] set checkpoints to 160000 and 170000 --- lib/src/lightclient/checkpoints.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/src/lightclient/checkpoints.rs b/lib/src/lightclient/checkpoints.rs index c768812..308292a 100644 --- a/lib/src/lightclient/checkpoints.rs +++ b/lib/src/lightclient/checkpoints.rs @@ -23,10 +23,15 @@ fn get_test_checkpoint(height: u64) -> Option<(u64, &'static str, &'static str) fn get_main_checkpoint(height: u64) -> Option<(u64, &'static str, &'static str)> { let checkpoints: Vec<(u64, &str, &str)> = vec![ - (177916, "0000000173fddfc716b3e7c904e3b271215df72e0af2dba7200257fec6aef2b5", + (160000, "0000000553274de0e5f07bf3a63bdb6ab71158a3506829fd6f7df2cd51d5b2a3", - "" - ) + "0175d619624f48e45df658b143f5239e22addf620d7000013dfd62298688ecb350015e464e8e594499a624a5d20e323a4de304ace8ec20b63cb41f5ed08629c678720f000001b90f0634e468eb3d2de0985c661fb9b7b8a081e4443147d617377a337c1dd13901152f108238acfd96b7b734333b0d3927d77812aa9648eef969de78c1daef023f019f3b14a209c15a14ddd3bd49355759c151ddcc1b7816fc472c7d9053f3495c6100000180623c9995f068e60c7fc0b9423eb753cc85ee8aa8df47c273ebb202dbf43f230000000001ef041d21ca2e599aca269d5a63b35f5ac2abe8e776279fb09ae902778b33746301982a0ad78d7d67d3c7b026adfdb342eceb50557cb4677ec43742028c4602216701b8d79586ce15b0cd9b3683091dea42cdad3fa4dc6d7d7853aaac062aa5717527" + ), + + (170000, "0000000191d6e3c5473215ab1e28a8fa8db6172eb4ec6fed371d4bd71224adb0", + + "019081dbde619339e0e85a13df8ff833ea866502d96d9839242eaf4e6f89a9935b000f00000001b542d70d235bfef8c3ea401fc7682c4889abc1d8047346ec374a846e498cf44f013317e59dfbc56000b20131e73d531dd805c481978f86c055b2f863ea7f0b296b01e0bc6b4ae0036aecc0973669061d777fe00f33c19d561cb89f9d8fef5d9d35100001d4ce711d7659419f11c307a77ab79c0fc2f62d1e7b2fc650d6a51704bcf31223017c86ee02304db5f5158a4186cc65e9ceb6acdf88877ea59f5184b04ada15bf0c01d3b830cc0959d5c6616a2eb11231763576719f844da23aafeb3ddcd44dcbb262017cda15fd9d8af2559d2fa920983b832ef410d10811cab7e678ee788d4a74df0a0001ef041d21ca2e599aca269d5a63b35f5ac2abe8e776279fb09ae902778b33746301982a0ad78d7d67d3c7b026adfdb342eceb50557cb4677ec43742028c4602216701b8d79586ce15b0cd9b3683091dea42cdad3fa4dc6d7d7853aaac062aa5717527" + ), ]; find_checkpoint(height, checkpoints) From ae239e6cb7b61943a1dd196c7401567a8965b96c Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Wed, 19 Feb 2020 21:00:42 +0100 Subject: [PATCH 2/3] set anchor_offset to 2, hush has dpow --- lib/src/lightwallet.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/lightwallet.rs b/lib/src/lightwallet.rs index fc0bd96..e46417d 100644 --- a/lib/src/lightwallet.rs +++ b/lib/src/lightwallet.rs @@ -1572,7 +1572,7 @@ impl LightWallet { if selected_value < u64::from(target_value) { let e = format!( "Insufficient verified funds (have {}, need {:?}). NOTE: funds need {} confirmations before they can be spent.", - selected_value, target_value, self.config.anchor_offset + selected_value, target_value, self.config.anchor_offset -2 ); error!("{}", e); return Err(e); From dfa1422449d5c45b401f7a0801271899603f115f Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Wed, 19 Feb 2020 21:06:06 +0100 Subject: [PATCH 3/3] set anchor_offset to 2, hush has dpow --- lib/src/lib.rs | 2 +- lib/src/lightwallet.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/lib.rs b/lib/src/lib.rs index ca28d24..ebd48ee 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -16,7 +16,7 @@ pub struct SaplingParams; pub struct PubCertificate; -pub const ANCHOR_OFFSET: u32 = 4; +pub const ANCHOR_OFFSET: u32 = 2; pub mod grpc_client { tonic::include_proto!("cash.z.wallet.sdk.rpc"); diff --git a/lib/src/lightwallet.rs b/lib/src/lightwallet.rs index e46417d..c16963c 100644 --- a/lib/src/lightwallet.rs +++ b/lib/src/lightwallet.rs @@ -1572,7 +1572,7 @@ impl LightWallet { if selected_value < u64::from(target_value) { let e = format!( "Insufficient verified funds (have {}, need {:?}). NOTE: funds need {} confirmations before they can be spent.", - selected_value, target_value, self.config.anchor_offset -2 + selected_value, target_value, self.config.anchor_offset ); error!("{}", e); return Err(e);