Migrate puzzles away from `load_clvm` to import from chia_puzzles_py #19055

matt-o-how · 2024-12-17T16:34:30Z

Purpose:

This PR migrates the deployed puzzles from living in this repository to being imported from https://github.com/Chia-Network/chia_puzzles/tree/main

The puzzle files are removed and uses of load_clvm() are replaced with Program.from_bytes() where appropriate.
We also remove duplicate redefinitions of the same Program where possible, opting to import the Program from another location instead.
This PR also renames VIRAL_BACKDOOR to REVOCATION_LAYER.

This PR does not remove load_clvm() as it is still useful for chialisp used in tests and for quick prototyping of future chialisp puzzles.

Going forward I believe also that chia\wallet\singleton.py and chia\wallet\puzzles\singleton_top_layer_v1_1.py can be merged into a single file -but this PR is already large enough.

socket-security · 2024-12-17T16:35:44Z

New dependencies detected. Learn more about Socket for GitHub ↗︎

Package	New capabilities	Transitives	Size	Publisher
pypi/[email protected]	None	`0`	105 kB	chia-network

View full report↗︎

github-actions · 2025-01-02T17:03:42Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2025-01-02T17:03:42Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2025-01-03T13:33:38Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

socket-security · 2025-01-03T13:34:13Z

👍 Dependency issues cleared. Learn more about Socket for GitHub ↗︎

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

View full report↗︎

richardkiss · 2025-01-07T00:48:12Z

chia/_tests/generator/test_rom.py

@@ -1,5 +1,6 @@
 from __future__ import annotations

+from chia_puzzles_py.programs import CHIALISP_DESERIALISATION, ROM_BOOTSRAP_GENERATOR


Suggested change

from chia_puzzles_py.programs import CHIALISP_DESERIALISATION, ROM_BOOTSRAP_GENERATOR

from chia_puzzles_py.programs import CHIALISP_DESERIALISATION, ROM_BOOTSTRAP_GENERATOR

annoyingly this typo is in chia-puzzles - will fix there and then here - good spot

This is resolved now

richardkiss · 2025-01-07T00:55:56Z

chia/wallet/nft_wallet/nft_puzzle_utils.py

@@ -0,0 +1,293 @@
+from __future__ import annotations


I'm curious, what motivated the refactor into this new file?

There was a circular import somewhere if the puzzles stayed in the same place as the utils

I take it all of these functions were moved verbatim, right?

richardkiss

I don't see any obvious problems beyond the one typo. Must have been a huge amount of work!

chia/_tests/clvm/test_condition_codes.py

.pre-commit-config.yaml

chia/_tests/generator/test_compression.py

chia/pools/pool_puzzles.py

chia/rpc/wallet_rpc_api.py

chia/wallet/nft_wallet/ownership_outer_puzzle.py

chia/wallet/singleton.py

chia/wallet/trading/offer.py

chia/wallet/util/debug_spend_bundle.py

chia/wallet/vc_wallet/vc_drivers.py

arvidn

it seems to me that STANDARD_BRICK_PUZZLE (in vc_drivers.py) as well as ACS_TRANSFER_PROGRAM probably should be part of the chia_puzzles wheel.

ACS_TRANSFER_PROGRAM is currently defined in pure python lists, not even hex, which is a bit unusual.

github-actions · 2025-01-08T16:28:10Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2025-01-08T17:33:57Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

arvidn

poetry.lock should be restored (apart from the new chia-puzzles dependency)

poetry.lock

github-actions · 2025-01-10T14:28:32Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

…TRANSFER_PROGRAM initialization

…zzles

…l_rpc.py

…r in test_pool_puzzles_lifecycle.py

github-actions · 2025-01-10T14:55:02Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

github-actions · 2025-01-10T17:20:53Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2025-01-10T17:43:53Z

File	Coverage	Missing Lines
`chia/wallet/nft_wallet/nft_puzzle_utils.py`	90.6%	lines 48, 53, 61, 73, 203, 216, 223-227, 237, 251

Total	Missing	Coverage
445 lines	13 lines	97%

matt-o-how added the Changed Required label for PR that categorizes merge commit message as "Changed" for changelog label Dec 18, 2024

github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Jan 2, 2025

matt-o-how force-pushed the remove_puzzles branch from 93870a9 to e3a5f58 Compare January 3, 2025 13:33

github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Jan 3, 2025

matt-o-how marked this pull request as ready for review January 6, 2025 16:30

matt-o-how requested a review from a team as a code owner January 6, 2025 16:30

matt-o-how requested a review from richardkiss January 6, 2025 16:30

github-actions bot added the coverage-diff label Jan 6, 2025

richardkiss reviewed Jan 7, 2025

View reviewed changes

richardkiss previously approved these changes Jan 7, 2025

View reviewed changes

matt-o-how dismissed richardkiss’s stale review via d8f37b6 January 7, 2025 12:29

arvidn reviewed Jan 7, 2025

View reviewed changes

arvidn reviewed Jan 8, 2025

View reviewed changes

github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Jan 8, 2025

matt-o-how force-pushed the remove_puzzles branch from e5ffe1e to edac3a4 Compare January 8, 2025 17:33

github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Jan 8, 2025

arvidn requested changes Jan 10, 2025

View reviewed changes

poetry.lock Outdated Show resolved Hide resolved

github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Jan 10, 2025

matt-o-how added 3 commits January 10, 2025 14:50

add dependency for chia_puzzles_py

133b058

migrate cat and dao wallets to new repo

6263bf9

migrate did wallet

3d2f809

matt-o-how added 21 commits January 10, 2025 14:50

remove test for condition codes

c8f7fd9

change generator type to SerializedProgram

0a44f69

remove remaining load_clvms that can be factored out

e7e5f31

delete consensus puzzles

58f0be0

fix test_singleton_lifecycle_fast

7cf32f4

cast debug_spend_bundle coin name to bytes32

4d2bbed

ruff debug_spend_bundle

c1ded9c

update chia-puzzles and fix typo

d4189a4

fix line endings

75860d1

fix typo in ROM_BOOTSTRAP_GENERATOR references

5866d2a

remove bytes32 cast from debug_spend_bundle

2e9a642

update chia-puzzles-py dependency to version 0.20.1 and refactor ACS_…

daf9bac

…TRANSFER_PROGRAM initialization

remove unused puzzle files

7ff15c0

singleton_top_layer exports hashs now which are imported from chia_pu…

6409eb2

…zzles

remove .get_tree_hash() in favor of importing the hash

87c5da6

remaining hash imports

66e161e

regenerate poetry.lock and pyproject.toml from main

e4ef9bf

import singleton launcher hash from explicit export

249daa4

import SINGLETON_LAUNCHER_HASH from chia.wallet.singleton in test_poo…

69a764d

…l_rpc.py

import SINGLETON_MOD_HASH from chia.wallet.puzzles.singleton_top_laye…

5f69832

…r in test_pool_puzzles_lifecycle.py

end in newline

8b1df6c

matt-o-how force-pushed the remove_puzzles branch from 0e93e9b to 8b1df6c Compare January 10, 2025 14:54

github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Jan 10, 2025

matt-o-how added 2 commits January 10, 2025 14:56

potery lock --no-update after rebase

494e5cf

LF line endings poetry lockl

400bf98

arvidn approved these changes Jan 10, 2025

View reviewed changes

github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Jan 10, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate puzzles away from `load_clvm` to import from chia_puzzles_py #19055

Migrate puzzles away from `load_clvm` to import from chia_puzzles_py #19055

matt-o-how commented Dec 17, 2024 •

edited

Loading

socket-security bot commented Dec 17, 2024 •

edited

Loading

github-actions bot commented Jan 2, 2025

github-actions bot commented Jan 2, 2025

github-actions bot commented Jan 3, 2025

socket-security bot commented Jan 3, 2025 •

edited

Loading

richardkiss Jan 7, 2025 •

edited

Loading

richardkiss Jan 7, 2025

matt-o-how Jan 7, 2025

matt-o-how Jan 10, 2025

richardkiss Jan 7, 2025

matt-o-how Jan 7, 2025

arvidn Jan 7, 2025

matt-o-how Jan 7, 2025

richardkiss left a comment

arvidn left a comment •

edited

Loading

github-actions bot commented Jan 8, 2025

github-actions bot commented Jan 8, 2025

arvidn left a comment

github-actions bot commented Jan 10, 2025

github-actions bot commented Jan 10, 2025

github-actions bot commented Jan 10, 2025

github-actions bot commented Jan 10, 2025

		@@ -1,5 +1,6 @@
		from __future__ import annotations

		from chia_puzzles_py.programs import CHIALISP_DESERIALISATION, ROM_BOOTSRAP_GENERATOR

Migrate puzzles away from load_clvm to import from chia_puzzles_py #19055

Are you sure you want to change the base?

Migrate puzzles away from load_clvm to import from chia_puzzles_py #19055

Conversation

matt-o-how commented Dec 17, 2024 • edited Loading

Purpose:

socket-security bot commented Dec 17, 2024 • edited Loading

github-actions bot commented Jan 2, 2025

github-actions bot commented Jan 2, 2025

github-actions bot commented Jan 3, 2025

socket-security bot commented Jan 3, 2025 • edited Loading

richardkiss Jan 7, 2025 • edited Loading

Choose a reason for hiding this comment

richardkiss Jan 7, 2025

Choose a reason for hiding this comment

matt-o-how Jan 7, 2025

Choose a reason for hiding this comment

matt-o-how Jan 10, 2025

Choose a reason for hiding this comment

richardkiss Jan 7, 2025

Choose a reason for hiding this comment

matt-o-how Jan 7, 2025

Choose a reason for hiding this comment

arvidn Jan 7, 2025

Choose a reason for hiding this comment

matt-o-how Jan 7, 2025

Choose a reason for hiding this comment

richardkiss left a comment

Choose a reason for hiding this comment

arvidn left a comment • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Jan 8, 2025

github-actions bot commented Jan 8, 2025

arvidn left a comment

Choose a reason for hiding this comment

github-actions bot commented Jan 10, 2025

github-actions bot commented Jan 10, 2025

github-actions bot commented Jan 10, 2025

github-actions bot commented Jan 10, 2025

Migrate puzzles away from `load_clvm` to import from chia_puzzles_py #19055

Migrate puzzles away from `load_clvm` to import from chia_puzzles_py #19055

matt-o-how commented Dec 17, 2024 •

edited

Loading

socket-security bot commented Dec 17, 2024 •

edited

Loading

socket-security bot commented Jan 3, 2025 •

edited

Loading

richardkiss Jan 7, 2025 •

edited

Loading

arvidn left a comment •

edited

Loading