Commit Graph
14659 Commits
Author SHA1 Message Date
Kyle AltendorfandGitHub f695e9819a Merge pull request #12733 from Chia-Network/checkpoint/long_lived_atari_from_main_6923ad8e12a376e7f5fa428a0cea0de70ce53e7f 2022-08-01 11:50:54 -04:00
Matt Hauff cfc0d6b5df Merge branch 'dl_offer_hooks' into dl_clsp_mirrors 2022-08-01 10:41:04 -05:00
Matt Hauff d5bdb7decb isort 2022-08-01 10:40:01 -05:00
Amine Khaldi ecc2ec535e Merge commit '6923ad8e12a376e7f5fa428a0cea0de70ce53e7f' into checkpoint/long_lived_atari_from_main_6923ad8e12a376e7f5fa428a0cea0de70ce53e7f 2022-08-01 16:29:47 +01:00
Kyle AltendorfandGitHub cc0962d0f5 Merge pull request #12732 from Chia-Network/checkpoint/long_lived_atari_from_main_3f740d375c1d767681e44d4a22ab89b6e0cb7ad0
checkpoint: into long_lived/atari from main  @ 3f740d375c
2022-08-01 11:28:59 -04:00
Matt Hauff b782989883 Merge branch 'dl_offer_hooks' into dl_clsp_mirrors 2022-08-01 10:28:13 -05:00
Amine Khaldi baf09aaf0b Merge commit '3f740d375c1d767681e44d4a22ab89b6e0cb7ad0' into checkpoint/long_lived_atari_from_main_3f740d375c1d767681e44d4a22ab89b6e0cb7ad0 2022-08-01 16:27:59 +01:00
Kyle AltendorfandGitHub d0b4035d80 Merge pull request #12731 from Chia-Network/checkpoint/long_lived_atari_from_main_f0c5a16c30e81f527ce43835873eb0f82d7e023f
checkpoint: into long_lived/atari from main  @ f0c5a16c30
2022-08-01 11:27:09 -04:00
Matt Hauff 521100b702 Merge remote-tracking branch 'origin/long_lived/atari' into dl_offer_hooks 2022-08-01 10:24:29 -05:00
Amine Khaldi f3ea104c1b Merge commit 'f0c5a16c30e81f527ce43835873eb0f82d7e023f' into checkpoint/long_lived_atari_from_main_f0c5a16c30e81f527ce43835873eb0f82d7e023f 2022-08-01 16:22:34 +01:00
Kyle AltendorfandGitHub 7325dd7dd5 Merge pull request #12726 from Chia-Network/atari-isort
stop excepting atari from isort
2022-08-01 11:21:13 -04:00
Matt Hauff 12fead98ec remove peer selection logic (merge error) 2022-08-01 10:14:59 -05:00
Matt Hauff aec6d0ff29 Merge branch 'dl_offer_hooks' into dl_clsp_mirrors 2022-08-01 10:08:51 -05:00
Matt Hauff 7e1701ed86 pre-commit 2022-08-01 10:07:49 -05:00
Matt Hauff 341cb7c2f3 Merge branch 'dl_offer_hooks' into dl_clsp_mirrors 2022-08-01 09:51:41 -05:00
Matt Hauff e27f48159f Merge remote-tracking branch 'origin/long_lived/atari' into dl_offer_hooks 2022-08-01 09:51:14 -05:00
Matt Hauff 140bdbb491 CLVM tests 2022-08-01 09:06:30 -05:00
Florin Chirica 52eeaff848 Fix bug. 2022-08-01 15:55:34 +02:00
Florin Chirica c477f2297a Fix bug. 2022-08-01 15:49:45 +02:00
Florin Chirica a853c450d5 Lint. 2022-08-01 15:01:24 +02:00
Florin Chirica 48b858b9ec Merge branch 'fc.get_keys' of https://github.com/Chia-Network/chia-blockchain into fc.get_keys 2022-08-01 14:54:33 +02:00
Florin Chirica bf1e5d0595 Address comments. 2022-08-01 14:53:22 +02:00
27de47c164 Update chia/rpc/data_layer_rpc_api.py
Co-authored-by: Kyle Altendorf <sda@fstab.net>
2022-08-01 15:45:56 +03:00
Florin ChiricaandGitHub e162a578b6 Merge branch 'long_lived/atari' into fc.get_keys 2022-08-01 15:08:23 +03:00
Florin ChiricaandGitHub 62184b3fdc Merge branch 'long_lived/atari' into fc.atari_banning 2022-08-01 14:55:19 +03:00
Kyle Altendorf 86ae361a2f apply isort to atari 2022-07-31 21:10:56 -07:00
Kyle Altendorf 30b86684a5 stop excepting atari from isort 2022-07-31 21:10:34 -07:00
Kyle AltendorfandGitHub 0602452da6 Merge pull request #12723 from Chia-Network/checkpoint/long_lived_atari_from_main_4197b39987312f5bd5a07782e90ee15a71490598
checkpoint: into long_lived/atari from main  @ 4197b39987
2022-07-31 17:25:21 -04:00
Amine Khaldi 4f534b2bae Merge commit '4197b39987312f5bd5a07782e90ee15a71490598' into checkpoint/long_lived_atari_from_main_4197b39987312f5bd5a07782e90ee15a71490598 2022-07-31 22:23:28 +01:00
Kyle AltendorfandGitHub aa1d338073 Merge pull request #12722 from Chia-Network/checkpoint/long_lived_atari_from_main_ee642115f66ef69f14502432281e4d3295ca2c61
checkpoint: into long_lived/atari from main  @ ee642115f6
2022-07-31 17:22:52 -04:00
Amine Khaldi a86de62966 Merge commit 'ee642115f66ef69f14502432281e4d3295ca2c61' into checkpoint/long_lived_atari_from_main_ee642115f66ef69f14502432281e4d3295ca2c61 2022-07-31 22:21:57 +01:00
Kyle AltendorfandGitHub a96aa53b14 Merge pull request #12721 from Chia-Network/checkpoint/long_lived_atari_from_main_ef6359638ff04118fa055dced138a048dec28f36
checkpoint: into long_lived/atari from main  @ ef6359638f
2022-07-31 17:20:06 -04:00
Amine Khaldi f2c80fd710 Merge commit 'ef6359638ff04118fa055dced138a048dec28f36' into checkpoint/long_lived_atari_from_main_ef6359638ff04118fa055dced138a048dec28f36 2022-07-31 22:19:07 +01:00
Kyle AltendorfandGitHub 2dabc8ee2c Merge pull request #12720 from Chia-Network/checkpoint/long_lived_atari_from_main_c699a2a20ea149cb215fd125f5df6b3fdcd3cade
checkpoint: into long_lived/atari from main  @ c699a2a20e
2022-07-31 17:18:10 -04:00
Amine Khaldi add7e3fa09 Merge commit 'c699a2a20ea149cb215fd125f5df6b3fdcd3cade' into checkpoint/long_lived_atari_from_main_c699a2a20ea149cb215fd125f5df6b3fdcd3cade 2022-07-31 22:17:04 +01:00
Kyle AltendorfandGitHub fdab3685c7 Merge pull request #12719 from Chia-Network/checkpoint/long_lived_atari_from_main_cb2528b78d418a3d9ac2ec61bfc65773d7790315
checkpoint: into long_lived/atari from main  @ cb2528b78d
2022-07-31 17:15:41 -04:00
Amine Khaldi 6f51829c43 Merge commit 'cb2528b78d418a3d9ac2ec61bfc65773d7790315' into checkpoint/long_lived_atari_from_main_cb2528b78d418a3d9ac2ec61bfc65773d7790315 2022-07-31 22:12:58 +01:00
Kyle AltendorfandGitHub 2cff472e13 Merge pull request #12717 from Chia-Network/checkpoint/long_lived_atari_from_main_391c1a00777dc340c23e2c9642c8f5461e4875b2 2022-07-31 17:02:00 -04:00
Amine Khaldi 2bb124068d Merge commit '391c1a00777dc340c23e2c9642c8f5461e4875b2' into checkpoint/long_lived_atari_from_main_391c1a00777dc340c23e2c9642c8f5461e4875b2 2022-07-31 21:58:15 +01:00
Kyle AltendorfandGitHub 021e2ca896 Merge pull request #12716 from Chia-Network/checkpoint/long_lived_atari_from_main_dea1182299f538ba031c2ab7720254bde6bb4440 2022-07-31 16:57:26 -04:00
Amine Khaldi 846ca8bdae Merge commit 'dea1182299f538ba031c2ab7720254bde6bb4440' into checkpoint/long_lived_atari_from_main_dea1182299f538ba031c2ab7720254bde6bb4440 2022-07-31 21:48:24 +01:00
Kyle AltendorfandGitHub 0c56659f94 Merge pull request #12715 from Chia-Network/checkpoint/long_lived_atari_from_main_d18fff0a8ae1c393f07155876dbb1c1d1ef3ff68 2022-07-31 16:36:31 -04:00
Amine Khaldi 1c780f6dc4 Merge commit 'd18fff0a8ae1c393f07155876dbb1c1d1ef3ff68' into checkpoint/long_lived_atari_from_main_d18fff0a8ae1c393f07155876dbb1c1d1ef3ff68 2022-07-31 21:03:16 +01:00
Kyle AltendorfandGitHub 3ef0f697a1 Merge pull request #12713 from Chia-Network/checkpoint/long_lived_atari_from_main_5504f36d4208036a177a2bd70c2eff7566581bf2
checkpoint: into long_lived/atari from main  @ 5504f36d42
2022-07-31 16:02:13 -04:00
Amine Khaldi 92709d5b0d Merge commit '5504f36d4208036a177a2bd70c2eff7566581bf2' into checkpoint/long_lived_atari_from_main_5504f36d4208036a177a2bd70c2eff7566581bf2 2022-07-31 21:00:43 +01:00
Kyle AltendorfandGitHub 15814111c3 Merge pull request #12712 from Chia-Network/checkpoint/long_lived_atari_from_main_7c5a4b2199cfb69b1974098bca0ff3f11c78bdf2
checkpoint: into long_lived/atari from main  @ 7c5a4b2199
2022-07-31 15:57:06 -04:00
Amine Khaldi 6fd10bbfef Merge commit '7c5a4b2199cfb69b1974098bca0ff3f11c78bdf2' into checkpoint/long_lived_atari_from_main_7c5a4b2199cfb69b1974098bca0ff3f11c78bdf2 2022-07-31 20:56:22 +01:00
Kyle AltendorfandGitHub ddd173d321 Merge pull request #12710 from Chia-Network/checkpoint/long_lived_atari_from_main_61de7bdb393fd8c11737f2d34d15560bfb9d632b 2022-07-31 15:48:29 -04:00
Amine Khaldi da67da07e8 Reflect the change on datalayer related code. 2022-07-31 20:29:58 +01:00
Amine Khaldi 5316bd085c Merge commit '61de7bdb393fd8c11737f2d34d15560bfb9d632b' into checkpoint/long_lived_atari_from_main_61de7bdb393fd8c11737f2d34d15560bfb9d632b 2022-07-31 19:26:06 +01:00