Commit Graph
14659 Commits
Author SHA1 Message Date
Kyle Altendorf b05b8fe25b Merge commit '2173e69837b528070eb88c88886405555c8c3013' into checkpoint/datalayer-sim_from_release_1.4.0_2173e69837b528070eb88c88886405555c8c3013 2022-06-28 18:26:04 -04:00
Kyle AltendorfandGitHub 68e3b69f3f Merge pull request #12140 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_680f203b249be85c8971f594462df8d3709c76ce 2022-06-28 18:25:44 -04:00
Amine Khaldi c4ace23d34 Merge release/1.4.0's 9be9444 into main 2022-06-28 20:59:40 +01:00
William AllenandGitHub 91b3ab3886 Merge pull request #12138 from Chia-Network/nft1_get_info_fix
Fix DID ID mismatch
2022-06-28 14:55:40 -05:00
William AllenandGitHub 45d72d18e5 Merge pull request #12137 from AmineKhaldi/main_checkpoint_1.4.0_0abf231
Merge release/1.4.0's 0abf231 into main
2022-06-28 14:55:15 -05:00
Kyle Altendorf f0b2a39d37 Merge commit '680f203b249be85c8971f594462df8d3709c76ce' into checkpoint/datalayer-sim_from_release_1.4.0_680f203b249be85c8971f594462df8d3709c76ce 2022-06-28 15:30:24 -04:00
Kyle AltendorfandGitHub 4dded37529 Merge pull request #12136 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_fdb60bf8c0bcc673e2129c2d34a094633c18f9d5 2022-06-28 15:24:59 -04:00
Jack NelsonandGitHub e7a8f021d3 Fix sql error when only config file is deleted (#12087)
* fix table already exists error

* catch when db exists without possible race conditon

avoid race condition hazard
2022-06-28 13:15:52 -05:00
ytx1991 5f7f2c13a6 Fix DID ID mismatch 2022-06-28 11:10:16 -07:00
Amine Khaldi ccb6e52394 Merge release/1.4.0's 0abf231 into main 2022-06-28 18:09:28 +01:00
dustinfaceandGitHub 2a36f950d4 farmer: Handle KeychainProxyConnectionFailure in Farmer.setup_keys (#12135) 2022-06-28 11:52:48 -05:00
dustinfaceandGitHub 21db92c548 cmds: NFTInfo.royalty_puzzle_hash is Optional but not None here (#12126) 2022-06-28 11:52:26 -05:00
dustinfaceandGitHub 46234d1e7b cmds: Can't shadow info which is NFTInfo in the first place (#12125) 2022-06-28 11:52:05 -05:00
Kyle AltendorfandGitHub ee19b7e1fd move py3createtorrent to development dependencies (#12074) 2022-06-28 11:51:04 -05:00
William AllenandGitHub 2e3fa8e2f1 Merge pull request #12120 from AmineKhaldi/main_checkpoint_1.4.0_0e65d3a
Merge release/1.4.0's 0e65d3a into main
2022-06-28 11:50:38 -05:00
Arvid NorbergandGitHub 45f2a364e5 remove unused WalletCoinStore.get_unspent_coins_at_height (#12052)
* fix logic error in WalletCoinStore.get_unspent_coins_at_height

* remove unused (and incorrect) get_unspent_coins_at_height function from WalletCoinStore
2022-06-28 11:50:03 -05:00
dustinfaceandGitHub 82a83b7ebd streamable: Introduce Streamable.__post_init__ processing cache (#11730) 2022-06-28 11:49:41 -05:00
dustinfaceandGitHub 0fd2dd66fc rpc: Enable more mypy in chia.rpc.rpc_server (#11928) 2022-06-28 11:42:20 -05:00
Florin Chirica a9bca78ec3 Increase fetch data interval. 2022-06-28 19:16:48 +03:00
Florin Chirica cd2d83ce22 Fix indentation. 2022-06-28 18:43:58 +03:00
Florin Chirica a348f048ec Confirm the initial root as well. 2022-06-28 18:36:51 +03:00
Kyle Altendorf a8357b45e7 Merge commit 'fdb60bf8c0bcc673e2129c2d34a094633c18f9d5' into checkpoint/datalayer-sim_from_release_1.4.0_fdb60bf8c0bcc673e2129c2d34a094633c18f9d5 2022-06-28 11:33:52 -04:00
Kyle AltendorfandGitHub 07d7251359 Merge pull request #12133 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_89d1d1bdb8c4dd0cdd2028e53e79f0f0bae18fec 2022-06-28 11:33:33 -04:00
Florin Chirica 75659b8016 Some fixes. 2022-06-28 17:50:03 +03:00
Kyle Altendorf 73b4faf991 Merge commit '89d1d1bdb8c4dd0cdd2028e53e79f0f0bae18fec' into checkpoint/datalayer-sim_from_release_1.4.0_89d1d1bdb8c4dd0cdd2028e53e79f0f0bae18fec 2022-06-28 08:52:24 -04:00
Kyle AltendorfandGitHub 136670c0fc Merge pull request #12128 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_95347e59cb2fd707e07bb268b0f093905116b58c 2022-06-28 08:51:45 -04:00
William AllenandGitHub 56c0868fe9 Merge pull request #12127 from Chia-Network/paninaro.bump_gui_f62c216cce6b89ef23a1b2b0a2dd6fc2a439649a
Bump chia-blockchain-gui to f62c216cce6b89ef23a1b2b0a2dd6fc2a439649a
2022-06-27 19:02:14 -05:00
William AllenandGitHub d04f7200be Merge pull request #12124 from Chia-Network/mh.wallet_node_regression_fix
Fix an accidental regression in the wallet node
2022-06-27 18:46:45 -05:00
Kyle Altendorf 78cf6597cd Merge commit '95347e59cb2fd707e07bb268b0f093905116b58c' into checkpoint/datalayer-sim_from_release_1.4.0_95347e59cb2fd707e07bb268b0f093905116b58c 2022-06-27 18:43:34 -04:00
Kyle AltendorfandGitHub 9941e6f368 Merge pull request #12123 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_fb4b789ba7b5cfc6343d9a91fe5d15eab8bbc7d8 2022-06-27 18:21:02 -04:00
Jeff Cruikshank 9c1e26349a Bump chia-blockchain-gui to f62c216cce6b89ef23a1b2b0a2dd6fc2a439649a
Disables Offerbin in the NFT offer sharing list
2022-06-27 14:55:22 -07:00
Matt Hauff b19f1c2be0 Fix an accidental regression in the wallet node 2022-06-27 13:52:16 -07:00
Kyle Altendorf 7483a012e6 Merge commit 'fb4b789ba7b5cfc6343d9a91fe5d15eab8bbc7d8' into checkpoint/datalayer-sim_from_release_1.4.0_fb4b789ba7b5cfc6343d9a91fe5d15eab8bbc7d8 2022-06-27 16:28:50 -04:00
Kyle AltendorfandGitHub 09c220c41b Merge pull request #12119 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_45dee3e7dd86a67bbd1b5994edfd186ac43dfbb3 2022-06-27 16:27:49 -04:00
Amine KhaldiandGitHub 3c52be6a55 Deduplicate pre-commit Python linting from the super linter. (#12084) 2022-06-27 14:57:14 -05:00
Florin Chirica f60f832523 Fix some tests. 2022-06-27 22:01:14 +03:00
Amine Khaldi 50dd06b66c Merge release/1.4.0's 0e65d3a into main 2022-06-27 18:27:14 +01:00
Kyle Altendorf 997bc7f647 Merge commit '45dee3e7dd86a67bbd1b5994edfd186ac43dfbb3' into checkpoint/datalayer-sim_from_release_1.4.0_45dee3e7dd86a67bbd1b5994edfd186ac43dfbb3 2022-06-27 13:13:56 -04:00
Kyle AltendorfandGitHub 0aa2019526 make pre-commit mypy run use regular venv (via activated shim) (#12077)
* make pre-commit mypy run use regular venv (via activated shim)

* & not Invoke-Expression

* Update activated.ps1

* install for pre-commit

* Update activated.sh

* Update .pre-commit-config.yaml
2022-06-27 12:13:22 -05:00
Kyle AltendorfandGitHub 53af10fde2 Merge pull request #12112 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_be1a487051e7479747ab49cd34df2a694713b95c 2022-06-27 13:13:18 -04:00
William AllenandGitHub 31703bdb84 Merge pull request #12117 from AmineKhaldi/main_checkpoint_1.4.0_136a97d
Merge release/1.4.0's 136a97d into main
2022-06-27 12:11:55 -05:00
Amine Khaldi 54feb98fe1 Merge release/1.4.0's 136a97d into main 2022-06-27 17:18:36 +01:00
William AllenandGitHub a67779aeda Merge pull request #12079 from AmineKhaldi/main_checkpoint_1.4.0_d7c5046
Merge release/1.4.0's d7c5046 into main
2022-06-27 10:55:16 -05:00
Kyle AltendorfandGitHub 5aaf07a686 run pylint directly (#12100)
* run pylint directly

* fixup
2022-06-27 10:53:04 -05:00
William AllenandGitHub ff68a23946 Merge pull request #12060 from Chia-Network/mh.get_coin_state_during_sync
Go to untrusted peers for coin state if trusted isn't synced
2022-06-27 10:04:20 -05:00
William AllenandGitHub 16e27cda6b Merge pull request #12108 from Chia-Network/paninaro.bump_gui_8853e6dbc8c50cad3bb354dd0e183160baadcb91
Bump chia-blockchain-gui to 8853e6dbc8c50cad3bb354dd0e183160baadcb91
2022-06-27 10:00:00 -05:00
William AllenandGitHub 9be94447ab Merge pull request #12095 from Chia-Network/ms.not_synced
Return not synced if no conncetions
2022-06-27 09:59:37 -05:00
Kyle Altendorf 4b77c9a713 Merge commit 'be1a487051e7479747ab49cd34df2a694713b95c' into checkpoint/datalayer-sim_from_release_1.4.0_be1a487051e7479747ab49cd34df2a694713b95c 2022-06-27 08:12:59 -04:00
Kyle AltendorfandGitHub 0bbb70fdfa Merge pull request #12110 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_5ad70ec0e3b16ed4cae8832a83820af7dd5475de 2022-06-27 08:12:42 -04:00
Kyle Altendorf c793dd0811 Merge commit '5ad70ec0e3b16ed4cae8832a83820af7dd5475de' into checkpoint/datalayer-sim_from_release_1.4.0_5ad70ec0e3b16ed4cae8832a83820af7dd5475de 2022-06-26 19:03:19 -04:00