Kyle Altendorf and GitHub
0f345c5179
Merge pull request #12109 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_3cd8284e72bfd294ba939ac2773963523406368d
2022-06-26 18:48:59 -04:00
Kyle Altendorf
59b11d76b3
Merge commit '3cd8284e72bfd294ba939ac2773963523406368d' into checkpoint/datalayer-sim_from_release_1.4.0_3cd8284e72bfd294ba939ac2773963523406368d
2022-06-26 18:14:21 -04:00
Kyle Altendorf and GitHub
3d6c9bb7a6
Merge pull request #12107 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_6b80055a1b2d5801307a1ae5f2b46b1ece1045db
2022-06-26 18:10:35 -04:00
Jeff Cruikshank
196dcb6b37
Bump chia-blockchain-gui to 8853e6dbc8c50cad3bb354dd0e183160baadcb91
...
Changes:
* When creating an NFT for XCH offer, verify that the offered NFT is owned (#811 )
* Contextual menu action for cancelling unconfirmed txns for an NFT (#813 )
* Allow some NFTCard interactions when previewing an NFT in the offer viewer/editor (#814 )
2022-06-26 14:54:27 -07:00
Kyle Altendorf
6a139ed755
Merge commit '6b80055a1b2d5801307a1ae5f2b46b1ece1045db' into checkpoint/datalayer-sim_from_release_1.4.0_6b80055a1b2d5801307a1ae5f2b46b1ece1045db
2022-06-26 17:10:11 -04:00
Kyle Altendorf and GitHub
18ec27d0a4
Merge pull request #12106 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_73ecb101e43f49be7ec88dc8bcb7ccf328bfb4ce
2022-06-26 17:07:57 -04:00
Kyle Altendorf
048b913bff
Merge commit '73ecb101e43f49be7ec88dc8bcb7ccf328bfb4ce' into checkpoint/datalayer-sim_from_release_1.4.0_73ecb101e43f49be7ec88dc8bcb7ccf328bfb4ce
2022-06-26 16:10:20 -04:00
Kyle Altendorf and GitHub
78d6c14a63
Merge pull request #12105 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_5a264e228f891cf90879f54981840c3312fd53b3
2022-06-26 16:10:02 -04:00
Kyle Altendorf
ab321b3634
Merge commit '5a264e228f891cf90879f54981840c3312fd53b3' into checkpoint/datalayer-sim_from_release_1.4.0_5a264e228f891cf90879f54981840c3312fd53b3
2022-06-26 15:12:47 -04:00
Kyle Altendorf and GitHub
c0d97f5089
Merge pull request #12104 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_06ee0f02e23b9480f5fff48e8aa039d73f126d67
2022-06-26 15:12:30 -04:00
Kyle Altendorf
489484cd6c
Merge commit '06ee0f02e23b9480f5fff48e8aa039d73f126d67' into checkpoint/datalayer-sim_from_release_1.4.0_06ee0f02e23b9480f5fff48e8aa039d73f126d67
2022-06-26 14:14:29 -04:00
Kyle Altendorf and GitHub
8571576c56
Merge pull request #12103 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_6efb5b8260dfffcee06abfcd52b2c2ba88343f0e
2022-06-26 14:13:51 -04:00
Kyle Altendorf
44d2da4f64
Merge commit '6efb5b8260dfffcee06abfcd52b2c2ba88343f0e' into checkpoint/datalayer-sim_from_release_1.4.0_6efb5b8260dfffcee06abfcd52b2c2ba88343f0e
2022-06-26 13:47:19 -04:00
Kyle Altendorf and GitHub
bc4cdd1a1a
Merge pull request #12102 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_8490d4e708fc81cde79ef1fb83a357c26b1a364a
2022-06-26 13:47:07 -04:00
Kyle Altendorf
32753748c6
Merge commit '8490d4e708fc81cde79ef1fb83a357c26b1a364a' into checkpoint/datalayer-sim_from_release_1.4.0_8490d4e708fc81cde79ef1fb83a357c26b1a364a
2022-06-26 13:01:09 -04:00
Kyle Altendorf and GitHub
dd7f459aec
Merge pull request #12099 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_b8e34c8569277985f5a7ae8b630666d64acfaece
2022-06-26 13:00:22 -04:00
Kyle Altendorf
1d30dd5e1a
Merge commit 'b8e34c8569277985f5a7ae8b630666d64acfaece' into checkpoint/datalayer-sim_from_release_1.4.0_b8e34c8569277985f5a7ae8b630666d64acfaece
2022-06-26 12:11:31 -04:00
Kyle Altendorf and GitHub
97902735c7
Merge pull request #12098 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_6fc1b1594a5c940b4b899fd79536bb07be39ef65
2022-06-26 12:10:41 -04:00
Kyle Altendorf
611f85ac61
Merge commit '6fc1b1594a5c940b4b899fd79536bb07be39ef65' into checkpoint/datalayer-sim_from_release_1.4.0_6fc1b1594a5c940b4b899fd79536bb07be39ef65
2022-06-26 10:08:45 -04:00
Kyle Altendorf and GitHub
80ebadcb8d
Merge pull request #12093 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_a36f5a2eabc98b8a7a909547fac9d71a5eb6959c
2022-06-26 10:08:11 -04:00
Mariano Sorgente and Amine Khaldi
5387298109
Return not synced if no conncetions
2022-06-26 13:16:03 +01:00
Kyle Altendorf
1f059c3136
Merge commit 'a36f5a2eabc98b8a7a909547fac9d71a5eb6959c' into checkpoint/datalayer-sim_from_release_1.4.0_a36f5a2eabc98b8a7a909547fac9d71a5eb6959c
2022-06-25 22:15:12 -04:00
Kyle Altendorf and GitHub
56ab651aee
Merge pull request #12085 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_a6272b894d41df2a83f18a8059858d2049543fec
2022-06-25 22:11:54 -04:00
Kyle Altendorf
2528ccefba
Merge commit 'a6272b894d41df2a83f18a8059858d2049543fec' into checkpoint/datalayer-sim_from_release_1.4.0_a6272b894d41df2a83f18a8059858d2049543fec
2022-06-25 17:05:32 -04:00
Kyle Altendorf and GitHub
a9a4d1f00a
Merge pull request #12081 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_d91ee386f952d33a04e7b5073e6011249ba7e8db
2022-06-25 17:05:04 -04:00
Kyle Altendorf
d2342abe49
Merge commit 'd91ee386f952d33a04e7b5073e6011249ba7e8db' into checkpoint/datalayer-sim_from_release_1.4.0_d91ee386f952d33a04e7b5073e6011249ba7e8db
2022-06-25 15:23:15 -04:00
Kyle Altendorf and GitHub
ede3431e38
Merge pull request #12078 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_a3c9674aa27fa086bb198f1a2db50aa432ee4e75
2022-06-25 15:22:56 -04:00
Amine Khaldi
217353de53
Merge release/1.4.0's d7c5046 into main
2022-06-25 18:32:16 +01:00
Kyle Altendorf
92d52b5f90
Merge commit 'a3c9674aa27fa086bb198f1a2db50aa432ee4e75' into checkpoint/datalayer-sim_from_release_1.4.0_a3c9674aa27fa086bb198f1a2db50aa432ee4e75
2022-06-25 10:31:23 -04:00
Kyle Altendorf and GitHub
64eee37327
Merge pull request #12068 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_1e3193ec2d6b23505b1eb014c549499447b3444a
...
checkpoint: into datalayer-sim from release/1.4.0 @ 1e3193ec2d
2022-06-25 10:25:02 -04:00
William Allen and GitHub
0abf231907
Merge pull request #12070 from Chia-Network/paninaro.bump_gui_c8dddc1c8db1f8a043812a91874158c37bb50022
...
Bump chia-blockchain-gui to c8dddc1c8db1f8a043812a91874158c37bb50022
2022-06-24 20:40:52 -05:00
Jeff Cruikshank
bd789a72a0
Bump chia-blockchain-gui to c8dddc1c8db1f8a043812a91874158c37bb50022
...
Includes fixes/changes for:
OfferList when displaying BigNumber amounts.
Updated sharing options.
Updated the status bar overlay.
Fixed issues with handling of images > 10MB.
2022-06-24 17:14:21 -07:00
William Allen and GitHub
0e65d3a092
Merge pull request #12069 from Chia-Network/wallintrowjb
...
fix wallet introducers for testnet
2022-06-24 19:09:21 -05:00
William Allen and GitHub
136a97dfd1
Merge pull request #12051 from Chia-Network/nft1_did_recovery_fix
...
Small fix for DID recovery
2022-06-24 18:38:56 -05:00
William Allen and GitHub
d7c50462cb
Merge pull request #12065 from Chia-Network/mh.nft_finalization
...
NFT cleanups
2022-06-24 18:37:51 -05:00
William Blanke
8f495a65cd
fix wallet introducers for testnet
2022-06-24 15:32:31 -07:00
Kyle Altendorf
f315d0e0ea
Merge commit '1e3193ec2d6b23505b1eb014c549499447b3444a' into checkpoint/datalayer-sim_from_release_1.4.0_1e3193ec2d6b23505b1eb014c549499447b3444a
2022-06-24 18:27:45 -04:00
Kyle Altendorf and GitHub
b1dad18137
Merge pull request #12066 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_48418955b1ccf1a189224d5690f2fde8efd6081e
2022-06-24 18:25:48 -04:00
Kyle Altendorf
5c9d2b7e60
Merge commit '48418955b1ccf1a189224d5690f2fde8efd6081e' into checkpoint/datalayer-sim_from_release_1.4.0_48418955b1ccf1a189224d5690f2fde8efd6081e
2022-06-24 16:53:01 -04:00
Matt Hauff
a065f1455b
forgot about p2_singleton_or_delayed
2022-06-24 13:52:40 -07:00
Matt Hauff
e72e446d95
forgot about p2_singleton
2022-06-24 13:45:38 -07:00
Kyle Altendorf and GitHub
0d262eea83
Merge pull request #12064 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_2d8230f6fb9173efecde0f812e6be8d596d88f08
2022-06-24 16:37:25 -04:00
Matt Hauff
c4ac22cf64
extract to libraries and shorten announcement bytes
2022-06-24 13:23:00 -07:00
Kyle Altendorf
2c478a06b6
Merge commit '2d8230f6fb9173efecde0f812e6be8d596d88f08' into checkpoint/datalayer-sim_from_release_1.4.0_2d8230f6fb9173efecde0f812e6be8d596d88f08
2022-06-24 15:35:07 -04:00
Kyle Altendorf and GitHub
2c1bad0fbf
Merge pull request #12061 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_5375a967552f647b11bde53e6b35e0c975b08f9c
2022-06-24 15:30:23 -04:00
ytx1991
7e7187aa9d
Fix nft_get_info API
2022-06-24 11:22:39 -07:00
Kyle Altendorf
2bb2504495
Merge commit '5375a967552f647b11bde53e6b35e0c975b08f9c' into checkpoint/datalayer-sim_from_release_1.4.0_5375a967552f647b11bde53e6b35e0c975b08f9c
2022-06-24 14:08:02 -04:00
Kyle Altendorf and GitHub
30879f5b6f
Merge pull request #12057 from Chia-Network/checkpoint/datalayer-sim_from_release_1.4.0_4a848475d5b9ca5be5239f40add3facfe874b3fd
2022-06-24 14:07:48 -04:00
Matt Hauff
6bdd204727
Go to untrusted peers for coin state if trusted isn't synced
2022-06-24 10:58:29 -07:00
Kyle Altendorf
9c2752c8a9
Merge commit '4a848475d5b9ca5be5239f40add3facfe874b3fd' into checkpoint/datalayer-sim_from_release_1.4.0_4a848475d5b9ca5be5239f40add3facfe874b3fd
2022-06-24 11:41:10 -04:00
Kyle AltendorfandGitHub
Jeff Cruikshank
Mariano SorgenteandAmine Khaldi
William AllenandGitHub
William Blanke
Matt Hauff
ytx1991