From 3203d8a3df48a93b918b04d062b486a5ce9f7767 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 3 Jun 2025 14:35:04 +0700 Subject: [PATCH 1/4] feat(wasm-dpp): export more token transition fields --- .../batch_transition/token_transition/burn.rs | 17 ++++++++++++ .../token_transition/claim.rs | 23 ++++++++++++++++ .../token_transition/config.rs | 12 +++++++++ .../token_transition/destroy.rs | 8 ++++++ .../token_transition/direct_purchase.rs | 17 ++++++++++++ .../token_transition/emergency_action.rs | 21 +++++++++++++++ .../token_transition/freeze.rs | 8 ++++++ .../batch_transition/token_transition/mint.rs | 23 ++++++++++++++++ .../set_price_for_direct_purchase.rs | 27 +++++++++++++++++++ .../token_transition/transfer.rs | 13 +++++++++ .../token_transition/unfreeze.rs | 8 ++++++ 11 files changed, 177 insertions(+) diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs index d3b31f9f889..055f26393df 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs @@ -1,5 +1,6 @@ use dpp::state_transition::batch_transition::TokenBurnTransition; use wasm_bindgen::prelude::wasm_bindgen; +use dpp::state_transition::batch_transition::token_burn_transition::v0::v0_methods::TokenBurnTransitionV0Methods; #[wasm_bindgen(js_name=TokenBurnTransition)] #[derive(Debug, Clone)] @@ -10,3 +11,19 @@ impl From for TokenBurnTransitionWasm { Self(value) } } + +#[wasm_bindgen(js_class = TokenBurnTransition)] +impl TokenBurnTransitionWasm { + #[wasm_bindgen(js_name=getPublicNote)] + pub fn public_note(&self) -> Option { + match self.0.public_note() { + Some(note) => Some(note.clone()), + None => None, + } + } + + #[wasm_bindgen(js_name=getBurnAmount)] + pub fn amount(&self) -> u64 { + self.0.burn_amount() + } +} \ No newline at end of file diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/claim.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/claim.rs index 490274497d6..3d6c9de8a40 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/claim.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/claim.rs @@ -1,5 +1,9 @@ use dpp::state_transition::batch_transition::TokenClaimTransition; use wasm_bindgen::prelude::wasm_bindgen; +use dpp::data_contract::associated_token::token_distribution_key::TokenDistributionType; +use dpp::state_transition::batch_transition::token_claim_transition::v0::v0_methods::TokenClaimTransitionV0Methods; +use dpp::tokens::emergency_action::TokenEmergencyAction; +use crate::batch_transition::token_transition::burn::TokenBurnTransitionWasm; #[wasm_bindgen(js_name=TokenClaimTransition)] #[derive(Debug, Clone)] @@ -10,3 +14,22 @@ impl From for TokenClaimTransitionWasm { Self(value) } } + +#[wasm_bindgen(js_class = TokenClaimTransition)] +impl TokenClaimTransitionWasm { + #[wasm_bindgen(js_name=getPublicNote)] + pub fn public_note(&self) -> Option { + match self.0.public_note() { + Some(note) => Some(note.clone()), + None => None, + } + } + + #[wasm_bindgen(js_name=getDistributionType)] + pub fn distribution_type(&self) -> u8 { + match self.0.distribution_type() { + TokenDistributionType::PreProgrammed => 0, + TokenDistributionType::Perpetual => 1 + } + } +} \ No newline at end of file diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs index 10712d3cd8a..25aabd46e42 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs @@ -1,5 +1,6 @@ use dpp::state_transition::batch_transition::TokenConfigUpdateTransition; use wasm_bindgen::prelude::wasm_bindgen; +use dpp::state_transition::batch_transition::token_config_update_transition::v0::v0_methods::TokenConfigUpdateTransitionV0Methods; #[wasm_bindgen(js_name=TokenConfigUpdateTransition)] #[derive(Debug, Clone)] @@ -10,3 +11,14 @@ impl From for TokenConfigUpdateTransitionWasm { Self(value) } } + +#[wasm_bindgen(js_class = TokenConfigUpdateTransition)] +impl TokenConfigUpdateTransitionWasm { + #[wasm_bindgen(js_name=getPublicNote)] + pub fn public_note(&self) -> Option { + match self.0.public_note() { + Some(note) => Some(note.clone()), + None => None, + } + } +} \ No newline at end of file diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/destroy.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/destroy.rs index a62a4e99f83..a5d9d4803fb 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/destroy.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/destroy.rs @@ -19,4 +19,12 @@ impl TokenDestroyFrozenFundsTransitionWasm { pub fn frozen_identity_id(&self) -> IdentifierWrapper { self.0.frozen_identity_id().into() } + + #[wasm_bindgen(js_name=getPublicNote)] + pub fn public_note(&self) -> Option { + match self.0.public_note() { + Some(note) => Some(note.clone()), + None => None, + } + } } diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs index a1c87142cca..a9828e39083 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs @@ -1,5 +1,9 @@ use dpp::state_transition::batch_transition::TokenDirectPurchaseTransition; use wasm_bindgen::prelude::wasm_bindgen; +use dpp::balances::credits::TokenAmount; +use dpp::fee::Credits; +use dpp::state_transition::batch_transition::token_direct_purchase_transition::v0::v0_methods::TokenDirectPurchaseTransitionV0Methods; +use dpp::tokens::token_pricing_schedule::TokenPricingSchedule; #[wasm_bindgen(js_name=TokenDirectPurchaseTransition)] #[derive(Debug, Clone)] @@ -10,3 +14,16 @@ impl From for TokenDirectPurchaseTransitionWasm { Self(value) } } + +#[wasm_bindgen(js_class = TokenDirectPurchaseTransition)] +impl TokenDirectPurchaseTransitionWasm { + #[wasm_bindgen(js_name=getCount)] + pub fn count(&self) -> TokenAmount { + self.0.token_count() + } + + #[wasm_bindgen(js_name=getTotalAgreedPrice)] + pub fn total_agreed_price(&self) -> Credits { + self.0.total_agreed_price() + } +} \ No newline at end of file diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs index ba704f005af..715471ce6db 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs @@ -1,5 +1,7 @@ use dpp::state_transition::batch_transition::TokenEmergencyActionTransition; use wasm_bindgen::prelude::wasm_bindgen; +use dpp::state_transition::batch_transition::token_emergency_action_transition::v0::v0_methods::TokenEmergencyActionTransitionV0Methods; +use dpp::tokens::emergency_action::TokenEmergencyAction; #[wasm_bindgen(js_name=TokenEmergencyActionTransition)] #[derive(Debug, Clone)] @@ -10,3 +12,22 @@ impl From for TokenEmergencyActionTransitionWasm Self(value) } } + +#[wasm_bindgen(js_class = TokenEmergencyActionTransition)] +impl TokenEmergencyActionTransitionWasm { + #[wasm_bindgen(js_name=getPublicNote)] + pub fn public_note(&self) -> Option { + match self.0.public_note() { + Some(note) => Some(note.clone()), + None => None, + } + } + + #[wasm_bindgen(js_name=getEmergencyAction)] + pub fn emergency_action(&self) -> u8 { + match self.0.emergency_action() { + TokenEmergencyAction::Pause => 0, + TokenEmergencyAction::Resume => 1 + } + } +} \ No newline at end of file diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/freeze.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/freeze.rs index 1a9f921e52e..3a528c1fcd5 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/freeze.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/freeze.rs @@ -19,4 +19,12 @@ impl TokenFreezeTransitionWasm { pub fn frozen_identity_id(&self) -> IdentifierWrapper { self.0.frozen_identity_id().into() } + + #[wasm_bindgen(js_name=getPublicNote)] + pub fn public_note(&self) -> Option { + match self.0.public_note() { + Some(note) => Some(note.clone()), + None => None, + } + } } diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs index a9b9a1ad1c4..c8e7b90907f 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs @@ -28,4 +28,27 @@ impl TokenMintTransitionWasm { .with_js_error() .map(Into::into) } + + #[wasm_bindgen(js_name=getIssuedToIdentityId)] + pub fn issued_to_identity_id( + &self, + ) -> Option { + match self.0.issued_to_identity_id() { + Some(id) => Some(id.into()), + None => None + } + } + + #[wasm_bindgen(js_name=getPublicNote)] + pub fn public_note(&self) -> Option { + match self.0.public_note() { + Some(note) => Some(note.clone()), + None => None, + } + } + + #[wasm_bindgen(js_name=getAmount)] + pub fn amount(&self) -> u64 { + self.0.amount() + } } diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs index 20652e70bc7..47fcf7cde7e 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs @@ -1,5 +1,8 @@ use dpp::state_transition::batch_transition::TokenSetPriceForDirectPurchaseTransition; use wasm_bindgen::prelude::wasm_bindgen; +use dpp::fee::Credits; +use dpp::state_transition::batch_transition::token_set_price_for_direct_purchase_transition::v0::v0_methods::TokenSetPriceForDirectPurchaseTransitionV0Methods; +use dpp::tokens::token_pricing_schedule::TokenPricingSchedule; #[wasm_bindgen(js_name=TokenSetPriceForDirectPurchaseTransition)] #[derive(Debug, Clone)] @@ -12,3 +15,27 @@ impl From Self(value) } } + +#[wasm_bindgen(js_class=TokenSetPriceForDirectPurchaseTransition)] +impl TokenSetPriceForDirectPurchaseTransitionWasm { + #[wasm_bindgen(js_name=getPublicNote)] + pub fn public_note(&self) -> Option { + match self.0.public_note() { + Some(note) => Some(note.clone()), + None => None, + } + } + + #[wasm_bindgen(js_name=getPrice)] + pub fn price(&self) -> Option { + match self.0.price() { + Some(price) => { + match price { + TokenPricingSchedule::SinglePrice(credits) => Some(credits.clone()), + TokenPricingSchedule::SetPrices(prices) => None + } + }, + None => None + } + } +} diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/transfer.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/transfer.rs index b80407bda6b..2ecbed91044 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/transfer.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/transfer.rs @@ -19,4 +19,17 @@ impl TokenTransferTransitionWasm { pub fn recipient_id(&self) -> IdentifierWrapper { self.0.recipient_id().into() } + + #[wasm_bindgen(js_name=getPublicNote)] + pub fn public_note(&self) -> Option { + match self.0.public_note() { + Some(note) => Some(note.clone()), + None => None, + } + } + + #[wasm_bindgen(js_name=getAmount)] + pub fn amount(&self) -> u64 { + self.0.amount() + } } diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/unfreeze.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/unfreeze.rs index f0e073dd819..dcb81524342 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/unfreeze.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/unfreeze.rs @@ -19,4 +19,12 @@ impl TokenUnfreezeTransitionWasm { pub fn frozen_identity_id(&self) -> IdentifierWrapper { self.0.frozen_identity_id().into() } + + #[wasm_bindgen(js_name=getPublicNote)] + pub fn public_note(&self) -> Option { + match self.0.public_note() { + Some(note) => Some(note.clone()), + None => None, + } + } } From 55347744b175ee5fa0adcd0c517b6d6f837ec283 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 3 Jun 2025 14:35:27 +0700 Subject: [PATCH 2/4] feat(wasm-dpp): lint fix --- .../batch_transition/token_transition/burn.rs | 4 ++-- .../batch_transition/token_transition/claim.rs | 10 +++++----- .../batch_transition/token_transition/config.rs | 4 ++-- .../token_transition/direct_purchase.rs | 6 +++--- .../token_transition/emergency_action.rs | 8 ++++---- .../batch_transition/token_transition/mint.rs | 6 ++---- .../token_transition/set_price_for_direct_purchase.rs | 10 ++++------ 7 files changed, 22 insertions(+), 26 deletions(-) diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs index 055f26393df..8ad0ccac9dc 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs @@ -1,6 +1,6 @@ +use dpp::state_transition::batch_transition::token_burn_transition::v0::v0_methods::TokenBurnTransitionV0Methods; use dpp::state_transition::batch_transition::TokenBurnTransition; use wasm_bindgen::prelude::wasm_bindgen; -use dpp::state_transition::batch_transition::token_burn_transition::v0::v0_methods::TokenBurnTransitionV0Methods; #[wasm_bindgen(js_name=TokenBurnTransition)] #[derive(Debug, Clone)] @@ -26,4 +26,4 @@ impl TokenBurnTransitionWasm { pub fn amount(&self) -> u64 { self.0.burn_amount() } -} \ No newline at end of file +} diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/claim.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/claim.rs index 3d6c9de8a40..8e95d03099c 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/claim.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/claim.rs @@ -1,9 +1,9 @@ -use dpp::state_transition::batch_transition::TokenClaimTransition; -use wasm_bindgen::prelude::wasm_bindgen; +use crate::batch_transition::token_transition::burn::TokenBurnTransitionWasm; use dpp::data_contract::associated_token::token_distribution_key::TokenDistributionType; use dpp::state_transition::batch_transition::token_claim_transition::v0::v0_methods::TokenClaimTransitionV0Methods; +use dpp::state_transition::batch_transition::TokenClaimTransition; use dpp::tokens::emergency_action::TokenEmergencyAction; -use crate::batch_transition::token_transition::burn::TokenBurnTransitionWasm; +use wasm_bindgen::prelude::wasm_bindgen; #[wasm_bindgen(js_name=TokenClaimTransition)] #[derive(Debug, Clone)] @@ -29,7 +29,7 @@ impl TokenClaimTransitionWasm { pub fn distribution_type(&self) -> u8 { match self.0.distribution_type() { TokenDistributionType::PreProgrammed => 0, - TokenDistributionType::Perpetual => 1 + TokenDistributionType::Perpetual => 1, } } -} \ No newline at end of file +} diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs index 25aabd46e42..c2dffceccca 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs @@ -1,6 +1,6 @@ +use dpp::state_transition::batch_transition::token_config_update_transition::v0::v0_methods::TokenConfigUpdateTransitionV0Methods; use dpp::state_transition::batch_transition::TokenConfigUpdateTransition; use wasm_bindgen::prelude::wasm_bindgen; -use dpp::state_transition::batch_transition::token_config_update_transition::v0::v0_methods::TokenConfigUpdateTransitionV0Methods; #[wasm_bindgen(js_name=TokenConfigUpdateTransition)] #[derive(Debug, Clone)] @@ -21,4 +21,4 @@ impl TokenConfigUpdateTransitionWasm { None => None, } } -} \ No newline at end of file +} diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs index a9828e39083..0cfa46a48f4 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs @@ -1,9 +1,9 @@ -use dpp::state_transition::batch_transition::TokenDirectPurchaseTransition; -use wasm_bindgen::prelude::wasm_bindgen; use dpp::balances::credits::TokenAmount; use dpp::fee::Credits; use dpp::state_transition::batch_transition::token_direct_purchase_transition::v0::v0_methods::TokenDirectPurchaseTransitionV0Methods; +use dpp::state_transition::batch_transition::TokenDirectPurchaseTransition; use dpp::tokens::token_pricing_schedule::TokenPricingSchedule; +use wasm_bindgen::prelude::wasm_bindgen; #[wasm_bindgen(js_name=TokenDirectPurchaseTransition)] #[derive(Debug, Clone)] @@ -26,4 +26,4 @@ impl TokenDirectPurchaseTransitionWasm { pub fn total_agreed_price(&self) -> Credits { self.0.total_agreed_price() } -} \ No newline at end of file +} diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs index 715471ce6db..33602efd33e 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs @@ -1,7 +1,7 @@ -use dpp::state_transition::batch_transition::TokenEmergencyActionTransition; -use wasm_bindgen::prelude::wasm_bindgen; use dpp::state_transition::batch_transition::token_emergency_action_transition::v0::v0_methods::TokenEmergencyActionTransitionV0Methods; +use dpp::state_transition::batch_transition::TokenEmergencyActionTransition; use dpp::tokens::emergency_action::TokenEmergencyAction; +use wasm_bindgen::prelude::wasm_bindgen; #[wasm_bindgen(js_name=TokenEmergencyActionTransition)] #[derive(Debug, Clone)] @@ -27,7 +27,7 @@ impl TokenEmergencyActionTransitionWasm { pub fn emergency_action(&self) -> u8 { match self.0.emergency_action() { TokenEmergencyAction::Pause => 0, - TokenEmergencyAction::Resume => 1 + TokenEmergencyAction::Resume => 1, } } -} \ No newline at end of file +} diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs index c8e7b90907f..b198d4a17dd 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs @@ -30,12 +30,10 @@ impl TokenMintTransitionWasm { } #[wasm_bindgen(js_name=getIssuedToIdentityId)] - pub fn issued_to_identity_id( - &self, - ) -> Option { + pub fn issued_to_identity_id(&self) -> Option { match self.0.issued_to_identity_id() { Some(id) => Some(id.into()), - None => None + None => None, } } diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs index 47fcf7cde7e..86d885861ab 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs @@ -29,13 +29,11 @@ impl TokenSetPriceForDirectPurchaseTransitionWasm { #[wasm_bindgen(js_name=getPrice)] pub fn price(&self) -> Option { match self.0.price() { - Some(price) => { - match price { - TokenPricingSchedule::SinglePrice(credits) => Some(credits.clone()), - TokenPricingSchedule::SetPrices(prices) => None - } + Some(price) => match price { + TokenPricingSchedule::SinglePrice(credits) => Some(credits.clone()), + TokenPricingSchedule::SetPrices(carprices) => None, }, - None => None + None => None, } } } From e9db4529a59b6c3f089815bf23a95c9b49852f26 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 3 Jun 2025 14:50:20 +0700 Subject: [PATCH 3/4] feat(wasm-dpp): fix some labels --- .../batch_transition/token_transition/direct_purchase.rs | 2 +- .../token_transition/set_price_for_direct_purchase.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs index 0cfa46a48f4..283c3a98e4d 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs @@ -17,7 +17,7 @@ impl From for TokenDirectPurchaseTransitionWasm { #[wasm_bindgen(js_class = TokenDirectPurchaseTransition)] impl TokenDirectPurchaseTransitionWasm { - #[wasm_bindgen(js_name=getCount)] + #[wasm_bindgen(js_name=getTokenCount)] pub fn count(&self) -> TokenAmount { self.0.token_count() } diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs index 86d885861ab..24b5c0e4db9 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs @@ -31,7 +31,7 @@ impl TokenSetPriceForDirectPurchaseTransitionWasm { match self.0.price() { Some(price) => match price { TokenPricingSchedule::SinglePrice(credits) => Some(credits.clone()), - TokenPricingSchedule::SetPrices(carprices) => None, + TokenPricingSchedule::SetPrices(prices) => None, }, None => None, } From 6b6a4db0284a09393a775737d147b2d682677b96 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 3 Jun 2025 15:12:00 +0700 Subject: [PATCH 4/4] feat(wasm-dpp): fix clippy warnings --- .../batch_transition/token_transition/burn.rs | 5 +---- .../batch_transition/token_transition/claim.rs | 7 +------ .../batch_transition/token_transition/config.rs | 5 +---- .../batch_transition/token_transition/destroy.rs | 5 +---- .../token_transition/direct_purchase.rs | 1 - .../token_transition/emergency_action.rs | 5 +---- .../batch_transition/token_transition/freeze.rs | 5 +---- .../batch_transition/token_transition/mint.rs | 10 ++-------- .../token_transition/set_price_for_direct_purchase.rs | 11 ++++------- .../batch_transition/token_transition/transfer.rs | 5 +---- .../batch_transition/token_transition/unfreeze.rs | 5 +---- 11 files changed, 14 insertions(+), 50 deletions(-) diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs index 8ad0ccac9dc..fc52614e0f3 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs @@ -16,10 +16,7 @@ impl From for TokenBurnTransitionWasm { impl TokenBurnTransitionWasm { #[wasm_bindgen(js_name=getPublicNote)] pub fn public_note(&self) -> Option { - match self.0.public_note() { - Some(note) => Some(note.clone()), - None => None, - } + self.0.public_note().cloned() } #[wasm_bindgen(js_name=getBurnAmount)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/claim.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/claim.rs index 8e95d03099c..dbb5e6df9f1 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/claim.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/claim.rs @@ -1,8 +1,6 @@ -use crate::batch_transition::token_transition::burn::TokenBurnTransitionWasm; use dpp::data_contract::associated_token::token_distribution_key::TokenDistributionType; use dpp::state_transition::batch_transition::token_claim_transition::v0::v0_methods::TokenClaimTransitionV0Methods; use dpp::state_transition::batch_transition::TokenClaimTransition; -use dpp::tokens::emergency_action::TokenEmergencyAction; use wasm_bindgen::prelude::wasm_bindgen; #[wasm_bindgen(js_name=TokenClaimTransition)] @@ -19,10 +17,7 @@ impl From for TokenClaimTransitionWasm { impl TokenClaimTransitionWasm { #[wasm_bindgen(js_name=getPublicNote)] pub fn public_note(&self) -> Option { - match self.0.public_note() { - Some(note) => Some(note.clone()), - None => None, - } + self.0.public_note().cloned() } #[wasm_bindgen(js_name=getDistributionType)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs index c2dffceccca..49c58f1b87d 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs @@ -16,9 +16,6 @@ impl From for TokenConfigUpdateTransitionWasm { impl TokenConfigUpdateTransitionWasm { #[wasm_bindgen(js_name=getPublicNote)] pub fn public_note(&self) -> Option { - match self.0.public_note() { - Some(note) => Some(note.clone()), - None => None, - } + self.0.public_note().cloned() } } diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/destroy.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/destroy.rs index a5d9d4803fb..7e44d7a6fe4 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/destroy.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/destroy.rs @@ -22,9 +22,6 @@ impl TokenDestroyFrozenFundsTransitionWasm { #[wasm_bindgen(js_name=getPublicNote)] pub fn public_note(&self) -> Option { - match self.0.public_note() { - Some(note) => Some(note.clone()), - None => None, - } + self.0.public_note().cloned() } } diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs index 283c3a98e4d..f04e14b1b17 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/direct_purchase.rs @@ -2,7 +2,6 @@ use dpp::balances::credits::TokenAmount; use dpp::fee::Credits; use dpp::state_transition::batch_transition::token_direct_purchase_transition::v0::v0_methods::TokenDirectPurchaseTransitionV0Methods; use dpp::state_transition::batch_transition::TokenDirectPurchaseTransition; -use dpp::tokens::token_pricing_schedule::TokenPricingSchedule; use wasm_bindgen::prelude::wasm_bindgen; #[wasm_bindgen(js_name=TokenDirectPurchaseTransition)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs index 33602efd33e..dd2645c8375 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs @@ -17,10 +17,7 @@ impl From for TokenEmergencyActionTransitionWasm impl TokenEmergencyActionTransitionWasm { #[wasm_bindgen(js_name=getPublicNote)] pub fn public_note(&self) -> Option { - match self.0.public_note() { - Some(note) => Some(note.clone()), - None => None, - } + self.0.public_note().cloned() } #[wasm_bindgen(js_name=getEmergencyAction)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/freeze.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/freeze.rs index 3a528c1fcd5..d8b785508b1 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/freeze.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/freeze.rs @@ -22,9 +22,6 @@ impl TokenFreezeTransitionWasm { #[wasm_bindgen(js_name=getPublicNote)] pub fn public_note(&self) -> Option { - match self.0.public_note() { - Some(note) => Some(note.clone()), - None => None, - } + self.0.public_note().cloned() } } diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs index b198d4a17dd..33ab4d3b1bd 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs @@ -31,18 +31,12 @@ impl TokenMintTransitionWasm { #[wasm_bindgen(js_name=getIssuedToIdentityId)] pub fn issued_to_identity_id(&self) -> Option { - match self.0.issued_to_identity_id() { - Some(id) => Some(id.into()), - None => None, - } + self.0.issued_to_identity_id().map(|id| id.into()) } #[wasm_bindgen(js_name=getPublicNote)] pub fn public_note(&self) -> Option { - match self.0.public_note() { - Some(note) => Some(note.clone()), - None => None, - } + self.0.public_note().cloned() } #[wasm_bindgen(js_name=getAmount)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs index 24b5c0e4db9..4ccccdf9576 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/set_price_for_direct_purchase.rs @@ -20,18 +20,15 @@ impl From impl TokenSetPriceForDirectPurchaseTransitionWasm { #[wasm_bindgen(js_name=getPublicNote)] pub fn public_note(&self) -> Option { - match self.0.public_note() { - Some(note) => Some(note.clone()), - None => None, - } + self.0.public_note().cloned() } #[wasm_bindgen(js_name=getPrice)] pub fn price(&self) -> Option { match self.0.price() { - Some(price) => match price { - TokenPricingSchedule::SinglePrice(credits) => Some(credits.clone()), - TokenPricingSchedule::SetPrices(prices) => None, + Some(token_pricing_schedule) => match token_pricing_schedule { + TokenPricingSchedule::SinglePrice(credits) => Some(*credits), + TokenPricingSchedule::SetPrices(_) => None, }, None => None, } diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/transfer.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/transfer.rs index 2ecbed91044..e00938ad52d 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/transfer.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/transfer.rs @@ -22,10 +22,7 @@ impl TokenTransferTransitionWasm { #[wasm_bindgen(js_name=getPublicNote)] pub fn public_note(&self) -> Option { - match self.0.public_note() { - Some(note) => Some(note.clone()), - None => None, - } + self.0.public_note().cloned() } #[wasm_bindgen(js_name=getAmount)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/unfreeze.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/unfreeze.rs index dcb81524342..212f8ed1c5c 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/unfreeze.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/unfreeze.rs @@ -22,9 +22,6 @@ impl TokenUnfreezeTransitionWasm { #[wasm_bindgen(js_name=getPublicNote)] pub fn public_note(&self) -> Option { - match self.0.public_note() { - Some(note) => Some(note.clone()), - None => None, - } + self.0.public_note().cloned() } }