chia-dev-tools 1.2.4__tar.gz → 1.2.6__tar.gz

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/.github/workflows/precommit.yml

@@ -53,6 +53,10 @@ jobs:
     - name: Add safe git directory
       uses: Chia-Network/actions/git-mark-workspace-safe@main
 
+    - name: disable git autocrlf
+      run: |
+        git config --global core.autocrlf false
+
     - uses: actions/checkout@v4
 
     - uses: Chia-Network/actions/setup-python@main

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/.github/workflows/super-linter.yml

@@ -63,10 +63,8 @@ jobs:
           VALIDATE_POWERSHELL: true
           VALIDATE_PYTHON: true
           VALIDATE_PYTHON_PYLINT: true
-          VALIDATE_PYTHON_FLAKE8: true
           VALIDATE_PYTHON_ISORT: true
           PYTHON_ISORT_CONFIG_FILE: pyproject.toml
-          VALIDATE_SHELL_SHFMT: true
           VALIDATE_TYPESCRIPT_ES: true
           VALIDATE_YAML: true
           DISABLE_ERRORS: false

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/.pre-commit-config.yaml

@@ -28,6 +28,11 @@ repos:
         args: ['--filter-files']
         minimum_pre_commit_version: '2.9.2'
         additional_dependencies: [isort==5.10.1]
+-   repo: https://github.com/scop/pre-commit-shfmt
+    rev: v3.8.0-1
+    hooks:
+    -   id: shfmt
+        args: ["--diff", "--write", "-i", "2"]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1
     hooks:

chia_dev_tools-1.2.6/.repo-content-updater.yml

@@ -0,0 +1,2 @@
+var_overrides:
+  DEPENDABOT_ACTIONS_REVIEWERS: '["cmmarslender", "altendky"]'

{chia_dev_tools-1.2.4/chia_dev_tools.egg-info → chia_dev_tools-1.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chia_dev_tools
-Version: 1.2.4
+Version: 1.2.6
 Summary: Chia development commands
 Home-page: https://github.com/Chia-Network
 Author: Quexington
@@ -20,12 +20,12 @@ Requires-Dist: pytest
 Requires-Dist: pytest-asyncio
 Requires-Dist: pytimeparse
 Requires-Dist: anyio
-Requires-Dist: chia-blockchain==2.1.4
+Requires-Dist: chia-blockchain==2.3.0
 Provides-Extra: dev
 Requires-Dist: anyio; extra == "dev"
 Requires-Dist: flake8; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
-Requires-Dist: black==24.4.0; extra == "dev"
+Requires-Dist: black==24.4.2; extra == "dev"
 Requires-Dist: types-aiofiles; extra == "dev"
 Requires-Dist: types-click; extra == "dev"
 Requires-Dist: types-cryptography; extra == "dev"

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/activated.sh

@@ -2,9 +2,12 @@
 
 set -o errexit
 
-SCRIPT_DIRECTORY=$(cd -- "$(dirname -- "$0")"; pwd)
+SCRIPT_DIRECTORY=$(
+  cd -- "$(dirname -- "$0")"
+  pwd
+)
 # shellcheck disable=SC1091
 if [ -d "${SCRIPT_DIRECTORY}/venv" ]; then # CI does not use venv
-source "${SCRIPT_DIRECTORY}/venv/bin/activate"
+  source "${SCRIPT_DIRECTORY}/venv/bin/activate"
 fi
 "$@"

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/cdv/cmds/chia_inspect.py

@@ -15,7 +15,7 @@ from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import INFINITE_COST, Program
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
-from chia.types.coin_spend import CoinSpend
+from chia.types.coin_spend import CoinSpend, make_spend
 from chia.types.generator_types import BlockGenerator
 from chia.types.spend_bundle import SpendBundle
 from chia.util.byte_types import hexstr_to_bytes
@@ -164,6 +164,7 @@ def inspect_any_cmd(ctx: click.Context, objects: Tuple[str]):
             assert isinstance(obj, Coin)  # mypy otherwise complains that obj is a str
             do_inspect_coin_cmd(ctx, [obj])
         elif type(obj) == CoinSpend:  # type: ignore[comparison-overlap]
+            assert isinstance(obj, CoinSpend)
             do_inspect_coin_spend_cmd(ctx, [obj])
         elif type(obj) == SpendBundle:  # type: ignore[comparison-overlap]
             do_inspect_spend_bundle_cmd(ctx, [obj])
@@ -272,7 +273,7 @@ def do_inspect_coin_spend_cmd(
         # If they specified the coin components
         if (not kwargs["coin"]) and all([kwargs["parent_id"], kwargs["puzzle_hash"], kwargs["amount"]]):
             coin_spend_objs: List[CoinSpend] = [
-                CoinSpend(
+                make_spend(
                     Coin(
                         bytes32.from_hexstr(kwargs["parent_id"]),
                         bytes32.from_hexstr(kwargs["puzzle_hash"]),
@@ -285,7 +286,7 @@ def do_inspect_coin_spend_cmd(
         # If they specifed a coin object to parse
         elif kwargs["coin"]:
             coin_spend_objs = [
-                CoinSpend(
+                make_spend(
                     do_inspect_coin_cmd(ctx, [kwargs["coin"]], print_results=False)[0],
                     parse_program(kwargs["puzzle_reveal"]),
                     parse_program(kwargs["solution"]),
@@ -321,7 +322,7 @@ def do_inspect_coin_spend_cmd(
                     mempool_mode=True,
                     constants=DEFAULT_CONSTANTS,
                 )
-                cost: int = npc_result.cost
+                cost = int(0 if npc_result.conds is None else npc_result.conds.cost)
                 if ignore_byte_cost:
                     cost -= len(bytes(coin_spend.puzzle_reveal)) * DEFAULT_CONSTANTS.COST_PER_BYTE
                 print(f"Cost: {cost}")
@@ -412,7 +413,7 @@ def do_inspect_spend_bundle_cmd(
                         mempool_mode=True,
                         constants=DEFAULT_CONSTANTS,
                     )
-                    cost: int = npc_result.cost
+                    cost = int(0 if npc_result.conds is None else npc_result.conds.cost)
                     if kwargs["ignore_byte_cost"]:
                         for coin_spend in spend_bundle.coin_spends:
                             cost -= len(bytes(coin_spend.puzzle_reveal)) * DEFAULT_CONSTANTS.COST_PER_BYTE
@@ -435,7 +436,7 @@ def do_inspect_spend_bundle_cmd(
                 for obj in spend_bundle_objs:
                     for coin_spend in obj.coin_spends:
                         conditions_dict = conditions_dict_for_solution(
-                            coin_spend.puzzle_reveal, coin_spend.solution, INFINITE_COST
+                            coin_spend.puzzle_reveal.to_program(), coin_spend.solution.to_program(), INFINITE_COST
                         )
                         if conditions_dict is None:
                             print(f"Generating conditions failed, con:{conditions_dict}")

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/cdv/examples/tests/test_piggybank.py

@@ -21,9 +21,9 @@ from cdv.test import setup as setup_test
 class TestStandardTransaction:
     @pytest_asyncio.fixture(scope="function")
     async def setup(self):
-        network, alice, bob = await setup_test()
-        await network.farm_block()
-        yield network, alice, bob
+        async with setup_test() as (network, alice, bob):
+            await network.farm_block()
+            yield network, alice, bob
 
     async def make_and_spend_piggybank(self, network, alice, bob, CONTRIBUTION_AMOUNT) -> Dict[str, List[Coin]]:
         # Get our alice wallet some money
@@ -87,7 +87,7 @@ class TestStandardTransaction:
             )
             assert len(filtered_result) == 1
         finally:
-            await network.close()
+            pass
 
     @pytest.mark.asyncio
     async def test_piggybank_completion(self, setup):
@@ -118,7 +118,7 @@ class TestStandardTransaction:
             )
             assert len(filtered_result) == 1
         finally:
-            await network.close()
+            pass
 
     @pytest.mark.asyncio
     async def test_piggybank_stealing(self, setup):
@@ -130,4 +130,4 @@ class TestStandardTransaction:
                 "GENERATOR_RUNTIME_ERROR" in result["error"]
             )  # This fails during puzzle execution, not in driver code
         finally:
-            await network.close()
+            pass

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/cdv/test/__init__.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
 import binascii
+import contextlib
 import datetime
 import struct
-from typing import Dict, List, Optional, Tuple, Union
+from contextlib import asynccontextmanager
+from typing import AsyncIterator, Dict, List, Optional, Tuple, Type, TypeVar, Union
 
 import pytimeparse
 from chia.clvm.spend_sim import SimClient, SpendSim
@@ -12,7 +14,7 @@ from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
-from chia.types.coin_spend import CoinSpend
+from chia.types.coin_spend import CoinSpend, make_spend
 from chia.types.spend_bundle import SpendBundle
 from chia.util.condition_tools import ConditionOpcode
 from chia.util.hash import std_hash
@@ -453,13 +455,7 @@ class Wallet:
         )
 
         spend_bundle = SpendBundle(
-            [
-                CoinSpend(
-                    found_coin.coin,  # Coin to spend
-                    self.puzzle,  # Puzzle used for found_coin
-                    solution,  # The solution to the puzzle locking found_coin
-                )
-            ],
+            [make_spend(found_coin.coin, self.puzzle, solution)],
             signature,
         )
         pushed: Dict[str, Union[str, List[Coin]]] = await self.parent.push_tx(spend_bundle)
@@ -533,11 +529,7 @@ class Wallet:
             delegated_puzzle_solution = Program.to(kwargs["args"])
             solution = delegated_puzzle_solution
 
-        solution_for_coin = CoinSpend(
-            coin.coin,
-            coin.puzzle(),
-            solution,
-        )
+        solution_for_coin = make_spend(coin.coin, coin.puzzle(), solution)
 
         # The reason this use of sign_coin_spends exists is that it correctly handles
         # the signing for non-standard coins.  I don't fully understand the difference but
@@ -564,6 +556,9 @@ class Wallet:
             return spend_bundle
 
 
+_T_Network = TypeVar("_T_Network", bound="Network")
+
+
 # A user oriented (domain specific) view of the chia network.
 class Network:
     """An object that owns a simulation, responsible for managing Wallet actors,
@@ -576,18 +571,17 @@ class Network:
     nobody: Wallet
 
     @classmethod
-    async def create(cls) -> "Network":
+    @contextlib.asynccontextmanager
+    async def managed(cls: Type[_T_Network]) -> AsyncIterator[_T_Network]:
         self = cls()
         self.time = datetime.timedelta(days=18750, seconds=61201)  # Past the initial transaction freeze
-        self.sim = await SpendSim.create()
-        self.sim_client = SimClient(self.sim)
-        self.wallets = {}
-        self.nobody = self.make_wallet("nobody")
-        self.wallets[str(self.nobody.pk())] = self.nobody
-        return self
-
-    async def close(self):
-        await self.sim.close()
+        async with SpendSim.managed() as sim:
+            self.sim = sim
+            self.sim_client = SimClient(self.sim)
+            self.wallets = {}
+            self.nobody = self.make_wallet("nobody")
+            self.wallets[str(self.nobody.pk())] = self.nobody
+            yield self
 
     # Have the system farm one block with a specific beneficiary (nobody if not specified).
     async def farm_block(self, **kwargs) -> Tuple[List[Coin], List[Coin]]:
@@ -716,8 +710,9 @@ class Network:
         }
 
 
-async def setup() -> Tuple[Network, Wallet, Wallet]:
-    network: Network = await Network.create()
-    alice: Wallet = network.make_wallet("alice")
-    bob: Wallet = network.make_wallet("bob")
-    return network, alice, bob
+@asynccontextmanager
+async def setup() -> AsyncIterator[Tuple[Network, Wallet, Wallet]]:
+    async with Network.managed() as network:
+        alice = network.make_wallet("alice")
+        bob = network.make_wallet("bob")
+        yield network, alice, bob

{chia_dev_tools-1.2.4/tests → chia_dev_tools-1.2.6/cdv/test}/test_skeleton.py

@@ -9,9 +9,9 @@ from cdv.test import setup as setup_test
 class TestSomething:
     @pytest_asyncio.fixture(scope="function")
     async def setup(self):
-        network, alice, bob = await setup_test()
-        await network.farm_block()
-        yield network, alice, bob
+        async with setup_test() as (network, alice, bob):
+            await network.farm_block()
+            yield network, alice, bob
 
     @pytest.mark.asyncio
     async def test_something(self, setup):
@@ -19,4 +19,4 @@ class TestSomething:
         try:
             pass
         finally:
-            await network.close()
+            pass

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6/chia_dev_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chia_dev_tools
-Version: 1.2.4
+Version: 1.2.6
 Summary: Chia development commands
 Home-page: https://github.com/Chia-Network
 Author: Quexington
@@ -20,12 +20,12 @@ Requires-Dist: pytest
 Requires-Dist: pytest-asyncio
 Requires-Dist: pytimeparse
 Requires-Dist: anyio
-Requires-Dist: chia-blockchain==2.1.4
+Requires-Dist: chia-blockchain==2.3.0
 Provides-Extra: dev
 Requires-Dist: anyio; extra == "dev"
 Requires-Dist: flake8; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
-Requires-Dist: black==24.4.0; extra == "dev"
+Requires-Dist: black==24.4.2; extra == "dev"
 Requires-Dist: types-aiofiles; extra == "dev"
 Requires-Dist: types-click; extra == "dev"
 Requires-Dist: types-cryptography; extra == "dev"

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/chia_dev_tools.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@
 .isort.cfg
 .markdown-lint.yml
 .pre-commit-config.yaml
+.repo-content-updater.yml
 LICENSE
 README.md
 activated.ps1

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/chia_dev_tools.egg-info/requires.txt

@@ -3,13 +3,13 @@ pytest
 pytest-asyncio
 pytimeparse
 anyio
-chia-blockchain==2.1.4
+chia-blockchain==2.3.0
 
 [dev]
 anyio
 flake8
 mypy
-black==24.4.0
+black==24.4.2
 types-aiofiles
 types-click
 types-cryptography

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/setup.py

@@ -13,14 +13,14 @@ dependencies = [
     "pytest-asyncio",
     "pytimeparse",
     "anyio",
-    "chia-blockchain==2.1.4",
+    "chia-blockchain==2.3.0",
 ]
 
 dev_dependencies = [
     "anyio",
     "flake8",
     "mypy",
-    "black==24.4.0",
+    "black==24.4.2",
     "types-aiofiles",
     "types-click",
     "types-cryptography",

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/tests/cmds/object_files/spendbundles/spendbundle.json

@@ -5,7 +5,7 @@
                 "parent_coin_info": "0x0000000000000000000000000000000000000000000000000000000000000000",
                 "puzzle_hash": "0x0000000000000000000000000000000000000000000000000000000000000000"},
                 "puzzle_reveal": "0x01",
-                "solution": "80"}
+                "solution": "0x80"}
     ],
     "aggregated_signature": "c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
   }

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/tests/cmds/object_files/spends/spend.json

@@ -2,4 +2,4 @@
           "parent_coin_info": "0x0000000000000000000000000000000000000000000000000000000000000000",
           "puzzle_hash": "0x0000000000000000000000000000000000000000000000000000000000000000"},
           "puzzle_reveal": "0x01",
-          "solution": "ffff32ffb080df54b2a616f5c79baaed254134ae5dfc6e24e2d8e1165b251601ceb67b1886db50aacf946eb20f00adc303e7534dd0ff2480ffff32ffb080df54b2a616f5c79baaed254134ae5dfc6e24e2d8e1165b251601ceb67b1886db50aacf946eb20f00adc303e7534dd0ff248080"}
+          "solution": "0xffff32ffb080df54b2a616f5c79baaed254134ae5dfc6e24e2d8e1165b251601ceb67b1886db50aacf946eb20f00adc303e7534dd0ff2480ffff32ffb080df54b2a616f5c79baaed254134ae5dfc6e24e2d8e1165b251601ceb67b1886db50aacf946eb20f00adc303e7534dd0ff248080"}

{chia_dev_tools-1.2.4 → chia_dev_tools-1.2.6}/tests/cmds/object_files/spends/spend_2.json

@@ -2,4 +2,4 @@
           "parent_coin_info": "0x0000000000000000000000000000000000000000000000000000000000000001",
           "puzzle_hash": "0x0000000000000000000000000000000000000000000000000000000000000000"},
           "puzzle_reveal": "0x01",
-          "solution": "ffff32ffb080df54b2a616f5c79baaed254134ae5dfc6e24e2d8e1165b251601ceb67b1886db50aacf946eb20f00adc303e7534dd0ff248080"}
+          "solution": "0xffff32ffb080df54b2a616f5c79baaed254134ae5dfc6e24e2d8e1165b251601ceb67b1886db50aacf946eb20f00adc303e7534dd0ff248080"}

{chia_dev_tools-1.2.4/cdv/test → chia_dev_tools-1.2.6/tests}/test_skeleton.py

@@ -9,9 +9,9 @@ from cdv.test import setup as setup_test
 class TestSomething:
     @pytest_asyncio.fixture(scope="function")
     async def setup(self):
-        network, alice, bob = await setup_test()
-        await network.farm_block()
-        yield network, alice, bob
+        async with setup_test() as (network, alice, bob):
+            await network.farm_block()
+            yield network, alice, bob
 
     @pytest.mark.asyncio
     async def test_something(self, setup):
@@ -19,4 +19,4 @@ class TestSomething:
         try:
             pass
         finally:
-            await network.close()
+            pass