Merge pull request #1816 from mintlayer/fix/no_freeze_tokens_in_orders

No frozen tokens in orders
mintlayer · Sep 20, 2024 · 43b3bfb · 43b3bfb
2 parents b5d6d58 + b140bd1
commit 43b3bfb
Show file tree

Hide file tree

Showing 15 changed files with 475 additions and 83 deletions.
diff --git a/chainstate/test-framework/src/random_tx_maker.rs b/chainstate/test-framework/src/random_tx_maker.rs
@@ -95,7 +95,13 @@ fn get_random_token<'a>(
         .iter()
         .choose(rng)
         .and_then(|(token_id, _)| {
-            tip_view.get_token_data(token_id).unwrap().is_some().then_some(*token_id)
+            tip_view
+                .get_token_data(token_id)
+                .unwrap()
+                .is_some_and(|data| match data {
+                    tokens_accounting::TokenData::FungibleToken(data) => !data.is_frozen(),
+                })
+                .then_some(*token_id)
         })
         .map(|token_id| {
             (
@@ -257,6 +263,20 @@ impl<'a> RandomTxMaker<'a> {
         let orders_db = OrdersAccountingDB::new(self.orders_store);
         let mut orders_cache = OrdersAccountingCache::new(&orders_db);
 
+        // Select random number of accounts to spend from
+        let account_inputs = self.select_accounts(rng);
+
+        // Spend from accounts first then from utxo because account commands affect the state (like freezing tokens)
+        let (account_inputs, account_outputs) = self.create_account_spending(
+            rng,
+            &mut tokens_cache,
+            &pos_db,
+            &mut pos_delta,
+            &mut orders_cache,
+            &account_inputs,
+            key_manager,
+        );
+
         // Select random number of utxos to spend
         let inputs_with_utxos = {
             let mut inputs_with_utxos = self.select_utxos(rng);
@@ -298,19 +318,6 @@ impl<'a> RandomTxMaker<'a> {
             inputs_with_utxos,
         );
 
-        // Select random number of accounts to spend from
-        let account_inputs = self.select_accounts(rng);
-
-        let (account_inputs, account_outputs) = self.create_account_spending(
-            rng,
-            &mut tokens_cache,
-            &pos_db,
-            &mut pos_delta,
-            &mut orders_cache,
-            &account_inputs,
-            key_manager,
-        );
-
         let mut inputs: Vec<_> = inputs.into_iter().chain(account_inputs).collect();
 
         outputs.extend(account_outputs);

diff --git a/chainstate/test-suite/src/tests/chainstate_storage_tests.rs b/chainstate/test-suite/src/tests/chainstate_storage_tests.rs
@@ -25,8 +25,9 @@ use common::{
         output_value::OutputValue,
         tokens::{make_token_id, NftIssuance, TokenAuxiliaryData, TokenIssuanceV0},
         ChainstateUpgrade, ChangeTokenMetadataUriActivated, DataDepositFeeVersion, Destination,
-        HtlcActivated, NetUpgrades, OrdersActivated, OutPointSourceId, RewardDistributionVersion,
-        TokenIssuanceVersion, TokensFeeVersion, Transaction, TxInput, TxOutput, UtxoOutPoint,
+        FrozenTokensValidationVersion, HtlcActivated, NetUpgrades, OrdersActivated,
+        OutPointSourceId, RewardDistributionVersion, TokenIssuanceVersion, TokensFeeVersion,
+        Transaction, TxInput, TxOutput, UtxoOutPoint,
     },
     primitives::{Amount, Id, Idable},
 };
@@ -121,6 +122,7 @@ fn store_fungible_token_v0(#[case] seed: Seed) {
                                 TokensFeeVersion::V1,
                                 DataDepositFeeVersion::V1,
                                 ChangeTokenMetadataUriActivated::Yes,
+                                FrozenTokensValidationVersion::V1,
                                 HtlcActivated::Yes,
                                 OrdersActivated::Yes,
                             ),
@@ -203,6 +205,7 @@ fn store_nft_v0(#[case] seed: Seed) {
                                 TokensFeeVersion::V1,
                                 DataDepositFeeVersion::V1,
                                 ChangeTokenMetadataUriActivated::Yes,
+                                FrozenTokensValidationVersion::V1,
                                 HtlcActivated::Yes,
                                 OrdersActivated::Yes,
                             ),
@@ -516,6 +519,7 @@ fn store_aux_data_from_issue_nft(#[case] seed: Seed) {
                                 TokensFeeVersion::V1,
                                 DataDepositFeeVersion::V1,
                                 ChangeTokenMetadataUriActivated::Yes,
+                                FrozenTokensValidationVersion::V1,
                                 HtlcActivated::Yes,
                                 OrdersActivated::Yes,
                             ),

diff --git a/chainstate/test-suite/src/tests/fungible_tokens.rs b/chainstate/test-suite/src/tests/fungible_tokens.rs
@@ -21,7 +21,7 @@ use chainstate::{
 };
 use chainstate_test_framework::{get_output_value, TestFramework, TransactionBuilder};
 use common::chain::tokens::{Metadata, NftIssuanceV0, TokenIssuanceV0, TokenTransfer};
-use common::chain::{RewardDistributionVersion, UtxoOutPoint};
+use common::chain::{FrozenTokensValidationVersion, RewardDistributionVersion, UtxoOutPoint};
 use common::primitives::{id, BlockHeight, Id};
 use common::{
     chain::{
@@ -59,6 +59,7 @@ fn make_test_framework_with_v0(rng: &mut (impl Rng + CryptoRng)) -> TestFramewor
                             TokensFeeVersion::V1,
                             DataDepositFeeVersion::V1,
                             ChangeTokenMetadataUriActivated::Yes,
+                            FrozenTokensValidationVersion::V1,
                             HtlcActivated::Yes,
                             OrdersActivated::Yes,
                         ),
@@ -966,6 +967,7 @@ fn no_v0_issuance_after_v1(#[case] seed: Seed) {
                                 TokensFeeVersion::V1,
                                 DataDepositFeeVersion::V1,
                                 ChangeTokenMetadataUriActivated::Yes,
+                                FrozenTokensValidationVersion::V1,
                                 HtlcActivated::Yes,
                                 OrdersActivated::Yes,
                             ),
@@ -1032,6 +1034,7 @@ fn no_v0_transfer_after_v1(#[case] seed: Seed) {
                                     TokensFeeVersion::V1,
                                     DataDepositFeeVersion::V1,
                                     ChangeTokenMetadataUriActivated::Yes,
+                                    FrozenTokensValidationVersion::V1,
                                     HtlcActivated::Yes,
                                     OrdersActivated::Yes,
                                 ),
@@ -1044,6 +1047,7 @@ fn no_v0_transfer_after_v1(#[case] seed: Seed) {
                                     TokensFeeVersion::V1,
                                     DataDepositFeeVersion::V1,
                                     ChangeTokenMetadataUriActivated::Yes,
+                                    FrozenTokensValidationVersion::V1,
                                     HtlcActivated::Yes,
                                     OrdersActivated::Yes,
                                 ),