Commit Graph

9854 Commits

Author SHA1 Message Date
Amine Khaldi
b502f24357
Merge commit 'bfc35b796f16fe1af6ff322fc602b47ea016dffb' into checkpoint/main_from_release_1.6.1_bfc35b796f16fe1af6ff322fc602b47ea016dffb 2022-11-03 14:21:51 +01:00
William Allen
c331f1cd4a
Merge pull request #13806 from Chia-Network/checkpoint/main_from_release_1.6.1_21b69ee3110eed8a3e774119173a810074bfb3a3
checkpoint: into main from release/1.6.1  @ 21b69ee311
2022-11-03 08:21:21 -05:00
Amine Khaldi
7607211d26
Merge commit '21b69ee3110eed8a3e774119173a810074bfb3a3' into checkpoint/main_from_release_1.6.1_21b69ee3110eed8a3e774119173a810074bfb3a3 2022-11-03 14:17:51 +01:00
William Allen
b1d4af2a08
Merge pull request #13801 from Chia-Network/checkpoint/main_from_release_1.6.1_fa33bea9e736b2d74545b776a5ed0bc093f5629c
checkpoint: into main from release/1.6.1  @ fa33bea9e7
2022-11-03 03:24:48 -05:00
Amine Khaldi
04f56e964d
Merge commit 'fa33bea9e736b2d74545b776a5ed0bc093f5629c' into checkpoint/main_from_release_1.6.1_fa33bea9e736b2d74545b776a5ed0bc093f5629c 2022-11-02 21:30:23 +01:00
William Allen
e8fd51ea70
Merge pull request #13800 from Chia-Network/checkpoint/main_from_release_1.6.1_00aac17996bc0c451133ab45d5f1641f368af959
checkpoint: into main from release/1.6.1  @ 00aac17996
2022-11-02 15:28:59 -05:00
Amine Khaldi
54ce10522b
Merge commit '00aac17996bc0c451133ab45d5f1641f368af959' into checkpoint/main_from_release_1.6.1_00aac17996bc0c451133ab45d5f1641f368af959 2022-11-02 19:07:34 +01:00
William Allen
900940e143
Merge pull request #13796 from Chia-Network/checkpoint/main_from_release_1.6.1_fa5bcf3e82a119f941582c36ef69c5189478ea11
checkpoint: into main from release/1.6.1  @ fa5bcf3e82
2022-11-02 13:06:19 -05:00
arty
787b1c7e8f
Bump for new clvm_tools and clvm_tools_rs versions (#13774)
* Bump for new clvm_tools and clvm_tools_rs versions

* remove no longer needed `type: ignore`

Co-authored-by: Kyle Altendorf <sda@fstab.net>
2022-11-02 11:18:15 -05:00
Amine Khaldi
49d6713a02
Merge commit 'fa5bcf3e82a119f941582c36ef69c5189478ea11' into checkpoint/main_from_release_1.6.1_fa5bcf3e82a119f941582c36ef69c5189478ea11 2022-11-02 13:48:27 +01:00
Florin Chirica
cd0c5c0f24
Fix pending root when changelist is empty. (#13119)
* Fix pending root when changelist is empty.

* Check explicitly.

* Fix test.

* Make more explicit error.

* Fix test.
2022-11-01 20:28:23 -05:00
William Allen
8c57639ce4
Merge pull request #13795 from Chia-Network/checkpoint/main_from_release_1.6.1_7df5d336fed740c12084e6b266401f800c07e4a4
checkpoint: into main from release/1.6.1  @ 7df5d336fe
2022-11-01 19:36:00 -05:00
Amine Khaldi
aa61fb71bf
Merge commit '7df5d336fed740c12084e6b266401f800c07e4a4' into checkpoint/main_from_release_1.6.1_7df5d336fed740c12084e6b266401f800c07e4a4 2022-11-01 21:58:56 +01:00
William Allen
b0b61aa9c0
Merge pull request #13794 from Chia-Network/checkpoint/main_from_release_1.6.1_40e1d28b479c78b191cce40d735b9ba6c0b848cf
checkpoint: into main from release/1.6.1  @ 40e1d28b47
2022-11-01 15:49:28 -05:00
Amine Khaldi
9e4035a8e4
Merge commit '40e1d28b479c78b191cce40d735b9ba6c0b848cf' into checkpoint/main_from_release_1.6.1_40e1d28b479c78b191cce40d735b9ba6c0b848cf 2022-11-01 21:47:00 +01:00
William Allen
e012808c68
Merge pull request #13791 from Chia-Network/checkpoint/main_from_release_1.6.1_f82c962bb08dca110a47d9ec54dfe78c409bc68b
checkpoint: into main from release/1.6.1  @ f82c962bb0
2022-11-01 15:46:11 -05:00
Kyle Altendorf
3870414e47
Bump datalayer tests to 60 minute timeout :[ (#13790)
https://github.com/Chia-Network/chia-blockchain/actions/runs/3371261657/usage
2022-11-01 15:44:49 -05:00
Kyle Altendorf
cc062976ea
remove uvloop extra (#13783)
Anyone that wants it can certainly still install it themselves.
2022-11-01 15:44:35 -05:00
Kyle Altendorf
e882061648
Add 🚨 to the dependency review workflow (#13782) 2022-11-01 15:44:12 -05:00
Kyle Altendorf
3c255f17c4
always use Chia-Network/actions/setup-python (#13779) 2022-11-01 15:43:54 -05:00
Kyle Altendorf
7897c80ed1
only open SQLite log file once per db wrapper (#13754)
* only open SQLite log file once per db wrapper

* actually remember the log file

* actually remember to close the connections...
2022-11-01 15:43:19 -05:00
Amine Khaldi
73acfc7409
Don't hold removals twice in mempool items as they're already part of the underlying spend bundle. (#13694) 2022-11-01 15:41:23 -05:00
Amine Khaldi
8e986f3ccf
Merge commit 'f82c962bb08dca110a47d9ec54dfe78c409bc68b' into checkpoint/main_from_release_1.6.1_f82c962bb08dca110a47d9ec54dfe78c409bc68b 2022-11-01 19:31:59 +01:00
William Allen
5403c9eb25
Merge pull request #13789 from Chia-Network/checkpoint/main_from_release_1.6.1_5a955c2ed63f1232b35de833fdb17c1efe946459
checkpoint: into main from release/1.6.1  @ 5a955c2ed6
2022-11-01 13:31:14 -05:00
Amine Khaldi
445555a74e
Merge commit '5a955c2ed63f1232b35de833fdb17c1efe946459' into checkpoint/main_from_release_1.6.1_5a955c2ed63f1232b35de833fdb17c1efe946459 2022-11-01 19:02:41 +01:00
William Allen
eaeefc56e1
Merge pull request #13787 from Chia-Network/checkpoint/main_from_release_1.6.1_0d8b5ab7631a9716e29359c1f37cddb820483ace
checkpoint: into main from release/1.6.1  @ 0d8b5ab763
2022-11-01 12:51:21 -05:00
Amine Khaldi
f50e154910
Merge commit '0d8b5ab7631a9716e29359c1f37cddb820483ace' into checkpoint/main_from_release_1.6.1_0d8b5ab7631a9716e29359c1f37cddb820483ace 2022-11-01 18:06:48 +01:00
William Allen
946677b4b1
Merge pull request #13781 from Chia-Network/checkpoint/main_from_release_1.6.1_5d2f93594da8b5c87ba1e860a2c493f973860906
checkpoint: into main from release/1.6.1  @ 5d2f93594d
2022-11-01 10:53:52 -05:00
Amine Khaldi
f9eecffeb3
Merge commit '5d2f93594da8b5c87ba1e860a2c493f973860906' into checkpoint/main_from_release_1.6.1_5d2f93594da8b5c87ba1e860a2c493f973860906 2022-11-01 12:08:16 +01:00
Arvid Norberg
bfc35b796f
improve handling of unfinished block messages (#13777) 2022-10-31 22:41:11 -05:00
William Allen
f3e14b0d7f
Merge pull request #13772 from Chia-Network/checkpoint/main_from_release_1.6.1_2eebd6c448d2a4dbafa6a74388b9ddf8993e4588
checkpoint: into main from release/1.6.1  @ 2eebd6c448
2022-10-31 17:53:20 -05:00
Matt Hauff
e98ecc3c80
Change function signature of CAT Wallet to match spec (#13766) 2022-10-31 17:26:36 -05:00
Amine Khaldi
b3ebaa397b
Merge commit '2eebd6c448d2a4dbafa6a74388b9ddf8993e4588' into checkpoint/main_from_release_1.6.1_2eebd6c448d2a4dbafa6a74388b9ddf8993e4588 2022-10-31 21:48:43 +01:00
William Allen
de78aa33d0
Merge pull request #13771 from Chia-Network/checkpoint/main_from_release_1.6.1_f9be6c9af8f656cd442019e0f837c142aab5561d
checkpoint: into main from release/1.6.1  @ f9be6c9af8
2022-10-31 15:42:23 -05:00
Amine Khaldi
41977c959e
Merge commit 'f9be6c9af8f656cd442019e0f837c142aab5561d' into checkpoint/main_from_release_1.6.1_f9be6c9af8f656cd442019e0f837c142aab5561d 2022-10-31 20:19:07 +01:00
Almog De Paz
bc57b44884
Rework wallet new peak (#12586)
* validate wp from fork and fix bugs(pr #11826)
move WalletWeighProofHandler to wallet_node
remove code dupelication

* fix init bug
remove bad return path

* lint

* merge fixes
remove redundant ses_cache

* lint

* lint

* fix test

* lint

* shorter methods
check header block
dont set in db if sync failed
use exceptions

* remove redundant code path, we already set the new wp

* exceptions

* dont send wp request if secondary sync is already running

* clean code

* add types

* revert change

* dont disconnect peer

* test bad block response

* lint

* move WP shutdown to _close

* remove redundant task creation, use await

* assert not None

* revert

* fix imports

* lint

* isort

* typo, use log.exception

* remove redundant assert
add log

* lint

* fix pool new peak bug

* lint
2022-10-31 14:18:42 -05:00
William Allen
4fdfbc25b9
Merge pull request #13770 from Chia-Network/checkpoint/main_from_release_1.6.1_6dfbc1ef7c7789560381441e64e502b4ac146ea9
checkpoint: into main from release/1.6.1  @ 6dfbc1ef7c
2022-10-31 14:17:18 -05:00
RightSexyOrc
712bf45117
Update PRETTY_GOOD_PRACTICES.md (#13763) 2022-10-31 13:58:02 -05:00
Jeff
21b69ee311
Bump chia-blockchain-gui to d352525713cae40dc66eda89abc63feedb1f896f (#13769)
Includes:
Fee is no longer required when sending an XCH or CAT transaction
Updated wording in Offer Builder
Show the fee estimator with default values
Include royalties in total amount(s) when viewing an offer
Tighten up sensitive_content NFT checking
2022-10-31 13:56:14 -05:00
Amine Khaldi
ef0242c23d
Merge commit '6dfbc1ef7c7789560381441e64e502b4ac146ea9' into checkpoint/main_from_release_1.6.1_6dfbc1ef7c7789560381441e64e502b4ac146ea9 2022-10-31 18:49:06 +01:00
William Allen
008ef2acd4
Merge pull request #13767 from Chia-Network/checkpoint/main_from_release_1.6.1_45b5ea39bba04c3c68b3ec7f56bec0d43f6dcd37
checkpoint: into main from release/1.6.1  @ 45b5ea39bb
2022-10-31 12:48:07 -05:00
William Allen
fa33bea9e7
Adding submodule branch override to Install-gui.ps1 (#13752)
* Adding submodule branch override to Install-gui.ps1

* Linting fix on Install-gui.ps1
2022-10-31 11:23:53 -05:00
Amine Khaldi
0c93394ae4
Merge commit '45b5ea39bba04c3c68b3ec7f56bec0d43f6dcd37' into checkpoint/main_from_release_1.6.1_45b5ea39bba04c3c68b3ec7f56bec0d43f6dcd37 2022-10-31 17:08:08 +01:00
Kyle Altendorf
00aac17996
strip input before bech32 decoding (#13759)
this avoids leading and trailing whitespace causing offer processing to fail
2022-10-31 10:45:08 -05:00
William Allen
93dcd5a3b7
Merge pull request #13753 from Chia-Network/checkpoint/main_from_release_1.6.1_bcb4c1ed48a8be9032f686d69d2eda7c23807194
checkpoint: into main from release/1.6.1  @ bcb4c1ed48
2022-10-31 10:44:11 -05:00
Amine Khaldi
d1e1a5d33d
Merge commit 'bcb4c1ed48a8be9032f686d69d2eda7c23807194' into checkpoint/main_from_release_1.6.1_bcb4c1ed48a8be9032f686d69d2eda7c23807194 2022-10-29 11:37:15 +01:00
Kyle Altendorf
fa5bcf3e82
leverage argparse for chia plotters help (#13742) 2022-10-28 23:59:36 -05:00
Kyle Altendorf
7df5d336fe
fix chia show -s with other options as well (#13738)
Regression introduced in b2c058970f results in `chia show -s` combined with anything else only showing the state regardless.
2022-10-28 23:56:51 -05:00
Kyle Altendorf
40e1d28b47
Increase job timeout for NFT wallet tests (#13675) (#13744)
(cherry picked from commit fe490d9e04)

Co-authored-by: Earle Lowe <30607889+emlowe@users.noreply.github.com>
2022-10-28 16:28:38 -05:00
dustinface
f82c962bb0
cmds: Adjust default log level for chia plots (#13731) 2022-10-28 16:05:03 -05:00