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

Fix memo plotid #17856

Merged
merged 7 commits into from Apr 30, 2024
Merged

Fix memo plotid #17856

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
89182c0
Convert hex to a string for memo and plotid
pmaslana Apr 9, 2024
9975164
Create a check for converting bytes to a string and remove the 32 byt…
pmaslana Apr 10, 2024
08b202d
Return the args.plotid bytes32.fromhex(plot_str) instead of bytes.fro…
pmaslana Apr 11, 2024
a68256a
Remove debugging print that was used to print out the type
pmaslana Apr 29, 2024
9d5c3a4
Fix invalid type annotation
pmaslana Apr 30, 2024
8c221a0
Start using bytes32 for the type to prevent errors
pmaslana Apr 30, 2024
aa3b5c3
Change bytes32 to bytes
pmaslana Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 13 additions & 3 deletions chia/plotting/create_plots.py
View file
Open in desktop
Expand Up @@ -202,19 +202,29 @@ async def create_plots(
# The plot id is based on the harvester, farmer, and pool keys
if keys.pool_public_key is not None:
plot_id: bytes32 = calculate_plot_id_pk(keys.pool_public_key, plot_public_key)
plot_memo: bytes32 = stream_plot_info_pk(keys.pool_public_key, keys.farmer_public_key, sk)
plot_memo: bytes = stream_plot_info_pk(keys.pool_public_key, keys.farmer_public_key, sk)
else:
assert keys.pool_contract_puzzle_hash is not None
plot_id = calculate_plot_id_ph(keys.pool_contract_puzzle_hash, plot_public_key)
plot_memo = stream_plot_info_ph(keys.pool_contract_puzzle_hash, keys.farmer_public_key, sk)

if args.plotid is not None:
log.info(f"Debug plot ID: {args.plotid}")
plot_id = bytes32(bytes.fromhex(args.plotid))
# Check if args.memo is of type bytes and convert it to a string if so
if isinstance(args.plotid, bytes):
plot_str = args.plotid.hex() # Convert bytes to hex string
else:
plot_str = args.plotid
plot_id = bytes32.fromhex(plot_str)

if args.memo is not None:
log.info(f"Debug memo: {args.memo}")
plot_memo = bytes32.fromhex(args.memo)
# Check if args.memo is of type bytes and convert it to a string if so
if isinstance(args.memo, bytes):
memo_str = args.memo.hex() # Convert bytes to hex string
else:
memo_str = args.memo
plot_memo = bytes.fromhex(memo_str)

dt_string = datetime.now().strftime("%Y-%m-%d-%H-%M")

Expand Down