catchup: into long_lived/datalayer_merkle_blob from main @ 214ecf7 (#…

…19029) Source hash: 214ecf7 Remaining commits: 0
Chia-Network · Dec 11, 2024 · 186d83a · 186d83a
2 parents e704b35 + c85cadd
commit 186d83a
Show file tree

Hide file tree

Showing 110 changed files with 4,054 additions and 1,476 deletions.
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
@@ -0,0 +1,26 @@
+self-hosted-runner:
+  # Labels of self-hosted runner in array of strings.
+  labels: ["benchmark", "glue-notify"]
+
+# Configuration variables in array of strings defined in your repository or
+# organization. `null` means disabling configuration variables check.
+# Empty array means no configuration variable is allowed.
+config-variables: null
+
+# Configuration for file paths. The keys are glob patterns to match to file
+# paths relative to the repository root. The values are the configurations for
+# the file paths. Note that the path separator is always '/'.
+# The following configurations are available.
+#
+# "ignore" is an array of regular expression patterns. Matched error messages
+# are ignored. This is similar to the "-ignore" command line option.
+paths:
+  #  .github/workflows/**/*.yml:
+  #    ignore: []
+  ".github/workflows/*.y*ml":
+    ignore: ["string should not be empty", ".* SC2002:.*"]
+  ".github/workflows/test-single.yml":
+    ignore: [
+        # special case here using a variable as a key in the excludes
+        'value .*\$\{\{ inputs.matrix_mode \}\}.* in "exclude" does not match in matrix "python" combinations. possible values are',
+      ]
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -26,7 +26,7 @@ updates:
       interval: "weekly"
       day: "tuesday"
     open-pull-requests-limit: 10
-    rebase-strategy: disabled
+    rebase-strategy: auto
     labels:
       - dependencies
       - python

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -5,7 +5,7 @@ on:
     inputs:
       repeats:
         description: "The number of times to execute each benchmark"
-        type: int
+        type: number
         default: 1
   push:
     paths-ignore:

diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml
@@ -39,6 +39,8 @@ permissions:
 jobs:
   version:
     uses: ./.github/workflows/reflow-version.yml
+    with:
+      release_type: ${{ inputs.release_type }}
 
   build:
     name: Build ${{ matrix.os.arch }}
@@ -65,7 +67,7 @@ jobs:
 
     env:
       CHIA_INSTALLER_VERSION: ${{ needs.version.outputs.chia-installer-version }}
-      SETUPTOOLS_SCM_PRETEND_VERSION_FOR_CHIA_BLOCKCHAIN: ${{ needs.version.outputs.chia-installer-version }}
+      POETRY_DYNAMIC_VERSIONING_OVERRIDE: "chia-blockchain=${{ needs.version.outputs.chia-installer-version }}"
       TAG_TYPE: ${{ needs.version.outputs.tag-type }}
 
     steps:
@@ -133,8 +135,8 @@ jobs:
           mkdir "$GITHUB_WORKSPACE"/bladebit
           cd "$GITHUB_WORKSPACE"/bladebit
           gh release download -R Chia-Network/bladebit "$LATEST_VERSION" -p 'bladebit*-${{ matrix.os.bladebit-suffix }}'
-          ls *.tar.gz | xargs -I{} bash -c 'tar -xzf {} && rm {}'
-          ls bladebit* | xargs -I{} chmod +x {}
+          find . -maxdepth 1 -name '*.tar.gz' -print0 | xargs -0 -I{} bash -c 'tar -xzf {} && rm {}'
+          find . -maxdepth 1 -name 'bladebit*' -print0 | xargs -0 -I{} chmod +x {}
           cd "$OLDPWD"
 
       - uses: ./.github/actions/install
@@ -332,7 +334,7 @@ jobs:
         shell: bash
         if: matrix.mode.name == 'GUI'
         run: |
-          [ $(stat -c %a:%G:%U /opt/chia/chrome-sandbox) == "4755:root:root" ]
+          [ "$(stat -c %a:%G:%U /opt/chia/chrome-sandbox)" == "4755:root:root" ]
 
       - name: Remove package
         run: |

diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml
@@ -39,6 +39,8 @@ permissions:
 jobs:
   version:
     uses: ./.github/workflows/reflow-version.yml
+    with:
+      release_type: ${{ inputs.release_type }}
 
   build:
     name: Build amd64 RPM
@@ -57,7 +59,7 @@ jobs:
 
     env:
       CHIA_INSTALLER_VERSION: ${{ needs.version.outputs.chia-installer-version }}
-      SETUPTOOLS_SCM_PRETEND_VERSION_FOR_CHIA_BLOCKCHAIN: ${{ needs.version.outputs.chia-installer-version }}
+      POETRY_DYNAMIC_VERSIONING_OVERRIDE: "chia-blockchain=${{ needs.version.outputs.chia-installer-version }}"
       TAG_TYPE: ${{ needs.version.outputs.tag-type }}
 
     steps:
@@ -123,8 +125,8 @@ jobs:
           mkdir "$GITHUB_WORKSPACE"/bladebit
           cd "$GITHUB_WORKSPACE"/bladebit
           gh release download -R Chia-Network/bladebit "$LATEST_VERSION" -p 'bladebit*-centos-x86-64.tar.gz'
-          ls *.tar.gz | xargs -I{} bash -c 'tar -xzf {} && rm {}'
-          ls bladebit* | xargs -I{} chmod +x {}
+          find . -maxdepth 1 -name '*.tar.gz' -print0 | xargs -0 -I{} bash -c 'tar -xzf {} && rm {}'
+          find . -maxdepth 1 -name 'bladebit*' -print0 | xargs -0 -I{} chmod +x {}
           cd "$OLDPWD"
 
       - uses: ./.github/actions/install

diff --git a/.github/workflows/build-macos-installers.yml b/.github/workflows/build-macos-installers.yml
@@ -39,6 +39,8 @@ permissions:
 jobs:
   version:
     uses: ./.github/workflows/reflow-version.yml
+    with:
+      release_type: ${{ inputs.release_type }}
 
   build:
     name: Build ${{ matrix.os.name }} DMG
@@ -62,7 +64,7 @@ jobs:
 
     env:
       CHIA_INSTALLER_VERSION: ${{ needs.version.outputs.chia-installer-version }}
-      SETUPTOOLS_SCM_PRETEND_VERSION_FOR_CHIA_BLOCKCHAIN: ${{ needs.version.outputs.chia-installer-version }}
+      POETRY_DYNAMIC_VERSIONING_OVERRIDE: "chia-blockchain=${{ needs.version.outputs.chia-installer-version }}"
       TAG_TYPE: ${{ needs.version.outputs.tag-type }}
 
     steps:
@@ -119,10 +121,10 @@ jobs:
         run: |
           LATEST_MADMAX=$(gh api repos/Chia-Network/chia-plotter-madmax/releases/latest --jq 'select(.prerelease == false) | .tag_name')
           mkdir "$GITHUB_WORKSPACE"/madmax
-          gh release download -R Chia-Network/chia-plotter-madmax "$LATEST_MADMAX" -p 'chia_plot-'$LATEST_MADMAX'-macos-${{ matrix.os.name }}'
-          mv chia_plot-$LATEST_MADMAX-macos-${{ matrix.os.name }} "$GITHUB_WORKSPACE"/madmax/chia_plot
-          gh release download -R Chia-Network/chia-plotter-madmax "$LATEST_MADMAX" -p 'chia_plot_k34-'$LATEST_MADMAX'-macos-${{ matrix.os.name }}'
-          mv chia_plot_k34-$LATEST_MADMAX-macos-${{ matrix.os.name }} "$GITHUB_WORKSPACE"/madmax/chia_plot_k34
+          gh release download -R Chia-Network/chia-plotter-madmax "$LATEST_MADMAX" -p "chia_plot-$LATEST_MADMAX-macos-${{ matrix.os.name }}"
+          mv "chia_plot-$LATEST_MADMAX-macos-${{ matrix.os.name }}" "$GITHUB_WORKSPACE"/madmax/chia_plot
+          gh release download -R Chia-Network/chia-plotter-madmax "$LATEST_MADMAX" -p "chia_plot_k34-$LATEST_MADMAX-macos-${{ matrix.os.name }}"
+          mv "chia_plot_k34-$LATEST_MADMAX-macos-${{ matrix.os.name }}" "$GITHUB_WORKSPACE"/madmax/chia_plot_k34
           chmod +x "$GITHUB_WORKSPACE"/madmax/chia_plot
           chmod +x "$GITHUB_WORKSPACE"/madmax/chia_plot_k34
 
@@ -162,8 +164,8 @@ jobs:
                 LATEST_VERSION=v2.0.1
               fi
           gh release download -R Chia-Network/bladebit "$LATEST_VERSION" -p 'bladebit*-${{ matrix.os.bladebit-suffix }}'
-          ls *.tar.gz | xargs -I{} bash -c 'tar -xzf {} && rm {}'
-          ls bladebit* | xargs -I{} chmod +x {}
+          find . -maxdepth 1 -name '*.tar.gz' -print0 | xargs -0 -I{} bash -c 'tar -xzf {} && rm {}'
+          find . -maxdepth 1 -name 'bladebit*' -print0 | xargs -0 -I{} chmod +x {}
           cd "$OLDPWD"
 
       - uses: ./.github/actions/install
@@ -312,10 +314,6 @@ jobs:
             matrix: intel
             artifact-name: intel
         exclude:
-          - os:
-              matrix: 12
-            arch:
-              matrix: arm
           - os:
               matrix: 13
             arch:
@@ -353,6 +351,8 @@ jobs:
 
       - name: Run chia dev installers test
         run: |
+          # TODO: maybe fix this and remove the disable
+          # shellcheck disable=SC2211
           "/Volumes/Chia "*"/Chia.app/Contents/Resources/app.asar.unpacked/daemon/chia" dev installers test --expected-chia-version "${{ needs.version.outputs.chia-installer-version }}"
 
       - name: Detach .dmg

diff --git a/.github/workflows/build-windows-installer.yml b/.github/workflows/build-windows-installer.yml
@@ -39,23 +39,23 @@ permissions:
 jobs:
   version:
     uses: ./.github/workflows/reflow-version.yml
+    with:
+      release_type: ${{ inputs.release_type }}
 
   build:
     name: Build EXE
     runs-on: [windows-2019]
     needs:
       - version
     timeout-minutes: 65
-    outputs:
-      chia-installer-version: ${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }}
     strategy:
       fail-fast: false
       matrix:
         python-version: ["3.10"]
 
     env:
       CHIA_INSTALLER_VERSION: ${{ needs.version.outputs.chia-installer-version }}
-      SETUPTOOLS_SCM_PRETEND_VERSION_FOR_CHIA_BLOCKCHAIN: ${{ needs.version.outputs.chia-installer-version }}
+      POETRY_DYNAMIC_VERSIONING_OVERRIDE: "chia-blockchain=${{ needs.version.outputs.chia-installer-version }}"
       TAG_TYPE: ${{ needs.version.outputs.tag-type }}
 
     steps:
@@ -121,14 +121,18 @@ jobs:
         if: steps.check_secrets.outputs.HAS_SIGNING_SECRET
         shell: bash
         run: |
-          echo "SM_HOST=${{ secrets.SM_HOST }}" >> "$GITHUB_ENV"
-          echo "SM_API_KEY=${{ secrets.SM_API_KEY }}" >> "$GITHUB_ENV"
-          echo "SM_CLIENT_CERT_FILE=D:\\Certificate_pkcs12.p12" >> "$GITHUB_ENV"
-          echo "SM_CLIENT_CERT_PASSWORD=${{ secrets.SM_CLIENT_CERT_PASSWORD }}" >> "$GITHUB_ENV"
-          echo "SM_CODE_SIGNING_CERT_SHA1_HASH=${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}" >> "$GITHUB_ENV"
-          echo "C:\Program Files (x86)\Windows Kits\10\App Certification Kit" >> $GITHUB_PATH
-          echo "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools" >> $GITHUB_PATH
-          echo "C:\Program Files\DigiCert\DigiCert One Signing Manager Tools" >> $GITHUB_PATH
+          {
+            echo "SM_HOST=${{ secrets.SM_HOST }}"
+            echo "SM_API_KEY=${{ secrets.SM_API_KEY }}"
+            echo "SM_CLIENT_CERT_FILE=D:\\Certificate_pkcs12.p12"
+            echo "SM_CLIENT_CERT_PASSWORD=${{ secrets.SM_CLIENT_CERT_PASSWORD }}"
+            echo "SM_CODE_SIGNING_CERT_SHA1_HASH=${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}"
+          } >> "$GITHUB_ENV"
+          {
+            echo "C:\Program Files (x86)\Windows Kits\10\App Certification Kit"
+            echo "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools"
+            echo "C:\Program Files\DigiCert\DigiCert One Signing Manager Tools"
+          } >> "$GITHUB_PATH"
 
       - name: Setup SSM KSP on windows latest
         if: steps.check_secrets.outputs.HAS_SIGNING_SECRET
@@ -183,7 +187,7 @@ jobs:
           mkdir "$GITHUB_WORKSPACE\\bladebit"
           cd "$GITHUB_WORKSPACE\\bladebit"
           gh release download -R Chia-Network/bladebit "$LATEST_VERSION" -p 'bladebit*windows-x86-64.zip'
-          ls *.zip | xargs -I{} bash -c 'unzip {} && rm {}'
+          find . -maxdepth 1 -name '*.zip' -print0 | xargs -0 -I{} bash -c 'unzip {} && rm {}'
           cd "$OLDPWD"
 
       - uses: ./.github/actions/install
@@ -213,12 +217,14 @@ jobs:
 
       - if: steps.cache-gui.outputs.cache-hit != 'true'
         name: Build GUI
+        shell: pwsh
         continue-on-error: false
         run: |
           cd .\build_scripts
           .\build_windows-1-gui.ps1
 
       - name: Build Windows installer
+        shell: pwsh
         env:
           HAS_SIGNING_SECRET: ${{ steps.check_secrets.outputs.HAS_SIGNING_SECRET }}
         run: |
@@ -234,6 +240,7 @@ jobs:
           path: chia-blockchain-gui\release-builds\windows-installer\
 
       - name: Remove Windows exe and installer to exclude from cache
+        shell: pwsh
         run: |
           Remove-Item .\chia-blockchain-gui\packages\gui\dist -Recurse -Force
           Remove-Item .\chia-blockchain-gui\packages\gui\daemon -Recurse -Force
@@ -335,6 +342,7 @@ jobs:
           path: packages
 
       - name: Install package
+        shell: pwsh
         run: |
           dir ./packages/
           $env:INSTALLER_PATH = (Get-ChildItem packages/ChiaSetup-*.exe)
@@ -347,14 +355,16 @@ jobs:
           dir ./installed/
 
       - name: List installed files
+        shell: pwsh
         run: |
           Get-ChildItem -Recurse $env:INSTALL_PATH | Select FullName
 
       - name: List all files
-        if:
+        shell: pwsh
         run: |
           Get-ChildItem -Recurse $env:INSTALL_PATH | Select FullName
 
       - name: Run chia dev installers test
+        shell: pwsh
         run: |
           & ($env:INSTALL_PATH + "/resources/app.asar.unpacked/daemon/chia.exe") dev installers test --expected-chia-version "${{ needs.version.outputs.chia-installer-version }}"
diff --git a/.github/workflows/dependency-review.yml b/.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/pyinstaller
+          allow-dependencies-licenses: pkg:pypi/pyinstaller, pkg:pypi/mypy
           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
diff --git a/.github/workflows/mozilla-ca-cert.yml b/.github/workflows/mozilla-ca-cert.yml
@@ -1,8 +1,6 @@
 name: "Update Mozilla CA sub module"
 on:
   workflow_dispatch:
-    branches:
-      - $default-branch
 
 jobs:
   update_ca_module:
@@ -11,7 +9,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: "${{ github.event.inputs.chia_ref }}"
           repository: chia-network/chia-blockchain
           submodules: recursive
           token: "${{ secrets.GITHUB_TOKEN }}"
@@ -28,7 +25,7 @@ jobs:
           git pull origin main
 
       - name: "Create Pull Request"
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           base: main
           body: "Newest Mozilla CA cert"

diff --git a/.github/workflows/reflow-publish-installer.yml b/.github/workflows/reflow-publish-installer.yml
@@ -118,35 +118,35 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          py3createtorrent -f -t ${TRACKER_URL} artifacts/${FILE} -o artifacts/${FILE}.torrent --webseed https://download.chia.net/install/${FILE}
-          gh release upload --repo ${{ github.repository }} $RELEASE_TAG artifacts/${FILE}.torrent
+          py3createtorrent -f -t "${TRACKER_URL}" "artifacts/${FILE}" -o "artifacts/${FILE}.torrent" --webseed "https://download.chia.net/install/${FILE}"
+          gh release upload --repo "${{ github.repository }}" "$RELEASE_TAG" "artifacts/${FILE}.torrent"
 
       - name: Upload Dev Installer
         if: steps.check_secrets.outputs.HAS_AWS_SECRET && github.ref == 'refs/heads/main'
         run: |
-          aws s3 cp artifacts/${FILE} ${LATEST_DEV_S3_URL}/${LATEST_DEV_FILE}
-          aws s3 cp artifacts/${FILE}.sha256 ${LATEST_DEV_S3_URL}/${LATEST_DEV_FILE}.sha256
+          aws s3 cp "artifacts/${FILE}" "${LATEST_DEV_S3_URL}/${LATEST_DEV_FILE}"
+          aws s3 cp "artifacts/${FILE}.sha256" "${LATEST_DEV_S3_URL}/${LATEST_DEV_FILE}.sha256"
 
       - name: Upload Release Files
         if: steps.check_secrets.outputs.HAS_AWS_SECRET && env.RELEASE == 'true'
         run: |
-          aws s3 cp artifacts/${FILE} ${INSTALL_S3_URL}
-          aws s3 cp artifacts/${FILE}.sha256 ${INSTALL_S3_URL}
+          aws s3 cp "artifacts/${FILE}" "${INSTALL_S3_URL}"
+          aws s3 cp "artifacts/${FILE}.sha256" "${INSTALL_S3_URL}"
 
       - name: Upload Release Torrent
         if: steps.check_secrets.outputs.HAS_AWS_SECRET && env.RELEASE == 'true' && matrix.mode.matrix == 'gui'
         run: |
-          aws s3 cp artifacts/${FILE}.torrent ${TORRENT_S3_URL}
+          aws s3 cp "artifacts/${FILE}.torrent" "${TORRENT_S3_URL}"
 
       - name: Upload release artifacts
         if: env.RELEASE == 'true'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh release upload \
-            --repo ${{ github.repository }} \
-            $RELEASE_TAG \
-            artifacts/${FILE}
+            --repo "${{ github.repository }}" \
+            "$RELEASE_TAG" \
+            "artifacts/${FILE}"
 
       - name: Mark installer complete
         uses: Chia-Network/actions/github/glue@main

diff --git a/.github/workflows/reflow-version.yml b/.github/workflows/reflow-version.yml
@@ -2,7 +2,15 @@ name: identify version
 
 on:
   workflow_call:
+    inputs:
+      release_type:
+        description: "Tagged release testing scenario"
+        required: false
+        type: string
+        default: ""
     outputs:
+      chia-dev-version:
+        value: ${{ jobs.version.outputs.chia-dev-version }}
       chia-installer-version:
         value: ${{ jobs.version.outputs.chia-installer-version }}
       tag-type:

diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
@@ -58,7 +58,7 @@ jobs:
       # Run Linter against code base #
       ################################
       - name: Lint Code Base
-        uses: github/super-linter@v6
+        uses: github/super-linter@v7
         #        uses: docker://github/super-linter:v3.10.2
         env:
           VALIDATE_ALL_CODEBASE: true