catchup: into long_lived/datalayer_merkle_blob from main @ cac84b5e057a074da6a72e2a8bbcc70ec0a09668

.github/workflows/build-macos-installers.yml

@@ -176,10 +176,10 @@ jobs:
 
       - uses: chia-network/actions/activate-venv@main
 
-      - name: Setup Node 18.x
+      - name: Setup Node 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: "18.x"
+          node-version: "20.x"
 
       - name: Prepare GUI cache
         id: gui-ref

.github/workflows/build-windows-installer.yml

@@ -95,10 +95,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Setup Node 18.x
+      - name: Setup Node 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: "18.x"
+          node-version: "20.x"
 
       - name: Test for secrets access
         id: check_secrets

.github/workflows/update-mozilla-ca-cert.yaml

@@ -0,0 +1,41 @@
+name: Update Mozilla cert.pem Nightly
+
+on:
+  schedule:
+    - cron: "0 11 * * *"
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}
+  cancel-in-progress: true
+
+jobs:
+  update_cert:
+    name: Update Mozilla cert.pem Nightly
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download latest Mozilla CA cert.pem
+        run: |
+          curl --silent --show-error --location https://curl.se/ca/cacert.pem -o chia/ssl/cacert.pem
+
+      - name: Set up commit signing
+        uses: Chia-Network/actions/commit-sign/gpg@main
+        with:
+          gpg_private_key: ${{ secrets.CHIA_AUTOMATION_PRIVATE_GPG_KEY }}
+          passphrase: ${{ secrets.CHIA_AUTOMATION_PRIVATE_GPG_PASSPHRASE }}
+
+      - name: Create Pull Request if cacert.pem changed
+        uses: peter-evans/create-pull-request@v6
+        with:
+          commit-message: "Update cacert.pem from Mozilla CA bundle"
+          title: "Update cacert.pem from Mozilla CA bundle"
+          body: "Automated update of cacert.pem from https://curl.se/ca/cacert.pem."
+          branch: update-cacert-pem
+          add-paths: chia/ssl/cacert.pem

.gitmodules

@@ -2,7 +2,3 @@
 	path = chia-blockchain-gui
 	url = https://github.com/Chia-Network/chia-blockchain-gui.git
 	branch = main
-[submodule "mozilla-ca"]
-	path = mozilla-ca
-	url = https://github.com/Chia-Network/mozilla-ca.git
-        branch = main

.pre-commit-config.yaml

@@ -40,7 +40,7 @@ repos:
     hooks:
       - id: poetry
         name: poetry
-        entry: ./activated.py --poetry poetry check
+        entry: ./activated.py --poetry poetry check --strict
         language: system
         pass_filenames: false
   - repo: https://github.com/pre-commit/mirrors-prettier

.repo-content-updater.yml

@@ -1,3 +1,4 @@
 var_overrides:
   DEPENDABOT_ACTIONS_REVIEWERS: '["cmmarslender", "altendky"]'
   DEPENDENCY_REVIEW_ALLOW_DEPENDENCIES_LICENSES: pkg:pypi/pyinstaller, pkg:pypi/mypy
+  DEPENDABOT_PIP_PULL_REQUEST_LIMIT: "30"

Install.ps1

@@ -37,8 +37,6 @@ if ($null -eq (Get-Command git -ErrorAction SilentlyContinue))
     Exit 1
 }
 
-git submodule update --init mozilla-ca
-
 if ($null -eq (Get-Command py -ErrorAction SilentlyContinue))
 {
     Write-Output "Unable to find py"

benchmarks/address_manager_store.py

@@ -22,7 +22,7 @@
 
 
 def generate_random_ip(rand: random.Random) -> str:
-    return str(IPv4Address(rand.getrandbits(32)))
+    return str(IPv4Address(rand.randbytes(4)))
 
 
 def populate_address_manager(num_new: int = 500000, num_tried: int = 200000) -> AddressManager:

benchmarks/block_ref.py

@@ -13,10 +13,10 @@
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32
 
+from chia.consensus.block_height_map import BlockHeightMap
 from chia.consensus.blockchain import Blockchain
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.consensus.get_block_generator import get_block_generator
-from chia.full_node.block_height_map import BlockHeightMap
 from chia.full_node.block_store import BlockStore
 from chia.full_node.coin_store import CoinStore
 from chia.types.blockchain_format.serialized_program import SerializedProgram

benchmarks/block_store.py

@@ -25,7 +25,6 @@
 from benchmarks.utils import setup_db
 from chia._tests.util.benchmarks import (
     clvm_generator,
-    rand_bytes,
     rand_class_group_element,
     rand_g1,
     rand_g2,
@@ -110,7 +109,7 @@ async def run_add_block_benchmark(version: int) -> None:
                 rand_hash() if not has_pool_pk else None,
                 rand_g1(),  # plot_public_key
                 uint8(32),
-                rand_bytes(8 * 32),
+                random.randbytes(8 * 32),
             )
 
             reward_chain_block = RewardChainBlock(

benchmarks/streamable.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+import random
 import sys
 from dataclasses import dataclass
 from enum import Enum
@@ -14,7 +15,7 @@
 from chia_rs.sized_ints import uint8, uint64
 
 from benchmarks.utils import EnumType, get_commit_hash
-from chia._tests.util.benchmarks import rand_bytes, rand_full_block, rand_hash
+from chia._tests.util.benchmarks import rand_full_block, rand_hash
 from chia.util.streamable import Streamable, streamable
 
 # to run this benchmark:
@@ -50,13 +51,13 @@ class BenchmarkClass(Streamable):
 
 
 def get_random_inner() -> BenchmarkInner:
-    return BenchmarkInner(rand_bytes(20).hex())
+    return BenchmarkInner(random.randbytes(20).hex())
 
 
 def get_random_middle() -> BenchmarkMiddle:
     a: uint64 = uint64(10)
     b: list[bytes32] = [rand_hash() for _ in range(a)]
-    c: tuple[str, bool, uint8, list[bytes]] = ("benchmark", False, uint8(1), [rand_bytes(a) for _ in range(a)])
+    c: tuple[str, bool, uint8, list[bytes]] = ("benchmark", False, uint8(1), [random.randbytes(a) for _ in range(a)])
     d: tuple[BenchmarkInner, BenchmarkInner] = (get_random_inner(), get_random_inner())
     e: BenchmarkInner = get_random_inner()
     return BenchmarkMiddle(a, b, c, d, e)

build_scripts/check_dependency_artifacts.py

@@ -13,6 +13,7 @@
     "chialisp_loader",
     "chialisp_puzzles",
     "chia_base",
+    "keyrings.cryptfile",
 }
 
 
@@ -36,7 +37,7 @@ def main() -> int:
         artifact_directory_path = directory_path.joinpath("artifacts")
         artifact_directory_path.mkdir()
 
-        extras = ["upnp"]
+        extras = ["dev", "legacy-keyring", "upnp"]
 
         print("Downloading packages for Python version:")
         lines = [

build_scripts/npm_global/package.json

@@ -10,6 +10,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "n": "^8.2.0"
+    "n": "^10.2.0"
   }
 }