Skip to content

Commit 6b5ee60

Browse files
authored
catchup: into long_lived/datalayer_merkle_blob from main @ cac84b5 (#19892)
Source hash: cac84b5 Remaining commits: 0
2 parents 35c03a5 + 70c3bdb commit 6b5ee60

File tree

132 files changed

+6463
-3613
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+6463
-3613
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ jobs:
176176

177177
- uses: chia-network/actions/activate-venv@main
178178

179-
- name: Setup Node 18.x
179+
- name: Setup Node 20.x
180180
uses: actions/setup-node@v4
181181
with:
182-
node-version: "18.x"
182+
node-version: "20.x"
183183

184184
- name: Prepare GUI cache
185185
id: gui-ref

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ jobs:
9595
with:
9696
python-version: ${{ matrix.python-version }}
9797

98-
- name: Setup Node 18.x
98+
- name: Setup Node 20.x
9999
uses: actions/setup-node@v4
100100
with:
101-
node-version: "18.x"
101+
node-version: "20.x"
102102

103103
- name: Test for secrets access
104104
id: check_secrets

.github/workflows/mozilla-ca-cert.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Update Mozilla cert.pem Nightly
2+
3+
on:
4+
schedule:
5+
- cron: "0 11 * * *"
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: write
10+
pull-requests: write
11+
12+
concurrency:
13+
group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}
14+
cancel-in-progress: true
15+
16+
jobs:
17+
update_cert:
18+
name: Update Mozilla cert.pem Nightly
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout code
22+
uses: actions/checkout@v4
23+
24+
- name: Download latest Mozilla CA cert.pem
25+
run: |
26+
curl --silent --show-error --location https://curl.se/ca/cacert.pem -o chia/ssl/cacert.pem
27+
28+
- name: Set up commit signing
29+
uses: Chia-Network/actions/commit-sign/gpg@main
30+
with:
31+
gpg_private_key: ${{ secrets.CHIA_AUTOMATION_PRIVATE_GPG_KEY }}
32+
passphrase: ${{ secrets.CHIA_AUTOMATION_PRIVATE_GPG_PASSPHRASE }}
33+
34+
- name: Create Pull Request if cacert.pem changed
35+
uses: peter-evans/create-pull-request@v6
36+
with:
37+
commit-message: "Update cacert.pem from Mozilla CA bundle"
38+
title: "Update cacert.pem from Mozilla CA bundle"
39+
body: "Automated update of cacert.pem from https://curl.se/ca/cacert.pem."
40+
branch: update-cacert-pem
41+
add-paths: chia/ssl/cacert.pem

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,3 @@
22
path = chia-blockchain-gui
33
url = https://github.com/Chia-Network/chia-blockchain-gui.git
44
branch = main
5-
[submodule "mozilla-ca"]
6-
path = mozilla-ca
7-
url = https://github.com/Chia-Network/mozilla-ca.git
8-
branch = main

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ repos:
4040
hooks:
4141
- id: poetry
4242
name: poetry
43-
entry: ./activated.py --poetry poetry check
43+
entry: ./activated.py --poetry poetry check --strict
4444
language: system
4545
pass_filenames: false
4646
- repo: https://github.com/pre-commit/mirrors-prettier

.repo-content-updater.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
var_overrides:
22
DEPENDABOT_ACTIONS_REVIEWERS: '["cmmarslender", "altendky"]'
33
DEPENDENCY_REVIEW_ALLOW_DEPENDENCIES_LICENSES: pkg:pypi/pyinstaller, pkg:pypi/mypy
4+
DEPENDABOT_PIP_PULL_REQUEST_LIMIT: "30"

Install.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ if ($null -eq (Get-Command git -ErrorAction SilentlyContinue))
3737
Exit 1
3838
}
3939

40-
git submodule update --init mozilla-ca
41-
4240
if ($null -eq (Get-Command py -ErrorAction SilentlyContinue))
4341
{
4442
Write-Output "Unable to find py"

benchmarks/address_manager_store.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323

2424
def generate_random_ip(rand: random.Random) -> str:
25-
return str(IPv4Address(rand.getrandbits(32)))
25+
return str(IPv4Address(rand.randbytes(4)))
2626

2727

2828
def populate_address_manager(num_new: int = 500000, num_tried: int = 200000) -> AddressManager:

benchmarks/block_ref.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
from chia_rs.sized_bytes import bytes32
1414
from chia_rs.sized_ints import uint32
1515

16+
from chia.consensus.block_height_map import BlockHeightMap
1617
from chia.consensus.blockchain import Blockchain
1718
from chia.consensus.default_constants import DEFAULT_CONSTANTS
1819
from chia.consensus.get_block_generator import get_block_generator
19-
from chia.full_node.block_height_map import BlockHeightMap
2020
from chia.full_node.block_store import BlockStore
2121
from chia.full_node.coin_store import CoinStore
2222
from chia.types.blockchain_format.serialized_program import SerializedProgram

0 commit comments

Comments
 (0)