Commit Graph
14659 Commits
Author SHA1 Message Date
Patrick MaslanaandGitHub 39a24c8173 Update the version of pre-commit-hooks in the pre-commit-config.yaml file (#12896) 2022-08-16 03:32:53 -05:00
Adam KellyandGitHub 2d5ed8ea42 Move DB test to new directory (#12831)
Signed-off-by: wallentx <william.allentx@gmail.com>

Signed-off-by: wallentx <william.allentx@gmail.com>
2022-08-16 03:32:20 -05:00
Patrick MaslanaandGitHub aac2583280 Update the version for flake8 in the pre-commit-config.yaml (#12895) 2022-08-16 00:25:40 -05:00
William AllenandGitHub bf075034e1 Merge pull request #12974 from Chia-Network/checkpoint/main_from_release_1.5.1_af60a81c92cba51c650ad9a2fd2bf653efcbaf0e
checkpoint: into main from release/1.5.1  @ af60a81c92
2022-08-16 00:16:52 -05:00
Kronus91andGitHub 0d2e9531f8 Fix NFT wallet naming issue (#12990)
* Fix NFT wallet naming

* Resolve comments

* Resolve comment

* Add tests
2022-08-16 00:14:36 -05:00
Kyle Altendorf d8fb847c0f automatic no-op/insert/upsert for offer inclusions 2022-08-15 22:28:01 -04:00
JeffandGitHub 715b343b67 Bump chia-blockchain-gui to ba92a879e42a6798b16c057bdb768c7733496b07 (#12995)
Includes:
* Update Electron version to 20.0.2
* Bump terser dev dependency to 5.14.2
* updated NFT burn description
* fix for token tooltip position
2022-08-15 20:29:55 -05:00
Jack NelsonandGitHub d3e63f37ea upgrade build depts (#12994) 2022-08-15 18:06:47 -07:00
Kyle Altendorf 8fc1e63895 Merge branch 'long_lived/atari' into atari-offer_rpc_stubs 2022-08-15 20:46:45 -04:00
Kyle Altendorf 3d46669614 use get_fee() 2022-08-15 20:46:30 -04:00
Kyle AltendorfandGitHub 70189cfd3b Merge pull request #12935 from Chia-Network/quex.new_merkle_roots
Change DL offers to prove a branch instead of a leaf
2022-08-15 20:40:32 -04:00
Kyle Altendorf 39219c2040 preliminary replacement of TEXT with BLOB 2022-08-15 20:15:23 -04:00
Matt Hauff f5499e2852 flake8 2022-08-15 17:23:14 -05:00
Jack Nelson 7d639cac13 Merge branch 'main' into jn.cmds-refactor 2022-08-15 17:33:18 -04:00
Kyle Altendorf a4fb1f47dd less todo 2022-08-15 16:32:54 -04:00
Kyle Altendorf 0b525e01dc less todo 2022-08-15 16:30:38 -04:00
Kyle AltendorfandGitHub 45a7c5d1a2 Merge pull request #12991 from Chia-Network/checkpoint/long_lived_atari_from_main_e5bc89e5b6ea36b9e1c65da7c13fdc96cfaae2dd
checkpoint: into long_lived/atari from main  @ e5bc89e5b6
2022-08-15 16:23:48 -04:00
Matt HauffandGitHub 1ee2dc4adb Merge branch 'long_lived/atari' into quex.new_merkle_roots 2022-08-15 15:00:23 -05:00
Kyle Altendorf 85d9f57754 split insert and publish at the data layer level 2022-08-15 15:57:08 -04:00
Amine Khaldi 286fe8fb7c Merge commit 'e5bc89e5b6ea36b9e1c65da7c13fdc96cfaae2dd' into checkpoint/long_lived_atari_from_main_e5bc89e5b6ea36b9e1c65da7c13fdc96cfaae2dd 2022-08-15 19:39:28 +01:00
Kyle AltendorfandGitHub 34c6fb6634 Merge pull request #12989 from Chia-Network/checkpoint/long_lived_atari_from_main_4b8130ec60688ec6f1387b69ecc76ea7801c1a48
checkpoint: into long_lived/atari from main  @ 4b8130ec60
2022-08-15 14:22:24 -04:00
Amine Khaldi 3a42cc4353 Merge commit '4b8130ec60688ec6f1387b69ecc76ea7801c1a48' into checkpoint/long_lived_atari_from_main_4b8130ec60688ec6f1387b69ecc76ea7801c1a48 2022-08-15 19:20:47 +01:00
Kyle AltendorfandGitHub 896db2581c Merge pull request #12985 from Chia-Network/checkpoint/long_lived_atari_from_main_c62a17358a1484f47447dbf27f13d52b005203d1
checkpoint: into long_lived/atari from main  @ c62a17358a
2022-08-15 14:20:02 -04:00
Kyle Altendorf 1ce50051d7 Merge branch 'long_lived/atari' into atari-offer_rpc_stubs 2022-08-15 13:45:58 -04:00
dustinfaceandGitHub d9b271dbfa tests: Drop redundant expected_state parameter of run_sync_step (#12398)
The expected state is already present in `sync_step`.
2022-08-15 12:23:08 -05:00
dustinfaceandGitHub 8e0b081fa3 streamable: More custom exceptions (#12316)
* streamable: More custom exceptions

* `Any` -> `object`

* Introduce `UnsupportedType`
2022-08-15 12:22:50 -05:00
Amine Khaldi a8efa403de Merge commit 'c62a17358a1484f47447dbf27f13d52b005203d1' into checkpoint/long_lived_atari_from_main_c62a17358a1484f47447dbf27f13d52b005203d1 2022-08-15 18:19:53 +01:00
dustinfaceandGitHub 84b0da7587 plotters: Move install_plotter into plotters (#12403) 2022-08-15 12:18:55 -05:00
Kyle AltendorfandGitHub c40d335428 Merge pull request #12966 from Chia-Network/lock_true
default `lock` parameter of `DataStore.shift_root_generations()` to True
2022-08-15 13:07:58 -04:00
Kyle AltendorfandGitHub becb7ee325 Merge pull request #12983 from Chia-Network/checkpoint/long_lived_atari_from_main_0142129112e85360f5008b84a0cb84afd0215ba5
checkpoint: into long_lived/atari from main  @ 0142129112
2022-08-15 13:05:17 -04:00
Kyle Altendorf 7576a465f9 assert entire maker and taker histories 2022-08-15 11:54:54 -04:00
Kyle Altendorf 5b009bb69a less todo 2022-08-15 11:37:29 -04:00
Amine Khaldi cc5ff6c3ae Merge commit '0142129112e85360f5008b84a0cb84afd0215ba5' into checkpoint/long_lived_atari_from_main_0142129112e85360f5008b84a0cb84afd0215ba5 2022-08-15 16:14:21 +01:00
Kyle AltendorfandGitHub 8f0679dd59 Merge pull request #12982 from Chia-Network/checkpoint/long_lived_atari_from_main_fc2498885f2ccb9401a3b3badaeac7361008533b
checkpoint: into long_lived/atari from main  @ fc2498885f
2022-08-15 11:12:21 -04:00
Kyle Altendorf 80a99e41ac stop using that private method 2022-08-15 11:09:04 -04:00
Amine Khaldi 616537cd75 Merge commit 'fc2498885f2ccb9401a3b3badaeac7361008533b' into checkpoint/long_lived_atari_from_main_fc2498885f2ccb9401a3b3badaeac7361008533b 2022-08-15 15:51:33 +01:00
Kyle AltendorfandGitHub b8510f6c75 Merge pull request #12981 from Chia-Network/checkpoint/long_lived_atari_from_main_a6c47e40a1b934adc65ce4e9357af97fc9915173
checkpoint: into long_lived/atari from main  @ a6c47e40a1
2022-08-15 10:49:33 -04:00
Amine Khaldi 7b4ca28f9a Merge commit 'a6c47e40a1b934adc65ce4e9357af97fc9915173' into checkpoint/long_lived_atari_from_main_a6c47e40a1b934adc65ce4e9357af97fc9915173 2022-08-15 15:48:42 +01:00
Kyle Altendorf 0cde736307 taking an offer now returns the trade id 2022-08-15 10:39:30 -04:00
Kyle AltendorfandGitHub 13082af354 Merge pull request #12980 from Chia-Network/checkpoint/long_lived_atari_from_main_d7dd977d9dd05382d08bea731177bc5edcb88013
checkpoint: into long_lived/atari from main  @ d7dd977d9d
2022-08-15 10:37:14 -04:00
Amine Khaldi 8e646dbacc Merge commit 'd7dd977d9dd05382d08bea731177bc5edcb88013' into checkpoint/long_lived_atari_from_main_d7dd977d9dd05382d08bea731177bc5edcb88013 2022-08-15 15:34:06 +01:00
Kyle AltendorfandGitHub fde28cdff8 Merge pull request #12979 from Chia-Network/checkpoint/long_lived_atari_from_main_da856267d533aed6f2162a4f71b97c04e7f551e8
checkpoint: into long_lived/atari from main  @ da856267d5
2022-08-15 10:33:15 -04:00
Amine Khaldi d6d48d1ace Merge commit 'da856267d533aed6f2162a4f71b97c04e7f551e8' into checkpoint/long_lived_atari_from_main_da856267d533aed6f2162a4f71b97c04e7f551e8 2022-08-15 15:30:04 +01:00
Kyle AltendorfandGitHub e56fe619bd Merge pull request #12976 from Chia-Network/checkpoint/long_lived_atari_from_main_0bc54ae08b6655ec5242a8b21460d34b5e4a38c6
checkpoint: into long_lived/atari from main  @ 0bc54ae08b
2022-08-15 10:25:27 -04:00
Kyle Altendorf a675960cdf less todo 2022-08-15 10:24:33 -04:00
Amine Khaldi d5a9585954 Reflect the change on datalayer related code. 2022-08-15 14:14:58 +01:00
Kyle Altendorf a0bbbd003c less todo 2022-08-15 09:01:40 -04:00
Amine Khaldi 34d6197890 Merge commit '0bc54ae08b6655ec5242a8b21460d34b5e4a38c6' into checkpoint/long_lived_atari_from_main_0bc54ae08b6655ec5242a8b21460d34b5e4a38c6 2022-08-15 13:55:39 +01:00
Kyle AltendorfandGitHub bf3c2a78e3 Merge pull request #12975 from Chia-Network/checkpoint/long_lived_atari_from_main_72c8ba4a2923dace453be01b700a1cd6a118633a
checkpoint: into long_lived/atari from main  @ 72c8ba4a29
2022-08-15 08:16:44 -04:00
Amine Khaldi 27c5ba9f8f Merge commit '72c8ba4a2923dace453be01b700a1cd6a118633a' into checkpoint/long_lived_atari_from_main_72c8ba4a2923dace453be01b700a1cd6a118633a 2022-08-15 12:58:03 +01:00