Skip to content

build(deps): consolidated dependabot updates (2026-05-27)#20954

Closed
ibutterbot wants to merge 9 commits into
Chia-Network:mainfrom
ibutterbot:dependabot/consolidated-20260527-160210
Closed

build(deps): consolidated dependabot updates (2026-05-27)#20954
ibutterbot wants to merge 9 commits into
Chia-Network:mainfrom
ibutterbot:dependabot/consolidated-20260527-160210

Conversation

@ibutterbot
Copy link
Copy Markdown
Contributor

@ibutterbot ibutterbot commented May 27, 2026

Consolidated Dependabot Updates

This PR consolidates the following dependabot dependency bumps into a single PR to avoid poetry.lock conflicts:

Skipped (cherry-pick conflicts)


Generated by dependabot-consolidator


Note

High Risk
Unresolved conflicts leave invalid YAML and Python, and the wallet sync conflict touches peer validation logic if merged incorrectly.

Overview
This PR is meant to roll up several Dependabot bumps into one change set (pyproject.toml / poetry.lock plus CI pins such as CodeQL v4.35.5). The lockfile diff clearly moves aiohttp from 3.13.4 to 3.13.5 and updates the Poetry content hash.

The branch is not mergeable as shown: Git conflict markers (<<<<<<<, =======, >>>>>>>) are still present across installer workflows (e.g. actions/setup-node v6.4.0 vs v6.3.0, configure-aws-credentials v6.1.1 vs v6.1.0), codeql-analysis.yml (init/autobuild/analyze v4.35.4 vs v4.35.5), pyproject.toml (competing floors for aiohttp, boto3, chialisp, ruff, pytest-rerunfailures, lxml, type stubs), and chia/wallet/wallet_node.py plus chia/_tests/wallet/test_wallet_node.py (HEAD’s request_and_validate_header_block path vs the older inline request_header_blocks validation).

Until those conflicts are resolved to the intended bumped versions (and the wallet refactor is chosen consistently with its tests), workflows will not parse and Python will not import.

Reviewed by Cursor Bugbot for commit bfa7e21. Bugbot is set up for automated code reviews on this repo. Configure here.

@ibutterbot ibutterbot requested review from a team as code owners May 27, 2026 16:02
@emlowe emlowe added the dependencies Pull requests that update a dependency file label May 27, 2026
Copy link
Copy Markdown

@cursor cursor Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit bfa7e21. Configure here.

=======
>>>>>>> 61badad (build(deps): bump chialisp from 0.4.1 to 0.4.5)
=======
>>>>>>> d00119c (build(deps): bump aiohttp from 3.13.4 to 3.13.5)
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unresolved merge conflict markers in production code

High Severity

Unresolved git merge conflict markers (<<<<<<<, =======, >>>>>>>) are present throughout the entire PR — in wallet_node.py (production code), pyproject.toml (build config), test_wallet_node.py, and all GitHub Actions workflow YAML files. This will cause Python syntax errors at import time for wallet_node.py, make pyproject.toml unparseable (breaking all dependency resolution and builds), and fail every CI workflow due to invalid YAML. The dependabot consolidation script clearly did not resolve the cherry-pick conflicts before committing.

Additional Locations (2)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit bfa7e21. Configure here.

@ibutterbot ibutterbot closed this May 27, 2026
@ibutterbot
Copy link
Copy Markdown
Contributor Author

Closing — replaced with a cleaner version that properly resolves conflicts and regenerates poetry.lock.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants