Skip to content

Commit aff9792

Browse files
arvidnarvidn
authored
bump chia_rs to 0.18.0 (#19133)
1 parent 7a643c6 commit aff9792

File tree

11 files changed

+41
-37
lines changed

11 files changed

+41
-37
lines changed

‎chia/_tests/blockchain/blockchain_test_utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ async def _validate_and_add_block(
7777
conds = None
7878
else:
7979
# fake the signature validation. Just say True here.
80-
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True)
80+
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True, 0, 0)
8181
results = PreValidationResult(None, uint64(1), conds, uint32(0))
8282
else:
8383
future = await pre_validate_block(

‎chia/_tests/core/full_node/test_full_node.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@
9191

9292

9393
def test_pre_validation_result() -> None:
94-
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True)
94+
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True, 0, 0)
9595
results = PreValidationResult(None, uint64(1), conds, uint32(0))
9696
assert results.validated_signature is True
9797

98-
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, False)
98+
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, False, 0, 0)
9999
results = PreValidationResult(None, uint64(1), conds, uint32(0))
100100
assert results.validated_signature is False
101101

‎chia/_tests/core/full_node/test_generator_tools.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@
6565

6666

6767
def test_tx_removals_and_additions() -> None:
68-
conditions = SpendBundleConditions(spends, uint64(0), uint32(0), uint64(0), None, None, [], uint64(0), 0, 0, False)
68+
conditions = SpendBundleConditions(
69+
spends, uint64(0), uint32(0), uint64(0), None, None, [], uint64(0), 0, 0, False, 0, 0
70+
)
6971
expected_rems = [coin_ids[0], coin_ids[1]]
7072
expected_additions = []
7173
for spend in spends:

‎chia/_tests/core/mempool/test_mempool.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def make_item(
111111
return MempoolItem(
112112
SpendBundle([], G2Element()),
113113
fee,
114-
SpendBundleConditions([], 0, 0, 0, None, None, [], cost, 0, 0, False),
114+
SpendBundleConditions([], 0, 0, 0, None, None, [], cost, 0, 0, False, 0, 0),
115115
spend_bundle_name,
116116
uint32(0),
117117
assert_height,

‎chia/_tests/core/mempool/test_mempool_manager.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@ def make_test_conds(
230230
0,
231231
0,
232232
False,
233+
0,
234+
0,
233235
)
234236

235237

‎chia/_tests/fee_estimation/test_fee_estimation_integration.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def make_mempoolitem() -> MempoolItem:
4141

4242
fee = uint64(10000000)
4343
spends: list[SpendConditions] = []
44-
conds = SpendBundleConditions(spends, 0, 0, 0, None, None, [], cost, 0, 0, False)
44+
conds = SpendBundleConditions(spends, 0, 0, 0, None, None, [], cost, 0, 0, False, 0, 0)
4545
mempool_item = MempoolItem(
4646
spend_bundle,
4747
fee,

‎chia/_tests/util/test_condition_tools.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def mk_agg_sig_conditions(
5151
agg_sig_puzzle_amount=agg_sig_data if opcode == ConditionOpcode.AGG_SIG_PUZZLE_AMOUNT else [],
5252
flags=0,
5353
)
54-
return SpendBundleConditions([spend], 0, 0, 0, None, None, agg_sig_unsafe_data, 0, 0, 0, False)
54+
return SpendBundleConditions([spend], 0, 0, 0, None, None, agg_sig_unsafe_data, 0, 0, 0, False, 0, 0)
5555

5656

5757
@pytest.mark.parametrize(
@@ -98,7 +98,7 @@ def test_pkm_pairs_vs_for_conditions_dict(opcode: ConditionOpcode) -> None:
9898

9999
class TestPkmPairs:
100100
def test_empty_list(self) -> None:
101-
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, False)
101+
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, False, 0, 0)
102102
pks, msgs = pkm_pairs(conds, b"foobar")
103103
assert pks == []
104104
assert msgs == []

‎chia/simulator/block_tools.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from typing import Any, Callable, Optional
1818

1919
import anyio
20-
from chia_rs import ALLOW_BACKREFS, MEMPOOL_MODE, AugSchemeMPL, G1Element, G2Element, PrivateKey, solution_generator
20+
from chia_rs import MEMPOOL_MODE, AugSchemeMPL, G1Element, G2Element, PrivateKey, solution_generator
2121

2222
from chia.consensus.block_creation import create_unfinished_block, unfinished_block_to_full_block
2323
from chia.consensus.block_record import BlockRecord
@@ -1947,7 +1947,7 @@ def compute_cost_test(generator: BlockGenerator, constants: ConsensusConstants,
19471947

19481948
if height >= constants.HARD_FORK_HEIGHT:
19491949
blocks = generator.generator_refs
1950-
cost, result = generator.program._run(INFINITE_COST, MEMPOOL_MODE | ALLOW_BACKREFS, [DESERIALIZE_MOD, blocks])
1950+
cost, result = generator.program._run(INFINITE_COST, MEMPOOL_MODE, [DESERIALIZE_MOD, blocks])
19511951
clvm_cost += cost
19521952

19531953
for spend in result.first().as_iter():

‎chia/types/blockchain_format/program.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import io
44
from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar
55

6-
from chia_rs import ALLOW_BACKREFS, MEMPOOL_MODE, run_chia_program, tree_hash
6+
from chia_rs import MEMPOOL_MODE, run_chia_program, tree_hash
77
from clvm.casts import int_from_bytes
88
from clvm.CLVMObject import CLVMStorage
99
from clvm.EvalError import EvalError
@@ -45,7 +45,7 @@ def from_bytes(cls: type[T_Program], blob: bytes) -> T_Program:
4545
b"\x01",
4646
blob,
4747
50,
48-
ALLOW_BACKREFS,
48+
0,
4949
)
5050
return cls.to(ret)
5151

‎poetry.lock‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand.
1+
# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
22

33
[[package]]
44
name = "aiofiles"
@@ -752,32 +752,32 @@ dev = ["black (>=23.1.0)", "pytest (>=7.2.1)", "ruff (>=0.0.252)"]
752752

753753
[[package]]
754754
name = "chia-rs"
755-
version = "0.17.0"
755+
version = "0.18.0"
756756
description = "Code useful for implementing chia consensus."
757757
optional = false
758758
python-versions = "*"
759759
files = [
760-
{file = "chia_rs-0.17.0-cp310-cp310-macosx_13_0_arm64.whl", hash = "sha256:513903ffa682000f212051ce12532cedb7f799916c26624fd539d5534efc6f79"},
761-
{file = "chia_rs-0.17.0-cp310-cp310-macosx_13_0_x86_64.whl", hash = "sha256:947989c2da981a93c44c25fe04345e667ced14c484d0b2c23b646c4b0f8e88d7"},
762-
{file = "chia_rs-0.17.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:1f620f6b1bbb407c1eece3ecb4a466b4485ad95a2c41bca1423b2a3dba1f50d7"},
763-
{file = "chia_rs-0.17.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:5ffac3188e5134b42a46b2496c2a19e7acbf9782cb6c131124cd79f6dce3120c"},
764-
{file = "chia_rs-0.17.0-cp310-cp310-win_amd64.whl", hash = "sha256:9dace4ba5b5b8c107cb7bde3345c55519fda18fc54a94d62d90c6b1128950606"},
765-
{file = "chia_rs-0.17.0-cp311-cp311-macosx_13_0_arm64.whl", hash = "sha256:8292b9cbc9b76416ef08bc11d419562a7270cc198592a88e410c20486af7496e"},
766-
{file = "chia_rs-0.17.0-cp311-cp311-macosx_13_0_x86_64.whl", hash = "sha256:9b00e0950e2dbeec23bf15cbca10a523b026078604e8f068a58564791b0cb1ff"},
767-
{file = "chia_rs-0.17.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:ea5e0e5db60c946f07b8d36a4047f5e851fad4959d51e2858d1802eac21a1e88"},
768-
{file = "chia_rs-0.17.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:c43c01ec902bbf03402114e04a52f1ad5edef959e909d6290b2527070a9a6c84"},
769-
{file = "chia_rs-0.17.0-cp311-cp311-win_amd64.whl", hash = "sha256:0f7ee574cbf5687a1de4f11f272f58afaae116f353f793ef2641c8e556cfe61d"},
770-
{file = "chia_rs-0.17.0-cp312-cp312-macosx_13_0_arm64.whl", hash = "sha256:bc530bc2cb0b95ddd18058cad77e04c65b7e8397fde0e850a51210eededbb830"},
771-
{file = "chia_rs-0.17.0-cp312-cp312-macosx_13_0_x86_64.whl", hash = "sha256:fd87dc7574681d0ba268f2f73f7b5ccf7c98779d749c0a4d92bbf8ac0634cca8"},
772-
{file = "chia_rs-0.17.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:c8f50dcc81cef461ebde497dfa18ebcb557146be2b2c26f2f33baa9c9bf83f8e"},
773-
{file = "chia_rs-0.17.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:7f159f05bc86eeaabb73d28967f8cbfc1abe9a62c0b5afa5f7f8485f4b6c8f31"},
774-
{file = "chia_rs-0.17.0-cp312-cp312-win_amd64.whl", hash = "sha256:b85c7f0e2d1b61ca98082bd2587b4c4408e5a59c65130a260b29e291d8411c04"},
775-
{file = "chia_rs-0.17.0-cp39-cp39-macosx_13_0_arm64.whl", hash = "sha256:5b3457eb1c530ebdad10d0b45f5a7bfe26a86ae4a11dab3edda6fcdff076ca8c"},
776-
{file = "chia_rs-0.17.0-cp39-cp39-macosx_13_0_x86_64.whl", hash = "sha256:a95daa92eb0a27c499927d0c7da4da1d68eff62454a1628c143c795bd6966440"},
777-
{file = "chia_rs-0.17.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:f885818d1d6117400d361cdb61380442d140622a9280dc8cf29513819c933486"},
778-
{file = "chia_rs-0.17.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:6acd8745c087d6af9fbd906c93fe6c18da95893420bc6e25bd5c39a3a5a0a5e4"},
779-
{file = "chia_rs-0.17.0-cp39-cp39-win_amd64.whl", hash = "sha256:b41ab13ac01c89a251d515408262231facc1fc8b942b5cd6d1b02230b16ba664"},
780-
{file = "chia_rs-0.17.0.tar.gz", hash = "sha256:2186fc7aed30526bbe99ecdb731ae0d5c907a24a9be9ac923b8daf14c7a7c4f9"},
760+
{file = "chia_rs-0.18.0-cp310-cp310-macosx_13_0_arm64.whl", hash = "sha256:e08c61d4613f9238a854a80afa00724c08275fd42d316fbef2e233b0ea2fea6b"},
761+
{file = "chia_rs-0.18.0-cp310-cp310-macosx_13_0_x86_64.whl", hash = "sha256:012b6ba555c92d180f36e853aa74339b96a080098ecdd58e0e83595e2b9aba3c"},
762+
{file = "chia_rs-0.18.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:7680bcb61090294bfdc20652d50dad29067099210130cc486d288bad042c3783"},
763+
{file = "chia_rs-0.18.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:af63bf892f96b5ff47a73cb8335a7280679622a3a76774b11774af8cf63b8f07"},
764+
{file = "chia_rs-0.18.0-cp310-cp310-win_amd64.whl", hash = "sha256:459bca73f42386d2908c670a972aef9566455939237f9ccd4fabb5394f65ea8a"},
765+
{file = "chia_rs-0.18.0-cp311-cp311-macosx_13_0_arm64.whl", hash = "sha256:e0b5241be750e11c726c95d8d53f15c776b728d7d0fafa89c1f5a246f1e42264"},
766+
{file = "chia_rs-0.18.0-cp311-cp311-macosx_13_0_x86_64.whl", hash = "sha256:60bb90ca2ce59065720dbb0a45a2bba68b92b1a4648d0aa0f89a4148eed12199"},
767+
{file = "chia_rs-0.18.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:d640cc750ee34a4be641a914f73a7d688476d2d5744af062fda16650c45406c1"},
768+
{file = "chia_rs-0.18.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:c9ad3766418f7daab84b4dbad168ace7bd57e09502d90883461a48772beaf432"},
769+
{file = "chia_rs-0.18.0-cp311-cp311-win_amd64.whl", hash = "sha256:fa8ee98bffcdcf7282283d284e17700179b3380b29d7750c55a7ac1ecd074702"},
770+
{file = "chia_rs-0.18.0-cp312-cp312-macosx_13_0_arm64.whl", hash = "sha256:13dec2c5ee16026feb277e12257dc5241388a3985d806e59dee5ced7d5485222"},
771+
{file = "chia_rs-0.18.0-cp312-cp312-macosx_13_0_x86_64.whl", hash = "sha256:5811eb1ab80a4a5113322f641fa63e8a6c2ca6fb1bb39ffaa8e2be81a573e0ba"},
772+
{file = "chia_rs-0.18.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:89c61cc0c7f74297d5bd441e93e421acf6118402ae70fdf3c1e14df8a8219a8b"},
773+
{file = "chia_rs-0.18.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:e3298dbd5efc72a8ab0e1554c45dd37eac3dc80d64222901ed10e193b882297f"},
774+
{file = "chia_rs-0.18.0-cp312-cp312-win_amd64.whl", hash = "sha256:b1fe23344d05e0174ee0981042a0864ad0df245a80f08c746638db560b411419"},
775+
{file = "chia_rs-0.18.0-cp39-cp39-macosx_13_0_arm64.whl", hash = "sha256:6d9981aa9cde06ff981dce5d7437d86f22732d7b255240ff33330cf2ee984429"},
776+
{file = "chia_rs-0.18.0-cp39-cp39-macosx_13_0_x86_64.whl", hash = "sha256:098f5998c622854df09b713d40844bda1f8fc9d16b4f06c451a3e3b8c40095ce"},
777+
{file = "chia_rs-0.18.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:bb4763b3e61c98ec262cb1f38728aa51e95a1d73262cd0fa201b9aa2cf88c61f"},
778+
{file = "chia_rs-0.18.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:d946d2d405b299cb5d341a3e7972e858f6cda8909cb37a4c68a3718f1303b725"},
779+
{file = "chia_rs-0.18.0-cp39-cp39-win_amd64.whl", hash = "sha256:43b88e1c892c734fa50dd794516bb358cf4963464392bf3130e16f0926b7d279"},
780+
{file = "chia_rs-0.18.0.tar.gz", hash = "sha256:da054b64e120c7f36b4ac08d664b14120ddaa1805a246b09209a4ae7cb906377"},
781781
]
782782

783783
[package.dependencies]
@@ -3336,4 +3336,4 @@ upnp = ["miniupnpc"]
33363336
[metadata]
33373337
lock-version = "2.0"
33383338
python-versions = ">=3.9, <4"
3339-
content-hash = "78821e547fe0580a1c646c3e8f5329ae5b6f7190da85127869e2ccd1030830f9"
3339+
content-hash = "16c96cee6159a1913a02c48254330659242ca87556a8d23bb1312695cee48920"

0 commit comments

Comments
 (0)