Skip to content

fix(platform): unique token keeps history documents #2506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 18, 2025
Merged

fix(platform): unique token keeps history documents #2506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 6 additions & 15 deletions ...sition/state_transitions/document/batch_transition/batched_transition/token_transition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,7 @@ pub trait TokenTransitionV0Methods {
token_history_contract: &'a DataContract,
) -> Result<DocumentTypeRef<'a>, ProtocolError>;
/// Historical document id
fn historical_document_id(
&self,
owner_id: Identifier,
owner_nonce: IdentityNonce,
) -> Identifier;
fn historical_document_id(&self, owner_id: Identifier) -> Identifier;
fn associated_token_event(
&self,
token_configuration: &TokenConfiguration,
Expand All @@ -213,7 +209,6 @@ pub trait TokenTransitionV0Methods {
/// Historical document id
fn build_historical_document(
&self,
token_historical_contract: &DataContract,
token_id: Identifier,
owner_id: Identifier,
owner_nonce: IdentityNonce,
Expand Down Expand Up @@ -327,24 +322,21 @@ impl TokenTransitionV0Methods for TokenTransition {
}

/// Historical document id
fn historical_document_id(
&self,
owner_id: Identifier,
owner_nonce: IdentityNonce,
) -> Identifier {
fn historical_document_id(&self, owner_id: Identifier) -> Identifier {
let token_id = self.token_id();
let name = self.historical_document_type_name();
let owner_nonce = self.identity_contract_nonce();
Document::generate_document_id_v0(
&(TOKEN_HISTORY_ID_BYTES.into()),
&token_id,
&owner_id,
name,
format!("history_{}", name).as_str(),
owner_nonce.to_be_bytes().as_slice(),
)
}

/// Historical document id
fn build_historical_document(
&self,
token_historical_contract: &DataContract,
token_id: Identifier,
owner_id: Identifier,
owner_nonce: IdentityNonce,
Expand All @@ -354,7 +346,6 @@ impl TokenTransitionV0Methods for TokenTransition {
) -> Result<Document, ProtocolError> {
self.associated_token_event(token_configuration, owner_id)?
.build_historical_document_owned(
token_historical_contract,
token_id,
owner_id,
owner_nonce,
Expand Down
5 changes: 2 additions & 3 deletions packages/rs-dpp/src/tokens/token_event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,16 @@ impl TokenEvent {

pub fn build_historical_document_owned(
self,
token_history_contract: &DataContract,
token_id: Identifier,
owner_id: Identifier,
owner_nonce: IdentityNonce,
block_info: &BlockInfo,
platform_version: &PlatformVersion,
) -> Result<Document, ProtocolError> {
let document_id = Document::generate_document_id_v0(
&token_history_contract.id(),
&token_id,
&owner_id,
self.associated_document_type_name(),
format!("history_{}", self.associated_document_type_name()).as_str(),
owner_nonce.to_be_bytes().as_slice(),
);

Expand Down
17 changes: 2 additions & 15 deletions packages/rs-drive-abci/tests/strategy_tests/verify_state_transitions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ use drive_abci::platform_types::platform::PlatformRef;
use drive_abci::rpc::core::MockCoreRPCLike;
use tenderdash_abci::proto::abci::ExecTxResult;
use dpp::block::extended_block_info::v0::ExtendedBlockInfoV0Getters;
use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters;
use dpp::data_contracts::SystemDataContract;
use dpp::document::serialization_traits::DocumentPlatformConversionMethodsV0;
use dpp::prelude::Identifier;
use dpp::voting::votes::Vote;
use drive::drive::votes::resolved::vote_polls::ResolvedVotePoll;
use drive::drive::votes::resolved::votes::resolved_resource_vote::accessors::v0::ResolvedResourceVoteGettersV0;
Expand Down Expand Up @@ -285,12 +283,7 @@ pub(crate) fn verify_state_transitions_were_or_were_not_executed(
.to_string(),
document_type_keeps_history: false,
document_id: token_transition_action
.historical_document_id(
batch_transition.owner_id(),
token_transition_action
.base()
.identity_contract_nonce(),
)
.historical_document_id(batch_transition.owner_id())
.to_vec(),
document_contested_status: 0,
},
Expand Down Expand Up @@ -532,12 +525,7 @@ pub(crate) fn verify_state_transitions_were_or_were_not_executed(
document_type_name,
document_type_keeps_history: false,
document_id: token_transition_action
.historical_document_id(
batch_transition.owner_id(),
token_transition_action
.base()
.identity_contract_nonce(),
)
.historical_document_id(batch_transition.owner_id())
.to_buffer(),
block_time_ms: None, //None because we want latest
contested_status:
Expand Down Expand Up @@ -566,7 +554,6 @@ pub(crate) fn verify_state_transitions_were_or_were_not_executed(

let expected_document = token_transition_action
.build_historical_document(
&token_history,
token_id,
batch_transition.owner_id(),
token_transition_action
Expand Down
1 change: 0 additions & 1 deletion packages/rs-drive/src/drive/tokens/add_transaction_history_operations/v0/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ impl Drive {
let document_type = event.associated_document_type(&contract)?;

let document = event.build_historical_document_owned(
&contract,
token_id,
owner_id,
owner_nonce,
Expand Down
14 changes: 5 additions & 9 deletions ...ges/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters;
use dpp::data_contract::associated_token::token_keeps_history_rules::accessors::v0::TokenKeepsHistoryRulesV0Getters;
use dpp::data_contract::document_type::DocumentTypeRef;
use dpp::data_contracts::SystemDataContract;

Check warning on line 32 in packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/mod.rs

View workflow job for this annotation

GitHub Actions / Rust packages (drive-abci) / Linting 

warning: unused import: `dpp::data_contracts::SystemDataContract`
  --> packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/mod.rs:32:5
   |
32 | use dpp::data_contracts::SystemDataContract;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `#[warn(unused_imports)]` on by default
use dpp::document::Document;
use dpp::identifier::Identifier;
use dpp::prelude::{DataContract, IdentityNonce};
Expand Down Expand Up @@ -128,24 +128,21 @@
}

/// Historical document id
pub fn historical_document_id(
&self,
owner_id: Identifier,
owner_nonce: IdentityNonce,
) -> Identifier {
pub fn historical_document_id(&self, owner_id: Identifier) -> Identifier {
let token_id = self.base().token_id();
let name = self.historical_document_type_name();
let owner_nonce = self.base().identity_contract_nonce();
Document::generate_document_id_v0(
&SystemDataContract::TokenHistory.id(),
&token_id,
&owner_id,
name,
format!("history_{}", name).as_str(),
owner_nonce.to_be_bytes().as_slice(),
)
}

/// Historical document id
pub fn build_historical_document(
&self,
token_historical_contract: &DataContract,
token_id: Identifier,
owner_id: Identifier,
owner_nonce: IdentityNonce,
Expand All @@ -154,7 +151,6 @@
) -> Result<Document, Error> {
self.associated_token_event()
.build_historical_document_owned(
token_historical_contract,
token_id,
owner_id,
owner_nonce,
Expand Down
3 changes: 1 addition & 2 deletions ...ive/src/verify/state_transition/verify_state_transition_was_executed_with_proof/v0/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ impl Drive {
document_type_name: token_history_document_type_name,
document_type_keeps_history: false,
document_id: token_transition
.historical_document_id(owner_id, identity_contract_nonce)
.historical_document_id(owner_id)
.to_buffer(),
block_time_ms: None, //None because we want latest
contested_status:
Expand All @@ -352,7 +352,6 @@ impl Drive {
let document = document.ok_or(Error::Proof(ProofError::IncorrectProof(format!("proof did not contain document with id {} expected to exist because the token keeps historical documents", token_transition.historical_document_type_name()))))?;

let expected_document = token_transition.build_historical_document(
&token_history_contract,
token_id,
owner_id,
identity_contract_nonce,
Expand Down
10 changes: 2 additions & 8 deletions packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
TokenTransition, TokenTransitionV0Methods,
};
use dpp::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods;
use dpp::state_transition::batch_transition::token_base_transition::v0::TokenBaseTransitionV0;

Check warning on line 26 in packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mod.rs

View workflow job for this annotation

GitHub Actions / Rust packages (wasm-dpp) / Linting 

warning: unused import: `dpp::state_transition::batch_transition::token_base_transition::v0::TokenBaseTransitionV0`
  --> packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mod.rs:26:5
   |
26 | use dpp::state_transition::batch_transition::token_base_transition::v0::TokenBaseTransitionV0;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
use dpp::state_transition::batch_transition::token_mint_transition::TokenMintTransitionV0;

Check warning on line 27 in packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mod.rs

View workflow job for this annotation

GitHub Actions / Rust packages (wasm-dpp) / Linting 

warning: unused import: `dpp::state_transition::batch_transition::token_mint_transition::TokenMintTransitionV0`
  --> packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mod.rs:27:5
   |
27 | use dpp::state_transition::batch_transition::token_mint_transition::TokenMintTransitionV0;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
use dpp::state_transition::batch_transition::TokenMintTransition;

Check warning on line 28 in packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mod.rs

View workflow job for this annotation

GitHub Actions / Rust packages (wasm-dpp) / Linting 

warning: unused import: `dpp::state_transition::batch_transition::TokenMintTransition`
  --> packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mod.rs:28:5
   |
28 | use dpp::state_transition::batch_transition::TokenMintTransition;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
use js_sys::Number;
use wasm_bindgen::prelude::wasm_bindgen;
use wasm_bindgen::JsValue;
Expand Down Expand Up @@ -103,14 +103,8 @@
}

#[wasm_bindgen(js_name=getHistoricalDocumentId)]
pub fn historical_document_id(
&self,
owner_id: IdentifierWrapper,
owner_nonce: IdentityNonce,
) -> IdentifierWrapper {
self.0
.historical_document_id(owner_id.into(), owner_nonce)
.into()
pub fn historical_document_id(&self, owner_id: IdentifierWrapper) -> IdentifierWrapper {
self.0.historical_document_id(owner_id.into()).into()
}

#[wasm_bindgen(js_name=getIdentityContractNonce)]
Expand Down
Loading