From a49b181d64d1375e91cb3ad3d55eb2c8224df48e Mon Sep 17 00:00:00 2001 From: a Date: Thu, 2 Nov 2023 05:45:56 +0300 Subject: [PATCH 01/17] Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index e6ddbff2e9..6db9c020b7 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -341,7 +341,6 @@ pub async fn query_transparent_balance<'a>( ); } Err(e) => { - display_line!(context.io(), "Querying error: {e}"); display_line!( context.io(), "No {} balance found for {}", From 064006cd451a54f4855fc187962e5d8ab09273e9 Mon Sep 17 00:00:00 2001 From: a Date: Sat, 4 Nov 2023 01:41:14 +0300 Subject: [PATCH 02/17] Balance fix --- .DS_Store | Bin 0 -> 6148 bytes apps/src/lib/client/rpc.rs | 2 +- sdk/.DS_Store | Bin 0 -> 6148 bytes sdk/src/.DS_Store | Bin 0 -> 6148 bytes 4 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .DS_Store create mode 100644 sdk/.DS_Store create mode 100644 sdk/src/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ef4c3022194675395d81e5970a1704b6959fff8c GIT binary patch literal 6148 zcmeH~Jr2S!425mVfW*>~F$)La1`&c2Z~+9}K<_Lbudr?Dlk!?i@dk<{|Ns!|4&+&QUNOPXA0=@ za60VqQhBz1yq?w1S+#Y8gMK-}+fM)zJBl}OH|!T%fHm2IsKEFm;4&~!fuAby0w63A AZvX%Q literal 0 HcmV?d00001 diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 6db9c020b7..6bf55ad7a3 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -340,7 +340,7 @@ pub async fn query_transparent_balance<'a>( balance ); } - Err(e) => { + Err() => { display_line!( context.io(), "No {} balance found for {}", diff --git a/sdk/.DS_Store b/sdk/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9a874b5768f336915163bb88cd434575b859f936 GIT binary patch literal 6148 zcmeH~Jr2S!425ml0g0s}V-^m;4I%_5-~tF3k&vj^b9A16778<}(6eNJu~Vz<8=6`~ zboab&MFtUB!i}=AFfm2m$tVxGT*u4pe81nUlA49C} z?O@64YO)2RT{MRe%{!}2F))pG(Sih~)xkgosK7*lF7m<7{{#Hn{6A@7N(HFEpDCdI z{CMqME{5De!8xj^&V40uS2uAX|X9<7g`A%WX184^4i)RQPa z8GeIkiiozK$F;~(L>6#E`LEc=g9;3)W{aUgN4#WSO&kM*E}G4U=9@J;6!o{`{Nm}NHIO3}paQoF%woB; z`oDqy)BoR+xS|47;H4DMrrUNcJ}GPK`um^%f7mt&xpV=Sy3uRJO8 Zip{ZK6URWOBkpt{e+En!8Wni70>3}26`KG6 literal 0 HcmV?d00001 From 4fcbbfa27774ee8bff60b2c3dea4a6d92b922657 Mon Sep 17 00:00:00 2001 From: a Date: Sat, 4 Nov 2023 01:41:57 +0300 Subject: [PATCH 03/17] Token balance fix --- .DS_Store | Bin 6148 -> 0 bytes sdk/.DS_Store | Bin 6148 -> 0 bytes sdk/src/.DS_Store | Bin 6148 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 sdk/.DS_Store delete mode 100644 sdk/src/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index ef4c3022194675395d81e5970a1704b6959fff8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mVfW*>~F$)La1`&c2Z~+9}K<_Lbudr?Dlk!?i@dk<{|Ns!|4&+&QUNOPXA0=@ za60VqQhBz1yq?w1S+#Y8gMK-}+fM)zJBl}OH|!T%fHm2IsKEFm;4&~!fuAby0w63A AZvX%Q diff --git a/sdk/.DS_Store b/sdk/.DS_Store deleted file mode 100644 index 9a874b5768f336915163bb88cd434575b859f936..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425ml0g0s}V-^m;4I%_5-~tF3k&vj^b9A16778<}(6eNJu~Vz<8=6`~ zboab&MFtUB!i}=AFfm2m$tVxGT*u4pe81nUlA49C} z?O@64YO)2RT{MRe%{!}2F))pG(Sih~)xkgosK7*lF7m<7{{#Hn{6A@7N(HFEpDCdI z{CMqME{5De!8xj^&V40uS2uAX|X9<7g`A%WX184^4i)RQPa z8GeIkiiozK$F;~(L>6#E`LEc=g9;3)W{aUgN4#WSO&kM*E}G4U=9@J;6!o{`{Nm}NHIO3}paQoF%woB; z`oDqy)BoR+xS|47;H4DMrrUNcJ}GPK`um^%f7mt&xpV=Sy3uRJO8 Zip{ZK6URWOBkpt{e+En!8Wni70>3}26`KG6 From 3d9f4f1462bb6a288f0e5dffe2022054b102eb57 Mon Sep 17 00:00:00 2001 From: a Date: Sat, 4 Nov 2023 05:03:43 +0300 Subject: [PATCH 04/17] Fix token balance --- .gitignore | 3 +++ apps/src/lib/client/rpc.rs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dec9856215..16d56f5299 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ wasm/*.wasm # app version string file /apps/version.rs + +# mac +.DS_Store diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 6bf55ad7a3..9cb6d46b5c 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -340,7 +340,7 @@ pub async fn query_transparent_balance<'a>( balance ); } - Err() => { + Err(_) => { display_line!( context.io(), "No {} balance found for {}", From 67d8ca4674038de720ba3bf8a8fdfe4b8677fdd6 Mon Sep 17 00:00:00 2001 From: a Date: Sat, 16 Dec 2023 08:11:34 +0300 Subject: [PATCH 05/17] Fix: Fix querying error while checking token balance --- .gitignore | 3 --- apps/src/lib/client/rpc.rs | 11 +++-------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 16d56f5299..dec9856215 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,3 @@ wasm/*.wasm # app version string file /apps/version.rs - -# mac -.DS_Store diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 9cb6d46b5c..67737179ae 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -48,7 +48,7 @@ use namada::types::masp::{BalanceOwner, ExtendedViewingKey, PaymentAddress}; use namada::types::storage::{BlockHeight, BlockResults, Epoch, Key, KeySeg}; use namada::types::token::{Change, MaspDenom}; use namada::types::{storage, token}; -use namada_sdk::error::{is_pinned_error, Error, PinnedBalanceError}; +use namada_sdk::error::{is_pinned_error, Error, PinnedBalanceError, QueryError}; use namada_sdk::masp::{Conversions, MaspAmount, MaspChange}; use namada_sdk::rpc::{ self, enriched_bonds_and_unbonds, query_epoch, TxResponse, @@ -340,13 +340,8 @@ pub async fn query_transparent_balance<'a>( balance ); } - Err(_) => { - display_line!( - context.io(), - "No {} balance found for {}", - token_alias, - owner - ) + Err(QueryError::NoSuchKey(_)) => { + display_line!(context.io(), "Querying error: {:?}", QueryError::NoSuchKey); } } } From 3900560c229d7788c67ab6eecc0b95549c624858 Mon Sep 17 00:00:00 2001 From: a Date: Sat, 16 Dec 2023 08:40:36 +0300 Subject: [PATCH 06/17] Fix: Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 67737179ae..8d2c155875 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -340,8 +340,15 @@ pub async fn query_transparent_balance<'a>( balance ); } - Err(QueryError::NoSuchKey(_)) => { - display_line!(context.io(), "Querying error: {:?}", QueryError::NoSuchKey); + Err(e) => { + if e != QueryError::NoSuchKey { + display_line!( + context.io(), + "No {} balance found for {}", + token_alias, + owner + ) + } } } } From 542a810ee81ceabc29822f5a2b788266714b6805 Mon Sep 17 00:00:00 2001 From: a Date: Sat, 16 Dec 2023 11:16:56 +0300 Subject: [PATCH 07/17] Fix: Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 8d2c155875..ee43cf19d7 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -341,7 +341,7 @@ pub async fn query_transparent_balance<'a>( ); } Err(e) => { - if e != QueryError::NoSuchKey { + if matches!(e, QueryError::NoSuchKey) { display_line!( context.io(), "No {} balance found for {}", From 0b38e8ad97049ed064921a405625b80d0041fdbb Mon Sep 17 00:00:00 2001 From: a Date: Sat, 16 Dec 2023 11:33:11 +0300 Subject: [PATCH 08/17] Fix: Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index ee43cf19d7..73a0bb3249 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -341,7 +341,7 @@ pub async fn query_transparent_balance<'a>( ); } Err(e) => { - if matches!(e, QueryError::NoSuchKey) { + if matches!(e, QueryError::NoSuchKey(_)) { display_line!( context.io(), "No {} balance found for {}", From 87b476a16ab6a64bcbd30c4f68822af78862828c Mon Sep 17 00:00:00 2001 From: a Date: Sat, 16 Dec 2023 11:41:25 +0300 Subject: [PATCH 09/17] Fix: Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 73a0bb3249..2474645335 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -341,7 +341,7 @@ pub async fn query_transparent_balance<'a>( ); } Err(e) => { - if matches!(e, QueryError::NoSuchKey(_)) { + if matches!(e, Err(Pinned(QueryError::NoSuchKey(_)))) { display_line!( context.io(), "No {} balance found for {}", From 50a0bd880ae98c8e4f3b9c01f3a534be5d0532b0 Mon Sep 17 00:00:00 2001 From: a Date: Sat, 16 Dec 2023 11:43:54 +0300 Subject: [PATCH 10/17] Fix: Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 2474645335..adcef6a566 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -341,7 +341,7 @@ pub async fn query_transparent_balance<'a>( ); } Err(e) => { - if matches!(e, Err(Pinned(QueryError::NoSuchKey(_)))) { + if matches!(e, Err(Query(QueryError::NoSuchKey(_)))) { display_line!( context.io(), "No {} balance found for {}", From 3d00876a81a1aa1f045e40007b81ae47175e40d3 Mon Sep 17 00:00:00 2001 From: a Date: Sat, 16 Dec 2023 12:05:18 +0300 Subject: [PATCH 11/17] Fix: Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index adcef6a566..73a0bb3249 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -341,7 +341,7 @@ pub async fn query_transparent_balance<'a>( ); } Err(e) => { - if matches!(e, Err(Query(QueryError::NoSuchKey(_)))) { + if matches!(e, QueryError::NoSuchKey(_)) { display_line!( context.io(), "No {} balance found for {}", From 1cdbf554b11a791b323c5822838d5cf2aeee12e3 Mon Sep 17 00:00:00 2001 From: a Date: Sat, 16 Dec 2023 12:12:35 +0300 Subject: [PATCH 12/17] Fix: Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 73a0bb3249..ceb658e555 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -341,7 +341,7 @@ pub async fn query_transparent_balance<'a>( ); } Err(e) => { - if matches!(e, QueryError::NoSuchKey(_)) { + if matches!(e, namada_sdk::error::Error::Query(QueryError::NoSuchKey(_))) { display_line!( context.io(), "No {} balance found for {}", From b052ae132692e2294238915215451c3b2a166c60 Mon Sep 17 00:00:00 2001 From: a Date: Sat, 16 Dec 2023 12:31:23 +0300 Subject: [PATCH 13/17] Fix: Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index ceb658e555..52d991876d 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -340,15 +340,16 @@ pub async fn query_transparent_balance<'a>( balance ); } + Err(namada_sdk::error::Error::Query(QueryError::NoSuchKey(_))) => { + display_line!(context.io(), "Querying error: {:?}", QueryError::NoSuchKey); + } Err(e) => { - if matches!(e, namada_sdk::error::Error::Query(QueryError::NoSuchKey(_))) { - display_line!( - context.io(), - "No {} balance found for {}", - token_alias, - owner - ) - } + display_line!( + context.io(), + "No {} balance found for {}", + token_alias, + owner + ) } } } From f12208c3c00a4f73cf2c081aa006dd0c34096968 Mon Sep 17 00:00:00 2001 From: a Date: Sat, 16 Dec 2023 12:37:45 +0300 Subject: [PATCH 14/17] Fix: Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 52d991876d..88f4c1ed40 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -341,7 +341,7 @@ pub async fn query_transparent_balance<'a>( ); } Err(namada_sdk::error::Error::Query(QueryError::NoSuchKey(_))) => { - display_line!(context.io(), "Querying error: {:?}", QueryError::NoSuchKey); + return; } Err(e) => { display_line!( From 002ee06c326ecaf739ae8300da58ce9dab42afe9 Mon Sep 17 00:00:00 2001 From: a Date: Sat, 16 Dec 2023 12:45:00 +0300 Subject: [PATCH 15/17] Fix: Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 88f4c1ed40..1f6a67fa9b 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -344,6 +344,7 @@ pub async fn query_transparent_balance<'a>( return; } Err(e) => { + display_line!(context.io(), "Querying error: {e}"); display_line!( context.io(), "No {} balance found for {}", From a73bb8db97daf90ebcbc56919e3126532776278b Mon Sep 17 00:00:00 2001 From: a Date: Sat, 16 Dec 2023 12:56:41 +0300 Subject: [PATCH 16/17] Fix: Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 1f6a67fa9b..589c8f40d1 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -343,8 +343,7 @@ pub async fn query_transparent_balance<'a>( Err(namada_sdk::error::Error::Query(QueryError::NoSuchKey(_))) => { return; } - Err(e) => { - display_line!(context.io(), "Querying error: {e}"); + Err(_) => { display_line!( context.io(), "No {} balance found for {}", From a3a41ec8d1a25efafbd4579e1f771afda061938a Mon Sep 17 00:00:00 2001 From: a Date: Mon, 18 Dec 2023 15:43:45 +0300 Subject: [PATCH 17/17] Fix querying error while checking token balance --- apps/src/lib/client/rpc.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 589c8f40d1..9dc6b0d21a 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -48,7 +48,9 @@ use namada::types::masp::{BalanceOwner, ExtendedViewingKey, PaymentAddress}; use namada::types::storage::{BlockHeight, BlockResults, Epoch, Key, KeySeg}; use namada::types::token::{Change, MaspDenom}; use namada::types::{storage, token}; -use namada_sdk::error::{is_pinned_error, Error, PinnedBalanceError, QueryError}; +use namada_sdk::error::{ + is_pinned_error, Error, PinnedBalanceError, QueryError, +}; use namada_sdk::masp::{Conversions, MaspAmount, MaspChange}; use namada_sdk::rpc::{ self, enriched_bonds_and_unbonds, query_epoch, TxResponse, @@ -340,8 +342,10 @@ pub async fn query_transparent_balance<'a>( balance ); } - Err(namada_sdk::error::Error::Query(QueryError::NoSuchKey(_))) => { - return; + Err(namada_sdk::error::Error::Query( + QueryError::NoSuchKey(_), + )) => { + return; } Err(_) => { display_line!(