Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: foxypool/chia-blockchain
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.1.4-og-1.6.0
Choose a base ref
...
head repository: foxypool/chia-blockchain
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing 989 changed files with 96,232 additions and 86,732 deletions.
6 changes: 3 additions & 3 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -5,16 +5,15 @@ disable_warnings=
relative_files=True
source_pkgs=
chia
tests
omit=
tests/**/config.py
chia/_tests/**/config.py
concurrency=multiprocessing, thread
parallel=True

[paths]
source =
chia/
venv/**/site-packages/chia/
.venv/**/site-packages/chia/

[report]
precision = 1
@@ -25,3 +24,4 @@ exclude_also =
if typing.TYPE_CHECKING:
if TYPE_CHECKING:
^ *@pytest.mark.skip($|\()
benchmark_runner: BenchmarkRunner
4 changes: 4 additions & 0 deletions .diffcover.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[tool.diff_cover]
exclude = [
"*/chia/_tests/*/config.py",
]
13 changes: 0 additions & 13 deletions .flake8

This file was deleted.

4 changes: 4 additions & 0 deletions .git_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node: $Format:%H$
node-date: $Format:%cI$
describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
ref-names: $Format:%D$
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.git_archival.txt export-subst
**/*.lock linguist-generated=false
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* @Chia-Network/required-reviewers
/.github/* @Chia-Network/actions-reviewers
/.github/**/* @Chia-Network/actions-reviewers
/PRETTY_GOOD_PRACTICES.md @altendky @Chia-Network/required-reviewers
/pylintrc @altendky @Chia-Network/required-reviewers
/tests/ether.py @altendky @Chia-Network/required-reviewers
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ body:
id: what-happened
attributes:
label: What happened?
description: A clear and concise description of what happened, how to reproduce it, and what you expected to happen.
description: A clear and concise description of what happened, how to reproduce it, and what you expected to happen.
validations:
required: true
- type: input
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -9,4 +9,4 @@ contact_links:
https://github.com/Chia-Network/chia-blockchain/discussions/new?category=ideas
- about: Get support in the Chia Discord chat channels.
name: Join the Discord support chat
url: 'https://discord.gg/chia'
url: "https://discord.gg/chia"
11 changes: 3 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -3,22 +3,17 @@
- In order to be merged, you must add the most appropriate category Label (Added, Changed, Fixed) to your PR
-->
<!-- Explain why this is an improvement (Does this add missing functionality, improve performance, or reduce complexity?) -->
### Purpose:


### Purpose:

<!-- Does this PR introduce a breaking change? -->
### Current Behavior:


### Current Behavior:

### New Behavior:



<!-- As we aim for complete code coverage, please include details regarding unit, and regression tests -->
### Testing Notes:


### Testing Notes:

<!-- Attach any visual examples, or supporting evidence (attach any .gif/video/console output below) -->
26 changes: 26 additions & 0 deletions .github/actionlint.yaml
Original file line number Diff line number Diff line change
@@ -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',
]
8 changes: 4 additions & 4 deletions .github/actions/install/action.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ inputs:
development:
description: "Install development dependencies."
required: false
default: ""
default: "false"
editable:
description: "Install as editable source."
required: false
@@ -45,15 +45,15 @@ runs:
env:
INSTALL_PYTHON_VERSION: ${{ inputs.python-version }}
run: |
${{ inputs.command-prefix }} sh install.sh ${{ inputs.development && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }} ${{ inputs.legacy_keyring && '-l' || '' }} ${{ inputs.automated == 'true' && '-a' || '' }} ${{ (fromJSON(inputs.do-system-installs) != true) && '-s' || '' }}
${{ inputs.command-prefix }} sh install.sh ${{ inputs.development == 'true' && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }} ${{ inputs.legacy_keyring && '-l' || '' }} ${{ inputs.automated == 'true' && '-a' || '' }} ${{ (fromJSON(inputs.do-system-installs) != true) && '-s' || '' }}
- name: Run install script (Windows)
if: runner.os == 'windows'
shell: pwsh
env:
INSTALL_PYTHON_VERSION: ${{ inputs.python-version }}
run: |
${{ inputs.command-prefix }} ./Install.ps1 ${{ inputs.development && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }}
${{ inputs.command-prefix }} ./Install.ps1 ${{ inputs.development == 'true' && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }}
- name: Create constraints file
if: inputs.constraints-file-artifact-name != ''
@@ -63,7 +63,7 @@ runs:
- name: Upload constraints file
if: inputs.constraints-file-artifact-name != ''
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.constraints-file-artifact-name }}
path: venv/constraints.txt
84 changes: 49 additions & 35 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,72 @@
# Basic dependabot.yml file with
# minimum configuration for two package managers
# This file is managed by the repo-content-updater project. Manual changes here will result in a PR to bring back
# inline with the upstream template, unless you remove the dependabot managed file property from the repo

version: 2
updates:
# Enable version updates for Python
- package-ecosystem: "gomod"
directory: /
schedule:
interval: "weekly"
day: "tuesday"
open-pull-requests-limit: 10
rebase-strategy: auto
labels:
- dependencies
- go
- "Changed"
reviewers: ["cmmarslender", "starttoaster"]
groups:
global:
patterns:
- "*"

- package-ecosystem: "pip"
# Look for a `Dockerfile` in the `root` directory
directory: "/"
# Check for updates once a week
directory: /
schedule:
interval: "weekly"
day: "tuesday"
open-pull-requests-limit: 10
rebase-strategy: auto
labels:
- dependencies
- python
- "Changed"
target-branch: "main"
pull-request-branch-name:
# Separate sections of the branch name with a hyphen
# for example, `dependabot-npm_and_yarn-next_js-acorn-6.4.1`
separator: "-"
reviewers:
- "emlowe"
- "altendky"
reviewers: ["emlowe", "altendky"]

# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
# Check for updates once a week
directories: ["/", ".github/actions/*"]
schedule:
interval: "weekly"
day: "tuesday"
open-pull-requests-limit: 10
rebase-strategy: auto
labels:
- dependencies
- github_actions
- "Changed"
target-branch: "main"
pull-request-branch-name:
# Separate sections of the branch name with a hyphen
# for example, `dependabot-npm_and_yarn-next_js-acorn-6.4.1`
separator: "-"
reviewers:
- "cmmarslender"
- "altendky"
reviewers: ["cmmarslender", "altendky"]

- package-ecosystem: "npm"
directory: "/"
# Check for updates once a week
directory: /
schedule:
interval: "weekly"
day: "tuesday"
open-pull-requests-limit: 10
rebase-strategy: auto
labels:
- dependencies
- javascript
- "Changed"
reviewers: ["cmmarslender", "ChiaMineJP"]

- package-ecosystem: cargo
directory: /
schedule:
interval: "weekly"
day: "tuesday"
open-pull-requests-limit: 10
rebase-strategy: auto
labels:
- dependencies
- rust
- "Changed"
target-branch: "main"
pull-request-branch-name:
# Separate sections of the branch name with a hyphen
# for example, `dependabot-npm_and_yarn-next_js-acorn-6.4.1`
separator: "-"
reviewers:
- "cmmarslender"
- "paninaro"
Loading