Almog De Paz
2a51d7deaf
wallet code reuse ( #12310 )
...
* validate wp from fork and fix bugs(pr #11826 )
move WalletWeighProofHandler to wallet_node
remove code dupelication
* fix init bug
remove bad return path
* lint
* merge fixes
remove redundant ses_cache
* lint
* lint
* fix test
* lint
* assert state_manager is not None
2022-08-10 04:45:01 -05:00
William Allen
e311bf4bd4
Wallentx/cherrypick ( #12865 )
...
* increased timeouts for less NFT test flakiness (#12847 )
* increased timeouts for less flakiness
* a few more timeouts
* and some more
* more blocks
* Swap intel installer to 10.14 runners (#12735 )
* Swap intel installer to 10.14 runners and swap to setup python wrapper forced to pyenv (since github's python versions don't support 10.14)
* Self-hosted cleanup steps
* Update to chia-network notarize cli
Co-authored-by: Sebastjan Trepca <trepca@gmail.com>
Co-authored-by: Chris Marslender <chrismarslender@gmail.com>
2022-08-09 14:14:35 -05:00
Sebastjan Trepca
4a98e92679
increased timeouts for less NFT test flakiness ( #12847 )
...
* increased timeouts for less flakiness
* a few more timeouts
* and some more
* more blocks
2022-08-09 09:31:22 -05:00
Kyle Altendorf
0a77e94c9d
Merge pull request #12833 from Chia-Network/quex.new_proof_format
2022-08-08 22:03:40 -04:00
dustinface
244a9dcc91
tests: Drop redundant RpcServer instances ( #12769 )
...
Just use the ones started by the actual `Service`.
2022-08-08 20:05:20 -05:00
William Allen
51e8c8b60e
nft wallet reorg fix ( #12828 ) ( #12841 )
...
* reorg fix
* refreshing nft coins
Co-authored-by: Sebastjan Trepca <trepca@gmail.com>
2022-08-08 17:47:30 -05:00
Amine Khaldi
b11352a97e
Unify SimulatorsAndWallets and remove extra bt from datalayer related tests.
2022-08-08 22:08:27 +01:00
Sebastjan Trepca
164fd158c8
nft wallet reorg fix ( #12828 )
...
* reorg fix
* refreshing nft coins
2022-08-08 14:45:54 -05:00
Amine Khaldi
647c0448cd
Merge commit 'bd5d4b13927caaaec3e9b67d88ad0398f22d1d8e' into checkpoint/long_lived_atari_from_main_bd5d4b13927caaaec3e9b67d88ad0398f22d1d8e
2022-08-08 18:32:39 +01:00
Matt Hauff
f22a7e0d7c
Switch format for RPC proofs_of_inclusion for DL offers
2022-08-08 11:12:24 -05:00
dustinface
aa0e996ac5
util: Drop partially implemented BIP39 passphrase support ( #12748 )
2022-08-06 09:50:33 -05:00
dustinface
820889a316
rpc: Improve RPC server start/stop ( #12768 )
...
* rpc: Improve RPC server start/stop
* `RpcServer.stop` -> `RpcServer.close`
2022-08-06 01:07:41 -05:00
Jack Nelson
2ab0fa8b0a
fix ci ( #12808 )
2022-08-05 16:09:02 -05:00
Kronus91
2fa9f768ea
Nft reorg ( #12665 )
...
* Hanlde NFT reorg
* Fix pre-commit
* Change approach & add more unit tests
* Add adjust test timeout
* Fix unit tests
* Fix unit tests
* Revert unit test changes
* Unit test
* Unit test
* Unit test
* Remove limit
* Resolve comments
* Fix pre-commit
2022-08-05 13:27:08 -05:00
Jack Nelson
0dd5391f40
Simulator Final touches ( #12703 )
...
* add new rpc and add tests.
I added, get_all_blocks rpc, and expanded the get_all_puzzle_hashes rpc.
* lint pass
* update plot directory for simulator
* return peak height on new block farm
* expand test coverage
* fix plot directory craziness
* simulator sync override
* Add new simulator networktype
* add logging to simulator
* Fix race condition, mempool and confirm
* add reorg seed
* farm block if block 0 sim & fix unsynced for sim
* lint
* oops i forgot to lint
* switch to detecting simulator in network type
also remove inline genesis generation
* fix config loading to use correct variable
Co-authored-by: Mariano Sorgente <sorgente711@gmail.com>
2022-08-05 01:23:18 -05:00
Arvid Norberg
f562d96535
uncurry the puzzle once instead of 3 times ( #12781 )
2022-08-04 23:16:04 -05:00
Matt Hauff
44b2568cd6
Block summaries of CAT1 offers in the RPC and CLI ( #12730 )
...
* Block summaries of CAT1 offers in the RPC
* block CLI too
* manually decompress/deserialize
* black
* Add test
* pre-commit
2022-08-04 20:38:43 -05:00
Kronus91
fba150627c
Add bulk cancel API ( #12427 )
...
* Add bulk cancel API
* Add cancel_all flag
* Add asset ID
* Resolve comments
* Fix pre-commit
2022-08-04 16:31:27 -05:00
Amine Khaldi
90331f39e0
Merge commit '8ec56d1901315a5efb13202023e15930349ae504' into checkpoint/long_lived_atari_from_main_8ec56d1901315a5efb13202023e15930349ae504
2022-08-04 20:55:51 +01:00
Amine Khaldi
5279f2b999
Merge commit '371f76e377c197b6a53899c72650f9854c26fd0c' into checkpoint/long_lived_atari_from_main_371f76e377c197b6a53899c72650f9854c26fd0c
2022-08-04 18:32:31 +01:00
Amine Khaldi
ef2e35ff80
Merge commit '539d9b53fd560433445e341c72bd89a63c108eb1' into checkpoint/long_lived_atari_from_main_539d9b53fd560433445e341c72bd89a63c108eb1
2022-08-04 17:23:52 +01:00
Arvid Norberg
67b45c92ea
avoid redundant printing of puzzle program in NFT uncurry attempt ( #12764 )
2022-08-03 20:49:22 -05:00
Mariano Sorgente
c9bebc6c40
Fix more flaky tests, and optimize test_pool_rpc and NFT tests (signed) ( #12761 )
...
* Fix asyncio lock created outside async function
* Increase wallet sync timeouts
* Attempt to fix flaky pool tests, remove sleeps
* Remove accidental change
* Completely remove sleeps and optimize
* Remove asyncio import
* More flaky fixes
* Large speed improvements, and test Untrusted also
* Improve perf
* Move wallet_is_synced
* try not starting RPC in setup
* Revert "try not starting RPC in setup"
This reverts commit e8de70e73a2d4b10e0df4a2158e8e9acd9c3afd3.
* Revert accidental changes
* Revert more accidental changes
* Revert cbgui update
2022-08-03 02:28:32 -05:00
Mariano Sorgente
4c7a917905
Increase timeouts to reduce flakiness ( #12745 )
2022-08-03 00:01:39 -05:00
Arvid Norberg
21e563eb4f
optimize get_coins_to_check() by returning the coin_names directly, rather than allocating full WalletCoinRecords and then compute the names ( #12741 )
2022-08-02 12:28:08 -05:00
Earle Lowe
62fd66cb5b
Update test with pytest.raises ( #12684 )
2022-08-01 18:16:10 -05:00
Jack Nelson
3a403f5047
Add small coin selection improvements ( #12682 )
...
* clean up existing test to align with our standards
* add zero amount test
it is failing
* 0 amount fix
* max_coin_amount type change
it should have been uint64
* add max_coin_amount logic for future use
* add slightly more logic
* forgot to include edgecase
* clarify comment
2022-08-01 18:15:47 -05:00
Jack Nelson
5585ba1d8c
Fix NFT > CAT Royalty splitting bug. ( #12581 )
...
* cleanup nft offer drek
* final changes
* address most requested changes
* fix tests and fix actual bug
rip 5 hours
* reversion
* final change kinda
* fix tests
* undo wrong change
* final lint pass and actual fix
* Update nft_wallet.py
* mac lint pass
* address changes p1
* address other changes & make code readable
2022-08-01 15:50:08 -05:00
Matt Hauff
7ceb91de8a
isort
2022-08-01 11:22:43 -05:00
Matt Hauff
a8fa5b919e
Merge branch 'dl_offer_hooks' into dl_clsp_mirrors
2022-08-01 11:21:42 -05:00
Matt Hauff
d388444daa
Merge remote-tracking branch 'origin/long_lived/atari' into dl_offer_hooks
2022-08-01 11:21:18 -05:00
Jeff
0fc63d62d2
Replace NFT_HRP and DID_HRP with AddressType ( #12711 )
...
* Replaced DID_HRP with AddressType.DID.hrp()
* Replaced NFT_HRP with AddressType.NFT.hrp()
2022-08-01 11:19:49 -05:00
Amine Khaldi
90d96467ab
Merge commit '383326c3b7fcd0d899950697e0766e11a2ce8c8b' into checkpoint/long_lived_atari_from_main_383326c3b7fcd0d899950697e0766e11a2ce8c8b
2022-08-01 16:56:07 +01:00
Matt Hauff
b782989883
Merge branch 'dl_offer_hooks' into dl_clsp_mirrors
2022-08-01 10:28:13 -05:00
Matt Hauff
521100b702
Merge remote-tracking branch 'origin/long_lived/atari' into dl_offer_hooks
2022-08-01 10:24:29 -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
Kyle Altendorf
86ae361a2f
apply isort to atari
2022-07-31 21:10:56 -07:00
Amine Khaldi
2bb124068d
Merge commit '391c1a00777dc340c23e2c9642c8f5461e4875b2' into checkpoint/long_lived_atari_from_main_391c1a00777dc340c23e2c9642c8f5461e4875b2
2022-07-31 21:58:15 +01:00
Jeff
a3f5a4e65d
Support for remembering the last used wallet key ( #12550 )
...
* Support for remembering the last used wallet key
* Added tests for WalletNode login/logout, last_used_fingerprint,
and get_private_key functionality.
Create intermediate dirs when writing last used fingerprint.
Return KeyringKeyNotFound when KeychainProxy is a local proxy and a key isn't found by fingerprint.
* Fixed Windows test failure
* Test fix
* Refactored get_private_key into two methods for clarity.
Added test to cover case where last_used_fingerprint file contains whitespace.
Other PR feedback addressed.
* Changes related to PR feedback
* Reverted changes to test_wallet_rpc.py
* Removed unnecessary try:except:
* Updated tests now that a dependent fixture has moved to conftests.py
2022-07-29 17:08:37 -05:00
Kyle Altendorf
e5bc89e5b6
catchup: into main from long_lived/post_1.5.0 @ 916ccee549 ( #12629 )
...
* updated wallet name
* deprecated series
* swap to cat2
* updating .gitmodule to point to defender-gui
* Remove break (its preventing other sockets from getting data when earlier ones have an error) (#12241 )
* Convert DID Wallet to use the new coin selection algorithm that the normal wallet and the CAT wallet already use (#12063 )
* small type change
* use coin_selection.py with DID Wallet
use more efficient coin selection methods.
* Add special DID edgecase + fix int type
* Ms.fix coin selection (#12261 )
* Fix coin selection bug
* Fix properly
* Fallback in cases of too many coins selected
* Also check for num coins
* Lint issues.
* Add another test
* No sorting, and faster knapsack
* Lint fix
* Remove comment and useless check
* Lint line
* Tx submission idempotance, and prioritize wallet (#12282 )
* Tx submission idempotance, and prioritize wallet
* TODO comment
* Updating gui modules
* extend min_coin to rpc calls & cli for coin selection (#12274 )
* add tests to test if min_coin is working
they are passing, but no harm in being safe
* expand min coin amount across wallet.py
* extend to trade_manager
* add new options to rpc's
almost done lol.
* add min_coin_amount to wallet send
* make param non optional
alleviate None errors
* add cat wallet changes, rpc and all + fix a bug i accidentally made
oops
* Fix offer compression backwards compatibility
* bumping gui pin to head of release/1.5.0
* Calculate NFT royalty amount
* Create NFT wallet after the DID created (#12175 )
* Bumping gui
* Show total amount to be paid for NFT offers
* Fix for NFT0 and NFT+Royalty detection suggested by quex
* Linter fix and formatting change
* Add RPCs for getting/extending the current derivation path index (#12472 )
* Sleep to allow neworking layer to execute (#12463 )
* Sleep to allow neworking layer to execute
* Add comment
* Added param to indicate how many additional phs create_more_puzzle_hashes should create. (#12493 )
Account for range() not including last_index when `up_to_index` is provided.
* Fixed the wallet db rename from v2/v1 to v2_r1.
Removed vestigial code for dealing with the lite wallet db now that
we're syncing v2_r1 from scratch.
* When extending the derivation index, make sure we don't mark previously (#12513 )
unused indices as used. This helps minimize gaps in the address space.
* Updating SBX asset ID
* Adding 1.5.0 changelog (#56 )
* Adding 1.5.0 changelog
* Adding CVE fix
* Updating gitmodules (#57 )
* Updating gitmodules
* Pinning gui
* black fixes
* mypy fixes
* xfail some run_block tests that need CAT2 update
* fix test
* Fix test based on series<->edition changes
* Drop EOL impish and hirsute (#12559 )
(cherry picked from commit 189790ced2#12360 )
* change type to uint64, 128 is too big anyway
* add new options to select_coins endpoint
* oops
* add tests and finalize
* oops
(cherry picked from commit d5bf4d8b59
2022-07-29 16:58:21 -05:00
Matt Hauff
f344aa95eb
pre-commit
2022-07-29 14:53:14 -05:00
Matt Hauff
d599f7f19a
RPCs working
2022-07-29 14:39:25 -05:00
Amine Khaldi
90a81f34b8
Merge commit '39c55994fbfae7b4c0938459fe5b3fda82de6912' into checkpoint/long_lived_atari_from_main_39c55994fbfae7b4c0938459fe5b3fda82de6912
2022-07-29 19:18:42 +01:00
Matt Hauff
eee142ddf9
Mirror deletion
2022-07-29 13:05:25 -05:00
Amine Khaldi
9ed71ddc87
Merge commit '7550a13eba4a84dc66fb6c1e02347fdb7ad5c0fd' into checkpoint/long_lived_atari_from_main_7550a13eba4a84dc66fb6c1e02347fdb7ad5c0fd
2022-07-29 18:42:33 +01:00
Jeff
4b8130ec60
NFT transfer/minting commands now validate the specified addresses ( #12520 )
...
* WIP to introduce a wallet AddressType enum to help validate
user-entered addresses for XCH/DID/NFTs etc.
* Support grabbing the current network's address prefix while also
allowing the current value to be updated (in case the config changes)
* Added tests for functionality in/used-by AddressType
* Removed code that would automatically resolve the selected network's address prefix.
is_valid_address() and ensure_valid_address() now require the allowed address types to be passed in.
* Check the length of the decoded address data
* Removed TXCH address type. "txch" address validation now requires a config to be passed into one of the validation functions.
* config is now required when using the address validation functions or calling AddressType.hrp().
root_path_and_config_with_address_prefix --> config_with_address_prefix fixture change.
* Update tests/conftest.py
Co-authored-by: Kyle Altendorf <sda@fstab.net>
* Update tests/conftest.py
Co-authored-by: Kyle Altendorf <sda@fstab.net>
Co-authored-by: Kyle Altendorf <sda@fstab.net>
2022-07-29 12:22:33 -05:00
Matt Hauff
fcb359938c
Mirror creation working
2022-07-29 10:32:57 -05:00
Amine Khaldi
d000c267f1
Merge commit '16aafffb71d297f27ca4e99cba69a7efc3033a3e' into checkpoint/long_lived_atari_from_main_16aafffb71d297f27ca4e99cba69a7efc3033a3e
2022-07-29 11:31:45 +01:00
Matt Hauff
a4464e71bd
Merge branch 'dl_generate_signed_transaction' into dl_offer_hooks
2022-07-28 15:46:27 -05:00
Matt Hauff
44be1ad07d
Merge branch 'dl_to_nft_chialisp' into dl_generate_signed_transaction
2022-07-28 15:45:58 -05:00
Matt Hauff
6206a6a95b
Merge remote-tracking branch 'origin/long_lived/atari' into dl_to_nft_chialisp
2022-07-28 15:44:03 -05:00
Amine Khaldi
9562eddfb5
Merge commit '4a69bc16135dcb36cf153f6c13924de6c681afec' into checkpoint/long_lived_atari_from_main_4a69bc16135dcb36cf153f6c13924de6c681afec
2022-07-27 18:16:49 +01:00
Amine Khaldi
d6ccba7a99
Reflect the change on datalayer related code.
2022-07-27 16:55:16 +01:00
Amine Khaldi
aed2c8e673
Merge commit '749162d9fead35d2beb2d34bdc7d90df4d5ec6d5' into checkpoint/long_lived_atari_from_main_749162d9fead35d2beb2d34bdc7d90df4d5ec6d5
2022-07-27 16:43:39 +01:00
Amine Khaldi
5a9764df09
Merge commit '2d812c50024a2c0147427d4feb1341a66ac56362' into checkpoint/long_lived_atari_from_main_2d812c50024a2c0147427d4feb1341a66ac56362
2022-07-27 16:34:28 +01:00
Jack Nelson
0bc54ae08b
Move simulator test requirements over to new module ( #12521 )
...
* create new test.simulator module
to allow other packages to use the simulator without it crashing.
also tiny QOL fixes
* change user mode sim plot filter
Now only plots matching the user set fingerprint are loaded, this decreases the chance of user error.
* fix small oops in configure
* oops
* fix lint
* isort, who dis
* move folder over to chia/simulator
also change mypy settings again
2022-07-25 14:07:38 -05:00
Amine Khaldi
e9705c43d2
Reflect this change on datalayer related code.
2022-07-23 19:56:57 +01:00
Amine Khaldi
9216b0e019
Merge commit '75a287fd4ce2659118198ea793de534f11442f0f' into checkpoint/long_lived_atari_from_main_75a287fd4ce2659118198ea793de534f11442f0f
2022-07-23 19:47:34 +01:00
Mariano Sorgente
2de8f7caac
optimize ph generation (~65% faster) ( #12467 )
...
* optimize ph generation
* Remove useless check
* More perf improvements
* G1 Elem not bytes
* Fix test
* Fix more tests
* Fix more more tests
2022-07-22 11:05:35 -05:00
Matt Hauff
c0d5cacb76
isort
2022-07-22 09:45:37 -05:00
Matt Hauff
1e62c059d4
Change API for dependencies
2022-07-22 09:28:28 -05:00
Matt Hauff
46f144b947
Add a test for multiple singleton dependencies
2022-07-22 08:33:59 -05:00
Matt Hauff
8538610cf4
Rework offer cancellation and add a DL test for it
2022-07-21 16:10:03 -05:00
Matt Hauff
733e13ca92
Add an option to not add pending singletons
2022-07-21 14:06:30 -05:00
Felix Brucker
f527926f60
Add support for excluding coins in create_signed_transaction wallet rpc ( #10915 )
2022-07-21 12:02:36 -05:00
Matt Hauff
99cbac8a5f
Rework offer completion detection
2022-07-21 10:19:27 -05:00
Matt Hauff
fe64274cd2
Add offer summaries
2022-07-21 09:40:49 -05:00
Matt Hauff
920d73122b
Merge branch 'dl_generate_signed_transaction' into dl_offer_hooks
2022-07-20 14:26:29 -05:00
Matt Hauff
2a1a939cc1
Merge branch 'dl_to_nft_chialisp' into dl_generate_signed_transaction
2022-07-20 14:25:58 -05:00
Matt Hauff
59663b2f76
Delete an old test file
2022-07-20 14:24:49 -05:00
Matt Hauff
917a76b50e
Merge remote-tracking branch 'origin/long_lived/atari' into dl_to_nft_chialisp
2022-07-20 14:03:33 -05:00
Matt Hauff
7c8684fa4b
pre-commit
2022-07-20 13:53:37 -05:00
Matt Hauff
163f1bcf74
DL offer support
2022-07-20 13:27:25 -05:00
Matt Hauff
ce27be60a1
modify the graftroot clvm
2022-07-20 13:21:40 -05:00
Matt Hauff
849336f307
fix coin serialization
2022-07-18 08:36:32 -05:00
Amine Khaldi
447a09d884
Adapt to the Rust coin amount hinting.
2022-07-18 11:32:51 +01:00
Amine Khaldi
5621274fbd
Merge commit '5ae87189c491f930e5081b38069e3a48de6cea9c' into checkpoint/long_lived_atari_from_main_5ae87189c491f930e5081b38069e3a48de6cea9c
2022-07-18 10:58:16 +01:00
Amine Khaldi
a9976eca8f
Merge commit 'ab53d489955863e7fc03caef69b29b09b0184784' into checkpoint/long_lived_atari_from_main_ab53d489955863e7fc03caef69b29b09b0184784
2022-07-17 17:21:19 +01:00
Amine Khaldi
e43fff6943
Merge commit '69ea31f509f82c2a2352a3c50561607348800ce2' into checkpoint/long_lived_atari_from_main_69ea31f509f82c2a2352a3c50561607348800ce2
2022-07-16 13:26:17 +01:00
Jack Nelson
d5bf4d8b59
Expand select_coins rpc ( #12360 )
...
* change type to uint64, 128 is too big anyway
* add new options to select_coins endpoint
* oops
* add tests and finalize
* oops
2022-07-15 20:50:41 -05:00
Arvid Norberg
acc8b7c98d
Optimize wallet set_spent() ( #12391 )
...
* optimize WalletCoinStore.set_spent() to just update the required fields in the DB
* overwriting an existing record with WalletCoinStore.add_coin_record() is an error
2022-07-15 17:16:59 -05:00
Amine Khaldi
a22e2e1625
Merge commit '8b2f7ec24cdf22be2d5150f92b9f2c928b08120d' into checkpoint/long_lived_atari_from_main_8b2f7ec24cdf22be2d5150f92b9f2c928b08120d
2022-07-14 14:15:59 +01:00
Matt Hauff
12a400283c
Add advanced to offer summary
2022-07-13 08:22:44 -05:00
Matt Hauff
ad697dad24
mypy
2022-07-13 07:07:41 -05:00
Jack Nelson
bd5d4b1392
remove extra bt from as many tests as possible ( speed up tests) ( #12290 )
...
* remove extra bt from as many tests as possible
max speed
* wallet bt tools removal
* fix error & add bt_tools to yield
* final changes
L bozo
* something funky going on
* fix issues
* a couple more fixes
* mypy happy
* damn lint
* Revert "something funky going on"
This reverts commit 1fcc9a34e1
2022-07-13 03:57:32 -05:00
Arvid Norberg
8ec56d1901
Wallet dbwrapper 2 ( #12234 )
...
* change DBWrapper -> DBWrapper2 in wallet. rip out all transaction tracking threaded through the wallet (because DBWrapper2 uses nested transactions)
* fix logging
* fix pending_changed callback in wallet_node
2022-07-12 19:09:05 -05:00
Matt Hauff
807ae8feda
Add generate_signed_transaction to DL
2022-07-12 15:22:10 -05:00
Matt Hauff
81e213d95c
Remove accidental print
2022-07-12 12:36:20 -05:00
Matt Hauff
a8309d221d
pre-commit
2022-07-12 12:30:38 -05:00
Matt Hauff
e6ed51179b
Remove some more dlo stuff
2022-07-12 10:44:49 -05:00
Matt Hauff
d0fc7ff329
Lint
2022-07-12 10:34:26 -05:00
Matt Hauff
ecded9f9a2
skip the rebase test
2022-07-12 09:56:41 -05:00
Matt Hauff
f768378ae7
Remove tests of old CLVM
2022-07-11 15:48:40 -05:00
Matt Hauff
1bb162a023
Pivot DL -> NFT
2022-07-11 15:46:34 -05:00
Matt Hauff
38f87a17d0
get rid of a bunch of stuff
2022-07-11 15:34:49 -05:00
Matt Hauff
978704efa9
Merge remote-tracking branch 'origin/long_lived/atari' into dl_offer_clvm
2022-07-11 12:22:25 -05:00
Almog De Paz
371f76e377
Wp validate from fork ( #11826 )
...
* only validate segments from fork point
* lint
* isort
* isort
2022-07-11 11:43:12 -05:00
Matt Hauff
516d49e098
pre-commit
2022-07-11 10:53:58 -05:00
Matt Hauff
165f32b2c3
Allow for multiple singleton dependencies
2022-07-11 10:51:13 -05:00
Matt Hauff
6ec56911d1
Make the graftrooting recursive
2022-07-11 10:33:51 -05:00
Mariano Sorgente
539d9b53fd
Ms.fix coin selection ( #12261 )
...
* Fix coin selection bug
* Fix properly
* Fallback in cases of too many coins selected
* Also check for num coins
* Lint issues.
* Add another test
* No sorting, and faster knapsack
* Lint fix
* Remove comment and useless check
* Lint line
2022-07-07 20:00:42 -05:00
Jack Nelson
383326c3b7
extend min_coin to rpc calls & cli for coin selection ( #12274 )
...
* add tests to test if min_coin is working
they are passing, but no harm in being safe
* expand min coin amount across wallet.py
* extend to trade_manager
* add new options to rpc's
almost done lol.
* add min_coin_amount to wallet send
* make param non optional
alleviate None errors
* add cat wallet changes, rpc and all + fix a bug i accidentally made
oops
2022-07-07 00:17:26 -05:00
Mariano Sorgente
391c1a0077
Add reorg test ( #12230 )
...
* Add reorg test
* Add another reorg test
2022-07-05 17:30:16 -05:00
Kyle Altendorf
05602c9944
Merge commit '91b3ab38861f57fd0bb14d617750deaa625d48a9' into checkpoint/long_lived_datalayer_from_release_1.4.0_91b3ab38861f57fd0bb14d617750deaa625d48a9
2022-07-02 17:49:01 -04:00
Kyle Altendorf
de2d812449
Merge commit '9be94447aba9bb6ad3bff8bee3f5625b42fb7c65' into checkpoint/long_lived_datalayer_from_release_1.4.0_9be94447aba9bb6ad3bff8bee3f5625b42fb7c65
2022-07-02 16:15:02 -04:00
Kyle Altendorf
fff7852188
Merge commit '136a97dfd1ffdb169c5b2c6283008071709cb2a0' into checkpoint/long_lived_datalayer_from_release_1.4.0_136a97dfd1ffdb169c5b2c6283008071709cb2a0
2022-07-02 12:34:43 -04:00
Kyle Altendorf
07e6adc4f2
Merge commit 'd7c50462cb4c58d88cfbf04186313884581d6722' into checkpoint/long_lived_datalayer_from_release_1.4.0_d7c50462cb4c58d88cfbf04186313884581d6722
2022-07-02 09:00:39 -04:00
Kyle Altendorf
62e3e4dbbf
Merge commit '45377fa20dc4a418ad6d362a3a72eec8e35fe9d1' into checkpoint/long_lived_datalayer_from_release_1.4.0_45377fa20dc4a418ad6d362a3a72eec8e35fe9d1
2022-07-01 18:22:48 -04:00
Kyle Altendorf
ca4edbd8ea
Merge commit 'c5f7006f9537022847b0a5637b05b14707bf4da7' into checkpoint/long_lived_datalayer_from_release_1.4.0_c5f7006f9537022847b0a5637b05b14707bf4da7
2022-07-01 17:56:11 -04:00
Kyle Altendorf
710a69024c
Merge commit 'e8d080210cefc8efbb983c69506683ac0ed073f0' into checkpoint/long_lived_datalayer_from_release_1.4.0_e8d080210cefc8efbb983c69506683ac0ed073f0
2022-07-01 16:35:21 -04:00
Kyle Altendorf
1b2ccd7484
Merge commit '0f49e5d048fa3d4ae082f31056cb7c77fbac9700' into checkpoint/long_lived_datalayer_from_release_1.4.0_0f49e5d048fa3d4ae082f31056cb7c77fbac9700
2022-07-01 14:50:05 -04:00
Kyle Altendorf
7ab11eab68
Merge commit '396463d6d9fa1b5a4b672eb93783cd0a78ccbd62' into checkpoint/long_lived_datalayer_from_release_1.4.0_396463d6d9fa1b5a4b672eb93783cd0a78ccbd62
2022-07-01 13:50:43 -04:00
Matt Hauff
56cf08b3ee
Check that coin was created in test
2022-07-01 10:49:52 -07:00
Matt Hauff
2efc38c717
Initial iteration of graftroot puzzle for DL offers
2022-07-01 10:42:59 -07:00
Arvid Norberg
39c55994fb
WalletTransactionStore unit test ( #12171 )
...
* add unit test for WalletTransactionStore
* minor simplification of WalletTransactionStore
2022-07-01 10:45:52 -05:00
Kyle Altendorf
5f10def1d9
Merge commit 'd2dbb1244846305985fbdd741799f242917a4687' into checkpoint/datalayer-sim_from_release_1.4.0_d2dbb1244846305985fbdd741799f242917a4687
2022-07-01 00:26:18 -04:00
Mariano Sorgente
7550a13eba
Fix some more flakiness ( #12160 )
...
* Fix some more flakiness
* Fixed few other flakes
* Revert debug change
* Fix NFT flaky test
* Try again to fix the wallet RPC test
* More increased timeouts
2022-06-30 20:08:13 -05:00
Kyle Altendorf
fc48beb91e
Merge commit '10b550c1bfb6221f746db35806d56407dc2f0139' into checkpoint/datalayer-sim_from_release_1.4.0_10b550c1bfb6221f746db35806d56407dc2f0139
2022-06-30 19:37:30 -04:00
Sebastjan Trepca
16aafffb71
fix for transfer nft with did ( #12163 )
2022-06-30 14:53:53 -05:00
Arvid Norberg
4a69bc1613
Wallet coin store cache ( #12130 )
...
* remove wallet coin store 'cache', where all coins are kept in RAM. Rely on the sqlite DB
* some DB optimizations to WalletCoinStore
2022-06-29 16:50:29 -05:00
Amine Khaldi
acfee231a8
Merge release/1.4.0's 91b3ab3 into main
2022-06-29 15:36:24 +01:00
Kyle Altendorf
749162d9fe
hint chia.clvm.spend_sim ( #11819 )
...
* hint chia.clvm.spend_sim
* adjust comments
* undo
* Created typo corrected to create
2022-06-29 04:34:41 -05:00
Arvid Norberg
2d812c5002
resurrect WalletCoinStore unittest ( #12116 )
2022-06-29 04:34:14 -05:00
Amine Khaldi
c4ace23d34
Merge release/1.4.0's 9be9444 into main
2022-06-28 20:59:40 +01:00
ytx1991
5f7f2c13a6
Fix DID ID mismatch
2022-06-28 11:10:16 -07:00
Kyle Altendorf
a8357b45e7
Merge commit 'fdb60bf8c0bcc673e2129c2d34a094633c18f9d5' into checkpoint/datalayer-sim_from_release_1.4.0_fdb60bf8c0bcc673e2129c2d34a094633c18f9d5
2022-06-28 11:33:52 -04:00
Kyle Altendorf
73b4faf991
Merge commit '89d1d1bdb8c4dd0cdd2028e53e79f0f0bae18fec' into checkpoint/datalayer-sim_from_release_1.4.0_89d1d1bdb8c4dd0cdd2028e53e79f0f0bae18fec
2022-06-28 08:52:24 -04:00
Kyle Altendorf
7483a012e6
Merge commit 'fb4b789ba7b5cfc6343d9a91fe5d15eab8bbc7d8' into checkpoint/datalayer-sim_from_release_1.4.0_fb4b789ba7b5cfc6343d9a91fe5d15eab8bbc7d8
2022-06-27 16:28:50 -04:00
Kyle Altendorf
997bc7f647
Merge commit '45dee3e7dd86a67bbd1b5994edfd186ac43dfbb3' into checkpoint/datalayer-sim_from_release_1.4.0_45dee3e7dd86a67bbd1b5994edfd186ac43dfbb3
2022-06-27 13:13:56 -04:00
Amine Khaldi
54feb98fe1
Merge release/1.4.0's 136a97d into main
2022-06-27 17:18:36 +01:00
Kyle Altendorf
4b77c9a713
Merge commit 'be1a487051e7479747ab49cd34df2a694713b95c' into checkpoint/datalayer-sim_from_release_1.4.0_be1a487051e7479747ab49cd34df2a694713b95c
2022-06-27 08:12:59 -04: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
048b913bff
Merge commit '73ecb101e43f49be7ec88dc8bcb7ccf328bfb4ce' into checkpoint/datalayer-sim_from_release_1.4.0_73ecb101e43f49be7ec88dc8bcb7ccf328bfb4ce
2022-06-26 16:10:20 -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
44d2da4f64
Merge commit '6efb5b8260dfffcee06abfcd52b2c2ba88343f0e' into checkpoint/datalayer-sim_from_release_1.4.0_6efb5b8260dfffcee06abfcd52b2c2ba88343f0e
2022-06-26 13:47:19 -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
1d30dd5e1a
Merge commit 'b8e34c8569277985f5a7ae8b630666d64acfaece' into checkpoint/datalayer-sim_from_release_1.4.0_b8e34c8569277985f5a7ae8b630666d64acfaece
2022-06-26 12:11:31 -04:00
Mariano Sorgente
5387298109
Return not synced if no conncetions
2022-06-26 13:16:03 +01:00
Amine Khaldi
217353de53
Merge release/1.4.0's d7c5046 into main
2022-06-25 18:32:16 +01:00
William Allen
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
Matt Hauff
c4ac22cf64
extract to libraries and shorten announcement bytes
2022-06-24 13:23:00 -07:00
ytx1991
7e7187aa9d
Fix nft_get_info API
2022-06-24 11:22:39 -07:00
ytx1991
d62d10ff30
Small fix for DID recovery
2022-06-23 21:32:08 -07:00
Kyle Altendorf
d3f797e4d6
Merge commit '6576aafa9d8788ada70238d0a9750a598547f4f4' into checkpoint/datalayer-sim_from_release_1.4.0_6576aafa9d8788ada70238d0a9750a598547f4f4
2022-06-23 20:39:45 -04:00
Amine Khaldi
8c015f7bdb
Merge release/1.4.0's 45377fa into main
2022-06-23 19:51:29 +01:00
ytx1991
4732f46275
Merge from release
2022-06-23 09:49:51 -07:00
Amine Khaldi
cff8367d59
Merge release/1.4.0's c5f7006 into main
2022-06-23 16:14:16 +01:00
Kyle Altendorf
8ddd877a3f
Merge commit '3c4eab1ee0e60b583e89396de7bca8ad49b7d396' into checkpoint/datalayer-sim_from_release_1.4.0_3c4eab1ee0e60b583e89396de7bca8ad49b7d396
2022-06-23 10:27:56 -04:00
Kyle Altendorf
970d06d27f
Merge commit '766da049de091f990fa85069dbf1bd6f37f10750' into checkpoint/datalayer-sim_from_release_1.4.0_766da049de091f990fa85069dbf1bd6f37f10750
2022-06-23 08:18:24 -04:00
ytx1991
a18bcdada6
Fix DID TX fee
2022-06-22 23:25:21 -07:00
ytx1991
d0b40c4940
Fix & verify the tx fee for NFT
2022-06-22 18:55:54 -07:00
Matt Hauff
7d654a34f0
Lint and remove taker from test
2022-06-22 14:52:44 -07:00
Matt Hauff
55fa30f437
Add heuristic in GST to keep new_owner the same if sending to ourself
2022-06-22 14:47:23 -07: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 Altendorf
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
Kronus91
717a361694
Merge branch 'release/1.4.0' into nft1_tx_fee
2022-06-22 09:56:40 -07:00
Amine Khaldi
28761f44a7
Merge release/1.4.0's e8d0802 into main
2022-06-22 15:32:27 +01:00
ytx1991
15206f9e45
Fix transaction record issue & migrate update_metadata to generate_signed_tx
2022-06-21 19:39:10 -07:00
ytx1991
241d48ab3a
Resolve comments
2022-06-21 14:55:48 -07:00
Kronus91
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 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
Amine Khaldi
792b682118
Merge release/1.4.0's 396463d into main
2022-06-20 20:57:46 +01:00
Amine Khaldi
853f44919a
Rename DISTRIBUTED_ID to DECENTRALIZED_ID.
2022-06-20 18:38:50 +01:00
Amine Khaldi
31db97d80a
Merge release/1.4.0's d2dbb12 into main
2022-06-19 12:05:21 +01:00
Kronus91
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
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
5046738c88
Improve DID metadata update RPC API.
2022-06-18 14:50:19 +01:00
geoffwalmsley
7f33869f1a
Merge branch 'trepca/nft1_test_updates' into gw.nft1_more_tests
2022-06-18 18:30:01 +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
geoffwalmsley
728f0300f8
assert nft1 royalties and clean up tests
2022-06-18 15:06:08 +12:00
Kronus91
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
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
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
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
Sebastjan
77b25e32b0
more fixes to nft tests
2022-06-17 18:32:39 +02:00
ytx1991
ccec59ce25
Fix set DID bug
2022-06-17 08:51:33 -07:00
Sebastjan
51a3bdee56
NFT tests a bit more DRY
2022-06-17 14:20:00 +02:00
Amine Khaldi
3c52d5a998
Merge release/1.4.0's fb4b789 into main
2022-06-17 09:49:53 +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
Amine Khaldi
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
Amine Khaldi
e87779cb60
Merge release/1.4.0's 45dee3e into main
2022-06-16 23:36:35 +01:00
ytx1991
ac33ef54d2
Add set_nft_status API
2022-06-16 14:34:51 -07:00
Amine Khaldi
8e848716cd
Merge release/1.4.0's be1a487 into main
2022-06-16 20:57:08 +01:00
Matt Hauff
ec1165cef2
Fix puzzles tests
2022-06-16 11:42:43 -07:00
Amine Khaldi
fb4b789ba7
Merge pull request #11909 from Chia-Network/more_nft_clvm_fixes
...
More nft clvm fixes
2022-06-16 19:38:10 +01:00
Matt Hauff
60e3983490
Lint
2022-06-16 10:46:23 -07:00
Matt Hauff
c05f4896d4
Merge remote-tracking branch 'origin/release/1.4.0' into rewind_nft1_offers
2022-06-16 10:38:46 -07:00
Matt Hauff
bc3379608f
Fix offer tests
2022-06-16 10:36:07 -07:00
Matt Hauff
febc12aef8
Lint
2022-06-16 10:03:06 -07:00
Matt Hauff
b01e821adc
Merge remote-tracking branch 'origin/more_nft_clvm_fixes' into rewind_nft1_offers
2022-06-16 09:42:33 -07:00
Matt Hauff
6caff00278
flake8
2022-06-16 08:59:58 -07:00
Matt Hauff
b01f7e94f8
Optimize transfer program
2022-06-16 08:26:07 -07:00
Matt Hauff
3991d951f7
remove old CLVM tests
2022-06-16 08:24:19 -07:00
Matt Hauff
2734269b60
Merge remote-tracking branch 'origin/release/1.4.0' into rewind_nft1_offers
2022-06-16 07:49:35 -07:00
Matt Hauff
20bb3e7e50
Fix test and mypy error
2022-06-16 07:48:03 -07:00
Amine Khaldi
d07c0930c0
Merge release/1.4.0's 6b80055 into main
2022-06-16 13:13:00 +01:00
geoffwalmsley
46dccb2e1d
check for owner change in drivers
2022-06-16 16:45:47 +12:00
ytx1991
7af5e62900
Fix tests
2022-06-15 20:12:10 -07:00
geoffwalmsley
dff887f8f0
puzzle test passing
2022-06-16 14:59:51 +12:00
geoffwalmsley
33801e2a1e
add test to recreate transfer puzzle from nft conditions
2022-06-16 14:27:42 +12:00
ytx1991
0d14bfbe3a
Fix bugs & Add tests
2022-06-15 18:54:49 -07:00
Matt Hauff
3274773d33
Partial commit
2022-06-15 14:46:51 -07:00
Amine Khaldi
61f7ab9deb
When minting an NFT, only include the metadata hash and the license hash when they are provided.
2022-06-15 20:26:16 +01:00
ytx1991
ca2e953e3c
Merge branch 'release/1.4.0' into nft1_claim
2022-06-15 12:02:56 -07:00
Amine Khaldi
5be6db6971
Address linting.
2022-06-15 19:33:28 +01:00
Amine Khaldi
75cab24625
Merge release/1.4.0's 73ecb10 into main
2022-06-15 18:22:11 +01:00
ytx1991
95886f6340
Merge branch 'release/1.4.0' into nft1_claim
2022-06-15 09:37:11 -07:00
ytx1991
ec37426df0
Add set nft DID api
2022-06-15 09:02:55 -07:00
Amine Khaldi
085dbefb05
Merge release/1.4.0's 06ee0f0 into main
2022-06-15 12:18:04 +01:00
Kronus91
1d9815fb06
Merge branch 'release/1.4.0' into 1.4.0_hide_wallet_info
2022-06-14 21:43:35 -07:00
William Allen
6b80055a1b
Merge pull request #11903 from Chia-Network/anotherassertwjb
...
another assert to make sure wallet is correct
2022-06-14 20:37:44 -05:00
ytx1991
476bd4597e
Fix tests
2022-06-14 16:48:32 -07:00
Kronus91
11187b2b39
Merge branch 'release/1.4.0' into 1.4.0_hide_wallet_info
2022-06-14 16:18:32 -07:00
Amine Khaldi
3c5d785071
Addendum.
2022-06-14 23:40:19 +01:00
Amine Khaldi
b5198906a3
Merge release/1.4.0's 6efb5b8 into main
2022-06-14 23:40:19 +01:00
Matt Hauff
b76a161295
Merge remote-tracking branch 'origin/more_nft_clvm_fixes' into rewind_nft1_offers
2022-06-14 14:36:26 -07:00
Matt Hauff
230d92b6f1
Allow create puzzle announcements through
2022-06-14 14:23:16 -07:00
Matt Hauff
7ee3f8845b
Make tests pass for takers
2022-06-14 14:05:27 -07:00
Amine Khaldi
a26de2d0be
Merge release/1.4.0's 8490d4e into main
2022-06-14 21:00:29 +01:00
Matt Hauff
b5eac1e121
Fixed merge conflicts
2022-06-14 12:11:10 -07:00
William Blanke
a0afb4ec93
another assert to make sure wallet is correct
2022-06-14 20:01:33 +01:00
Matt Hauff
6cd63dfdb7
black
2022-06-14 11:31:03 -07:00
Matt Hauff
b4f5e2904c
Fix bech32 encoding in tests
2022-06-14 11:09:37 -07:00
Jeff Cruikshank
defb727bcb
Fixed tests
2022-06-14 10:40:56 -07:00
Kyle Altendorf
48eab3072c
Merge pull request #11810 from Chia-Network/atari-owned_singletons_rpc
2022-06-14 13:29:23 -04:00
Matt Hauff
61412fb63f
Merge remote-tracking branch 'origin/release/1.4.0' into mh.nft_tranferring_rework
2022-06-14 10:11:26 -07:00
Matt Hauff
2319c91c7d
Add get_inner_solution
2022-06-14 09:34:01 -07:00
Jeff Cruikshank
9851d6bb57
chia wallet show output now displays the DID ID for NFT/DID wallets
...
Added `nft_get_wallet_did` RPC to get the DID ID for an NFT wallet
Bech32m encode the DID ID output from `nft_get_wallets_with_dids` RPC
2022-06-14 09:28:33 -07:00
Matt Hauff
e8b300813f
Lint
2022-06-14 08:44:08 -07:00
William Allen
6efb5b8260
Merge pull request #11865 from AmineKhaldi/bech32m_nfts_dids
...
Initial iteration of updating RPCs and CLI to use bech32m identifiers for NFTs and DIDs
2022-06-14 10:17:38 -05:00
geoffwalmsley
7e342b11a9
edits to make offer test - still failing
2022-06-14 23:20:57 +12:00
Amine Khaldi
95a2ae339c
Merge release/1.4.0's b8e34c8 into main
2022-06-14 12:18:43 +01:00
geoffwalmsley
38bc44e917
make offer requesting an nft
2022-06-14 22:07:17 +12:00
William Allen
8490d4e708
Merge pull request #11887 from Chia-Network/new_nft1_chialisp
...
New NFT chialisp
2022-06-13 23:17:00 -05:00
geoffwalmsley
88688cac3a
add maker nft1 offer test
2022-06-14 15:51:42 +12:00
Matt Hauff
4b5a51f872
Merge remote-tracking branch 'origin/mh.nft_tranferring_rework' into rewind_nft1_offers
2022-06-13 16:17:28 -07:00
Matt Hauff
fc1d69cf58
Merge remote-tracking branch 'origin/new_nft1_chialisp' into rewind_nft1_offers
2022-06-13 16:17:06 -07:00
Matt Hauff
e039bf2deb
transfer_nft -> generate_signed_transaction
2022-06-13 15:05:16 -07:00
Kyle Altendorf
c429933737
Merge commit 'd0de8038cd95b71fa050f79e3685c51dcf05e13e' into catchup/long_lived_atari_from_release_1.4.0_d0de8038cd95b71fa050f79e3685c51dcf05e13e
2022-06-13 17:44:12 -04:00
Matt Hauff
e665397289
Merge remote-tracking branch 'trepca/new_nft1_chialisp' into new_nft1_chialisp
2022-06-13 12:32:18 -07:00
