Fix after rebase

Author: azarovh

wallet/src/account/output_cache/mod.rs

@@ -1563,7 +1563,7 @@ impl OutputCache {
                     | OrderAccountCommand::FreezeOrder(order_id)
                     | OrderAccountCommand::ConcludeOrder(order_id) => {
                         if let Some(data) = self.orders.get_mut(order_id) {
-                            data.last_parent = find_parent(&unconfirmed_descendants, tx_id.into());
+                            data.last_parent = find_parent(&self.unconfirmed_descendants, &tx_id);
                         }
                     }
                 },
@@ -1932,8 +1932,8 @@ fn uses_conflicting_nonce(
     confirmed_account_type: AccountType,
     confirmed_nonce: AccountNonce,
 ) -> bool {
-    unconfirmed_tx.inputs().iter().any(|inp| match inp {
-        TxInput::Utxo(_) => false,
+    unconfirmed_tx.inputs().iter().any(|input| match input {
+        TxInput::Utxo(_) | TxInput::OrderAccountCommand(_) => false,
         TxInput::AccountCommand(nonce, cmd) => {
             confirmed_account_type == cmd.into() && *nonce <= confirmed_nonce
         }

wallet/src/wallet/tests.rs

@@ -7001,7 +7001,26 @@ fn conflicting_delegation_account_nonce_same_wallet(#[case] seed: Seed) {
 #[case(Seed::from_entropy())]
 fn conflicting_order_account_nonce(#[case] seed: Seed) {
     let mut rng = make_seedable_rng(seed);
-    let chain_config = Arc::new(create_unit_test_config());
+    let chain_config = common::chain::config::create_unit_test_config_builder()
+        .chainstate_upgrades(
+            common::chain::NetUpgrades::initialize(vec![(
+                BlockHeight::zero(),
+                common::chain::ChainstateUpgrade::new(
+                    common::chain::TokenIssuanceVersion::V1,
+                    common::chain::RewardDistributionVersion::V1,
+                    common::chain::TokensFeeVersion::V1,
+                    common::chain::DataDepositFeeVersion::V1,
+                    common::chain::ChangeTokenMetadataUriActivated::Yes,
+                    common::chain::FrozenTokensValidationVersion::V1,
+                    common::chain::HtlcActivated::Yes,
+                    common::chain::OrdersActivated::Yes,
+                    common::chain::OrdersVersion::V0,
+                ),
+            )])
+            .expect("cannot fail"),
+        )
+        .build();
+    let chain_config = Arc::new(chain_config);
 
     let mut wallet = create_wallet(chain_config.clone());