starred/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2026-09-05 02:24:21 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,659 Commits 442 Branches 260 Tags
use-structured-RPC-errors
Commit Graph
14659 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle AltendorfandGitHub a6dc841ef8 Merge pull request #12055 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_61717035f2b8dc3e3ce74ec468187de709008d44 2022-06-24 11:40:49 -04:00
William AllenandGitHub cec19e02de Merge pull request #12054 from AmineKhaldi/main_checkpoint_1.4.0_983ed87 
Merge release/1.4.0's 983ed87 into main
 2022-06-24 09:23:58 -05:00
Kyle Altendorf 9d466f5c6e Merge commit '61717035f2b8dc3e3ce74ec468187de709008d44' into checkpoint/datalayer-sim_from_release_1.4.0_61717035f2b8dc3e3ce74ec468187de709008d44 2022-06-24 08:40:32 -04:00
Kyle AltendorfandGitHub 74e1e9e0be Merge pull request #12046 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_6576aafa9d8788ada70238d0a9750a598547f4f4 2022-06-24 08:33:09 -04:00
Amine Khaldi 8f54175b26 Merge release/1.4.0's 983ed87 into main 2022-06-24 12:55:32 +01:00
Amine KhaldiandGitHub 32050bc3fe Merge pull request #12045 from AmineKhaldi/main_checkpoint_1.4.0_cb6290d 
Merge release/1.4.0's cb6290d into main
 2022-06-24 12:52:52 +01:00
Amine KhaldiandGitHub 33e0ec8747 Merge pull request #12041 from Chia-Network/delay_queue_creation 
delay WalletNode._new_peak_queue instantiation to avoid errors
 2022-06-24 12:52:17 +01:00
ytx1991 d62d10ff30 Small fix for DID recovery 2022-06-23 21:32:08 -07:00
Kyle Altendorf d3f797e4d6 Merge commit '6576aafa9d8788ada70238d0a9750a598547f4f4' into checkpoint/datalayer-sim_from_release_1.4.0_6576aafa9d8788ada70238d0a9750a598547f4f4 2022-06-23 20:39:45 -04:00
Kyle AltendorfandGitHub 3d4943ef81 Merge pull request #12042 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_bb8c2cf827490dd38ad976f5433b4c1e31017367 2022-06-23 20:18:28 -04:00
Amine Khaldi f3bbcfa20d Merge release/1.4.0's cb6290d into main 2022-06-24 00:02:28 +01:00
Amine KhaldiandGitHub 983ed87c8b Merge pull request #12044 from Chia-Network/paninaro.bump_gui_94b95f7ed77861d55902aace2c4aca76c75f402c 
Bump chia-blockchain-gui to 94b95f7ed77861d55902aace2c4aca76c75f402c
 2022-06-23 23:57:13 +01:00
Amine KhaldiandGitHub cb6290d1ab Merge pull request #12037 from trepca/nft1_puzhash_gen_fix 
fix for derivation path generation hogging CPU for NFT wallet
 2022-06-23 23:54:29 +01:00
Amine KhaldiandGitHub ac140bd9d9 Merge pull request #12039 from AmineKhaldi/main_checkpoint_1.4.0_45377fa 
Merge release/1.4.0's 45377fa into main
 2022-06-23 23:54:08 +01:00
Jeff Cruikshank 1b14dca478 Bump chia-blockchain-gui to 94b95f7ed77861d55902aace2c4aca76c75f402c 
Includes fixes for large XCH amounts in offers being reported as NaN
Profiles dropdown is refreshed after a new wallet is created
 2022-06-23 14:44:07 -07:00
Kyle Altendorf c740191c0b Merge commit 'bb8c2cf827490dd38ad976f5433b4c1e31017367' into checkpoint/datalayer-sim_from_release_1.4.0_bb8c2cf827490dd38ad976f5433b4c1e31017367 2022-06-23 15:46:36 -04:00
Kyle Altendorf 1227ef1b46 delay WalletNode._new_peak_queue instantiation to avoid errors 2022-06-23 15:42:16 -04:00
Kyle AltendorfandGitHub 31a23eade6 Merge pull request #12038 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_022052ac4506964e54727e6911918d73beccde3c 2022-06-23 15:39:04 -04:00
Amine Khaldi 8c015f7bdb Merge release/1.4.0's 45377fa into main 2022-06-23 19:51:29 +01:00
Sebastjan b4286061db merged 2022-06-23 20:50:50 +02:00
Amine KhaldiandGitHub 45377fa20d Merge pull request #12008 from Chia-Network/nft1_tx_fee 
NFT/DID transaction related fix
 2022-06-23 19:35:27 +01:00
Kyle Altendorf 02b291a497 Merge commit '022052ac4506964e54727e6911918d73beccde3c' into checkpoint/datalayer-sim_from_release_1.4.0_022052ac4506964e54727e6911918d73beccde3c 2022-06-23 14:17:31 -04:00
Kyle AltendorfandGitHub a4e1d1ea6e Merge pull request #12034 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_45a77273e835d8fb44e996ff9dd357fc8f90ad91 2022-06-23 14:17:16 -04:00
Kyle Altendorf bf55108518 Merge commit '45a77273e835d8fb44e996ff9dd357fc8f90ad91' into checkpoint/datalayer-sim_from_release_1.4.0_45a77273e835d8fb44e996ff9dd357fc8f90ad91 2022-06-23 13:28:33 -04:00
Kyle AltendorfandGitHub b406e30e23 Merge pull request #12033 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_b9b7cac4c9f2cfe69dbd9a0faa11fedf41366744 2022-06-23 13:26:08 -04:00
Sebastjan a0088946eb removed puzhash generation for nft wallet 2022-06-23 19:05:15 +02:00
Kyle Altendorf b26c1a394f Merge commit 'b9b7cac4c9f2cfe69dbd9a0faa11fedf41366744' into checkpoint/datalayer-sim_from_release_1.4.0_b9b7cac4c9f2cfe69dbd9a0faa11fedf41366744 2022-06-23 12:58:26 -04:00
ytx1991 4732f46275 Merge from release 2022-06-23 09:49:51 -07:00
Florin Chirica d5c29d893d Initial commit pending roots. 2022-06-23 18:44:45 +02:00
Kyle AltendorfandGitHub 67abea2649 Merge pull request #12029 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_3c4eab1ee0e60b583e89396de7bca8ad49b7d396 2022-06-23 12:27:29 -04:00
Amine KhaldiandGitHub 493e9de523 Merge pull request #12030 from AmineKhaldi/main_checkpoint_1.4.0_c5f7006 
Merge release/1.4.0's c5f7006 into main
 2022-06-23 17:06:45 +01:00
Amine Khaldi cff8367d59 Merge release/1.4.0's c5f7006 into main 2022-06-23 16:14:16 +01:00
Amine KhaldiandGitHub c5f7006f95 Merge pull request #12024 from Chia-Network/fee_and_cancel_fix 
Fee and cancel fix
 2022-06-23 16:11:10 +01:00
Kyle Altendorf 8ddd877a3f Merge commit '3c4eab1ee0e60b583e89396de7bca8ad49b7d396' into checkpoint/datalayer-sim_from_release_1.4.0_3c4eab1ee0e60b583e89396de7bca8ad49b7d396 2022-06-23 10:27:56 -04:00
Kyle AltendorfandGitHub 80952ac8e7 Merge pull request #12028 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_e4706302127062cdaf6681b7787918e16c7a5866 2022-06-23 10:27:42 -04:00
Kyle Altendorf 5b659686a6 Merge commit 'e4706302127062cdaf6681b7787918e16c7a5866' into checkpoint/datalayer-sim_from_release_1.4.0_e4706302127062cdaf6681b7787918e16c7a5866 2022-06-23 09:55:04 -04:00
Kyle AltendorfandGitHub 288ad44758 Merge pull request #12027 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_766da049de091f990fa85069dbf1bd6f37f10750 2022-06-23 09:51:02 -04:00
Kyle Altendorf 970d06d27f Merge commit '766da049de091f990fa85069dbf1bd6f37f10750' into checkpoint/datalayer-sim_from_release_1.4.0_766da049de091f990fa85069dbf1bd6f37f10750 2022-06-23 08:18:24 -04:00
Kyle AltendorfandGitHub 827780b64e Merge pull request #12023 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_5b49a574e4f3ea3d90f35bcf40908d0ff32614df 2022-06-23 08:15:46 -04:00
Kyle AltendorfandGitHub 22e47a81df more uint64() for nft coin amount (#12025) 2022-06-23 11:59:33 +01:00
ytx1991 a18bcdada6 Fix DID TX fee 2022-06-22 23:25:21 -07:00
ytx1991 d0b40c4940 Fix & verify the tx fee for NFT 2022-06-22 18:55:54 -07:00
Matt Hauff b176d27094 Remove lock acquisition 2022-06-22 14:59:28 -07:00
Matt Hauff 7d654a34f0 Lint and remove taker from test 2022-06-22 14:52:44 -07:00
Kyle Altendorf 49057717a7 Merge commit '5b49a574e4f3ea3d90f35bcf40908d0ff32614df' into checkpoint/datalayer-sim_from_release_1.4.0_5b49a574e4f3ea3d90f35bcf40908d0ff32614df 2022-06-22 17:48:50 -04:00
Matt Hauff c439693dde Fix fees on generate_signed_transaction 2022-06-22 14:48:00 -07:00
Matt Hauff 55fa30f437 Add heuristic in GST to keep new_owner the same if sending to ourself 2022-06-22 14:47:23 -07:00
William AllenandGitHub 1d6cf09bc9 Merge pull request #12020 from AmineKhaldi/main_checkpoint_1.4.0_6c09d75 
Merge release/1.4.0's 6c09d75 into main
 2022-06-22 16:01:19 -05:00
William AllenandGitHub 4f444c8fe0 Merge pull request #12019 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_22533ad96bdcf37d204bbd0d2c58e3b145e7d848 
checkpoint: into datalayer-sim from release/1.4.0 @ 22533ad96b
 2022-06-22 16:00:13 -05:00
Amine Khaldi f6ab06708f Merge release/1.4.0's 6c09d75 into main 2022-06-22 20:50:11 +01:00