[CHIA-1736] catchup: long_lived/vault from main @ 08730a266b201e487ca1d361e108491f7862d81b

.github/workflows/dependency-review.yml

@@ -21,5 +21,5 @@ jobs:
       - name: "Dependency Review"
         uses: actions/dependency-review-action@v4
         with:
-          allow-dependencies-licenses: pkg:pypi/pylint, pkg:pypi/pyinstaller
+          allow-dependencies-licenses: pkg:pypi/pyinstaller
           deny-licenses: AGPL-1.0-only, AGPL-1.0-or-later, AGPL-1.0-or-later, AGPL-3.0-or-later, GPL-1.0-only, GPL-1.0-or-later, GPL-2.0-only, GPL-2.0-or-later, GPL-3.0-only, GPL-3.0-or-later

.github/workflows/upload-pypi-source.yml

@@ -118,8 +118,8 @@ jobs:
         python:
           - major_dot_minor: "3.10"
         check:
-          - name: black
-            command: black --check --diff .
+          - name: ruff
+            command: ruff format --check --diff .
           - name: generated protocol tests
             command: |
               python3 -m chia._tests.util.build_network_protocol_files

.pre-commit-config.yaml

@@ -15,9 +15,9 @@ repos:
         pass_filenames: false
   - repo: local
     hooks:
-      - id: black
-        name: black
-        entry: ./activated.py black
+      - id: ruff_format
+        name: ruff format
+        entry: ./activated.py ruff format
         language: system
         require_serial: true
         types_or: [python, pyi]
@@ -71,6 +71,13 @@ repos:
         entry: ./activated.py python chia/util/virtual_project_analysis.py print_cycles --directory chia --config virtual_project.yaml
         language: system
         pass_filenames: false
+  - repo: local
+    hooks:
+      - id: ruff
+        name: Ruff
+        entry: ./activated.py ruff check --fix
+        language: system
+        types: [python]
   - repo: local
     hooks:
       - id: build mypy.ini
@@ -85,10 +92,3 @@ repos:
         entry: ./activated.py mypy
         language: system
         pass_filenames: false
-  - repo: local
-    hooks:
-      - id: ruff
-        name: Ruff
-        entry: ./activated.py ruff check --fix
-        language: system
-        types: [python]

CONTRIBUTING.md

@@ -57,13 +57,12 @@ to configure how the tests are run. For example, for more logging: change the lo
 ```bash
 sh install.sh -d
 . ./activate
-black . && ruff check --fix && mypy && pylint benchmarks build_scripts chia tests tools *.py
-py.test tests -v --durations 0
+ruff format && ruff check --fix && mypy
+pytest tests -v --durations 0
 ```
 
-The [black library](https://black.readthedocs.io/en/stable/) is used as an automatic style formatter to make things easier.
 The [Mypy library](https://mypy.readthedocs.io/en/stable/) is very useful for ensuring objects are of the correct type, so try to always add the type of the return value, and the type of local variables.
-The [Ruff library](https://docs.astral.sh) is used to sort, group, validate imports, ensure consistent style, and further lint all of the python files
+The [Ruff library](https://docs.astral.sh) is used to format, sort, group, validate imports, ensure consistent style, and further lint all of the python files
 
 If you want verbose logging for tests, edit the `tests/pytest.ini` file.
 
@@ -77,27 +76,6 @@ To install pre-commit on your system see https://pre-commit.com/#installation. A
 with `pre-commit run` or let it trigger the hooks automatically before each commit by installing the
 provided configuration with `pre-commit install`.
 
-## Configure VS code
-
-1. Install python extension
-2. Set the environment to `./venv/bin/python`
-3. Install mypy plugin
-4. Preferences > Settings > Python > Linting > mypy enabled
-5. Preferences > Settings > Formatting > Python > Provider > black
-6. Preferences > Settings > mypy > Targets: set to `./chia`
-
-## Configure Pycharm
-
-Pycharm is an amazing and beautiful python IDE that some of us use to work on this project.
-If you combine it with python black and formatting on save, you will get a very efficient
-workflow. It's also especially efficient for git branching, cherry-picking, committing and pushing.
-
-1. Run blackd in a terminal
-2. Install BlackConnect plugin
-3. Set to run python black on save
-4. Set line length to 120
-5. Install the linters in the root directory
-
 ## Testnets and review environments
 
 The current official testnet is testnet10. Look at `chia/util/initial_config.yaml` to see the configuration parameters

activated.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -o errexit
 

build_scripts/build_license_directory.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # PULL IN LICENSES USING NPM - LICENSE CHECKER
 npm install -g license-checker

build_scripts/build_linux_deb-1-gui.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -o errexit
 

build_scripts/build_linux_deb-2-installer.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -o errexit
 

build_scripts/build_linux_rpm-1-gui.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -o errexit
 

build_scripts/build_linux_rpm-2-installer.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -o errexit
 

build_scripts/build_macos-1-gui.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -o errexit -o nounset
 

build_scripts/build_macos-2-installer.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -o errexit -o nounset
 

build_scripts/build_win_license_dir.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # PULL IN LICENSES USING NPM - LICENSE CHECKER
 npm install -g license-checker

build_scripts/clean-runner.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Cleans up files/directories that may be left over from previous runs for a clean slate before starting a new build
 
 set -o errexit

chia/_tests/blockchain/blockchain_test_utils.py

@@ -3,7 +3,7 @@
 import asyncio
 from typing import Optional
 
-from chia_rs import BLSCache
+from chia_rs import SpendBundleConditions
 
 from chia.consensus.block_body_validation import ForkInfo
 from chia.consensus.blockchain import AddBlockResult, Blockchain
@@ -52,7 +52,6 @@ async def _validate_and_add_block(
     expected_error: Optional[Err] = None,
     skip_prevalidation: bool = False,
     fork_info: Optional[ForkInfo] = None,
-    use_bls_cache: bool = False,
 ) -> None:
     # Tries to validate and add the block, and checks that there are no errors in the process and that the
     # block is added to the peak.
@@ -73,19 +72,22 @@ async def _validate_and_add_block(
     new_slot = len(block.finished_sub_slots) > 0
     ssi, diff = get_next_sub_slot_iters_and_difficulty(blockchain.constants, new_slot, prev_b, blockchain)
     await check_block_store_invariant(blockchain)
+
     if skip_prevalidation:
-        results = PreValidationResult(None, uint64(1), None, False, uint32(0))
+        if block.transactions_generator is None:
+            conds = None
+        else:
+            # fake the signature validation. Just say True here.
+            conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True)
+        results = PreValidationResult(None, uint64(1), conds, uint32(0))
     else:
-        # validate_signatures must be False in order to trigger add_block() to
-        # validate the signature.
         futures = await pre_validate_blocks_multiprocessing(
             blockchain.constants,
             AugmentedBlockchain(blockchain),
             [block],
             blockchain.pool,
             {},
             ValidationState(ssi, diff, prev_ses_block),
-            validate_signatures=False,
         )
         pre_validation_results: list[PreValidationResult] = list(await asyncio.gather(*futures))
         assert pre_validation_results is not None
@@ -105,16 +107,12 @@ async def _validate_and_add_block(
         return None
     if fork_info is None:
         fork_info = ForkInfo(block.height - 1, block.height - 1, block.prev_header_hash)
-    if use_bls_cache:
-        bls_cache = BLSCache(100)
-    else:
-        bls_cache = None
 
     (
         result,
         err,
         _,
-    ) = await blockchain.add_block(block, results, bls_cache, ssi, fork_info=fork_info)
+    ) = await blockchain.add_block(block, results, ssi, fork_info=fork_info)
     await check_block_store_invariant(blockchain)
 
     if expected_error is None and expected_result != AddBlockResult.INVALID_BLOCK:

chia/_tests/blockchain/test_augmented_chain.py

@@ -15,7 +15,6 @@
 
 @dataclass
 class NullBlockchain:
-
     if TYPE_CHECKING:
         from chia.consensus.blockchain_interface import BlocksProtocol
 
@@ -72,7 +71,6 @@ def BR(b: FullBlock) -> BlockRecord:
 @pytest.mark.anyio
 @pytest.mark.limit_consensus_modes(reason="save time")
 async def test_augmented_chain(default_10000_blocks: list[FullBlock]) -> None:
-
     blocks = default_10000_blocks
     # this test blockchain is expected to have block generators at these
     # heights: