Commit Graph
14659 Commits
Author SHA1 Message Date
Amine Khaldi e0b9e25526 Make the minting CLI default to an empty DID and allow the user to explicitly turn off DID ownership support. 2022-06-20 20:45:54 +01:00
Amine Khaldi 853f44919a Rename DISTRIBUTED_ID to DECENTRALIZED_ID. 2022-06-20 18:38:50 +01:00
Amine KhaldiandGitHub aa50b0fd03 Merge pull request #11979 from AmineKhaldi/main_checkpoint_1.4.0_4ae6d3f
Merge release/1.4.0's 4ae6d3f into main
2022-06-19 17:58:59 +01:00
Amine Khaldi efab0229b9 Merge release/1.4.0's 4ae6d3f into main 2022-06-19 15:13:45 +01:00
Amine KhaldiandGitHub c9cdb6a9db Merge pull request #11978 from AmineKhaldi/main_checkpoint_1.4.0_d2dbb12
Merge release/1.4.0's d2dbb12 into main
2022-06-19 15:12:06 +01:00
Kyle AltendorfandGitHub 8316e6e303 Merge pull request #11975 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_eab86d7bffb82915ebcb1b451f0a452710d41731 2022-06-19 09:09:35 -04:00
Amine KhaldiandGitHub 4ae6d3f361 Merge pull request #11943 from Chia-Network/mh.remove_async
Remove async
2022-06-19 12:07:38 +01:00
Amine Khaldi 31db97d80a Merge release/1.4.0's d2dbb12 into main 2022-06-19 12:05:21 +01:00
Amine KhaldiandGitHub d2dbb12448 Merge pull request #11966 from AmineKhaldi/improve_did_update_metadata
Improve DID metadata update RPC API
2022-06-19 12:03:43 +01:00
Amine KhaldiandGitHub aebd564b48 Merge pull request #11973 from AmineKhaldi/main_checkpoint_1.4.0_2f3b3aa
Merge release/1.4.0's 2f3b3aa into main
2022-06-19 12:02:59 +01:00
Kyle Altendorf 7a229ce200 Merge commit 'eab86d7bffb82915ebcb1b451f0a452710d41731' into checkpoint/datalayer-sim_from_release_1.4.0_eab86d7bffb82915ebcb1b451f0a452710d41731 2022-06-18 20:08:41 -04:00
Kyle AltendorfandGitHub 9fb4abf642 Merge pull request #11974 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_c8359f0af96ab802ad9f1157396f9778433771ca
checkpoint: into datalayer-sim from release/1.4.0 @ c8359f0af9
2022-06-18 19:48:00 -04:00
Amine Khaldi 2203081e5a Merge release/1.4.0's 2f3b3aa into main 2022-06-18 21:02:53 +01:00
Amine KhaldiandGitHub 2f3b3aafd8 Merge pull request #11948 from AmineKhaldi/add_uri_cli_mu_lu
Introduce the ability to update metadata and license URIs in the NFT add_uri command
2022-06-18 21:00:47 +01:00
Kyle Altendorf 6d8f429a2a Merge commit 'c8359f0af96ab802ad9f1157396f9778433771ca' into checkpoint/datalayer-sim_from_release_1.4.0_c8359f0af96ab802ad9f1157396f9778433771ca 2022-06-18 15:55:04 -04:00
Kyle AltendorfandGitHub 6a8fd50457 Merge pull request #11969 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_8defd89522547fcfeca4b8231c23b3dc872070b3 2022-06-18 15:53:56 -04:00
Amine KhaldiandGitHub 06d4ef73ed Merge pull request #11971 from AmineKhaldi/main_checkpoint_1.4.0_10b550c
Merge release/1.4.0's 10b550c into main
2022-06-18 20:14:04 +01:00
Kronus91andGitHub fbd32b5a63 Merge branch 'release/1.4.0' into nft1_set_status 2022-06-18 11:48:01 -07:00
Amine Khaldi 5350b8a4c6 Merge release/1.4.0's 10b550c into main 2022-06-18 18:56:12 +01:00
Amine KhaldiandGitHub d1c8d545ec Merge pull request #11970 from AmineKhaldi/main_checkpoint_1.4.0_78f8485
Merge release/1.4.0's 78f8485 into main
2022-06-18 18:49:10 +01:00
Amine Khaldi d517945438 Merge release/1.4.0's 78f8485 into main 2022-06-18 17:46:49 +01:00
Amine KhaldiandGitHub 467cc0acf6 Merge pull request #11968 from AmineKhaldi/main_checkpoint_1.4.0_69e8f0a
Merge release/1.4.0's 69e8f0a into main
2022-06-18 17:44:07 +01:00
Kyle Altendorf 841d91eae5 Merge commit '8defd89522547fcfeca4b8231c23b3dc872070b3' into checkpoint/datalayer-sim_from_release_1.4.0_8defd89522547fcfeca4b8231c23b3dc872070b3 2022-06-18 11:25:38 -04:00
Amine Khaldi cbcfb82a64 Merge release/1.4.0's 69e8f0a into main 2022-06-18 16:03:15 +01:00
Amine KhaldiandGitHub 67801de84b Merge pull request #11967 from AmineKhaldi/main_checkpoint_1.4.0_25c3145
Merge release/1.4.0's 25c3145 into main
2022-06-18 16:01:25 +01:00
Amine Khaldi 20b1be437f Merge release/1.4.0's 25c3145 into main 2022-06-18 14:57:32 +01:00
Amine KhaldiandGitHub 0e601ff76e Merge pull request #11965 from AmineKhaldi/main_checkpoint_1.4.0_4183859
Merge release/1.4.0's 4183859 into main
2022-06-18 14:54:59 +01:00
Amine Khaldi 5046738c88 Improve DID metadata update RPC API. 2022-06-18 14:50:19 +01:00
Kyle AltendorfandGitHub abe0fb2a3d Merge pull request #11964 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_7b104f3212406639bee1a6dfdd66670bf0354083
Checkpoint/datalayer sim from release 1.4.0 7b104f3212
2022-06-18 09:31:02 -04:00
Amine Khaldi f3b219ad7e Merge release/1.4.0's 4183859 into main 2022-06-18 13:55:15 +01:00
Amine KhaldiandGitHub 7f52ed4feb Merge pull request #11962 from AmineKhaldi/main_checkpoint_1.4.0_2173e69
Merge release/1.4.0's 2173e69 into main
2022-06-18 13:52:09 +01:00
Kyle Altendorf f803ebc4fc Merge commit '7b104f3212406639bee1a6dfdd66670bf0354083' into checkpoint/datalayer-sim_from_release_1.4.0_7b104f3212406639bee1a6dfdd66670bf0354083 2022-06-18 08:16:45 -04:00
Kyle AltendorfandGitHub 4de04c87bd Merge pull request #11963 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_84738ab89e330620a04634a07d1a2a1d5a81be69 2022-06-18 08:11:08 -04:00
Amine KhaldiandGitHub 10b550c1bf Merge pull request #11947 from trepca/nft1_test_updates
NFT wallet test updates
2022-06-18 13:10:50 +01:00
Kyle Altendorf 5bf8c3ade0 Merge commit '84738ab89e330620a04634a07d1a2a1d5a81be69' into checkpoint/datalayer-sim_from_release_1.4.0_84738ab89e330620a04634a07d1a2a1d5a81be69 2022-06-18 07:31:47 -04:00
Amine Khaldi 3be67d5b6a Merge release/1.4.0's 2173e69 into main 2022-06-18 11:53:58 +01:00
Amine KhaldiandGitHub 717625f2ea Merge pull request #11959 from AmineKhaldi/main_checkpoint_1.4.0_680f203
Merge release/1.4.0's 680f203 into main
2022-06-18 11:46:07 +01:00
ytx1991 2af3b26176 Fix transaction status 2022-06-17 23:47:44 -07:00
geoffwalmsley 7f33869f1a Merge branch 'trepca/nft1_test_updates' into gw.nft1_more_tests 2022-06-18 18:30:01 +12:00
geoffwalmsley c456f0cd9d mypy 2022-06-18 18:17:50 +12:00
geoffwalmsley 9b60f1c2d9 Merge branch 'release/1.4.0' into gw.nft1_more_tests 2022-06-18 17:40:58 +12:00
geoffwalmsley 2bc7d666b7 test request nft for cat 2022-06-18 17:39:22 +12:00
geoffwalmsley 4570df0925 test offer nft for cat 2022-06-18 17:15:52 +12:00
ytx1991 b91b7c44a8 Merge branch 'release/1.4.0' into nft1_set_status 2022-06-17 21:07:29 -07:00
wjblankeandGitHub 78f8485e52 Merge pull request #11958 from Chia-Network/paninaro.bump_gui_a3577b36ea2be2e90916d9ea7aaac245b555a0dc
Bump chia-blockchain-gui to a3577b36ea2be2e90916d9ea7aaac245b555a0dc
2022-06-17 20:54:52 -07:00
geoffwalmsley 728f0300f8 assert nft1 royalties and clean up tests 2022-06-18 15:06:08 +12:00
Kronus91andGitHub 4365b374cf Merge branch 'release/1.4.0' into nft1_set_status 2022-06-17 19:38:03 -07:00
ytx1991 e5dfc0825f Rewrite ownership logic 2022-06-17 19:34:32 -07:00
geoffwalmsley 4551822b33 test taker nft is unclaimed by did 2022-06-18 11:09:38 +12:00
wjblankeandGitHub 3f12951b49 Merge pull request #11957 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_8e709ae0d350887f3aa50eb302c9cb36c68b19a1
Checkpoint/datalayer sim from release 1.4.0 8e709ae0d3
2022-06-17 15:59:28 -07:00