From f92ffe140aaec33aceb8027f1eafa2a8820f0118 Mon Sep 17 00:00:00 2001 From: geoffwalmsley Date: Thu, 18 May 2023 11:27:48 +1200 Subject: [PATCH 1/5] update to chia-blockchain 1.8.1 --- chianft/util/mint.py | 5 +++-- setup.py | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chianft/util/mint.py b/chianft/util/mint.py index 732acad..1f0e0e9 100644 --- a/chianft/util/mint.py +++ b/chianft/util/mint.py @@ -16,10 +16,11 @@ from chia.types.spend_bundle import SpendBundle from chia.util.byte_types import hexstr_to_bytes from chia.util.ints import uint64 -from chia.wallet.did_wallet.did_wallet_puzzles import LAUNCHER_PUZZLE_HASH +from chia.wallet.did_wallet.did_wallet_puzzles import INTERMEDIATE_LAUNCHER_MOD from chia.wallet.trading.offer import Offer from chia.wallet.util.wallet_types import WalletType +INTERMEDIATE_LAUNCHER_MOD_HASH = INTERMEDIATE_LAUNCHER_MOD.get_tree_hash() class Minter: def __init__( @@ -439,7 +440,7 @@ async def submit_spend_bundles( launcher_ids = [ coin.name().hex() for coin in sb.removals() - if coin.puzzle_hash == LAUNCHER_PUZZLE_HASH + if coin.puzzle_hash == INTERMEDIATE_LAUNCHER_MOD_HASH ] if create_sell_offer: await self.create_offer(launcher_ids, create_sell_offer) diff --git a/setup.py b/setup.py index 8322e36..80b5bd0 100644 --- a/setup.py +++ b/setup.py @@ -4,15 +4,14 @@ long_description = fh.read() dependencies = [ - # "chia-blockchain @ git+https://github.com/Chia-Network/chia-blockchain.git@1.6.2", - "chia-blockchain==1.7.0", - "packaging==21.3", + "chia-blockchain>=1.8.1", + "packaging==23.0", ] dev_dependencies = [ "build", "click~=8.1.3", - "chia-dev-tools~=1.1.5", + "chia-dev-tools~=1.2.0", "coverage", "pre-commit", "pylint", From 917a15f7572add5a4557a005750b0af25875caa1 Mon Sep 17 00:00:00 2001 From: geoffwalmsley Date: Thu, 18 May 2023 11:35:39 +1200 Subject: [PATCH 2/5] fix chia-blockchain version in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 80b5bd0..f269139 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ long_description = fh.read() dependencies = [ - "chia-blockchain>=1.8.1", + "chia-blockchain>=1.8.0", "packaging==23.0", ] From add09a41b6f6d17048b580e6c6f3d50385d7afd5 Mon Sep 17 00:00:00 2001 From: geoffwalmsley Date: Thu, 18 May 2023 12:19:45 +1200 Subject: [PATCH 3/5] update workflow tests for new sim setup --- .github/workflows/run-tests.yml | 2 +- setup.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index faaa904..0f990e4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -57,7 +57,7 @@ jobs: fi pip install --extra-index https://pypi.chia.net/simple/ --editable .[dev] chia init - echo -ne "\n" | cdv sim create + echo -ne "\n" | chia dev sim create export CHIA_ROOT=~/.chia/simulator/main/ chia start wallet sleep 10 diff --git a/setup.py b/setup.py index f269139..4847994 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,6 @@ dev_dependencies = [ "build", "click~=8.1.3", - "chia-dev-tools~=1.2.0", "coverage", "pre-commit", "pylint", From bde48b29e91f1dc3cc758c513b03e1b3a97680bb Mon Sep 17 00:00:00 2001 From: geoffwalmsley Date: Thu, 18 May 2023 15:25:57 +1200 Subject: [PATCH 4/5] fix changed puzzle reference --- chianft/util/mint.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/chianft/util/mint.py b/chianft/util/mint.py index 1f0e0e9..27c9e55 100644 --- a/chianft/util/mint.py +++ b/chianft/util/mint.py @@ -16,12 +16,10 @@ from chia.types.spend_bundle import SpendBundle from chia.util.byte_types import hexstr_to_bytes from chia.util.ints import uint64 -from chia.wallet.did_wallet.did_wallet_puzzles import INTERMEDIATE_LAUNCHER_MOD +from chia.wallet.singleton import SINGLETON_LAUNCHER_PUZZLE_HASH from chia.wallet.trading.offer import Offer from chia.wallet.util.wallet_types import WalletType -INTERMEDIATE_LAUNCHER_MOD_HASH = INTERMEDIATE_LAUNCHER_MOD.get_tree_hash() - class Minter: def __init__( self, @@ -440,7 +438,7 @@ async def submit_spend_bundles( launcher_ids = [ coin.name().hex() for coin in sb.removals() - if coin.puzzle_hash == INTERMEDIATE_LAUNCHER_MOD_HASH + if coin.puzzle_hash == SINGLETON_LAUNCHER_PUZZLE_HASH ] if create_sell_offer: await self.create_offer(launcher_ids, create_sell_offer) From 6d4f5914e1f98bc132661e3dc670a1a38b1397eb Mon Sep 17 00:00:00 2001 From: Geoff Walmsley <5695735+geoffwalmsley@users.noreply.github.com> Date: Thu, 18 May 2023 17:27:20 +1200 Subject: [PATCH 5/5] Update setup.py Co-authored-by: Kyle Altendorf --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4847994..65602fb 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ long_description = fh.read() dependencies = [ - "chia-blockchain>=1.8.0", + "chia-blockchain==1.8.1", "packaging==23.0", ]