Skip to content

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Mar 28, 2019

Remaining backports for rc3

sipa added 3 commits March 28, 2019 18:09
This makes orphan processing work like handling getdata messages:
After every actual transaction validation attempt, interrupt
processing to deal with messages arriving from other peers.

Github-Pull: bitcoin#15644
Rebased-From: 866c805
@maflcko maflcko added this to the 0.18.0 milestone Mar 28, 2019
@gmaxwell
Copy link
Contributor

ACK

jnewbery and others added 5 commits April 1, 2019 15:46
The existing wallet_resendwallettransactions.py test only tests the
resendwallettransactions RPC. It does not test whether transactions are
actually rebroadcast, or whether the rebroadcast logic is called on a
timer.

This commit updates the test to not use the resendwallettransactions RPC and
test that transactions are rebroadcast on a timer.

Github-Pull: bitcoin#15646
Rebased-From: 529c1ae
@maflcko
Copy link
Member Author

maflcko commented Apr 1, 2019

Would be nice if someone could double check the cherry-picks for correctly solving the conflicts

@promag
Copy link
Contributor

promag commented Apr 1, 2019

ACK 95faffe, well done in ed0498a - verified all cherry picks.

@laanwj
Copy link
Member

laanwj commented Apr 2, 2019

utACK 95faffe

@laanwj laanwj merged commit 95faffe into bitcoin:0.18 Apr 2, 2019
laanwj added a commit that referenced this pull request Apr 2, 2019
95faffe qa: Check unconfirmed balance after loadwallet (João Barbosa)
59716ec wallet: Update transactions with current mempool after load (João Barbosa)
ed0498a interfaces: Add Chain::requestMempoolTransactions (João Barbosa)
ebf6566 wallet: Move CWallet::ReacceptWalletTransactions locks to callers (João Barbosa)
a90db2f [tests] Add test for wallet rebroadcasts (John Newbery)
50c56f2 Interrupt orphan processing after every transaction (Pieter Wuille)
bb60121 [MOVEONLY] Move processing of orphan queue to ProcessOrphanTx (Pieter Wuille)
6355214 Simplify orphan processing in preparation for interruptibility (Pieter Wuille)

Pull request description:

  Remaining backports for rc3

ACKs for commit 95faff:
  promag:
    ACK 95faffe, well done in ed0498a - verified all cherry picks.

Tree-SHA512: 597ee45493ac04e8c3149628a357c3238169d4b4f78158f22a3531e5f66289c228ecd6582f99026698883216f1ee7934d6315d19c99fc5f4f33dd1bed4300186
@maflcko maflcko deleted the 1904-18B branch April 2, 2019 13:05
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants