[LABS-298] Simplify push_transactions (#20279)

* Simplify `push_transactions`

* Further simplify

Author: Quexington

chia/_tests/wallet/rpc/test_wallet_rpc.py

@@ -386,14 +386,24 @@ async def test_push_transactions(wallet_environments: WalletTestFramework) -> No
         )
     ).signed_tx
 
+    with pytest.raises(ValueError, match="Cannot add conditions to a transaction if no new fee spend is being added"):
+        await client.push_transactions(
+            PushTransactions(transactions=[tx]),
+            tx_config=wallet_environments.tx_config,
+            extra_conditions=(Remark(rest=Program.to("foo")),),
+        )
+
     resp_client = await client.push_transactions(
         PushTransactions(transactions=[tx], fee=uint64(10)),
         wallet_environments.tx_config,
     )
+    await full_node_api.wait_for_wallet_synced(wallet_node)
     resp = await client.fetch("push_transactions", {"transactions": [tx.to_json_dict()], "fee": 10})
     assert resp["success"]
+    await full_node_api.wait_for_wallet_synced(wallet_node)
     resp = await client.fetch("push_transactions", {"transactions": [bytes(tx).hex()], "fee": 10})
     assert resp["success"]
+    await full_node_api.wait_for_wallet_synced(wallet_node)
 
     spend_bundle = WalletSpendBundle.aggregate(
         [tx.spend_bundle for tx in resp_client.transactions if tx.spend_bundle is not None]

chia/wallet/wallet_rpc_api.py

@@ -23,7 +23,7 @@
 from chia.rpc.util import ALL_TRANSLATION_LAYERS, RpcEndpoint, marshal
 from chia.server.ws_connection import WSChiaConnection
 from chia.types.blockchain_format.coin import coin_as_list
-from chia.types.blockchain_format.program import INFINITE_COST, Program, run_with_cost
+from chia.types.blockchain_format.program import Program
 from chia.types.coin_record import CoinRecord
 from chia.types.signing_mode import CHIP_0002_SIGN_MESSAGE_PREFIX, SigningMode
 from chia.util.bech32m import decode_puzzle_hash, encode_puzzle_hash
@@ -39,14 +39,14 @@
 from chia.wallet.cat_wallet.cat_wallet import CATWallet
 from chia.wallet.conditions import (
     AssertCoinAnnouncement,
+    AssertConcurrentSpend,
     AssertPuzzleAnnouncement,
     Condition,
     ConditionValidTimes,
     CreateCoin,
     CreateCoinAnnouncement,
     CreatePuzzleAnnouncement,
     conditions_from_json_dicts,
-    parse_conditions_non_consensus,
     parse_timelock_info,
 )
 from chia.wallet.derive_keys import (
@@ -1007,50 +1007,21 @@ async def push_transactions(
     ) -> PushTransactionsResponse:
         if not action_scope.config.push:
             raise ValueError("Cannot push transactions if push is False")
+        tx_removals = [c for tx in request.transactions for c in tx.removals]
         async with action_scope.use() as interface:
             interface.side_effects.transactions.extend(request.transactions)
-            if request.fee != 0:
-                all_conditions_and_origins = [
-                    (condition, cs.coin.name())
-                    for tx in interface.side_effects.transactions
-                    if tx.spend_bundle is not None
-                    for cs in tx.spend_bundle.coin_spends
-                    for condition in run_with_cost(cs.puzzle_reveal, INFINITE_COST, cs.solution)[1].as_iter()
-                ]
-                create_coin_announcement = next(
-                    condition
-                    for condition in parse_conditions_non_consensus(
-                        [con for con, coin in all_conditions_and_origins], abstractions=False
-                    )
-                    if isinstance(condition, CreateCoinAnnouncement)
-                )
-                announcement_origin = next(
-                    coin
-                    for condition, coin in all_conditions_and_origins
-                    if condition == create_coin_announcement.to_program()
-                )
-                async with self.service.wallet_state_manager.new_action_scope(
-                    dataclasses.replace(
-                        action_scope.config.tx_config,
-                        excluded_coin_ids=[
-                            *action_scope.config.tx_config.excluded_coin_ids,
-                            *(c.name() for tx in interface.side_effects.transactions for c in tx.removals),
-                        ],
-                    ),
-                    push=False,
-                ) as inner_action_scope:
-                    await self.service.wallet_state_manager.main_wallet.create_tandem_xch_tx(
-                        request.fee,
-                        inner_action_scope,
-                        extra_conditions=(
-                            *extra_conditions,
-                            CreateCoinAnnouncement(
-                                create_coin_announcement.msg, announcement_origin
-                            ).corresponding_assertion(),
-                        ),
-                    )
-
-                interface.side_effects.transactions.extend(inner_action_scope.side_effects.transactions)
+            interface.side_effects.selected_coins.extend(tx_removals)
+        if request.fee != 0:
+            await self.service.wallet_state_manager.main_wallet.create_tandem_xch_tx(
+                request.fee,
+                action_scope,
+                extra_conditions=(
+                    *extra_conditions,
+                    AssertConcurrentSpend(tx_removals[0].name()),
+                ),
+            )
+        elif extra_conditions != tuple():
+            raise ValueError("Cannot add conditions to a transaction if no new fee spend is being added")
 
         return PushTransactionsResponse([], [])  # tx_endpoint takes care of this