Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,12 @@ use bincode::{Decode, Encode};
use derive_more::Display;

pub use super::super::token_base_transition::IDENTIFIER_FIELDS;
use crate::prelude::{
DerivationEncryptionKeyIndex, RecipientKeyIndex, RootEncryptionKeyIndex, SenderKeyIndex,
};
use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition;
use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote};
use platform_value::Identifier;
#[cfg(feature = "state-transition-serde-conversion")]
use serde::{Deserialize, Serialize};

pub type SharedEncryptedNote = (SenderKeyIndex, RecipientKeyIndex, Vec<u8>);
pub type PrivateEncryptedNote = (
RootEncryptionKeyIndex,
DerivationEncryptionKeyIndex,
Vec<u8>,
);

mod property_names {
pub const AMOUNT: &str = "$amount";
pub const RECIPIENT_OWNER_ID: &str = "recipientOwnerId";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::prelude::{DerivationEncryptionKeyIndex, RecipientKeyIndex, RootEncryp
use crate::state_transition::batch_transition::batched_transition::token_transfer_transition::TokenTransferTransitionV0;
use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors;
use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition;
use crate::state_transition::batch_transition::token_transfer_transition::{PrivateEncryptedNote, SharedEncryptedNote};
use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote};

impl TokenBaseTransitionAccessors for TokenTransferTransitionV0 {
fn base(&self) -> &TokenBaseTransition {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::state_transition::batch_transition::batched_transition::token_transfe
use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors;
use crate::state_transition::batch_transition::TokenTransferTransition;
use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition;
use crate::state_transition::batch_transition::token_transfer_transition::{PrivateEncryptedNote, SharedEncryptedNote};
use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote};

impl TokenBaseTransitionAccessors for TokenTransferTransition {
fn base(&self) -> &TokenBaseTransition {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#[cfg(feature = "state-transition-signing")]
use crate::balances::credits::TokenAmount;
#[cfg(feature = "state-transition-signing")]
use crate::data_contract::associated_token::token_configuration_item::TokenConfigurationChangeItem;
#[cfg(feature = "state-transition-signing")]
use crate::data_contract::document_type::DocumentTypeRef;
Expand All @@ -20,16 +21,15 @@ use crate::prelude::UserFeeIncrease;
use crate::state_transition::batch_transition::batched_transition::BatchedTransition;
use crate::state_transition::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0;
use crate::state_transition::batch_transition::methods::v1::DocumentsBatchTransitionMethodsV1;
use crate::state_transition::batch_transition::token_transfer_transition::{
PrivateEncryptedNote, SharedEncryptedNote,
};
use crate::state_transition::batch_transition::BatchTransition;
#[cfg(feature = "state-transition-signing")]
use crate::state_transition::batch_transition::{BatchTransitionV0, BatchTransitionV1};
#[cfg(feature = "state-transition-signing")]
use crate::state_transition::StateTransition;
#[cfg(feature = "state-transition-signing")]
use crate::tokens::emergency_action::TokenEmergencyAction;
#[cfg(feature = "state-transition-signing")]
use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote};
use crate::ProtocolError;
#[cfg(feature = "state-transition-signing")]
use platform_value::Identifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ use crate::identity::IdentityPublicKey;
#[cfg(feature = "state-transition-signing")]
use crate::prelude::{IdentityNonce, UserFeeIncrease};
use crate::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0;
use crate::state_transition::batch_transition::token_transfer_transition::{
PrivateEncryptedNote, SharedEncryptedNote,
};
#[cfg(feature = "state-transition-signing")]
use crate::state_transition::StateTransition;
#[cfg(feature = "state-transition-signing")]
use crate::tokens::emergency_action::TokenEmergencyAction;
#[cfg(feature = "state-transition-signing")]
use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote};
#[cfg(feature = "state-transition-signing")]
use crate::version::FeatureVersion;
#[cfg(feature = "state-transition-signing")]
use crate::ProtocolError;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ use crate::ProtocolError;
use platform_value::Identifier;
#[cfg(feature = "state-transition-signing")]
use platform_version::version::{FeatureVersion, PlatformVersion};
#[cfg(feature = "state-transition-signing")]
use crate::balances::credits::TokenAmount;
#[cfg(feature = "state-transition-signing")]
use crate::data_contract::associated_token::token_configuration_item::TokenConfigurationChangeItem;
Expand Down Expand Up @@ -71,13 +72,13 @@ use crate::state_transition::batch_transition::token_freeze_transition::TokenFre
#[cfg(feature = "state-transition-signing")]
use crate::state_transition::batch_transition::token_mint_transition::TokenMintTransitionV0;
#[cfg(feature = "state-transition-signing")]
use crate::state_transition::batch_transition::token_transfer_transition::{PrivateEncryptedNote, SharedEncryptedNote};
#[cfg(feature = "state-transition-signing")]
use crate::state_transition::batch_transition::token_transfer_transition::TokenTransferTransitionV0;
#[cfg(feature = "state-transition-signing")]
use crate::state_transition::batch_transition::token_unfreeze_transition::TokenUnfreezeTransitionV0;
#[cfg(feature = "state-transition-signing")]
use crate::tokens::emergency_action::TokenEmergencyAction;
#[cfg(feature = "state-transition-signing")]
use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote};

impl DocumentsBatchTransitionAccessorsV0 for BatchTransitionV1 {
type IterType<'a>
Expand Down
10 changes: 10 additions & 0 deletions packages/rs-dpp/src/tokens/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
use crate::data_contract::TokenContractPosition;
use crate::prelude::{
DerivationEncryptionKeyIndex, RecipientKeyIndex, RootEncryptionKeyIndex, SenderKeyIndex,
};
use crate::util::hash::hash_double;

pub mod allowed_currency;
Expand All @@ -8,6 +11,13 @@ pub mod info;
pub mod status;
pub mod token_event;

pub type SharedEncryptedNote = (SenderKeyIndex, RecipientKeyIndex, Vec<u8>);
pub type PrivateEncryptedNote = (
RootEncryptionKeyIndex,
DerivationEncryptionKeyIndex,
Vec<u8>,
);

pub fn calculate_token_id(contract_id: &[u8; 32], token_pos: TokenContractPosition) -> [u8; 32] {
let mut bytes = b"dash_token".to_vec();
bytes.extend_from_slice(contract_id);
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-dpp/src/tokens/token_event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ pub type TokenEventPersonalEncryptedNote = Option<(
Vec<u8>,
)>;
use crate::serialization::PlatformSerializableWithPlatformVersion;
use crate::state_transition::batch_transition::token_transfer_transition::SharedEncryptedNote;
use crate::tokens::emergency_action::TokenEmergencyAction;
use crate::tokens::SharedEncryptedNote;
use crate::ProtocolError;

pub type RecipientIdentifier = Identifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use derive_more::From;
use crate::state_transition_action::batch::batched_transition::token_transition::token_base_transition_action::TokenBaseTransitionAction;
use dpp::identifier::Identifier;
use dpp::prelude::{DerivationEncryptionKeyIndex, RootEncryptionKeyIndex};
use dpp::state_transition::batch_transition::token_transfer_transition::{PrivateEncryptedNote, SharedEncryptedNote};
use dpp::tokens::{PrivateEncryptedNote, SharedEncryptedNote};

/// transformer module
pub mod transformer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use dpp::identifier::Identifier;
use dpp::prelude::{
DerivationEncryptionKeyIndex, IdentityNonce, RootEncryptionKeyIndex,
};
use dpp::state_transition::batch_transition::token_transfer_transition::{PrivateEncryptedNote, SharedEncryptedNote};
use dpp::tokens::{PrivateEncryptedNote, SharedEncryptedNote};
use crate::drive::contract::DataContractFetchInfo;
use crate::state_transition_action::batch::batched_transition::token_transition::token_base_transition_action::{
TokenBaseTransitionAction, TokenBaseTransitionActionAccessorsV0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@ use dpp::identity::signer::Signer;
use dpp::identity::IdentityPublicKey;
use dpp::prelude::UserFeeIncrease;
use dpp::state_transition::batch_transition::methods::v1::DocumentsBatchTransitionMethodsV1;
use dpp::state_transition::batch_transition::token_transfer_transition::{
PrivateEncryptedNote, SharedEncryptedNote,
};
use dpp::state_transition::batch_transition::BatchTransition;
use dpp::state_transition::StateTransition;
use dpp::tokens::calculate_token_id;
use dpp::tokens::{calculate_token_id, PrivateEncryptedNote, SharedEncryptedNote};
use dpp::version::PlatformVersion;

/// A builder to configure and broadcast token transfer transitions
Expand Down