New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[wallet] List COutput solvability + wallet_ismine refactoring. #1755
[wallet] List COutput solvability + wallet_ismine refactoring. #1755
Conversation
Functionality tested, working as intended, compiled without any issues. |
need to make sure CMake is aware of the file rename: Index: CMakeLists.txt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- CMakeLists.txt (revision fb3924ae7422f3c35cf619a8d06d0293ee488684)
+++ CMakeLists.txt (date 1596012586895)
@@ -316,6 +316,7 @@
./src/rpc/rawtransaction.cpp
./src/rpc/server.cpp
./src/script/sigcache.cpp
+ ./src/script/ismine.cpp
./src/sporkdb.cpp
./src/timedata.cpp
./src/torcontrol.cpp
@@ -372,7 +373,6 @@
./src/legacy/stakemodifier.cpp
./src/wallet/wallet.cpp
./src/wallet/wallet_zerocoin.cpp
- ./src/wallet/wallet_ismine.cpp
./src/wallet/walletdb.cpp
./src/zpiv/zpivwallet.cpp
./src/zpiv/zpivtracker.cpp |
hmm yeah, i'm pretty sure that pushed the change to some other branch. |
Needs rebase due to conflicts with #1666 just merged. |
Removes conditional dependency of `src/test` on wallet. Makes multisig and P2SH tests complete without wallet built-in.
Adapted version of btc@c3932b32700a210b5fbf36e32bddac604dec9288
…vable definitions
b8e334d
to
6f4f351
Compare
done, rebased. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK 6f4f351
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK 6f4f351
…values e02edd3 Cleaning isminetype::ISMINE_SPENDABLE_STAKEABLE. (furszy) 1bf9dc4 wallet: unify GetUnspentCredit with GetCredit (furszy) 9f2ae47 wallet: remove currently unused UpdateAmount method. (furszy) bef69d3 wallet: add cachable amounts for caching credit/debit values (furszy) 8f2a156 Make IsMine stop distinguishing solvable/unsolvable (furszy) e541593 Make coincontrol use IsSolvable to determine solvability (furszy) e1a0cfb Back port of IsSolvable to check scripts solvability. (furszy) Pull request description: Built on top of #1755 and #1666 . The goal of this PR has been to improve the `CWalletTx` to be able to add shielded cached balances in a much cleaner way. Including the following changes: * Adapted IsSolvable function from 0c8ea63 (without the witness check. Only used to check regular outputs to be able to decouple the output solvability from `ismine.h` enum) * Solvability decoupled from `ismine.h`. Back ported 6d714c3 and 4e91820 from bitcoin#13142. * And lastly, adapted bitcoin#15780 beauty cleanup to our sources. ACKs for top commit: random-zebra: utACK e02edd3 Tree-SHA512: 3c54397585f2ce1a47a5a86292216b5beab6cbf1e4ad6c289a1daa958cf4c535855bac1e13a7de290bd8d374abef3da7a909b11ee0f5016af31e90f642b448d5
Mixing few back ports with code readability improvements.
By commits position:
wallet_ismineh
to ismine.h
and makes multisig and P2SH tests compile without wallet built-in.solvable
member in COutput to describe whether an output is solvable by the wallet or not (btc#7688).This is an initial step, will continue moving forward until can split the ismine code from the solvability aspect.