chia-blockchain 2.1.0rc2__tar.gz → 2.1.0rc4__tar.gz

{chia-blockchain-2.1.0rc2 → chia-blockchain-2.1.0rc4}/.github/workflows/build-linux-installer-deb.yml

@@ -39,7 +39,7 @@ permissions:
 
 jobs:
   build:
-    name: Linux ${{ matrix.os.arch }} DEB Installer
+    name: Build ${{ matrix.os.arch }}
     runs-on: ${{ matrix.os.runs-on }}
     container: chianetwork/ubuntu-20.04-builder:latest
     timeout-minutes: 120
@@ -83,15 +83,16 @@ jobs:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Check tag type
-      id: check_tag_type
       shell: bash
       run: |
         REG_B="^[0-9]+\.[0-9]+\.[0-9]+-b[0-9]+$"
         REG_RC="^[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+$"
         if [[ "${{ github.event.release.tag_name }}" =~ $REG_B ]] || [[ "${{ inputs.release_type }}" =~ $REG_B ]]; then
-          echo "TAG_TYPE=beta" >> "$GITHUB_OUTPUT"
+          echo "TAG_TYPE=beta"
+          echo "TAG_TYPE=beta" >> "$GITHUB_ENV"
         elif [[ "${{ github.event.release.tag_name }}" =~ $REG_RC ]] || [[ "${{ inputs.release_type }}" =~ $REG_RC ]]; then
-          echo "TAG_TYPE=rc" >> "$GITHUB_OUTPUT"
+          echo "TAG_TYPE=rc"
+          echo "TAG_TYPE=rc" >> "$GITHUB_ENV"
         fi
 
     # Create our own venv outside of the git directory JUST for getting the ACTUAL version so that install can't break it
@@ -142,7 +143,7 @@ jobs:
         LATEST_RC=$(gh api repos/Chia-Network/bladebit/releases --jq 'map(select(.prerelease) | select(.tag_name | test("^v[0-9]+\\.[0-9]+\\.[0-9]+-rc[0-9]+$"))) | first | .tag_name')
 
         # Compare the versions and choose the newest that matches the requirements
-        if [[ "$TAG_TYPE" == "beta" || -z "${{ github.event.release.tag_name }}" ]]; then
+        if [[ "$TAG_TYPE" == "beta" || -z "$TAG_TYPE" ]]; then
           # For beta or dev builds (indicated by the absence of a tag), use the latest version available
           LATEST_VERSION=$(printf "%s\n%s\n%s\n" "$LATEST_RELEASE" "$LATEST_BETA" "$LATEST_RC" | sed '/-/!s/$/_/' | sort -V | sed 's/_$//' | tail -n 1)
         elif [[ "$TAG_TYPE" == "rc" ]]; then
@@ -295,3 +296,72 @@ jobs:
     - name: Remove working files to exclude from cache
       run: |
         rm -rf ./chia-blockchain-gui/packages/gui/daemon
+
+  test:
+    name: Test ${{ matrix.distribution.name }} ${{ matrix.mode.name }} ${{ matrix.arch.name }}
+    runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
+    needs:
+    - build
+    container: ${{ matrix.distribution.url }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+        - runs-on:
+            arm: [linux, arm64]
+            intel: [ubuntu-latest]
+        distribution:
+        - name: debian:bullseye
+          type: debian
+          # https://packages.debian.org/bullseye/python/python3 (3.9)
+          url: "docker://debian:bullseye"
+        - name: debian:bookworm
+          type: debian
+          # https://packages.debian.org/bookworm/python/python3 (3.11)
+          url: "docker://debian:bookworm"
+        - name: ubuntu:focal (20.04)
+          type: ubuntu
+          # https://packages.ubuntu.com/focal/python3 (20.04, 3.8)
+          url: "docker://ubuntu:focal"
+        - name: ubuntu:jammy (22.04)
+          type: ubuntu
+          # https://packages.ubuntu.com/jammy/python3 (22.04, 3.10)
+          url: "docker://ubuntu:jammy"
+        mode:
+        - name: GUI
+          file: chia-blockchain_*.deb
+        - name: CLI
+          file: chia-blockchain-cli_*.deb
+        arch:
+        - name: ARM64
+          matrix: arm
+          artifact-name: arm64
+        - name: Intel
+          matrix: intel
+          artifact-name: amd64
+
+    env:
+      DEBIAN_FRONTEND: noninteractive
+
+    steps:
+    - uses: Chia-Network/actions/clean-workspace@main
+
+    - name: Download packages
+      uses: actions/download-artifact@v3
+      id: download
+      with:
+        name: chia-installers-linux-deb-${{ matrix.arch.artifact-name }}
+        path: packages
+
+    - name: Update apt repos
+      run: |
+        apt-get update --yes
+
+    - name: Install package
+      run: |
+        ls -l "${{ steps.download.outputs.download-path }}"
+        apt-get install --yes "${{ steps.download.outputs.download-path }}"/${{ matrix.mode.file }}
+
+    - name: Run chia version
+      run: |
+        chia version

{chia-blockchain-2.1.0rc2 → chia-blockchain-2.1.0rc4}/.github/workflows/build-linux-installer-rpm.yml

@@ -39,7 +39,7 @@ permissions:
 
 jobs:
   build:
-    name: Linux amd64 RPM Installer
+    name: Build amd64 RPM
     runs-on: ubuntu-latest
     container:
       image: chianetwork/rocky8-builder:latest
@@ -71,15 +71,16 @@ jobs:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Check tag type
-      id: check_tag_type
       shell: bash
       run: |
         REG_B="^[0-9]+\.[0-9]+\.[0-9]+-b[0-9]+$"
         REG_RC="^[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+$"
         if [[ "${{ github.event.release.tag_name }}" =~ $REG_B ]] || [[ "${{ inputs.release_type }}" =~ $REG_B ]]; then
-          echo "TAG_TYPE=beta" >> "$GITHUB_OUTPUT"
+          echo "TAG_TYPE=beta"
+          echo "TAG_TYPE=beta" >> "$GITHUB_ENV"
         elif [[ "${{ github.event.release.tag_name }}" =~ $REG_RC ]] || [[ "${{ inputs.release_type }}" =~ $REG_RC ]]; then
-          echo "TAG_TYPE=rc" >> "$GITHUB_OUTPUT"
+          echo "TAG_TYPE=rc"
+          echo "TAG_TYPE=rc" >> "$GITHUB_ENV"
         fi
 
     - uses: Chia-Network/actions/enforce-semver@main
@@ -133,7 +134,7 @@ jobs:
         LATEST_RC=$(gh api repos/Chia-Network/bladebit/releases --jq 'map(select(.prerelease) | select(.tag_name | test("^v[0-9]+\\.[0-9]+\\.[0-9]+-rc[0-9]+$"))) | first | .tag_name')
 
         # Compare the versions and choose the newest that matches the requirements
-        if [[ "$TAG_TYPE" == "beta" || -z "${{ github.event.release.tag_name }}" ]]; then
+        if [[ "$TAG_TYPE" == "beta" || -z "$TAG_TYPE" ]]; then
           # For beta or dev builds (indicated by the absence of a tag), use the latest version available
           LATEST_VERSION=$(printf "%s\n%s\n%s\n" "$LATEST_RELEASE" "$LATEST_BETA" "$LATEST_RC" | sed '/-/!s/$/_/' | sort -V | sed 's/_$//' | tail -n 1)
         elif [[ "$TAG_TYPE" == "rc" ]]; then
@@ -162,7 +163,6 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
         development: true
-        skip-system-installs: true
 
     - uses: chia-network/actions/activate-venv@main
 
@@ -288,3 +288,59 @@ jobs:
     - name: Remove working files to exclude from cache
       run: |
         rm -rf ./chia-blockchain-gui/packages/gui/daemon
+
+  test:
+    name: Test ${{ matrix.distribution.name }} ${{ matrix.mode.name }}
+    runs-on: ${{ matrix.os }}
+    needs:
+    - build
+    container: ${{ matrix.distribution.url }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        distribution:
+        - name: amazonlinux:2023
+          type: amazon
+          url: "docker://amazonlinux:2023"
+        - name: fedora:37
+          type: fedora
+          # (37, 3.11) https://packages.fedoraproject.org/search?query=python3&releases=Fedora+37&start=0
+          url: "docker://fedora:37"
+        - name: fedora:38
+          type: fedora
+          # (38, 3.11) https://packages.fedoraproject.org/search?query=python3&releases=Fedora+38&start=0
+          url: "docker://fedora:38"
+        - name: rockylinux:8
+          type: rocky
+          url: "docker://rockylinux:8"
+        - name: rockylinux:9
+          type: rocky
+          url: "docker://rockylinux:9"
+        - name: build image
+          type: rocky
+          url: "docker://chianetwork/rocky8-builder:latest"
+        mode:
+        - name: GUI
+          file: chia-blockchain-[0,1,2,3,4,5,6,7,8,9]*.rpm
+        - name: CLI
+          file: chia-blockchain-cli-[0,1,2,3,4,5,6,7,8,9]*.rpm
+
+    steps:
+    - uses: Chia-Network/actions/clean-workspace@main
+
+    - name: Download packages
+      uses: actions/download-artifact@v3
+      id: download
+      with:
+        name: chia-installers-linux-rpm-intel
+        path: packages
+
+    - name: Install package
+      run: |
+        ls -l "${{ steps.download.outputs.download-path }}"
+        yum install -y "${{ steps.download.outputs.download-path }}"/${{ matrix.mode.file }}
+
+    - name: Run chia version
+      run: |
+        chia version

{chia-blockchain-2.1.0rc2 → chia-blockchain-2.1.0rc4}/.github/workflows/build-macos-installers.yml

@@ -39,7 +39,7 @@ permissions:
 
 jobs:
   build:
-    name: MacOS ${{ matrix.os.name }} Installer
+    name: Build ${{ matrix.os.name }} DMG
     runs-on: ${{ matrix.os.runs-on }}
     timeout-minutes: 90
     strategy:
@@ -82,15 +82,16 @@ jobs:
           MACOSX_DEPLOYMENT_TARGET: 11
 
       - name: Check tag type
-        id: check_tag_type
         shell: bash
         run: |
           REG_B="^[0-9]+\.[0-9]+\.[0-9]+-b[0-9]+$"
           REG_RC="^[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+$"
           if [[ "${{ github.event.release.tag_name }}" =~ $REG_B ]] || [[ "${{ inputs.release_type }}" =~ $REG_B ]]; then
-            echo "TAG_TYPE=beta" >> "$GITHUB_OUTPUT"
+            echo "TAG_TYPE=beta"
+            echo "TAG_TYPE=beta" >> "$GITHUB_ENV"
           elif [[ "${{ github.event.release.tag_name }}" =~ $REG_RC ]] || [[ "${{ inputs.release_type }}" =~ $REG_RC ]]; then
-            echo "TAG_TYPE=rc" >> "$GITHUB_OUTPUT"
+            echo "TAG_TYPE=rc"
+            echo "TAG_TYPE=rc" >> "$GITHUB_ENV"
           fi
 
       - name: Test for secrets access
@@ -166,7 +167,7 @@ jobs:
           LATEST_RC=$(gh api repos/Chia-Network/bladebit/releases --jq 'map(select(.prerelease) | select(.tag_name | test("^v[0-9]+\\.[0-9]+\\.[0-9]+-rc[0-9]+$"))) | first | .tag_name')
 
           # Compare the versions and choose the newest that matches the requirements
-          if [[ "$TAG_TYPE" == "beta" || -z "${{ github.event.release.tag_name }}" ]]; then
+          if [[ "$TAG_TYPE" == "beta" || -z "$TAG_TYPE" ]]; then
             # For beta or dev builds (indicated by the absence of a tag), use the latest version available
             LATEST_VERSION=$(printf "%s\n%s\n%s\n" "$LATEST_RELEASE" "$LATEST_BETA" "$LATEST_RC" | sed '/-/!s/$/_/' | sort -V | sed 's/_$//' | tail -n 1)
           elif [[ "$TAG_TYPE" == "rc" ]]; then
@@ -333,3 +334,68 @@ jobs:
       - name: Remove working files to exclude from cache
         run: |
           rm -rf ./chia-blockchain-gui/packages/gui/daemon
+
+  test:
+    name: Test ${{ matrix.os.name }} ${{ matrix.arch.name }}
+    runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
+    needs:
+    - build
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - name: 11
+            matrix: 11
+            runs-on:
+              intel: macos-11
+              arm: [macos, arm64]
+          - name: 12
+            matrix: 12
+            runs-on:
+              intel: macos-12
+          - name: 13
+            matrix: 13
+            runs-on:
+              intel: macos-13
+        arch:
+          - name: ARM64
+            matrix: arm
+            artifact-name: m1
+          - name: Intel
+            matrix: intel
+            artifact-name: intel
+        exclude:
+          - os:
+              matrix: 12
+            arch:
+              matrix: arm
+          - os:
+              matrix: 13
+            arch:
+              matrix: arm
+
+    steps:
+    - uses: Chia-Network/actions/clean-workspace@main
+
+    - name: Download packages
+      uses: actions/download-artifact@v3
+      id: download
+      with:
+        name: chia-installers-macos-dmg-${{ matrix.arch.artifact-name }}
+        path: packages
+
+    - name: Mount .dmg
+      env:
+        PACKAGE_PATH: ${{ github.workspace }}/build_scripts/final_installer/
+      run: |
+        ls -l "${{ steps.download.outputs.download-path }}"
+        hdiutil attach "${{ steps.download.outputs.download-path }}"/chia-*.dmg
+
+    - name: Run chia version
+      run: |
+        "/Volumes/Chia "*"/Chia.app/Contents/Resources/app.asar.unpacked/daemon/chia" version
+
+    - name: Detach .dmg
+      if: always()
+      run: |
+        hdiutil detach "/Volumes/Chia "*

{chia-blockchain-2.1.0rc2 → chia-blockchain-2.1.0rc4}/.github/workflows/build-windows-installer.yml

@@ -39,7 +39,7 @@ permissions:
 
 jobs:
   build:
-    name: Windows 10 Installer
+    name: Build EXE
     runs-on: [windows-2019]
     timeout-minutes: 65
     strategy:
@@ -60,15 +60,16 @@ jobs:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Check tag type
-      id: check_tag_type
       shell: bash
       run: |
         REG_B="^[0-9]+\.[0-9]+\.[0-9]+-b[0-9]+$"
         REG_RC="^[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+$"
         if [[ "${{ github.event.release.tag_name }}" =~ $REG_B ]] || [[ "${{ inputs.release_type }}" =~ $REG_B ]]; then
-          echo "TAG_TYPE=beta" >> "$GITHUB_OUTPUT"
+          echo "TAG_TYPE=beta"
+          echo "TAG_TYPE=beta" >> "$GITHUB_ENV"
         elif [[ "${{ github.event.release.tag_name }}" =~ $REG_RC ]] || [[ "${{ inputs.release_type }}" =~ $REG_RC ]]; then
-          echo "TAG_TYPE=rc" >> "$GITHUB_OUTPUT"
+          echo "TAG_TYPE=rc"
+          echo "TAG_TYPE=rc" >> "$GITHUB_ENV"
         fi
 
     - name: Set git urls to https instead of ssh
@@ -198,7 +199,7 @@ jobs:
         LATEST_RC=$(gh api repos/Chia-Network/bladebit/releases --jq 'map(select(.prerelease) | select(.tag_name | test("^v[0-9]+\\.[0-9]+\\.[0-9]+-rc[0-9]+$"))) | first | .tag_name')
 
         # Compare the versions and choose the newest that matches the requirements
-        if [[ "$TAG_TYPE" == "beta" || -z "${{ github.event.release.tag_name }}" ]]; then
+        if [[ "$TAG_TYPE" == "beta" || -z "$TAG_TYPE" ]]; then
           # For beta or dev builds (indicated by the absence of a tag), use the latest version available
           LATEST_VERSION=$(printf "%s\n%s\n%s\n" "$LATEST_RELEASE" "$LATEST_BETA" "$LATEST_RC" | sed '/-/!s/$/_/' | sort -V | sed 's/_$//' | tail -n 1)
         elif [[ "$TAG_TYPE" == "rc" ]]; then
@@ -364,3 +365,47 @@ jobs:
         Remove-Item .\chia-blockchain-gui\packages\gui\daemon -Recurse -Force
         Remove-Item .\chia-blockchain-gui\Chia-win32-x64 -Recurse -Force
         Remove-Item .\chia-blockchain-gui\release-builds -Recurse -Force
+
+  test:
+    name: Test ${{ matrix.os.name }}
+    runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
+    needs:
+    - build
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - name: 2019
+            matrix: 2019
+            runs-on:
+              intel: windows-2019
+          - name: 2022
+            matrix: 2022
+            runs-on:
+              intel: windows-2022
+        arch:
+          - name: Intel
+            matrix: intel
+
+    steps:
+    - uses: Chia-Network/actions/clean-workspace@main
+
+    - name: Download packages
+      uses: actions/download-artifact@v3
+      with:
+        name: chia-installers-windows-exe-intel
+        path: packages
+
+    - name: Install package
+      env:
+        INSTALL_PATH: ${{ github.workspace }}\installed
+      run: |
+        dir ./packages/
+        $env:INSTALLER_PATH = (Get-ChildItem packages/windows-installer/ChiaSetup-*.exe)
+        Start-Process -Wait -FilePath $env:INSTALLER_PATH -ArgumentList "/S", ("/D=" + $env:INSTALL_PATH)
+
+    - name: Run chia version
+      env:
+        INSTALL_PATH: ${{ github.workspace }}\installed
+      run: |
+        & ($env:INSTALL_PATH + "\resources\app.asar.unpacked\daemon\chia.exe") version

{chia-blockchain-2.1.0rc2/chia_blockchain.egg-info → chia-blockchain-2.1.0rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chia-blockchain
-Version: 2.1.0rc2
+Version: 2.1.0rc4
 Summary: Chia blockchain full node, farmer, timelord, and wallet.
 Home-page: https://chia.net/
 Author: Mariano Sorgente
@@ -13,15 +13,15 @@ Requires-Python: >=3.8.1, <4
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiofiles==23.2.1
-Requires-Dist: anyio==3.7.1
+Requires-Dist: anyio==4.0.0
 Requires-Dist: blspy==2.0.2
 Requires-Dist: boto3==1.28.25
 Requires-Dist: chiavdf==1.0.11
 Requires-Dist: chiabip158==1.3
-Requires-Dist: chiapos==2.0.2
+Requires-Dist: chiapos==2.0.3rc1
 Requires-Dist: clvm==0.9.7
 Requires-Dist: clvm_tools==0.4.6
-Requires-Dist: chia_rs==0.2.10
+Requires-Dist: chia_rs==0.2.11
 Requires-Dist: clvm-tools-rs==0.1.34
 Requires-Dist: aiohttp==3.8.5
 Requires-Dist: aiosqlite==0.19.0
@@ -44,6 +44,7 @@ Requires-Dist: zstd==1.5.5.1
 Requires-Dist: packaging==23.1
 Requires-Dist: psutil==5.9.4
 Provides-Extra: dev
+Requires-Dist: astroid==2.15.6; extra == "dev"
 Requires-Dist: build==0.10.0; extra == "dev"
 Requires-Dist: coverage==7.3.0; extra == "dev"
 Requires-Dist: diff-cover==7.7.0; extra == "dev"

{chia-blockchain-2.1.0rc2 → chia-blockchain-2.1.0rc4}/chia/cmds/data.py

@@ -315,14 +315,14 @@ def get_root_history(
     help="Specify if already existing files need to be overwritten by this command",
 )
 @click.option(
-    "-f", "--foldername", type=str, help="If specified, use a non-default folder to write the files", required=False
+    "-d", "--directory", type=str, help="If specified, use a non-default directory to write the files", required=False
 )
 @create_rpc_port_option()
 @options.create_fingerprint()
 def add_missing_files(
     ids: Optional[str],
     overwrite: bool,
-    foldername: Optional[str],
+    directory: Optional[str],
     data_rpc_port: int,
     fingerprint: Optional[int],
 ) -> None:
@@ -333,7 +333,7 @@ def add_missing_files(
             rpc_port=data_rpc_port,
             ids=None if ids is None else json.loads(ids),
             overwrite=overwrite,
-            foldername=None if foldername is None else Path(foldername),
+            foldername=None if directory is None else Path(directory),
             fingerprint=fingerprint,
         )
     )

{chia-blockchain-2.1.0rc2 → chia-blockchain-2.1.0rc4}/chia/cmds/farm_funcs.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import sys
+import traceback
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -10,6 +12,7 @@ from chia.rpc.farmer_rpc_client import FarmerRpcClient
 from chia.rpc.full_node_rpc_client import FullNodeRpcClient
 from chia.rpc.wallet_rpc_client import WalletRpcClient
 from chia.util.default_root import DEFAULT_ROOT_PATH
+from chia.util.errors import CliRpcConnectionError
 from chia.util.misc import format_bytes, format_minutes
 from chia.util.network import is_localhost
 
@@ -89,15 +92,26 @@ async def summary(
     root_path: Path = DEFAULT_ROOT_PATH,
 ) -> None:
     harvesters_summary = await get_harvesters_summary(farmer_rpc_port, root_path)
-    blockchain_state = await get_blockchain_state(rpc_port, root_path)
+    blockchain_state = None
+    try:
+        blockchain_state = await get_blockchain_state(rpc_port, root_path)
+    except CliRpcConnectionError:
+        pass
+    except Exception:
+        print("Error while trying to get blockchain state!", file=sys.stderr)
+        traceback.print_exc(file=sys.stderr)
+
     farmer_running = False if harvesters_summary is None else True  # harvesters uses farmer rpc too
 
     wallet_not_ready: bool = False
     amounts = None
     try:
         amounts = await get_wallets_stats(wallet_rpc_port, root_path)
-    except Exception:
+    except CliRpcConnectionError:
         wallet_not_ready = True
+    except Exception:
+        print("Error while trying to get wallet stats!", file=sys.stderr)
+        traceback.print_exc(file=sys.stderr)
     wallet_not_running: bool = True if amounts is None else False
 
     print("Farming status: ", end="")

{chia-blockchain-2.1.0rc2 → chia-blockchain-2.1.0rc4}/chia/full_node/pending_tx_cache.py

@@ -87,7 +87,7 @@ class PendingTxCache:
             self._cache_cost -= removed_item.cost
             to_evict[1].pop(first_in)
             if to_evict[1] == {}:
-                self._by_height.pop()
+                self._by_height.popitem()
 
     def drain(self, up_to_height: uint32) -> Dict[bytes32, MempoolItem]:
         ret: Dict[bytes32, MempoolItem] = {}

{chia-blockchain-2.1.0rc2 → chia-blockchain-2.1.0rc4}/chia/simulator/setup_services.py

@@ -329,8 +329,24 @@ async def setup_wallet_node(
         await service.wait_closed()
         if db_path.exists():
             # TODO: remove (maybe) when fixed https://github.com/python/cpython/issues/97641
+
+            # 3.11 switched to using functools.lru_cache for the statement cache.
+            # See #87028. This introduces a reference cycle involving the connection
+            # object, so the connection object no longer gets immediately
+            # deallocated, not until, for example, gc.collect() is called to break
+            # the cycle.
             gc.collect()
-            db_path.unlink()
+            for _ in range(10):
+                try:
+                    db_path.unlink()
+                    break
+                except PermissionError as e:
+                    print(f"db_path.unlink(): {e}")
+                    time.sleep(0.1)
+                    # filesystem operations are async on windows
+                    # [WinError 32] The process cannot access the file because it is
+                    # being used by another process
+                    pass
         keychain.delete_all_keys()
 
 

{chia-blockchain-2.1.0rc2 → chia-blockchain-2.1.0rc4}/chia/wallet/vc_wallet/cr_cat_wallet.py

@@ -167,15 +167,19 @@ class CRCATWallet(CATWallet):
         replace_self = cls()
         replace_self.standard_wallet = cat_wallet.standard_wallet
         replace_self.log = logging.getLogger(cat_wallet.get_name())
+        replace_self.log.info(f"Converting CAT wallet {cat_wallet.id()} to CR-CAT wallet")
         replace_self.wallet_state_manager = cat_wallet.wallet_state_manager
         replace_self.info = CRCATInfo(
             cat_wallet.cat_info.limitations_program_hash, None, authorized_providers, proofs_checker
         )
-        replace_self.wallet_info = await cat_wallet.wallet_state_manager.user_store.update_wallet(
+        await cat_wallet.wallet_state_manager.user_store.update_wallet(
             WalletInfo(
                 cat_wallet.id(), cat_wallet.get_name(), uint8(WalletType.CRCAT.value), bytes(replace_self.info).hex()
             )
         )
+        updated_wallet_info = await cat_wallet.wallet_state_manager.user_store.get_wallet_by_id(cat_wallet.id())
+        assert updated_wallet_info is not None
+        replace_self.wallet_info = updated_wallet_info
 
         cat_wallet.wallet_state_manager.wallets[cat_wallet.id()] = replace_self
 

{chia-blockchain-2.1.0rc2 → chia-blockchain-2.1.0rc4}/chia/wallet/wallet_state_manager.py

@@ -2024,7 +2024,7 @@ class WalletStateManager:
                 ):
                     coins_removed = tx.spend_bundle.removals()
                     trade_coins_removed = set([])
-                    trade = None
+                    trades = []
                     for removed_coin in coins_removed:
                         trade = await self.trade_manager.get_trade_by_coin(removed_coin)
                         if trade is not None and trade.status in (
@@ -2032,21 +2032,22 @@ class WalletStateManager:
                             TradeStatus.PENDING_ACCEPT.value,
                             TradeStatus.PENDING_CANCEL.value,
                         ):
+                            if trade not in trades:
+                                trades.append(trade)
                             # offer was tied to these coins, lets subscribe to them to get a confirmation to
                             # cancel it if it's confirmed
                             # we send transactions to multiple peers, and in cases when mempool gets
                             # fragmented, it's safest to wait for confirmation from blockchain before setting
                             # offer to failed
                             trade_coins_removed.add(removed_coin.name())
-                    if trade and trade_coins_removed:
+                    if trades != [] and trade_coins_removed != set():
                         if not tx.is_valid():
                             # we've tried to send this transaction to a full node multiple times
                             # but failed, it's safe to assume that it's not going to be accepted
                             # we can mark this offer as failed
                             self.log.info("This offer can't be posted, removing it from pending offers")
-                            assert trade is not None
-                            await self.trade_manager.fail_pending_offer(trade.trade_id)
-
+                            for trade in trades:
+                                await self.trade_manager.fail_pending_offer(trade.trade_id)
                         else:
                             self.log.info(
                                 "Subscribing to unspendable offer coins: %s",

{chia-blockchain-2.1.0rc2 → chia-blockchain-2.1.0rc4/chia_blockchain.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chia-blockchain
-Version: 2.1.0rc2
+Version: 2.1.0rc4
 Summary: Chia blockchain full node, farmer, timelord, and wallet.
 Home-page: https://chia.net/
 Author: Mariano Sorgente
@@ -13,15 +13,15 @@ Requires-Python: >=3.8.1, <4
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiofiles==23.2.1
-Requires-Dist: anyio==3.7.1
+Requires-Dist: anyio==4.0.0
 Requires-Dist: blspy==2.0.2
 Requires-Dist: boto3==1.28.25
 Requires-Dist: chiavdf==1.0.11
 Requires-Dist: chiabip158==1.3
-Requires-Dist: chiapos==2.0.2
+Requires-Dist: chiapos==2.0.3rc1
 Requires-Dist: clvm==0.9.7
 Requires-Dist: clvm_tools==0.4.6
-Requires-Dist: chia_rs==0.2.10
+Requires-Dist: chia_rs==0.2.11
 Requires-Dist: clvm-tools-rs==0.1.34
 Requires-Dist: aiohttp==3.8.5
 Requires-Dist: aiosqlite==0.19.0
@@ -44,6 +44,7 @@ Requires-Dist: zstd==1.5.5.1
 Requires-Dist: packaging==23.1
 Requires-Dist: psutil==5.9.4
 Provides-Extra: dev
+Requires-Dist: astroid==2.15.6; extra == "dev"
 Requires-Dist: build==0.10.0; extra == "dev"
 Requires-Dist: coverage==7.3.0; extra == "dev"
 Requires-Dist: diff-cover==7.7.0; extra == "dev"

{chia-blockchain-2.1.0rc2 → chia-blockchain-2.1.0rc4}/chia_blockchain.egg-info/requires.txt

@@ -1,13 +1,13 @@
 aiofiles==23.2.1
-anyio==3.7.1
+anyio==4.0.0
 blspy==2.0.2
 boto3==1.28.25
 chiavdf==1.0.11
 chiabip158==1.3
-chiapos==2.0.2
+chiapos==2.0.3rc1
 clvm==0.9.7
 clvm_tools==0.4.6
-chia_rs==0.2.10
+chia_rs==0.2.11
 clvm-tools-rs==0.1.34
 aiohttp==3.8.5
 aiosqlite==0.19.0
@@ -31,6 +31,7 @@ packaging==23.1
 psutil==5.9.4
 
 [dev]
+astroid==2.15.6
 build==0.10.0
 coverage==7.3.0
 diff-cover==7.7.0