build(deps): consolidated dependabot updates (2026-05-27)#20954
build(deps): consolidated dependabot updates (2026-05-27)#20954ibutterbot wants to merge 9 commits into
Conversation
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ 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) |
There was a problem hiding this comment.
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)
Reviewed by Cursor Bugbot for commit bfa7e21. Configure here.
|
Closing — replaced with a cleaner version that properly resolves conflicts and regenerates poetry.lock. |


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.lockplus CI pins such as CodeQL v4.35.5). The lockfile diff clearly movesaiohttpfrom 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-nodev6.4.0 vs v6.3.0,configure-aws-credentialsv6.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), andchia/wallet/wallet_node.pypluschia/_tests/wallet/test_wallet_node.py(HEAD’srequest_and_validate_header_blockpath vs the older inlinerequest_header_blocksvalidation).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.