Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions .github/workflows/mozilla-ca-cert.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions Install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion build_scripts/pyinstaller.spec
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ datas.append((f"{ROOT}/chia/util/initial-config.yaml", "chia/util"))
for path in sorted({path.parent for path in ROOT.joinpath("chia").rglob("*.hex")}):
datas.append((f"{path}/*.hex", path.relative_to(ROOT)))
datas.append((f"{ROOT}/chia/ssl/*", "chia/ssl"))
datas.append((f"{ROOT}/mozilla-ca/*", "mozilla-ca"))
datas.extend(version_data)

pathex = []
Expand Down
4 changes: 2 additions & 2 deletions chia/ssl/create_ssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from pathlib import Path
from typing import Any, Optional

import certifi
import importlib_resources
from cryptography import x509
from cryptography.hazmat.backends import default_backend
Expand Down Expand Up @@ -36,8 +37,7 @@ def get_chia_ca_crt_key() -> tuple[Any, Any]:


def get_mozilla_ca_crt() -> str:
mozilla_path = Path(__file__).parent.parent.parent.absolute() / "mozilla-ca/cacert.pem"
return str(mozilla_path)
return certifi.where()


def write_ssl_cert_and_key(cert_path: Path, cert_data: bytes, key_path: Path, key_data: bytes, overwrite: bool = True):
Expand Down
2 changes: 0 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ if [ "$(uname -m)" = "armv7l" ]; then
echo "Exiting."
exit 1
fi
# Get submodules
git submodule update --init mozilla-ca

# You can specify preferred python version by exporting `INSTALL_PYTHON_VERSION`
# e.g. `export INSTALL_PYTHON_VERSION=3.9`
Expand Down
1 change: 0 additions & 1 deletion mozilla-ca
Submodule mozilla-ca deleted from c88cd8
14 changes: 7 additions & 7 deletions poetry.lock
Original file line number Diff line number Diff line change
Expand Up @@ -576,15 +576,14 @@ virtualenv = ["virtualenv (>=20.0.35)"]

[[package]]
name = "certifi"
version = "2024.7.4"
version = "2025.7.14"
description = "Python package for providing Mozilla's CA Bundle."
optional = true
python-versions = ">=3.6"
optional = false
python-versions = ">=3.7"
groups = ["main"]
markers = "sys_platform == \"linux\" and extra == \"dev\""
files = [
{file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"},
{file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"},
{file = "certifi-2025.7.14-py3-none-any.whl", hash = "sha256:6b31f564a415d79ee77df69d757bb49a5bb53bd9f756cbbe24394ffd6fc1f4b2"},
{file = "certifi-2025.7.14.tar.gz", hash = "sha256:8ea99dbdfaaf2ba2f9bac77b9249ef62ec5218e7c2b2e903378ed5fccf765995"},
]

[[package]]
Expand Down Expand Up @@ -877,6 +876,7 @@ files = [
{file = "chiabip158-1.5.2-cp39-cp39-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b7b36a529ee5685294fe55cedfa0788cb1baac03c310b1533cd23481357efd10"},
{file = "chiabip158-1.5.2-cp39-cp39-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ad40df68317d39f33272e25fd9651f05a27b85d524e9ed694ac7549cde44918c"},
{file = "chiabip158-1.5.2-cp39-cp39-win_amd64.whl", hash = "sha256:07b298cfb0621dba1027c710e9669970f4e089c118db8732bd456101c727db65"},
{file = "chiabip158-1.5.2.tar.gz", hash = "sha256:86c225f5a566cca3199607f6ea646799da9e406df6fb0ae7323d57e5ac8e2f2c"},
]

[[package]]
Expand Down Expand Up @@ -3785,4 +3785,4 @@ upnp = ["miniupnpc"]
[metadata]
lock-version = "2.1"
python-versions = ">=3.9, <4"
content-hash = "a0b086bb169964bc3c677ffeceb8d2d8a3e5c13d0eb245f685ea49538cab48a5"
content-hash = "ffa8c33289949d7133c21adc6e3d44b7b525ad6b74f5b452d6c5182f1a7abe10"
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ homepage = "https://chia.net/"

[tool.poetry]
# see [tool.poetry-dynamic-versioning]
packages = [{ include = "chia"}, { include = "mozilla-ca/cacert.pem" }]
packages = [{ include = "chia"}]
version = "0.0.0"

[project.scripts]
Expand Down Expand Up @@ -49,6 +49,7 @@ aiosqlite = ">=0.20.0" # asyncio wrapper for sqlite, to store blocks
anyio = ">=4.6.2.post1"
bitstring = ">=4.1.4" # Binary data management library
boto3 = ">=1.35.43" # AWS S3 for Data Layer S3 plugin
certifi = ">=2023.11.17" # Root CA bundle for SSL certificate verification
chiabip158 = ">=1.5.2" # bip158-style wallet filters
chiapos = ">=2.0.10" # proof of space
chia-puzzles-py = ">=0.20.1"
Expand Down
Loading