Commit Graph
14659 Commits
Author SHA1 Message Date
Amine KhaldiandGitHub 08baad9fb7 Merge pull request #12016 from AmineKhaldi/main_checkpoint_1.4.0_eabb2c5
Merge release/1.4.0's eabb2c5 into main
2022-06-22 20:48:24 +01:00
Kyle Altendorf b92442aa10 Merge commit '22533ad96bdcf37d204bbd0d2c58e3b145e7d848' into checkpoint/datalayer-sim_from_release_1.4.0_22533ad96bdcf37d204bbd0d2c58e3b145e7d848 2022-06-22 15:33:30 -04:00
Kyle AltendorfandGitHub 8c8a4aa736 Merge pull request #12017 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_cfc023fac502131ee2b630e87253de92876369b2 2022-06-22 14:36:44 -04:00
Kyle Altendorf c465b9a01f Merge commit 'cfc023fac502131ee2b630e87253de92876369b2' into checkpoint/datalayer-sim_from_release_1.4.0_cfc023fac502131ee2b630e87253de92876369b2
Conflicts:
	chia-blockchain-gui
2022-06-22 13:49:55 -04:00
Kyle AltendorfandGitHub 75a287fd4c not optional - WalletNode.wallet_state_manager, .server, .keychain_proxy (#11981)
* not optional - `WalletNode.wallet_state_manager`, `.server`, `.keychain_proxy`

* correct caught exception type

* remove some more

* more
2022-06-22 12:10:19 -05:00
Kronus91andGitHub 717a361694 Merge branch 'release/1.4.0' into nft1_tx_fee 2022-06-22 09:56:40 -07:00
Amine Khaldi c0e8c86e3e Merge release/1.4.0's eabb2c5 into main 2022-06-22 17:13:06 +01:00
William AllenandGitHub bc9300be25 Merge pull request #12013 from AmineKhaldi/main_checkpoint_1.4.0_e8d0802
Merge release/1.4.0's e8d0802 into main
2022-06-22 10:59:02 -05:00
William AllenandGitHub 6c09d75531 Merge pull request #12004 from Chia-Network/nft_offer_cli
Add CLI support for NFT offers
2022-06-22 10:58:37 -05:00
Amine Khaldi 28761f44a7 Merge release/1.4.0's e8d0802 into main 2022-06-22 15:32:27 +01:00
Amine KhaldiandGitHub b1f0b780a7 Merge pull request #12010 from AmineKhaldi/main_checkpoint_1.4.0_66831eb
Merge release/1.4.0's 66831eb into main
2022-06-22 15:30:35 +01:00
Amine KhaldiandGitHub eabb2c5a29 Merge pull request #11991 from AmineKhaldi/minting_cli_did_ownership
Make the minting CLI default to an empty DID and allow the user to explicitly turn off DID ownership support
2022-06-22 13:00:37 +01:00
Amine Khaldi 1aa48103b8 Address linting. 2022-06-22 12:18:02 +01:00
Amine Khaldi 1e5b426ce5 Merge release/1.4.0's 66831eb into main 2022-06-22 11:41:53 +01:00
William AllenandGitHub e8d080210c Merge pull request #11944 from Chia-Network/nft1_set_status
Pre-launch bug fix N in 1
2022-06-22 02:59:42 -05:00
William AllenandGitHub 66831ebdef Merge pull request #11997 from trepca/nft1_eve_spend
empty eve did coin, use gen_sign_tx for minting
2022-06-22 02:58:58 -05:00
neurosis69andGitHub 480d611712 add debug option to log all SQL commands for wallet db (#11635)
* add log_sqlite_cmds option for wallet db

* use context manager for file handling
2022-06-22 02:17:09 -05:00
Kyle AltendorfandGitHub 56777f9dd7 switch back to official dnspython for v2.2.0 (#10541) 2022-06-22 02:04:57 -05:00
ytx1991 38da30c2fd Fix pre-commit 2022-06-21 20:10:43 -07:00
ytx1991 15206f9e45 Fix transaction record issue & migrate update_metadata to generate_signed_tx 2022-06-21 19:39:10 -07:00
Matt Hauff 501f42e547 Add CLI support for NFT offers 2022-06-21 16:15:43 -07:00
Sebastjan f183dccd35 fix 2022-06-22 00:09:00 +02:00
dustinfaceandGitHub 421ec50a4f rpc: Introduce rpc_server.Endpoint hint alias (#11889) 2022-06-21 16:57:42 -05:00
ytx1991 241d48ab3a Resolve comments 2022-06-21 14:55:48 -07:00
Kyle AltendorfandGitHub db04a90eef add workflow emoji (#11988)
* add workflow emoji

* move from job name to workflow name

* move from test-single to test

* some more
2022-06-21 14:51:01 -05:00
Kyle AltendorfandGitHub 15105badf0 Make WalletUserStore.create_wallet() raise on failure, and return non-optional (#10957) 2022-06-21 14:49:46 -05:00
William AllenandGitHub 497bd8db7d Merge pull request #12000 from AmineKhaldi/main_checkpoint_1.4.0_0f49e5d
Merge release/1.4.0's 0f49e5d into main
2022-06-21 14:48:11 -05:00
Sebastjan 1cd2da519d fix 2022-06-21 21:12:17 +02:00
63964ce43d Update chia/wallet/nft_wallet/nft_wallet.py
Co-authored-by: Kyle Altendorf <sda@fstab.net>
2022-06-21 20:17:15 +02:00
Sebastjan 1d2ceb52b1 log debug fix 2022-06-21 20:10:03 +02:00
Amine Khaldi 0e745ea0d1 Address Jeff's feedback and suggestions. 2022-06-21 18:22:01 +01:00
Matt Hauff 3a42d071b9 Cast amount to uint64 2022-06-21 09:58:19 -07:00
24d7453cb4 Update chia/wallet/nft_wallet/nft_wallet.py
Co-authored-by: Kyle Altendorf <sda@fstab.net>
2022-06-21 18:47:59 +02:00
d274a2456b Update chia/wallet/nft_wallet/nft_wallet.py
Co-authored-by: Kyle Altendorf <sda@fstab.net>
2022-06-21 18:47:53 +02:00
4fb5ab4f48 Update chia/wallet/nft_wallet/nft_wallet.py
Co-authored-by: Kyle Altendorf <sda@fstab.net>
2022-06-21 18:47:38 +02:00
92283da460 Update chia/wallet/nft_wallet/nft_wallet.py
Co-authored-by: Kyle Altendorf <sda@fstab.net>
2022-06-21 18:47:00 +02:00
2acd45ab26 Update chia/wallet/nft_wallet/nft_wallet.py
Co-authored-by: Kyle Altendorf <sda@fstab.net>
2022-06-21 18:46:24 +02:00
3e0b157041 Update chia/wallet/nft_wallet/nft_wallet.py
Co-authored-by: Kyle Altendorf <sda@fstab.net>
2022-06-21 18:46:14 +02:00
Kronus91andGitHub 65170371ef Merge branch 'release/1.4.0' into nft1_set_status 2022-06-21 09:17:47 -07:00
Amine Khaldi dd1a07965a Merge release/1.4.0's 0f49e5d into main 2022-06-21 15:46:45 +01:00
Amine KhaldiandGitHub 0f49e5d048 Merge pull request #11961 from Chia-Network/gw.nft1_more_tests
Adding further tests and cat support for NFT1 offers
2022-06-21 15:45:06 +01:00
Amine Khaldi be48c11809 Merge remote-tracking branch 'remotes/origin/release/1.4.0' into gw.nft1_more_tests 2022-06-21 13:50:19 +01:00
Sebastjan 5998478bc4 empty eve did coin, use gen_sign_tx for minting 2022-06-21 14:31:27 +02:00
Amine KhaldiandGitHub 2afab82258 Merge pull request #11996 from AmineKhaldi/main_checkpoint_1.4.0_92d8c2c
Merge release/1.4.0's 92d8c2c into main
2022-06-21 12:19:47 +01:00
Amine Khaldi e1286daa10 Merge release/1.4.0's 92d8c2c into main 2022-06-21 10:57:11 +01:00
Amine KhaldiandGitHub ce60aa7082 Merge pull request #11992 from AmineKhaldi/main_checkpoint_1.4.0_396463d
Merge release/1.4.0's 396463d into main
2022-06-21 10:55:19 +01:00
Amine KhaldiandGitHub 92d8c2ce54 Merge pull request #11993 from Chia-Network/paninaro.bump_gui_09b81062e0ac106265b7d467580bf3b42ecd9d95
Bump chia-blockchain-gui to 09b81062e0ac106265b7d467580bf3b42ecd9d95
2022-06-21 10:54:53 +01:00
Jeff Cruikshank 77d9c8d5b2 Bump chia-blockchain-gui to 09b81062e0ac106265b7d467580bf3b42ecd9d95
Includes minor fixes/improvements
2022-06-20 18:01:57 -07:00
Amine Khaldi 792b682118 Merge release/1.4.0's 396463d into main 2022-06-20 20:57:46 +01:00
Amine KhaldiandGitHub 396463d6d9 Merge pull request #11989 from AmineKhaldi/rename_did
Rename DISTRIBUTED_ID to DECENTRALIZED_ID
2022-06-20 20:53:23 +01:00