Commit Graph
14659 Commits
Author SHA1 Message Date
Amine Khaldi 5f007159ec Merge release/1.4.0's 680f203 into main 2022-06-17 21:54:52 +01:00
Amine KhaldiandGitHub 3c6f38b5d2 Merge pull request #11956 from AmineKhaldi/main_checkpoint_1.4.0_fdb60bf
Merge release/1.4.0's fdb60bf into main
2022-06-17 21:52:46 +01:00
Jeff Cruikshank 581b095408 Bump chia-blockchain-gui to a3577b36ea2be2e90916d9ea7aaac245b555a0dc
Includes support for assigning a DID to an NFT.
2022-06-17 12:18:55 -07:00
Kyle Altendorf 9e41db4d42 Merge commit '8e709ae0d350887f3aa50eb302c9cb36c68b19a1' into checkpoint/datalayer-sim_from_release_1.4.0_8e709ae0d350887f3aa50eb302c9cb36c68b19a1
Conflicts:
	chia/wallet/wallet.py
	chia/wallet/wallet_state_manager.py
2022-06-17 15:12:49 -04:00
Amine Khaldi 9491fae415 Merge release/1.4.0's fdb60bf into main 2022-06-17 20:07:12 +01:00
Amine KhaldiandGitHub 2f0f6fc541 Merge pull request #11954 from AmineKhaldi/main_checkpoint_1.4.0_89d1d1b
Merge release/1.4.0's 89d1d1b into main
2022-06-17 20:05:31 +01:00
dustinfaceandGitHub 04c822b2c3 rpc: Be specific about *args in RpcServer state changed methods (#11927) 2022-06-17 20:01:56 +01:00
Sebastjan 4de766c190 another fix to nft tests 2022-06-17 20:20:16 +02:00
Matt Hauff 07d62dd5cb uint64 cast for coin serialization 2022-06-17 11:04:03 -07:00
wjblankeandGitHub 49e4b1c5ce Merge pull request #11953 from Chia-Network/catchup/datalayer-sim_from_long_lived_atari_bc05f7be76f961e6ac9f271389cc177a234c1efb
Catchup/datalayer sim from long lived atari bc05f7be76
2022-06-17 10:45:22 -07:00
Kyle AltendorfandGitHub ab9a04b84b Merge pull request #10735 from Chia-Network/fc.new_server 2022-06-17 13:37:38 -04:00
Amine KhaldiandGitHub 69e8f0a3a2 Merge pull request #11949 from Chia-Network/mh.nft_offer_compression
Add NFT puzzles to offer compression
2022-06-17 18:36:30 +01:00
Sebastjan a8f4b14b9d another fix to nft tests 2022-06-17 19:21:22 +02:00
Amine Khaldi 345a8e8635 Merge release/1.4.0's 89d1d1b into main 2022-06-17 17:45:06 +01:00
Amine KhaldiandGitHub c6f60e791b Merge pull request #11950 from AmineKhaldi/main_checkpoint_1.4.0_95347e5
Merge release/1.4.0's 95347e5 into main
2022-06-17 17:43:04 +01:00
Sebastjan 77b25e32b0 more fixes to nft tests 2022-06-17 18:32:39 +02:00
Kyle Altendorf 362eafcff3 Merge commit 'bc05f7be76f961e6ac9f271389cc177a234c1efb' into catchup/datalayer-sim_from_long_lived_atari_bc05f7be76f961e6ac9f271389cc177a234c1efb 2022-06-17 12:01:54 -04:00
ytx1991 ccec59ce25 Fix set DID bug 2022-06-17 08:51:33 -07:00
Kyle AltendorfandGitHub bc05f7be76 Merge pull request #11803 from Chia-Network/el.start_wallet
Start wallet when starting data
2022-06-17 11:35:15 -04:00
Amine Khaldi 05264622ed Merge release/1.4.0's 95347e5 into main 2022-06-17 16:21:21 +01:00
Amine KhaldiandGitHub 247db4227e Merge pull request #11946 from AmineKhaldi/main_checkpoint_1.4.0_fb4b789
Merge release/1.4.0's fb4b789 into main
2022-06-17 16:19:08 +01:00
Matt Hauff a0a98ccac9 Add NFT puzzles to offer compression 2022-06-17 08:05:26 -07:00
Amine Khaldi cbd40741e2 Introduce the ability to update metadata and license URIs in the NFT add_uri command. 2022-06-17 15:28:47 +01:00
Sebastjan 51a3bdee56 NFT tests a bit more DRY 2022-06-17 14:20:00 +02:00
Florin Chirica 34d4ad4035 Use typing_extensions. 2022-06-17 14:04:22 +03:00
Florin Chirica c741fee349 Use literal. 2022-06-17 13:45:40 +03:00
dce9f7a593 Update chia/data_layer/download_data.py
Co-authored-by: Kyle Altendorf <sda@fstab.net>
2022-06-17 13:13:33 +03:00
Amine KhaldiandGitHub 25c3145c5f Merge pull request #11906 from AmineKhaldi/nft_mint_wallet_validation
NFT minting RPC API: Provide a meaningful error when the wallet provided is not an NFT one
2022-06-17 10:59:13 +01:00
Amine KhaldiandGitHub 4183859da9 Merge pull request #11940 from AmineKhaldi/consistent_cli_fees_handling
Attempt to make fees handling consistent throughout CLI commands
2022-06-17 10:53:35 +01:00
Amine Khaldi 3c52d5a998 Merge release/1.4.0's fb4b789 into main 2022-06-17 09:49:53 +01:00
Amine KhaldiandGitHub 6f6d091492 Merge pull request #11942 from AmineKhaldi/main_checkpoint_1.4.0_45dee3e
Merge release/1.4.0's 45dee3e into main
2022-06-17 09:46:52 +01:00
Amine KhaldiandGitHub 2173e69837 Merge pull request #11938 from AmineKhaldi/nft_get_info_cmd
Initial iteration of the chia wallet nft get_info command
2022-06-17 09:27:40 +01:00
Amine KhaldiandGitHub 680f203b24 Merge pull request #11941 from Chia-Network/paninaro.bump_gui_58049ea72ee81cf37bf54f6b305e08e791b204e3
Bump chia-blockchain-gui to 58049ea72ee81cf37bf54f6b305e08e791b204e3
2022-06-17 09:14:07 +01:00
geoffwalmsley 7c9eb8268f fix flaky test in nft transfer with did 2022-06-17 13:56:25 +12:00
ytx1991 fcd6a6578f fix pre-commit 2022-06-16 16:13:21 -07:00
Matt HauffandGitHub c3040cf3e9 Remove async 2022-06-16 16:00:41 -07:00
Amine KhaldiandGitHub fdb60bf8c0 Merge pull request #11922 from AmineKhaldi/nft_mint_better_hashes_handling
When minting NFTs, only include the metadata hash and the license hash when they are provided
2022-06-16 23:49:18 +01:00
dustinfaceandGitHub b997b9d83d rpc: Make RpcServer a dataclass (#11923) 2022-06-16 23:47:06 +01:00
Amine Khaldi a18f910b6d Address linting. 2022-06-16 23:44:47 +01:00
Amine Khaldi e87779cb60 Merge release/1.4.0's 45dee3e into main 2022-06-16 23:36:35 +01:00
Jeff Cruikshank 4a3d5d0317 Bump chia-blockchain-gui to 58049ea72ee81cf37bf54f6b305e08e791b204e3
Includes NFT offer fixes to work with the revamped offer backend.
Fixes/enhancements from Zlatko for downloading, viewing full-window,
and other fixes.
2022-06-16 15:35:12 -07:00
Amine KhaldiandGitHub 49235b704f Merge pull request #11936 from AmineKhaldi/main_checkpoint_1.4.0_be1a487
Merge release/1.4.0's be1a487 into main
2022-06-16 23:23:35 +01:00
Amine Khaldi bf3d2f184c Attempt to make fees handling consistent throughout CLI commands. 2022-06-16 23:06:32 +01:00
Amine Khaldi 931ac543d2 Initial iteration of the chia wallet nft get_info command. 2022-06-16 22:47:54 +01:00
ytx1991 ac33ef54d2 Add set_nft_status API 2022-06-16 14:34:51 -07:00
Amine KhaldiandGitHub 89d1d1bdb8 Merge pull request #11832 from Chia-Network/rewind_nft1_offers
NFT1 offers again
2022-06-16 21:04:27 +01:00
Amine Khaldi 8e848716cd Merge release/1.4.0's be1a487 into main 2022-06-16 20:57:08 +01:00
Amine KhaldiandGitHub 9f41471230 Merge pull request #11935 from AmineKhaldi/main_checkpoint_1.4.0_5ad70ec
Merge release/1.4.0's 5ad70ec into main
2022-06-16 20:53:42 +01:00
Amine KhaldiandGitHub 95347e59cb Merge pull request #11929 from xdustinface/pr-release-owner-did
cmds: `NFTInfo.owner_did` is `Optional[bytes32]`
2022-06-16 20:29:47 +01:00
dustinfaceandGitHub f5255498f6 cmds: Fix change_payout_instructions for invalid addresses (#11912)
`decode_puzzle_hash` raises
2022-06-16 19:56:41 +01:00