[0.13.2] wallet/rpc backports #9347

1. 
   MarcoFalke commented at 12:04 pm on December 14, 2016: member

   Remaining wallet backports for 0.13.2 release

   Edit: Sorry for force pushing a few times. There were two conflicts, so would be nice if someone could look over the cherry-picks.

2. [QA] add fundrawtransaction test on a locked wallet with empty keypool

   Github-Pull: #9295
   Rebased-From: 1a6eacbf3b7e3d5941fec1154079bbc4678ce861

   0cc07f82f0
3. [Wallet] Bugfix: FRT: don't terminate when keypool is empty

   Github-Pull: #9295
   Rebased-From: c24a4f5981d47d55aa9e4eb40294832a4d38fb80

   43bcfca489
4. MarcoFalke added the label Backport on Dec 14, 2016
5. MarcoFalke added this to the milestone 0.13.2 on Dec 14, 2016
6. MarcoFalke force-pushed on Dec 14, 2016
7. Update for OpenSSL 1.1 API

   Github-Pull: #9326
   Rebased-From: bae1eef752dcecfd85fa482881e1dbe4d7e9f74c b05b1af10b9a5298bd90bea439f0fd6c636e0cfa

   a0f7ececfd
8. MarcoFalke force-pushed on Dec 14, 2016
9. MarcoFalke force-pushed on Dec 14, 2016
10. Make RelayWalletTransaction attempt to AcceptToMemoryPool.

    This resolves an issue where a wallet transaction which failed to
     relay previously because it couldn't make it into the mempool
     will not try again until restart, even though mempool conditions
     may have changed.
    
    Abandoned and known-conflicted transactions are skipped.
    
    Some concern was expressed that there may be users with many
     unknown conflicts would waste a lot of CPU time trying to
     add them to their memory pools over and over again.  But I am
     doubtful these users exist in any number, if they do exist
     they have worse problems, and they can mitigate any performance
     issue this might have by abandoning the transactions in question.
    
    Github-Pull: #9290
    Rebased-From: f692fce8a49e05e25f1c767aae1e50db419caebe

    35174a0280
11. Return txid even if ATMP fails for new transaction

    Github-Pull: #9302
    Rebased-From: b3a74100b86423c553ac327f3ea6fdbc2c50890a

    f5d606e5ab
12. MarcoFalke force-pushed on Dec 14, 2016
13. in src/wallet/wallet.cpp: in f5d606e5ab outdated

    1455+    if (!IsCoinBase() && !isAbandoned() && GetDepthInMainChain() == 0)
    1456     {
    1457-        if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {
    1458+        CValidationState state;
    1459+        /* GetDepthInMainChain already catches known conflicts. */
    1460+        if (InMempool() || AcceptToMemoryPool(false, maxTxFee, state)) {
    

    ---

    ---

    

    MarcoFalke commented at 10:20 pm on December 14, 2016:

    Not sure if I solved this merge conflict correctly. fLimitFree should probably be true to backport the behavior how it is in master, otoh the other places in wallet.cpp don’t apply the limit, so it should not be applied here for consistency either?

    ---

    

    morcos commented at 7:55 pm on December 15, 2016:

    My view point is this doesn’t matter. I think its fine the way you did it, and more consistent with the rest of 0.13 code. But I also think it would be no big deal if it was rate limited. It happens every 20 mins anyway..

    ---

    

    gmaxwell commented at 11:18 pm on December 15, 2016:

    I believe this should be false like in the other cases of the wallet behavior. The “free limiter” this this flag controls there is really a p2p network feature, and shouldn’t really apply to wallet transactions… and in 0.13.2 we won’t have removed the relaying of non-fee transactions yet.
14. 
    laanwj commented at 4:00 pm on December 15, 2016: member

    Thanks for the backport, commit-list ACK f5d606e. I cannot answer your question about fLimitFree.
15. Complain when unknown rpcserialversion is specified

    Github-Pull: #9292
    Rebased-From: 80d073c9bca4521d512ea14ff7919d4609647b6d

    c365556185
16. [qa] Don't set unknown rpcserialversion

    Github-Pull: #9322
    Rebased-From: fa615d39b53a9309ef480c41ec073354c4371f40

    49a612f347
17. MarcoFalke renamed this:
    [0.13.2] wallet backports
    [0.13.2] wallet/rpc backports
    on Dec 15, 2016
18. MarcoFalke added the label Wallet on Dec 15, 2016
19. MarcoFalke added the label RPC/REST/ZMQ on Dec 15, 2016
20. 
    MarcoFalke commented at 8:56 pm on December 15, 2016: member

    Just verified that this fixes the OpenSSL issues on fedora rawhide as well:

    782328660e6dc44c026d13fef4d069ad8cad4d42:

    0wallet/test/crypto_tests.cpp:45:20: error: aggregate 'EVP_CIPHER_CTX ctx' has incomplete type and cannot be defined
    1     EVP_CIPHER_CTX ctx;
    2                    ^~~
    

    After fb987b364511291261b082d5d4206fc296455a3b and a0f7ececfd096df398fc5e4aad07f1a43760afb4, all is fine.

21. 
    btcdrak commented at 7:58 am on December 19, 2016: contributor

    ACK 49a612f347be150b03eb6ef8fa438d2b06e26993
22. laanwj merged this on Dec 19, 2016
23. laanwj closed this on Dec 19, 2016

    ---

24. laanwj referenced this in commit b711390895 on Dec 19, 2016
25. MarcoFalke deleted the branch on Dec 19, 2016
26. MarcoFalke locked this on Sep 8, 2021

Contributors
MarcoFalke morcos gmaxwell laanwj btcdrak

Labels
Wallet RPC/REST/ZMQ Backport

Milestone
0.13.2