Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

catchup: into long_lived/datalayer_merkle_blob from main @ 214ecf79dbaac1e983f854e8c85880f8ccb65a21 #19029

Conversation

altendky
Copy link
Contributor

Source hash: 214ecf7
Remaining commits: 0

altendky and others added 30 commits December 2, 2024 11:21
#18305)

* use the lock file for pinning dependencies, not the project definition

* fixup

* `>=`

* trying v4.3.3

* undo

* undo

* rebase-strategy: auto

* Revert "rebase-strategy: auto"

This reverts commit 659eb4d.

* Revert "Revert "rebase-strategy: auto""

This reverts commit bf8a5ff.

* Revert "Revert "Revert "rebase-strategy: auto"""

This reverts commit 49e7d19.
Bumps [github/super-linter](https://github.com/github/super-linter) from 6 to 7.
- [Release notes](https://github.com/github/super-linter/releases)
- [Changelog](https://github.com/github/super-linter/blob/main/CHANGELOG.md)
- [Commits](github/super-linter@v6...v7)

---
updated-dependencies:
- dependency-name: github/super-linter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix trusted wallet sync on deep reorg

* handle long sync exception case in finish sync

* fix_wallet_sync_test

* fix test_long_sync_wallet

* reconnect only untrusted node in test

* fix long_sync test, update only on finish_sync()

* revert add_blocks_in_batches

* types

* fix  flakey test_long_reorg_nodes_and_wallet
* Add start simulator to installers

* Point to correct path for start_simulator
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@v6...v7)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…18893)

add new configuration option to log the first 6 hex digits of all coins added, removed and reorged (off by default)
)

extend unit test for BlockStore and add in_main_chain=1 to the SQL query, that just asks for heights
* Add comments about PLR6201

* Change comment

* Change comment
* `VALIDATE_GITHUB_ACTIONS: true`

* fixups

* there

* and the config...

* wrong way, back again

* shellcheck

* tweak

* wrong place

* see ya super-linter

* Revert "wrong place"

This reverts commit 478fde7.

* -shellcheck

* reintroduce actionlint/shellcheck issue to show failure

* Revert "reintroduce actionlint/shellcheck issue to show failure"

This reverts commit 24b0345.

* blech
Bumps [lxml](https://github.com/lxml/lxml) from 5.2.2 to 5.3.0.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](lxml/lxml@lxml-5.2.2...lxml-5.3.0)

---
updated-dependencies:
- dependency-name: lxml
  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>
* chia plotnft CLI improvements

* use CliRpcConnectionError

* add check to show

* fix typo

* Update plotnft CLI to newer framework

* Fix help cut-paste error

* add test using new framework

* some minor fixes

* use click.Choice for pool/local option

* some click options

* Some more plotnft cli tests

* drop test_pool_cmdline from mypy-exclusions

* mypy fixes

* several fixes

* Add leave test

* join tests

* more join tests

* missing await

* Try setting config

* use root_path from NeedsWalletRPC

* linting

* Some cleanup

* Add claim tests

* Improved tests

* refactor some test code

* Add inspect tests

* Skip bad test for now

* Add in change payout tests

* quoting error

* Add test for get_login_link

* Add in a few negative tests for join

* Few more tests

* Experment with clirunner env overrides

* put back chia_root into context dict

* Some cleanup and one more test

* maybe final test

* some updates

* some dedup and reorg of test code

* run trusted and untrusted paramertization

* make reuse puzhash stuff work

* Add in required mock object for test_update_pool_config_new_config

* rearrange code per review comment - limit use of NeedsWalletRPC to chia_command

* Add in plotnft click parsing tests

* added ability to pass in obj to runner invoke

* Add in some more test cases

* fix up create issues with config

* Add in couple more test cases for error conditions

* Minor code cleanup

* Use long options for readability, minor code cleanup

* Use config file for farmer rpc port

* simplify code

* Add testing for prompt cases

* Add mocking for default_root_path

* context cleanup

* temp debugging output

* patch the proper object

* move some wallet fixtures into top level conftest and remove conftest import

* merge to origin/main
Bumps [cryptography](https://github.com/pyca/cryptography) from 43.0.1 to 43.0.3.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@43.0.1...43.0.3)

---
updated-dependencies:
- dependency-name: cryptography
  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.35.43 to 1.35.73.
- [Release notes](https://github.com/boto/boto3/releases)
- [Commits](boto/boto3@1.35.43...1.35.73)

---
updated-dependencies:
- dependency-name: boto3
  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 [pre-commit](https://github.com/pre-commit/pre-commit) from 3.7.1 to 4.0.1.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](pre-commit/pre-commit@v3.7.1...v4.0.1)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [clvm-tools](https://github.com/Chia-Network/clvm_tools) from 0.4.9 to 0.4.10.
- [Release notes](https://github.com/Chia-Network/clvm_tools/releases)
- [Commits](Chia-Network/clvm_tools@0.4.9...0.4.10)

---
updated-dependencies:
- dependency-name: clvm-tools
  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 [aiohttp](https://github.com/aio-libs/aiohttp) from 3.10.4 to 3.11.9.
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](aio-libs/aiohttp@v3.10.4...v3.11.9)

---
updated-dependencies:
- dependency-name: aiohttp
  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>
* build(deps): bump ruff from 0.7.1 to 0.8.1

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.1 to 0.8.1.
- [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.7.1...0.8.1)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fix ruff issues

* >-

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matt <[email protected]>
Co-authored-by: Kyle Altendorf <[email protected]>
* fix short_sync_backtrack

* add test for a 1-block reorg in short_sync_backtrack() (#18966)

---------

Co-authored-by: Arvid Norberg <[email protected]>
…pm_macos (#18892)

build(deps): bump cross-spawn in /build_scripts/npm_macos

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](moxystudio/node-cross-spawn@v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…41126 (#18975)

build(deps): bump types-setuptools

Bumps [types-setuptools](https://github.com/python/typeshed) from 75.5.0.20241122 to 75.6.0.20241126.
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-setuptools
  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>
…pm_windows (#18891)

build(deps): bump cross-spawn in /build_scripts/npm_windows

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](moxystudio/node-cross-spawn@v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add ergonomic message condition drivers

* Add test coverage (and fix some bugs!)
Delete unnecessary `TODO` in `auto_claim_coins`
AmineKhaldi and others added 18 commits December 5, 2024 23:21
…nt/main_from_release_2.5.0_c59eeec5261dae19c9161b4d88326029563e4388
* bump chia_rs to 0.16.0 and introduce soft-fork6

* add test for keccak256 operator
* build(deps): bump mypy from 1.11.1 to 1.13.0

Bumps [mypy](https://github.com/python/mypy) from 1.11.1 to 1.13.0.
- [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md)
- [Commits](python/mypy@v1.11.1...v1.13.0)

---
updated-dependencies:
- dependency-name: mypy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Add some none checks for mypy happiness

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Earle Lowe <[email protected]>
…nt/main_from_release_2.5.0_f9b7ddcfcf50b8a0cf7a39a9c9f5f53214702319
…nt/main_from_release_2.5.0_0d40f9f27dcef5ad235d516b793244aaa6a87720
* Update .repo-content-updater.yml to use default rebase setting

* prettier

* prettier again
Simplify add_block_batch.

1. No need to accept AugmentedBlockchain and reconstruct it again.
2. No need to return both success and an unused optional error.
* unconfirmed_tx_cache

* fix types in test

* fix already included check
* add some validation of fork_info in Blockchain.add_block(). This would have caught the bug introduced in main a while ago

* simplify add_blocks_in_batches
…long_lived_datalayer_merkle_blob_from_main_214ecf79dbaac1e983f854e8c85880f8ccb65a21
@altendky altendky requested review from a team as code owners December 11, 2024 13:17
@altendky altendky added checkpoint_merge Changed Required label for PR that categorizes merge commit message as "Changed" for changelog labels Dec 11, 2024
Copy link

socket-security bot commented Dec 11, 2024

👍 Dependency issues cleared. Learn more about Socket for GitHub ↗︎

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

Ignoring: pypi/[email protected], pypi/[email protected]

View full report↗︎

Next steps

Take a deeper look at the dependency

Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support [AT] socket [DOT] dev.

Remove the package

If you happen to install a dependency that Socket reports as Known Malware you should immediately remove it and select a different dependency. For other alert types, you may may wish to investigate alternative packages or consider if there are other ways to mitigate the specific risk posed by the dependency.

Mark a package as acceptable risk

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of ecosystem/package-name@version specifiers. e.g. @SocketSecurity ignore npm/[email protected] or ignore all packages with @SocketSecurity ignore-all

@altendky
Copy link
Contributor Author

@SocketSecurity ignore pypi/[email protected]

Copy link
Contributor

File Coverage Missing Lines
chia/_tests/conftest.py 89.4% lines 1347-1348, 1350-1351, 1354
chia/_tests/util/gen_ssl_certs.py 0.0% lines 86-87
chia/cmds/farm.py 50.0% lines 64
chia/cmds/rpc.py 33.3% lines 27, 29, 49, 72, 94, 106-107, 109, 122-123, 132, 180-181, 202
chia/cmds/sim_funcs.py 0.0% lines 133-134, 136
chia/seeder/start_crawler.py 25.0% lines 70-71, 75-76, 86, 88
chia/simulator/start_simulator.py 60.0% lines 137, 139
chia/util/default_root.py 85.7% lines 27
chia/util/keychain.py 0.0% lines 533
Total Missing Coverage
1410 lines 35 lines 97%

@altendky altendky merged commit 186d83a into long_lived/datalayer_merkle_blob Dec 11, 2024
362 of 363 checks passed
@altendky altendky deleted the catchup/long_lived_datalayer_merkle_blob_from_main_214ecf79dbaac1e983f854e8c85880f8ccb65a21 branch December 11, 2024 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changed Required label for PR that categorizes merge commit message as "Changed" for changelog checkpoint_merge coverage-diff
Projects
None yet
Development

Successfully merging this pull request may close these issues.