Skip to content

Backports 0.18 pr3#4222

Merged
UdjinM6 merged 6 commits into
dashpay:developfrom
Munkybooty:backports-0.18-pr3
Jul 3, 2021
Merged

Backports 0.18 pr3#4222
UdjinM6 merged 6 commits into
dashpay:developfrom
Munkybooty:backports-0.18-pr3

Conversation

@Munkybooty
Copy link
Copy Markdown

No description provided.

265bd50 Removes unsed `CBloomFilter` constructor. (251)

Pull request description:

  This pull request removes the `CBloomFilter::CBloomFilter(const unsigned int, const double, const unsigned int)` constructor, which became obsolete with 086ee67.

Tree-SHA512: 46742f178e219661e82609a9bf6b644ebc58ab3efc2d1865c5562980e84f16a5fa286be9813738196ad7a27e639dee926062538eb44cadd67ab87ad5e9a266ba

# Conflicts:
#	src/bloom.h
@PastaPastaPasta PastaPastaPasta added the RPC Some notable changes to RPC params/behaviour/descriptions label Jun 30, 2021
Copy link
Copy Markdown
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some thoughts

Comment thread src/qt/guiutil.cpp Outdated
Comment thread src/wallet/rpcdump.cpp Outdated
Comment thread depends/packages/qt.mk Outdated
Comment thread src/qt/transactionview.cpp Outdated
@Munkybooty Munkybooty force-pushed the backports-0.18-pr3 branch 3 times, most recently from 08188d3 to 527007b Compare July 1, 2021 15:49
@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented Jul 2, 2021

Pls rebase and drop 14006 (backported in #4220) and 13765 ("backported" via #2319)

@Munkybooty Munkybooty force-pushed the backports-0.18-pr3 branch 2 times, most recently from b959b83 to 97470e8 Compare July 2, 2021 01:31
Comment thread test/functional/wallet_multiwallet.py Outdated
MarcoFalke and others added 5 commits July 2, 2021 10:38
4b3b85c refactor: use fs:: over boost::filesystem:: (fanquake)

Pull request description:

  Noticed while investigating bitcoin#13973.

Tree-SHA512: 20a764d2ff460883fa0fd543c0a51031a9a202b40cfda9943f9995d3108c0a8296a3982b63bbd069167f73a1855003304a83df466763032ce7339b08b3a97d4b

# Conflicts:
#	src/qt/guiutil.cpp
b2f23c4 [RPC] Remove getinfo deprecation warning (John Newbery)

Pull request description:

  `getinfo` was removed in V0.16. A removal warning message was left in place to tell users that the method had been removed. We can remove that entirely in V0.18.

Tree-SHA512: bf93fbcf57a9be480438dcbdcab2dfd69ce277218b10628776975b093b3ffd2caa1751e0fb4cb0245443c81465693e2b8750e96d3e38632a78bae5ffa04f9212

# Conflicts:
#	src/rpc/misc.cpp
…eature_blocksdir.py log message

241f8b5 Fix typo in feature_blocksdir.py log message (Alexander Leishman)

Pull request description:

  Typo I came across while writing some new tests.

Tree-SHA512: cc494553125a1e84f9238a14761e3fb76623e98d951811dd3bfb13595a03a1888d73859487a2cbb76c7ae85897bc64016a220a92c2636b35ea6356a5b5340d66

# Conflicts:
#	test/functional/feature_blocksdir.py
…as unknown

321159e don't report minversion wallet entry as unknown (Gregory Sanders)

Pull request description:

  It is known in WalletBatch::LoadWallet

Tree-SHA512: 82f7e12f48ae7d17317074ce5b5e27c70ba8334b04adbf7cc863f8169cc1aa460b9454571e2698aa00059c8c8f669fe19c0d40c4910dcded260ddca6ce78be9d

# Conflicts:
#	src/wallet/walletdb.cpp
23f4343 Add CMerkleTx::IsImmatureCoinBase method (Ben Woosley)

Pull request description:

  All but one call to `GetBlocksToMaturity` is testing it relative to 0
  for the purposes of determining whether the coinbase tx is immature.
  In such case, the value greater than 0 implies that the tx is coinbase,
  so there is no need to separately test that status.

  This names the concept for easy singular use.

Tree-SHA512: 4470d07404a0707144f9827b9a94c5c4905f23ee6f9248edc5df599a59d28e21ea0201d8abe5d5d73b39cb05b60c861ea8e04767eef04433e2ee95dcfed653ee

# Conflicts:
#	src/wallet/wallet.h
@Munkybooty Munkybooty force-pushed the backports-0.18-pr3 branch from 97470e8 to 19b9e74 Compare July 2, 2021 14:38
@UdjinM6 UdjinM6 added this to the 18 milestone Jul 2, 2021
Copy link
Copy Markdown

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

Copy link
Copy Markdown
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 merged commit 22451a2 into dashpay:develop Jul 3, 2021
@Munkybooty Munkybooty deleted the backports-0.18-pr3 branch November 30, 2021 03:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

RPC Some notable changes to RPC params/behaviour/descriptions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants