checkpoint: into main from release/2.5.4 @ 3901126 (#19660)

amendment to Dedup patch #19565 (#19569)

Co-authored-by: Arvid Norberg <[email protected]>

Author: Starttoaster

chia/_tests/core/mempool/test_mempool_manager.py

@@ -878,7 +878,7 @@ def mk_coin_spend(coin: Coin, solution: Optional[str] = None) -> CoinSpend:
     return make_spend(
         coin,
         SerializedProgram.to(None),
-        SerializedProgram.to(bytes.fromhex(solution) if solution is not None else None),
+        SerializedProgram.fromhex(solution if solution is not None else "80"),
     )
 
 
@@ -2991,14 +2991,15 @@ async def test_check_removals_with_block_creation(flags: int, old: bool) -> None
 
 @pytest.mark.anyio
 async def test_dedup_not_canonical() -> None:
-    # this is 1, but with a non-canonical encoding
-    coin_spend = mk_coin_spend(TEST_COIN, solution="c00101")
-    coins = TestCoins(coins=[], lineage={})
+    # this is ((1)), but with a non-canonical encoding
+    coin_spend = mk_coin_spend(TEST_COIN, solution="ffffc001018080")
+    coins = TestCoins([TEST_COIN], lineage={})
     mempool_manager = await setup_mempool(coins)
     sb = SpendBundle([coin_spend], G2Element())
     sb_conds = make_test_conds(spend_ids=[(TEST_COIN, ELIGIBLE_FOR_DEDUP)])
     bundle_add_info = await mempool_manager.add_spend_bundle(sb, sb_conds, sb.name(), uint32(1))
     assert bundle_add_info.status == MempoolInclusionStatus.FAILED
+    assert bundle_add_info.error == Err.INVALID_COIN_SOLUTION
 
 
 def make_coin_record(coin: Coin, spent_block_index: int = 0) -> CoinRecord:

chia/full_node/mempool_manager.py

@@ -612,7 +612,10 @@ async def validate_spend_bundle(
                 EligibilityAndAdditions(is_eligible_for_dedup=False, spend_additions=[], ff_puzzle_hash=None),
             )
 
-            supports_dedup = eligibility_info.is_eligible_for_dedup and is_clvm_canonical(bytes(coin_spend.solution))
+            supports_dedup = eligibility_info.is_eligible_for_dedup
+            if supports_dedup and not is_clvm_canonical(bytes(coin_spend.solution)):
+                return Err.INVALID_COIN_SOLUTION, None, []
+
             mark_as_fast_forward = eligibility_info.ff_puzzle_hash is not None and supports_fast_forward(coin_spend)
             lineage_info = None
             if mark_as_fast_forward: