Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
23285f1
feat: add group info to token action screens
pauldelucia May 9, 2025
e4bfebf
fix: group for token config update
pauldelucia May 9, 2025
577713c
backend
pauldelucia May 12, 2025
54b74d1
action buttons in group action screen
pauldelucia May 13, 2025
d4c8b6b
Merge remote-tracking branch 'origin/v0.9-dev' into feat/group-infos
lklimek May 13, 2025
08f5360
fix: dont set recipient
pauldelucia May 13, 2025
3c3fd35
fix ui for active group action
pauldelucia May 13, 2025
d3cffea
fix
pauldelucia May 13, 2025
aafc6d2
fix
pauldelucia May 13, 2025
a31111e
fix
pauldelucia May 13, 2025
472ac4a
update sdk
pauldelucia May 13, 2025
5b18df6
Merge branch 'v0.9-dev' into feat/group-infos
pauldelucia May 14, 2025
5834e54
fix success messages
pauldelucia May 14, 2025
36298b8
Merge branch 'v0.9-dev' into feat/group-infos
pauldelucia May 16, 2025
a1128e3
Merge branch 'v0.9-dev' into feat/group-infos
pauldelucia May 19, 2025
52424ee
fix unused error message on token screen builds
pauldelucia May 19, 2025
90b382c
handle error in group actions screen rather than expect
pauldelucia May 19, 2025
a8604b1
insert identity token balances when inserting identity
pauldelucia May 19, 2025
cc3ecba
fix tokens screens routing to the wrong screens
pauldelucia May 19, 2025
77a4d17
query token balances after adding new token
pauldelucia May 19, 2025
973c3fd
fix
pauldelucia May 19, 2025
7700672
fix
pauldelucia May 19, 2025
fb2a8af
Merge branch 'v0.9-dev' into feat/group-infos
pauldelucia May 19, 2025
97900e0
update sdk to rc.11
QuantumExplorer May 19, 2025
8cc79d8
Merge branch 'feat/group-infos' of github.com:dashpay/dash-evo-tool i…
QuantumExplorer May 19, 2025
8f09a10
Merge branch 'v0.9-dev' into feat/group-infos
QuantumExplorer May 19, 2025
f85ffe2
restricted keys
QuantumExplorer May 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 42 additions & 42 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rfd = "0.15.1"
qrcode = "0.14.1"
eframe = { version = "0.31.1", features = ["persistence"] }
base64 = "0.22.1"
dash-sdk = { git = "https://github.com/dashpay/platform.git", rev = "64f0c69d013df26e58b59594c55f7690b9bc358c" }
dash-sdk = { git = "https://github.com/dashpay/platform.git", rev = "9c98e6b72cd250dd7ea9ded1d74fe84d17733915" }
thiserror = "2"
serde = "1.0.219"
serde_json = "1.0.140"
Expand Down
8 changes: 6 additions & 2 deletions src/backend_task/tokens/burn_tokens.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ use crate::context::AppContext;
use crate::model::qualified_identity::QualifiedIdentity;

use crate::model::proof_log_item::{ProofLogItem, RequestType};
use dash_sdk::dpp::group::GroupStateTransitionInfoStatus;
use dash_sdk::dpp::identity::accessors::IdentityGettersV0;
use dash_sdk::dpp::state_transition::batch_transition::methods::StateTransitionCreationOptions;
use dash_sdk::dpp::state_transition::proof_result::StateTransitionProofResult;
use dash_sdk::dpp::state_transition::StateTransitionSigningOptions;
use dash_sdk::platform::transition::broadcast::BroadcastStateTransition;
use dash_sdk::platform::transition::fungible_tokens::burn::TokenBurnTransitionBuilder;
use dash_sdk::platform::{DataContract, IdentityPublicKey};
Expand All @@ -23,6 +22,7 @@ impl AppContext {
signing_key: IdentityPublicKey,
public_note: Option<String>,
amount: u64,
group_info: Option<GroupStateTransitionInfoStatus>,
sdk: &Sdk,
_sender: mpsc::Sender<TaskResult>,
) -> Result<BackendTaskSuccessResult, String> {
Expand All @@ -37,6 +37,10 @@ impl AppContext {
builder = builder.with_public_note(note);
}

if let Some(group_info) = group_info {
builder = builder.with_using_group_info(group_info);
}

let options = self.state_transition_options();

let state_transition = builder
Expand Down
2 changes: 0 additions & 2 deletions src/backend_task/tokens/claim_tokens.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ use crate::model::qualified_identity::QualifiedIdentity;
use crate::model::proof_log_item::{ProofLogItem, RequestType};
use dash_sdk::dpp::data_contract::associated_token::token_distribution_key::TokenDistributionType;
use dash_sdk::dpp::identity::accessors::IdentityGettersV0;
use dash_sdk::dpp::state_transition::batch_transition::methods::StateTransitionCreationOptions;
use dash_sdk::dpp::state_transition::proof_result::StateTransitionProofResult;
use dash_sdk::dpp::state_transition::StateTransitionSigningOptions;
use dash_sdk::platform::transition::broadcast::BroadcastStateTransition;
use dash_sdk::platform::transition::fungible_tokens::claim::TokenClaimTransitionBuilder;
use dash_sdk::platform::{DataContract, IdentityPublicKey};
Expand Down
8 changes: 6 additions & 2 deletions src/backend_task/tokens/destroy_frozen_funds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ use crate::context::AppContext;
use crate::model::qualified_identity::QualifiedIdentity;

use crate::model::proof_log_item::{ProofLogItem, RequestType};
use dash_sdk::dpp::group::GroupStateTransitionInfoStatus;
use dash_sdk::dpp::identity::accessors::IdentityGettersV0;
use dash_sdk::dpp::state_transition::batch_transition::methods::StateTransitionCreationOptions;
use dash_sdk::dpp::state_transition::proof_result::StateTransitionProofResult;
use dash_sdk::dpp::state_transition::StateTransitionSigningOptions;
use dash_sdk::platform::transition::broadcast::BroadcastStateTransition;
use dash_sdk::platform::transition::fungible_tokens::destroy::TokenDestroyFrozenFundsTransitionBuilder;
use dash_sdk::platform::{DataContract, Identifier, IdentityPublicKey};
Expand All @@ -23,6 +22,7 @@ impl AppContext {
signing_key: IdentityPublicKey,
public_note: Option<String>,
frozen_identity: Identifier,
group_info: Option<GroupStateTransitionInfoStatus>,
sdk: &Sdk,
_sender: mpsc::Sender<TaskResult>,
) -> Result<BackendTaskSuccessResult, String> {
Expand All @@ -37,6 +37,10 @@ impl AppContext {
builder = builder.with_public_note(note);
}

if let Some(group_info) = group_info {
builder = builder.with_using_group_info(group_info);
}

let options = self.state_transition_options();

let state_transition = builder
Expand Down
8 changes: 6 additions & 2 deletions src/backend_task/tokens/freeze_tokens.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ use crate::context::AppContext;
use crate::model::qualified_identity::QualifiedIdentity;

use crate::model::proof_log_item::{ProofLogItem, RequestType};
use dash_sdk::dpp::group::GroupStateTransitionInfoStatus;
use dash_sdk::dpp::identity::accessors::IdentityGettersV0;
use dash_sdk::dpp::state_transition::batch_transition::methods::StateTransitionCreationOptions;
use dash_sdk::dpp::state_transition::proof_result::StateTransitionProofResult;
use dash_sdk::dpp::state_transition::StateTransitionSigningOptions;
use dash_sdk::platform::transition::broadcast::BroadcastStateTransition;
use dash_sdk::platform::transition::fungible_tokens::freeze::TokenFreezeTransitionBuilder;
use dash_sdk::platform::{DataContract, Identifier, IdentityPublicKey};
Expand All @@ -23,6 +22,7 @@ impl AppContext {
signing_key: IdentityPublicKey,
public_note: Option<String>,
freeze_identity: Identifier,
group_info: Option<GroupStateTransitionInfoStatus>,
sdk: &Sdk,
_sender: mpsc::Sender<TaskResult>,
) -> Result<BackendTaskSuccessResult, String> {
Expand All @@ -37,6 +37,10 @@ impl AppContext {
builder = builder.with_public_note(note);
}

if let Some(group_info) = group_info {
builder = builder.with_using_group_info(group_info);
}

let options = self.state_transition_options();

let state_transition = builder
Expand Down
Loading