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

Bring clvm_serde from richardkiss/hsms #14

Closed
wants to merge 40 commits into from
Closed

Bring clvm_serde from richardkiss/hsms #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b8dc71f
Modernize `SConstruct`.
richardkiss Aug 11, 2023
64fc398
Use `chialisp_puzzles` and `chia_base`.
richardkiss Aug 11, 2023
8c77afd
Use `chia_base` to greatly simplify hsms.
richardkiss Aug 11, 2023
cb8522d
Bump `chia_base` to 0.1.3. `chmod -x`
richardkiss Aug 11, 2023
bd07a87
Get `full_life_cycle.sh` working
richardkiss Aug 11, 2023
127b817
`black`
richardkiss Aug 11, 2023
762368a
Refactor clvm_serialization
richardkiss Aug 12, 2023
f136851
Forgot a command
richardkiss Aug 12, 2023
e8a20e5
setuptools
richardkiss Aug 12, 2023
f2f2d9b
Some minor improvements
richardkiss Aug 14, 2023
8321490
Get `hsm_dump_us` working
richardkiss Aug 16, 2023
ca26079
Remove `UnsignedSpend.from_chunks`
richardkiss Aug 16, 2023
3dea622
Handle hex or qrint encoding, zlib okay too
richardkiss Aug 18, 2023
8b7b8d9
standard dataclasses
richardkiss Oct 2, 2023
932db42
First crack at interop tests
richardkiss Oct 5, 2023
11350e1
Pay attention to `Field.default_factory`
richardkiss Oct 5, 2023
e9e6c5a
Allow hybrid expandable `dataclass` objects
richardkiss Oct 7, 2023
d6dd389
refactor
richardkiss Oct 10, 2023
3a1ccf6
`Nonexandable`. May rename
richardkiss Oct 10, 2023
07c39a2
Simplify `SumHint` and `PathHint`.
richardkiss Oct 10, 2023
90b4f66
Move `SumHint` and `PathHint`
richardkiss Oct 10, 2023
8a04d2d
nonexpandable tuple
richardkiss Oct 12, 2023
311a44e
Rewrite `Nonexpandable` in terms of `tuple_nonexpandable`
richardkiss Oct 12, 2023
11c28d1
Serde of dataclasses now leverages tuple
richardkiss Oct 12, 2023
2819a45
Ditch `PairTuple` and use `Frugal`
richardkiss Oct 12, 2023
ddfd8ed
Eliminate special case for `Frugal`
richardkiss Oct 12, 2023
509e113
Make `UnsignedSpend` more like original version
richardkiss Oct 12, 2023
47a361d
Delete obsolete, rename
richardkiss Oct 12, 2023
29cd02c
Add `hsms.core`
richardkiss Oct 16, 2023
f14bc23
Use new serialization rather than legacy.
richardkiss Oct 17, 2023
5dd7540
Revamp `TypeTree`
richardkiss Oct 25, 2023
19b833a
move `clvm_serde`
richardkiss Oct 25, 2023
6e449bf
Fix tests, mypy
richardkiss Nov 6, 2023
fd6450a
pin to `chia_base`
richardkiss Nov 7, 2023
3ee1475
Support `from __future__ import annotations`
richardkiss Nov 7, 2023
c9963d8
Interop with subtypes of `int`, `bytes`, `str`
richardkiss Nov 9, 2023
331a331
coverage
richardkiss Nov 9, 2023
287b3aa
py38
richardkiss Nov 10, 2023
41337c5
`from_bytes`
richardkiss Nov 10, 2023
906c92c
Pin to actual version and small helpful change
Quexington Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hsms/clvm_serde/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ def de(p: Program) -> Tuple[Any, ...]:
while todo:
des = todo.pop()
if todo:
v = p.pair[0]
p = p.pair[1]
v = Program.to(p.pair[0])
p = Program.to(p.pair[1])
else:
v = p
args.append(des(v))
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of your changes, in the current clvm_serde branch, I changed this line 304 like this:

-            args.append(des(v))
+            args.append(des(Program.to(v)))

I no longer remember exactly what motivated this change. Maybe you remember what motivated yours. Do think your change is still necessary if you rebase to the current version of clvm_serde?

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ license = { file = "LICENSE" }
readme = "README.md"
dependencies = [
"segno==1.4.1",
"chia_base @ git+https://github.com/richardkiss/chia_base@91d9dba09e316714cf4bc86505587437fe442e48#egg=chia_base",
"chialisp_puzzles @ git+https://github.com/richardkiss/chialisp_puzzles@eb97cd844b094e6dcd595b5bd6522d3a78eb692c#egg=chialisp_puzzles",
"chia_base==0.1.4",
"chialisp_puzzles==0.1.1",
Copy link
Contributor

Choose a reason for hiding this comment

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

This change seems to be included in 25191ed. Try rebasing.

]
# version is defined with `setuptools_scm`
dynamic = ["version"]
Expand Down