diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-08-12 13:49:51 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-08-12 13:49:58 -0400 |
| commit | b499d8576f30d13dfe9000852afe47ee1c28cfbe (patch) | |
| tree | eb06ccd79ffa8ef19e7affa85cfa21ab4095f360 /Makefile.am | |
| parent | 00dad5e0e1ddd6047bd4ff0a3032aa8950817b5f (diff) | |
| parent | c8b53c3beafa289dcdbd8c2ee9f957bdeca79cbc (diff) | |
| download | bitcoin-b499d8576f30d13dfe9000852afe47ee1c28cfbe.tar.xz | |
Merge #16557: [wallet] restore coinbase and confirmed/conflicted checks in SubmitMemoryPoolAndRelay()
c8b53c3beafa289dcdbd8c2ee9f957bdeca79cbc [wallet] Restore confirmed/conflicted tx check in SubmitMemoryPoolAndRelay() (John Newbery)
214c4ecb9ab306627a08abb35cf82c73f10ec627 [wallet] restore coinbase check in SubmitMemoryPoolAndRelay() (John Newbery)
Pull request description:
These checks don't change mempool acceptance/relay behaviour, but reduce log spam.
ACKs for top commit:
MarcoFalke:
ACK c8b53c3beafa289dcdbd8c2ee9f957bdeca79cbc (non-doc changes are mostly a git revert 8753f5652b4710e66b50ce87788bf6f33619b75a)
ariard:
utACK c8b53c3
Tree-SHA512: f928573ad68d2f70ac69a84b57f352d255dccd1942097cc664f130fcbdcdd7364bc52c43b9157e65ebbaaebbe93586c6e8386f24361b27478e0a23a445677672
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions