chia-blockchain 2.6.0rc3__py3-none-any.whl → 2.6.0rc4__py3-none-any.whl

chia/_tests/core/full_node/test_full_node.py

@@ -95,6 +95,7 @@ from chia.types.blockchain_format.proof_of_space import (
 )
 from chia.types.blockchain_format.serialized_program import SerializedProgram
 from chia.types.blockchain_format.vdf import CompressibleVDFField, VDFProof
+from chia.types.clvm_cost import QUOTE_BYTES, QUOTE_EXECUTION_COST
 from chia.types.coin_spend import make_spend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
@@ -3388,6 +3389,7 @@ async def test_pending_tx_cache_retry_on_new_peak(
 @pytest.mark.parametrize("mismatch_fee", [True, False])
 @pytest.mark.parametrize("tx_already_seen", [True, False])
 @pytest.mark.parametrize("mismatch_on_reannounce", [True, False])
+@pytest.mark.parametrize("tolerated_quote_cost_diff", [True, False])
 async def test_ban_for_mismatched_tx_cost_fee(
     three_nodes: list[FullNodeAPI],
     bt: BlockTools,
@@ -3396,6 +3398,7 @@ async def test_ban_for_mismatched_tx_cost_fee(
     mismatch_fee: bool,
     tx_already_seen: bool,
     mismatch_on_reannounce: bool,
+    tolerated_quote_cost_diff: bool,
 ) -> None:
     """
     Tests that a peer gets banned if it sends a `NewTransaction` message with a
@@ -3406,6 +3409,8 @@ async def test_ban_for_mismatched_tx_cost_fee(
     the ones specified in the `NewTransaction` message.
     With `mismatch_on_reannounce` we control whether the peer sent us the same
     transaction twice with different cost and fee.
+    With `tolerated_quote_cost_diff` we cover older nodes with a specific cost
+    mismatch due to the byte size cost and execution cost of the wrapper quote.
     """
     full_node_1, full_node_2, full_node_3 = three_nodes
     server_1 = full_node_1.full_node.server
@@ -3439,7 +3444,9 @@ async def test_ban_for_mismatched_tx_cost_fee(
     assert mempool_item is not None
     # Now send a NewTransaction with a cost and/or fee mismatch from the second
     # full node.
-    cost = uint64(mempool_item.cost + 1) if mismatch_cost else mempool_item.cost
+    quote_cost = QUOTE_BYTES * node.constants.COST_PER_BYTE + QUOTE_EXECUTION_COST
+    cost_diff = quote_cost if tolerated_quote_cost_diff else 0
+    cost = uint64(mempool_item.cost + 1) if mismatch_cost else uint64(mempool_item.cost + cost_diff)
     fee = uint64(mempool_item.fee + 1) if mismatch_fee else mempool_item.fee
     msg = make_msg(ProtocolMessageTypes.new_transaction, NewTransaction(mempool_item.name, cost, fee))
     # We won't ban localhost, so let's set a different ip address for the

chia/_tests/core/mempool/test_mempool_manager.py

@@ -41,8 +41,6 @@ from chia.full_node.eligible_coin_spends import (
 from chia.full_node.mempool import MAX_SKIPPED_ITEMS, PRIORITY_TX_THRESHOLD
 from chia.full_node.mempool_manager import (
     MEMPOOL_MIN_FEE_INCREASE,
-    QUOTE_BYTES,
-    QUOTE_EXECUTION_COST,
     MempoolManager,
     TimelockConditions,
     can_replace,
@@ -63,7 +61,7 @@ from chia.simulator.wallet_tools import WalletTool
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import DEFAULT_FLAGS, INFINITE_COST, Program
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.clvm_cost import CLVMCost
+from chia.types.clvm_cost import QUOTE_BYTES, QUOTE_EXECUTION_COST, CLVMCost
 from chia.types.coin_spend import make_spend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs

chia/full_node/full_node.py

@@ -78,6 +78,7 @@ from chia.server.server import ChiaServer
 from chia.server.ws_connection import WSChiaConnection
 from chia.types.blockchain_format.classgroup import ClassgroupElement
 from chia.types.blockchain_format.vdf import CompressibleVDFField, VDFInfo, VDFProof, validate_vdf
+from chia.types.clvm_cost import QUOTE_BYTES, QUOTE_EXECUTION_COST
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.mempool_item import MempoolItem
 from chia.types.peer_info import PeerInfo
@@ -2818,7 +2819,14 @@ class FullNode:
             # Now that we validated this transaction, check what fees and
             # costs the peers have advertised for it.
             for peer_id, entry in peers_with_tx.items():
-                if entry.advertised_fee == mempool_item.fee and entry.advertised_cost == mempool_item.cost:
+                # Older nodes (2.4.3 and earlier) compute the cost slightly
+                # differently. They include the byte cost and execution cost of
+                # the quote for the puzzle.
+                tolerated_diff = QUOTE_BYTES * self.constants.COST_PER_BYTE + QUOTE_EXECUTION_COST
+                if entry.advertised_fee == mempool_item.fee and (
+                    entry.advertised_cost == mempool_item.cost
+                    or entry.advertised_cost == mempool_item.cost + tolerated_diff
+                ):
                     continue
                 self.log.warning(
                     f"Banning peer {peer_id}. Sent us a new tx {spend_name} with mismatch "

chia/full_node/full_node_api.py

@@ -67,6 +67,7 @@ from chia.server.ws_connection import WSChiaConnection
 from chia.types.block_protocol import BlockInfo
 from chia.types.blockchain_format.coin import Coin, hash_coin_ids
 from chia.types.blockchain_format.proof_of_space import verify_and_get_quality_string
+from chia.types.clvm_cost import QUOTE_BYTES, QUOTE_EXECUTION_COST
 from chia.types.generator_types import BlockGenerator, NewBlockGenerator
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.peer_info import PeerInfo
@@ -220,11 +221,17 @@ class FullNodeAPI:
         # If already seen, the cost and fee must match, otherwise ban the peer
         mempool_item = self.full_node.mempool_manager.get_mempool_item(transaction.transaction_id, include_pending=True)
         if mempool_item is not None:
-            if mempool_item.cost != transaction.cost or mempool_item.fee != transaction.fees:
+            # Older nodes (2.4.3 and earlier) compute the cost slightly
+            # differently. They include the byte cost and execution cost of
+            # the quote for the puzzle.
+            tolerated_diff = QUOTE_BYTES * self.full_node.constants.COST_PER_BYTE + QUOTE_EXECUTION_COST
+            if (transaction.cost != mempool_item.cost and transaction.cost != mempool_item.cost + tolerated_diff) or (
+                transaction.fees != mempool_item.fee
+            ):
                 self.log.warning(
-                    f"Banning peer {peer.peer_node_id}. Sent us an already seen tx {transaction.transaction_id} "
-                    f"with mismatch on cost {transaction.cost} vs validation cost {mempool_item.cost} and/or "
-                    f"fee {transaction.fees} vs {mempool_item.fee}."
+                    f"Banning peer {peer.peer_node_id} version {peer.version}. Sent us an already seen tx "
+                    f"{transaction.transaction_id} with mismatch on cost {transaction.cost} vs validation "
+                    f"cost {mempool_item.cost} and/or fee {transaction.fees} vs {mempool_item.fee}."
                 )
                 await peer.close(CONSENSUS_ERROR_BAN_SECONDS)
             return None
@@ -244,11 +251,19 @@ class FullNodeAPI:
                     return None
                 prev = current_map.get(peer.peer_node_id)
                 if prev is not None:
-                    if prev.advertised_fee != transaction.fees or prev.advertised_cost != transaction.cost:
+                    # Older nodes (2.4.3 and earlier) compute the cost slightly
+                    # differently. They include the byte cost and execution cost of
+                    # the quote for the puzzle.
+                    tolerated_diff = QUOTE_BYTES * self.full_node.constants.COST_PER_BYTE + QUOTE_EXECUTION_COST
+                    if prev.advertised_fee != transaction.fees or (
+                        prev.advertised_cost != transaction.cost
+                        and abs(prev.advertised_cost - transaction.cost) != tolerated_diff
+                    ):
                         self.log.warning(
-                            f"Banning peer {peer.peer_node_id}. Sent us a new tx {transaction.transaction_id} with "
-                            f"mismatch on cost {transaction.cost} vs previous advertised cost {prev.advertised_cost} "
-                            f"and/or fee {transaction.fees} vs previous advertised fee {prev.advertised_fee}."
+                            f"Banning peer {peer.peer_node_id} version {peer.version}. Sent us a new tx "
+                            f"{transaction.transaction_id} with mismatch on cost {transaction.cost} vs "
+                            f"previous advertised cost {prev.advertised_cost} and/or fee {transaction.fees} "
+                            f"vs previous advertised fee {prev.advertised_fee}."
                         )
                         await peer.close(CONSENSUS_ERROR_BAN_SECONDS)
                     return None

chia/full_node/mempool_manager.py

@@ -36,7 +36,7 @@ from chia.full_node.fee_estimator_interface import FeeEstimatorInterface
 from chia.full_node.mempool import MEMPOOL_ITEM_FEE_LIMIT, Mempool, MempoolRemoveInfo, MempoolRemoveReason
 from chia.full_node.pending_tx_cache import ConflictTxCache, PendingTxCache
 from chia.types.blockchain_format.coin import Coin
-from chia.types.clvm_cost import CLVMCost
+from chia.types.clvm_cost import QUOTE_BYTES, QUOTE_EXECUTION_COST, CLVMCost
 from chia.types.fee_rate import FeeRate
 from chia.types.generator_types import NewBlockGenerator
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
@@ -140,11 +140,6 @@ class NewPeakInfo:
     removals: list[MempoolRemoveInfo]
 
 
-# For block overhead cost calculation
-QUOTE_BYTES = 2
-QUOTE_EXECUTION_COST = 20
-
-
 def is_atom_canonical(clvm_buffer: bytes, offset: int) -> tuple[int, bool]:
     b = clvm_buffer[offset]
     if (b & 0b11000000) == 0b10000000:

chia/types/clvm_cost.py

@@ -11,3 +11,7 @@ are charged a higher rate, depending on their arguments.
 """
 
 CLVMCost = NewType("CLVMCost", uint64)
+
+# For block overhead cost calculation
+QUOTE_BYTES = 2
+QUOTE_EXECUTION_COST = 20

{chia_blockchain-2.6.0rc3.dist-info → chia_blockchain-2.6.0rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chia-blockchain
-Version: 2.6.0rc3
+Version: 2.6.0rc4
 Summary: Chia blockchain full node, farmer, timelord, and wallet.
 License-Expression: Apache-2.0
 License-File: LICENSE

{chia_blockchain-2.6.0rc3.dist-info → chia_blockchain-2.6.0rc4.dist-info}/RECORD

@@ -211,7 +211,7 @@ chia/_tests/core/full_node/stores/test_sync_store.py,sha256=3UAWBrU4STQdSyILsWNY
 chia/_tests/core/full_node/test_address_manager.py,sha256=te51gguX_AgSO-PGYMoZSVDYokprX3_Oc3KkXzmoWgs,31806
 chia/_tests/core/full_node/test_block_height_map.py,sha256=5LKwLo76KuoUivIHHA7JoHG201BFoAcgC5xEA0t2UJc,24733
 chia/_tests/core/full_node/test_conditions.py,sha256=7lLBXz3PZI6kuB1i35fQm2EEJADeUNmT_QNX8fpwFOE,25818
-chia/_tests/core/full_node/test_full_node.py,sha256=aX8k730uNtPMYd6YyX9k_Jvt3rSam8T8-wj503NryyM,151531
+chia/_tests/core/full_node/test_full_node.py,sha256=5ViRbmYcCmKgSQJjW4cnFi-abociEp-f6U1cfQz-Z6U,152029
 chia/_tests/core/full_node/test_generator_tools.py,sha256=Ft38N9nioI-6P9ZXUzhle5tJViek1a8dwMHRM3gSq5Q,3771
 chia/_tests/core/full_node/test_hard_fork_utils.py,sha256=XNIi66_1Lew_OqL5bp9sMeszjL9dJWdSjjBr_IofJts,3815
 chia/_tests/core/full_node/test_hint_management.py,sha256=QqbvtiztYHSTZBBqdSAo4kv9ROLi70LnDbg_lw_I3fA,4499
@@ -229,7 +229,7 @@ chia/_tests/core/mempool/test_mempool.py,sha256=g4vZRUnplL9KFWaCflqgm_xC2yCQoth3
 chia/_tests/core/mempool/test_mempool_fee_estimator.py,sha256=QcCpuCwbYYAlQ3toVHQfTP1MffPBWDnWV2XCAOycmvU,3824
 chia/_tests/core/mempool/test_mempool_fee_protocol.py,sha256=0_lj2VlUIsEXOLKDG6zF8suyUPSL7GlakFmDdWHUkYg,2071
 chia/_tests/core/mempool/test_mempool_item_queries.py,sha256=9PgMxWV05pInH8aXD88BsLQ3tPiEMcOFcwAHktAvNVo,6988
-chia/_tests/core/mempool/test_mempool_manager.py,sha256=l9qvKTeGFivu9LpOCFzydOlJ5kQl90BZECYm8Sej1yQ,157791
+chia/_tests/core/mempool/test_mempool_manager.py,sha256=L3CcQssR8F7dgMwS5bLjGSY6dptuOvi3_syoLAG40Rw,157783
 chia/_tests/core/mempool/test_mempool_performance.py,sha256=a5bLSJ_Q_EVYnUHn96I5RC7VZl7niizBK47yVnzvWn4,2935
 chia/_tests/core/mempool/test_singleton_fast_forward.py,sha256=_oq3QWvKRm4E0Qoo_DnY_LB2aWzIhnUDWK9H-NgxFLM,33890
 chia/_tests/core/node_height.py,sha256=yfkEmmYCsAb3cIe1ZhtE9J2SFB9lG_49SgjxsITdrZk,917
@@ -657,8 +657,8 @@ chia/full_node/fee_estimator_interface.py,sha256=3yE7-IfFhP1HnReSIOnULUReXXgxIGL
 chia/full_node/fee_history.py,sha256=hcLmy3HLuuATidOQ94wD7MAtzZU9PadKaKt8q3m8fVI,591
 chia/full_node/fee_tracker.py,sha256=WYeWUTQSVhrHS12rDl5ITpg8Ppd0Jb3g9VXw70GP2eI,22520
 chia/full_node/full_block_utils.py,sha256=rss2zZooEYCrflffOzqBmYhaFSiVut9JRDOkt1VJKBo,13231
-chia/full_node/full_node.py,sha256=v4Isa9zm-7Nwkj1MhAWqB7GnX01g10G87sUKOIsc_XU,168906
-chia/full_node/full_node_api.py,sha256=XQAmLYtpOZkVuWUGUOe5wsMvVDKApY4XhYgLrmhg2PQ,99777
+chia/full_node/full_node.py,sha256=vgrjxNTn388T4hdo79UonNjg_eBpvdBRFHK9W-Ugjso,169395
+chia/full_node/full_node_api.py,sha256=4gwfboLaBdwQcoia3Eh8mtycCEUK2vcrW34TNwqvtHg,100772
 chia/full_node/full_node_rpc_api.py,sha256=fWYwh7VbYMoUVtjcAjBdHSIEhiba-MzoEm8dwsC8ifk,48566
 chia/full_node/full_node_rpc_client.py,sha256=6alfL1AFn8tkvjA6CB4ekGSSZqoRF1GkQz2cEuSnSwQ,13384
 chia/full_node/full_node_service.py,sha256=fD3mAV3Ud74MNl4g9xCnkhw_QIb4MwOGkoQKngVMiWA,307
@@ -667,7 +667,7 @@ chia/full_node/hard_fork_utils.py,sha256=RgiXIfBg1fVQBjaCUa2cYwVrJwzgad4RVhX8vx9
 chia/full_node/hint_management.py,sha256=UJPTSIWnCXG7hO3QfuLMV1WAaBuHUdC1gok7zdz-9BA,2281
 chia/full_node/hint_store.py,sha256=0m6y0_f0rhGIKqfAmhFSGEeyM3LCN-dv-bR1OfIr4Uo,3666
 chia/full_node/mempool.py,sha256=oQk9aZyYC-qUESRUsHD4647JnyZnRHa6e5plE20DCgM,33917
-chia/full_node/mempool_manager.py,sha256=vz2sF45Zl1VIFOGhZyaJyHlss8LTQXtJ5EpvoeU3P2A,51370
+chia/full_node/mempool_manager.py,sha256=VGTMxtlhpRk7W1A2TWDMLMZyu2y44TBAxzt33fwVJP0,51323
 chia/full_node/pending_tx_cache.py,sha256=3iIsoKBGtqi2N58ndu3WmGbb9HCW72fhaN3bm56o5VA,3623
 chia/full_node/start_full_node.py,sha256=8jBRHlxy86gUQb-9UzTlZlRLSVDBaOtOEVVeg-vhlEI,4263
 chia/full_node/subscriptions.py,sha256=TvV_dgUOF-6CjILFZ86rCxUzkdgFUlQZcwjUcZLXB2U,8641
@@ -820,7 +820,7 @@ chia/types/blockchain_format/proof_of_space.py,sha256=MP9LY9hRcrQqpoIS9_hC1dP8mg
 chia/types/blockchain_format/serialized_program.py,sha256=4pN6DiiLOx3CfXILguFbJCtDOkIKcRrTA8GWfuUU0pY,88
 chia/types/blockchain_format/tree_hash.py,sha256=dBpipLhIAAH8YYxPxzx8LinBi_3S342z5YBJYb-GCYs,2572
 chia/types/blockchain_format/vdf.py,sha256=AQ7zojUUOSt8pdNm1k1hn_xnQV2WTp5JhSugR6negGw,2290
-chia/types/clvm_cost.py,sha256=Su99-qk-cCcUYBesrVcylJPosJytOGPAoE_j-eMp3FY,336
+chia/types/clvm_cost.py,sha256=nP_N6RyA_HvKtKih4QjTJb2EFWzDityYKaxSEMpu27o,417
 chia/types/coin_spend.py,sha256=_zY55TNWVQVgHkkNN832fV1H8-41vV0CLvoCSzmLCl0,1778
 chia/types/condition_opcodes.py,sha256=nFibKuhiR0FwXUB0hqDQbv0Ngfb-BezNKTfDzoa3vII,2213
 chia/types/condition_with_args.py,sha256=N5f6V0ok1cLSTG-4YqAGOISYyhixC8745LGYqvu0Y58,389
@@ -1012,8 +1012,8 @@ chia/wallet/wallet_transaction_store.py,sha256=e0RtKV29mfaXsQZg4M3bjUxfPFy_3BAqE
 chia/wallet/wallet_user_store.py,sha256=TFtNVU5E334fK1MCTOAG2SXIia8wBfeVSamDWvjqzAY,4048
 chia/wallet/wallet_weight_proof_handler.py,sha256=Ni42zOX_wkLTcDnicqWJiE9pZJ5gcGyWqMfLiwgEXtM,4856
 chia/wallet/wsm_apis.py,sha256=6LmxbHXC-tqNbRyoiGgz-f19PF1nEfMbfm3BTnsNQ6s,3914
-chia_blockchain-2.6.0rc3.dist-info/METADATA,sha256=OilVtTvqJl5I19TPnU9yOxsS3j8_TWdG_Q_fZNptMLE,10368
-chia_blockchain-2.6.0rc3.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-chia_blockchain-2.6.0rc3.dist-info/entry_points.txt,sha256=ehxlhrA6j4WmQ3W1pZ4GZEX9KCyrmuTsk9c_BNF9NUM,800
-chia_blockchain-2.6.0rc3.dist-info/licenses/LICENSE,sha256=0tuU-jTzeRDJJaxF2YCEpBwbywgpbrVSXq1i6fJq63U,11347
-chia_blockchain-2.6.0rc3.dist-info/RECORD,,
+chia_blockchain-2.6.0rc4.dist-info/METADATA,sha256=SwgFBm3NnmEBD6VdWk734RQgfwzr4_MA1jBfuo5KEH8,10368
+chia_blockchain-2.6.0rc4.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+chia_blockchain-2.6.0rc4.dist-info/entry_points.txt,sha256=ehxlhrA6j4WmQ3W1pZ4GZEX9KCyrmuTsk9c_BNF9NUM,800
+chia_blockchain-2.6.0rc4.dist-info/licenses/LICENSE,sha256=0tuU-jTzeRDJJaxF2YCEpBwbywgpbrVSXq1i6fJq63U,11347
+chia_blockchain-2.6.0rc4.dist-info/RECORD,,

{chia_blockchain-2.6.0rc3.dist-info → chia_blockchain-2.6.0rc4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.3.0
+Generator: poetry-core 2.3.1
 Root-Is-Purelib: true
 Tag: py3-none-any