Skip to content

[pull] master from bitcoin:master#905

Merged
pull[bot] merged 17 commits intorizalgowandy:masterfrom
bitcoin:master
Mar 16, 2023
Merged

[pull] master from bitcoin:master#905
pull[bot] merged 17 commits intorizalgowandy:masterfrom
bitcoin:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Mar 16, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

andrewtoth and others added 17 commits October 5, 2022 09:25
By moving the "positive-only" flag out of
the lambda function.
`AvailableCoins` already filters non-spendable coins.
CWallet::DummySignTx, OutputGroupTypeMap::find
we only need the "include unsafe" flag, not all what coin
control stores.
fadf8b8 refactor: Add and use PRUNE_TARGET_MANUAL constexpr (MarcoFalke)
fa9bd7b Move ::fImporting to BlockManager (MarcoFalke)
fa442b1 Pass fImporting to ImportingNow helper class (MarcoFalke)
fa177d7 Move ::fPruneMode into BlockManager (MarcoFalke)
fa721f1 Move ::nPruneTarget into BlockManager (MarcoFalke)

Pull request description:

  It seems preferable to assign globals to a class (in this case `BlockManager`), than to leave them dangling. This should clarify scope for code-readers, as well as clarifying unit test behaviour.

ACKs for top commit:
  TheCharlatan:
    Code review ACK fadf8b8
  achow101:
    ACK fadf8b8
  dergoegge:
    Code review ACK fadf8b8

Tree-SHA512: d261b69257560c9f460bbe85944ca478d0390b498a5af514bafcb4f6444841e5ea58c2e8982f38c48685d6f649039234aec853a934e24ebf23e20d975991a5dc
475c20a wallet: remove coin control arg from AutomaticCoinSelection (furszy)
8a55831 wallet: remove unused methods (furszy)
8471967 wallet: GroupOutput, remove unneeded "spendable" check (furszy)
a9aa041 wallet: OutputGroup, remove unused effective_feerate member (furszy)
99034b2 wallet: APS, don't create empty groups (furszy)
805f399 wallet: do not make two COutputs, use shared_ptr (furszy)

Pull request description:

  Few small findings post-#25806 and extra cleanups, nothing biggie.

ACKs for top commit:
  S3RK:
    Code review ACK 475c20a
  Xekyo:
    utACK 475c20a
  achow101:
    ACK 475c20a

Tree-SHA512: df45efebd6e2e4ecac619d6ecef794979c328a2d6ef532e25124d0dc1c72b55ccf13498f61fb65958b907bfba6a72ed569bf34eb5fbe35419632fe0406e78798
… mempool/contents

1ff5d61 doc: add mempool/contents rest verbose and mempool_sequence args (Andrew Toth)
52a31dc tests: mempool/contents verbose and mempool_sequence query params tests (Andrew Toth)
a518fff rest: add verbose and mempool_sequence query params for mempool/contents (Andrew Toth)

Pull request description:

  The verbose mempool json response can get very large. This adds an option to return the non-verbose response of just the txids. It is identical to the rpc response so the diff here is minimal. This also adds the mempool_sequence parameter for rpc consistency. Verbose defaults to true to remain backwards compatible.

  It uses query parameters to be compatible with the efforts in #25752.

ACKs for top commit:
  achow101:
    ACK 1ff5d61
  stickies-v:
    re-ACK [1ff5d61](1ff5d61)
  pablomartin4btc:
    tested ACK 1ff5d61.

Tree-SHA512: 1bf08a7ffde2e7db14dc746e421feedf17d84c4b3f1141e79e36feb6014811dfde80e1d8dbc476c15ff705de2d3c967b3081dcd80536d76b7edf888f1a92e9d1
@pull pull bot added the ⤵️ pull label Mar 16, 2023
@pull pull bot merged commit ebb15ea into rizalgowandy:master Mar 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants