catchup: into long_lived/datalayer_merkle_blob from main @ ebf8105fc12c351888069ba399be6cf998f680e0 #20041
Conversation
Fix rebasing fast forward spends on new peak.
…age exists (#19865) Handle items that spend an older ff version when newer lineage exists.
…nt/main_from_release_2.5.5_d2e9df3b510fdf8f9312af58096378902baddc67
fast-forward spends can be treated as regular spends if the coin doesn't appear to support the rebasing
…_macos (#19890) build(deps): bump form-data in /build_scripts/npm_macos Bumps [form-data](https://github.com/form-data/form-data) from 4.0.0 to 4.0.4. - [Release notes](https://github.com/form-data/form-data/releases) - [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md) - [Commits](form-data/form-data@v4.0.0...v4.0.4) --- updated-dependencies: - dependency-name: form-data dependency-version: 4.0.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Include plotNFT rewards in get_farmed_amount * Add flag to include pool rewards in farm summary * Add -i for short flag * Fix expected args * Include additional farming detail * Include additional farming detail * Format/organize output * Move block rewards * Update test * Format * Update test_farm_cmd.py * revert test bool * Passing tests * Added test for 'include_pool_rewards=True' * Address linting errors
* build(deps): bump mypy from 1.15.0 to 1.17.0 --- updated-dependencies: - dependency-name: mypy dependency-version: 1.17.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * handle mypy commentary --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kyle Altendorf <[email protected]>
* bump chia_rs to 0.29 * correct return value from get_spends_for_trusted_block() * remove unnecessary casts * adjust test for the new error messages in chia_rs * Update chia/full_node/full_node_rpc_api.py Co-authored-by: Kyle Altendorf <[email protected]> --------- Co-authored-by: Kyle Altendorf <[email protected]>
* Change `TransactionRecord` to use dict instead of list of tuples for memos * Update streamable and fix tests * Update test to accidentally fixed memos generation * Remove `TransactionRecord.*_json_dict_convenience` * Fix test * Use AddressType library in WSM method * Use AddressType library in transaction_store method
…h R-CATs (#19831) * Port `test_trade_cancellation` * Port `test_trade_conflict` * Port `test_trade_bad_spend` * Port `test_trade_high_fee` * Port `test_aggregated_trade_state`
* Port `get_wallet_balance(s)` * Use Streamable dict functionality
Remove some dependencies in `chia.server`.
Bumps [mypy](https://github.com/python/mypy) from 1.17.0 to 1.17.1. - [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md) - [Commits](python/mypy@v1.17.0...v1.17.1) --- updated-dependencies: - dependency-name: mypy dependency-version: 1.17.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.12.4 to 0.12.7. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.12.4...0.12.7) --- updated-dependencies: - dependency-name: ruff dependency-version: 0.12.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [pyinstaller](https://github.com/pyinstaller/pyinstaller) from 6.14.2 to 6.15.0. - [Release notes](https://github.com/pyinstaller/pyinstaller/releases) - [Changelog](https://github.com/pyinstaller/pyinstaller/blob/develop/doc/CHANGES.rst) - [Commits](pyinstaller/pyinstaller@v6.14.2...v6.15.0) --- updated-dependencies: - dependency-name: pyinstaller dependency-version: 6.15.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [anyio](https://github.com/agronholm/anyio) from 4.9.0 to 4.10.0. - [Release notes](https://github.com/agronholm/anyio/releases) - [Changelog](https://github.com/agronholm/anyio/blob/master/docs/versionhistory.rst) - [Commits](agronholm/anyio@4.9.0...4.10) --- updated-dependencies: - dependency-name: anyio dependency-version: 4.10.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
--- updated-dependencies: - dependency-name: aiohttp dependency-version: 3.12.15 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#19910) Bumps [tmp](https://github.com/raszi/node-tmp) from 0.2.1 to 0.2.4. - [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md) - [Commits](raszi/node-tmp@v0.2.1...v0.2.4) --- updated-dependencies: - dependency-name: tmp dependency-version: 0.2.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…50801 (#19906) build(deps): bump types-setuptools Bumps [types-setuptools](https://github.com/typeshed-internal/stub_uploader) from 80.9.0.20250529 to 80.9.0.20250801. - [Commits](https://github.com/typeshed-internal/stub_uploader/commits) --- updated-dependencies: - dependency-name: types-setuptools dependency-version: 80.9.0.20250801 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps chia-puzzles-py from 0.20.1 to 0.20.2. --- updated-dependencies: - dependency-name: chia-puzzles-py dependency-version: 0.20.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.39.11 to 1.40.3. - [Release notes](https://github.com/boto/boto3/releases) - [Commits](boto/boto3@1.39.11...1.40.3) --- updated-dependencies: - dependency-name: boto3 dependency-version: 1.40.3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…19842) * Port `test_nft_offer_nft_for_cat` * Port `test_nft_offer_nft0_and_xch_for_cat` * Forgot to delete an unnecessary state process * Port `test_nft_offer_sell_nft_for_cat` * Port `test_nft_offer_request_nft_for_cat` * Port `test_complex_nft_offer` * Fix a new issue in complex test * Minor change. --------- Co-authored-by: Amine Khaldi <[email protected]>
Update dependabot
… get_unspent_lineage_info_for_puzzle_hash (#19909) Be explicit about falling back to coin_puzzle_hash index in get_unspent_lineage_info_for_puzzle_hash.
* stub chiapos2 API * update block tools to support v2 plots when generating chains, as well as using the solve_proof() stub in the solver * review comments
Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.10.4 to 7.10.5. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](nedbat/coveragepy@7.10.4...7.10.5) --- updated-dependencies: - dependency-name: coverage dependency-version: 7.10.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…CH (#20016) improve logging of NO_OVERFLOWS_IN_FIRST_SUB_SLOT_NEW_EPOCH
* remove redundant comment * add solver to farmer group
Source hash: ecb54a5 Remaining commits: 1 In addition to changes in the network protocol and its generated files, between the original and this checkpoint, here are the introduced code changes in order to get back to a working state: ```diff diff --git a/chia/_tests/harvester/test_harvester_api.py b/chia/_tests/harvester/test_harvester_api.py index 479adb6..5c9e6d5 100644 --- a/chia/_tests/harvester/test_harvester_api.py +++ b/chia/_tests/harvester/test_harvester_api.py @@ -51,7 +51,7 @@ async def harvester_environment( def signage_point_from_block( block: FullBlock, constants: ConsensusConstants -) -> harvester_protocol.NewSignagePointHarvester: +) -> harvester_protocol.NewSignagePointHarvester2: sp_index = block.reward_chain_block.signage_point_index challenge_hash = block.reward_chain_block.pos_ss_cc_challenge_hash sp_hash = ( @@ -59,7 +59,7 @@ def signage_point_from_block( if block.reward_chain_block.reward_chain_sp_vdf else challenge_hash ) - return harvester_protocol.NewSignagePointHarvester( + return harvester_protocol.NewSignagePointHarvester2( challenge_hash=challenge_hash, difficulty=uint64(constants.DIFFICULTY_STARTING), sub_slot_iters=uint64(constants.SUB_SLOT_ITERS_STARTING), @@ -75,7 +75,7 @@ def create_test_setup( harvester_environment: HarvesterTestEnvironment, default_400_blocks: list[FullBlock], blockchain_constants: ConsensusConstants, -) -> tuple[HarvesterTestEnvironment, harvester_protocol.NewSignagePointHarvester, MagicMock]: +) -> tuple[HarvesterTestEnvironment, harvester_protocol.NewSignagePointHarvester2, MagicMock]: env = harvester_environment block = default_400_blocks[2] new_challenge = signage_point_from_block(block, blockchain_constants) @@ -128,7 +128,7 @@ async def test_new_signage_point_harvester_pool_difficulty( sub_slot_iters=uint64(67108864), ) - new_challenge = harvester_protocol.NewSignagePointHarvester( + new_challenge = harvester_protocol.NewSignagePointHarvester2( challenge_hash=new_challenge.challenge_hash, difficulty=new_challenge.difficulty, sub_slot_iters=new_challenge.sub_slot_iters, diff --git a/chia/harvester/harvester_api.py b/chia/harvester/harvester_api.py index 0ff578c74a..54fc6e1 100644 --- a/chia/harvester/harvester_api.py +++ b/chia/harvester/harvester_api.py @@ -53,7 +53,7 @@ class HarvesterAPI: def ready(self) -> bool: return True - def _plot_passes_filter(self, plot_info: PlotInfo, challenge: harvester_protocol.NewSignagePointHarvester) -> bool: + def _plot_passes_filter(self, plot_info: PlotInfo, challenge: harvester_protocol.NewSignagePointHarvester2) -> bool: filter_prefix_bits = calculate_prefix_bits( self.harvester.constants, challenge.peak_height, ```
Annotate test_rate_limits.py.
* fixup coverage handling with conditional macos-intel execution * more mess. for the moment at least * let a few local-only steps run regardless * correct the version
Bumps [cryptography](https://github.com/pyca/cryptography) from 45.0.6 to 45.0.7. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](pyca/cryptography@45.0.6...45.0.7) --- updated-dependencies: - dependency-name: cryptography dependency-version: 45.0.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.40.18 to 1.40.22. - [Release notes](https://github.com/boto/boto3/releases) - [Commits](boto/boto3@1.40.18...1.40.22) --- updated-dependencies: - dependency-name: boto3 dependency-version: 1.40.22 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.12.10 to 0.12.11. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.12.10...0.12.11) --- updated-dependencies: - dependency-name: ruff dependency-version: 0.12.11 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* remove unnecessary NPCResult in mempool_manager * review comment * Update chia/full_node/mempool_manager.py Co-authored-by: Amine Khaldi <[email protected]> --------- Co-authored-by: Amine Khaldi <[email protected]>
…retrying potential transactions (#20002) Add a test to cover new peak returning added transactions as a result of retrying potential transactions.
…long_lived_datalayer_merkle_blob_from_main_ebf8105fc12c351888069ba399be6cf998f680e0
altendky
added
checkpoint_merge
Changed
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
|
Warning Review the following alerts detected in dependencies. According to your organization's Security Policy, it is recommended to resolve "Warn" alerts. Learn more about Socket for GitHub.
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
altendky
merged commit 0d7a723
into
long_lived/datalayer_merkle_blob
altendky
deleted the
catchup/long_lived_datalayer_merkle_blob_from_main_ebf8105fc12c351888069ba399be6cf998f680e0
branch
Source hash: ebf8105
Remaining commits: 0