Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate puzzles away from load_clvm to import from chia_puzzles_py #19055

Merged
merged 53 commits into from
Jan 17, 2025
Merged

Migrate puzzles away from load_clvm to import from chia_puzzles_py #19055

merged 53 commits into from
Jan 17, 2025

Conversation

matt-o-how
Copy link
Contributor

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

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 Socket Security
Copy link

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

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

Package New capabilities Transitives Size Publisher
pypi/chia-puzzles-py@0.20.1 None 0 105 kB chia-network

View full report↗︎

@matt-o-how 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 github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Jan 2, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 2, 2025

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

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 2, 2025

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

@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Jan 3, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 3, 2025

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

@socket-security Socket Security
Copy link

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

👍 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↗︎

@matt-o-how matt-o-how marked this pull request as ready for review January 6, 2025 16:30
@matt-o-how matt-o-how requested a review from a team as a code owner January 6, 2025 16:30
@matt-o-how matt-o-how requested a review from richardkiss January 6, 2025 16:30
richardkiss
richardkiss previously approved these changes Jan 7, 2025
View reviewed changes
Copy link
Contributor

@richardkiss richardkiss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

arvidn
arvidn reviewed Jan 7, 2025
View reviewed changes
chia/_tests/clvm/test_condition_codes.py Outdated Show resolved Hide resolved
.pre-commit-config.yaml Show resolved Hide resolved
chia/_tests/generator/test_compression.py Show resolved Hide resolved
chia/pools/pool_puzzles.py Outdated Show resolved Hide resolved
chia/rpc/wallet_rpc_api.py Show resolved Hide resolved
chia/wallet/nft_wallet/ownership_outer_puzzle.py Show resolved Hide resolved
chia/wallet/singleton.py Outdated Show resolved Hide resolved
chia/wallet/trading/offer.py Outdated Show resolved Hide resolved
chia/wallet/util/debug_spend_bundle.py Outdated Show resolved Hide resolved
chia/wallet/vc_wallet/vc_drivers.py Outdated Show resolved Hide resolved
arvidn
arvidn reviewed Jan 8, 2025
View reviewed changes
Copy link
Contributor

@arvidn arvidn left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Jan 8, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 8, 2025

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

@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Jan 8, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 8, 2025

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

arvidn
arvidn requested changes Jan 10, 2025
View reviewed changes
Copy link
Contributor

@arvidn arvidn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

poetry.lock Outdated Show resolved Hide resolved
@github-actions github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Jan 10, 2025
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Jan 10, 2025
@github-actions GitHub Actions
Copy link
Contributor

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

@matt-o-how
remove test for condition codes
6ea39df
@matt-o-how
change generator type to SerializedProgram
9e118f8
@matt-o-how
remove remaining load_clvms that can be factored out
22916ad
@matt-o-how
delete consensus puzzles
458565b
@matt-o-how
fix test_singleton_lifecycle_fast
b38a46c
@matt-o-how
cast debug_spend_bundle coin name to bytes32
adcf452
@matt-o-how
ruff debug_spend_bundle
f1be872
@matt-o-how
update chia-puzzles and fix typo
1733639
@matt-o-how
fix line endings
7f0dcdb
@matt-o-how
fix typo in ROM_BOOTSTRAP_GENERATOR references
21e8262
@matt-o-how
remove bytes32 cast from debug_spend_bundle
bfa5764
@matt-o-how
update chia-puzzles-py dependency to version 0.20.1 and refactor ACS_…
046ff5a 
…TRANSFER_PROGRAM initialization
@matt-o-how
remove unused puzzle files
4ea49bc
@matt-o-how
singleton_top_layer exports hashs now which are imported from chia_pu…
b263e72 
…zzles
@matt-o-how
remove .get_tree_hash() in favor of importing the hash
dd3540c
@matt-o-how
remaining hash imports
75ac130
@matt-o-how
regenerate poetry.lock and pyproject.toml from main
e91b2a8
@matt-o-how
import singleton launcher hash from explicit export
b369c13
@matt-o-how
import SINGLETON_LAUNCHER_HASH from chia.wallet.singleton in test_poo…
8ea5cf3 
…l_rpc.py
@matt-o-how
import SINGLETON_MOD_HASH from chia.wallet.puzzles.singleton_top_laye…
ff17f94 
…r in test_pool_puzzles_lifecycle.py
@matt-o-how
poetry lock --no-update post-rebase
66039d4
@matt-o-how
re-regenerate lock file --no-update
70c47e1
@matt-o-how
fix rebased block_tools
07c892a
@github-actions GitHub Actions
Copy link
Contributor

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%

@pmaslana pmaslana merged commit 8bb8a1b into main Jan 17, 2025
363 of 364 checks passed
@pmaslana pmaslana deleted the remove_puzzles branch January 17, 2025 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arvidn arvidn arvidn approved these changes

@richardkiss richardkiss richardkiss left review comments

Assignees
No one assigned
Labels
Changed Required label for PR that categorizes merge commit message as "Changed" for changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@matt-o-how @richardkiss @arvidn @pmaslana