Backports 0.18 pr18 #4638

Munkybooty · 2021-12-23T04:18:21Z

Still experiencing build issues so again, i do apologize if the pr is bad. There are some parts of the codebase i haven't dealt with before so apologies for any trivial mistakes that normally would not be present.

github-actions · 2021-12-23T17:22:55Z

This pull request has conflicts, please rebase.

src/wallet/rpcwallet.cpp

src/rpc/mining.cpp

test/functional/test_framework/blocktools.py

src/wallet/rpcdump.cpp

doc/release-notes-14481.md

doc/man/bitcoin-wallet.1

contrib/devtools/gen-manpages.sh

github-actions · 2021-12-30T20:42:26Z

This Pull Request may conflict if the Pull Requests below are merged first.

#4643
conflictable files: src/rpc/rawtransaction.cpp,src/wallet/rpcwallet.cpp

Munkybooty · 2022-01-04T05:27:38Z

I've tried to recreate the test failure but i continually have it passing on linux64. I'm not sure whats causing CI to freak out at the moment over wallet_dump.py

PastaPastaPasta · 2022-01-21T10:37:51Z

src/wallet/rpcdump.cpp

both of these references should be left aligned

github-actions · 2022-01-24T15:29:18Z

This pull request has conflicts, please rebase.

PastaPastaPasta · 2022-01-21T10:42:20Z

test/functional/wallet_importmulti.py

should likely be changed since we don't have witness

PastaPastaPasta · 2022-01-21T10:42:29Z

test/functional/wallet_importmulti.py

UdjinM6

pls see below + https://github.com/UdjinM6/dash/commits/pr4638

test/functional/mining_basic.py

test/functional/test_framework/blocktools.py

test/functional/wallet_importmulti.py

src/wallet/test/wallet_tests.cpp

github-actions · 2022-02-23T09:58:05Z

This pull request has conflicts, please rebase.

UdjinM6 · 2022-02-26T11:42:46Z

I'm just going to repeat: pls see https://github.com/UdjinM6/dash/commits/pr4638 🤷‍♂️

Munkybooty · 2022-02-26T18:01:53Z

I totally thought I had cherry picked it before I pushed my bad

…as default e3e1a56 [test] functional: set cwd of nodes to tmpdir (Sjors Provoost) Pull request description: Any process launched by bitcoind will have `self.datadir` as its `cwd`. Tree-SHA512: 0b311643bb96c7dc2f693774620173243b3add40bf373284695af2f0071823b23485289fd2ffe152b7f63e0bfe989b16720077cfc2ce33905f9b8e7f2630f3c0

…ght, currentblocktx fa178a6 [rpc] mining: Omit uninitialized currentblockweight, currentblocktx (MarcoFalke) Pull request description: Previously we'd report "0", which could be mistaken for a valid number. E.g. the number of transactions is 0 or the block weight is 0, whatever that means. Tree-SHA512: ee94ab203a329e272211b726f4c23edec4b09c650ec363b77fd59ad9264165d73064f78ebb9e11b5c2c543b73c157752410a307655560531c7d5444d203aa0ea

Munkybooty · 2022-02-27T18:34:45Z

Squashed changes to make review easier

UdjinM6

ACK

src/wallet/rpcdump.cpp

…ate keys are disabled f4b00b7 Import public keys in order (Andrew Chow) 9e1551b Test pubkey import to keypool (Andrew Chow) 513719c Add option to importmulti add an imported pubkey to the keypool (Andrew Chow) 9b81fd1 Fetch keys from keypool when private keys are disabled (Andrew Chow) 99cccb9 Add a method to add a pubkey to the keypool (Andrew Chow) Pull request description: If the wallet has private keys disabled, allow importing public keys into the keypool. A `keypool` option has been added to `importmulti` in order to signal that the keys should be added to the keypool. Tree-SHA512: e88ea7bf726c13031aa739389a0c2662e6b22a4f9a4dc45b042418c692a950d98f170e0db80eb59e9c9063cda8765eaa85b2927d1790b9625744f7a87bad5fc8

fa1e281 doc: Add missing wallet-tool manpages (MarcoFalke) fa0fe3b contrib: Add missing wallet tool to gen-manpages.sh (MarcoFalke) Pull request description: Tree-SHA512: 8c5c7e98f634cb1c8b43ecc9a15f22df2f572f5d752fb20f09910fb0d31e74df8144c1833f54bb44ad53cb5ca166f7e896317951899d4b0aa05bd3262f66835c

…ption 4701239 [Docs] Small updates to getrawtransaction description (Amiti Uttarwar) Pull request description: As per review comments on bitcoin#15159 Tree-SHA512: 0bbbe956b47d177f7e67c5ab2048287783327d9e07a679d64d79aee3ea8633e769f75b59d3dbce517924ba5d64d6c44f26bf49e16d40612463e460ad1a238129

0164b0f build: Remove WINVER pre define in Makefile.leveldb.inlcude (Chun Kuan Lee) d0522ec Drop defunct Windows compat fixes (Ben Woosley) d8a2992 windows: Call SetProcessDEPPolicy directly (Chun Kuan Lee) 1bd9ffd windows: Set _WIN32_WINNT to 0x0601 (Windows 7) (Chun Kuan Lee) Pull request description: The current minimum support Windows version is Vista. So set it to 0x0600 https://github.com/mirror/mingw-w64/blob/5a88def8ad862ef8f4e5f2e69661bfb2d07f1ce2/mingw-w64-headers/include/sdkddkver.h#L19 Tree-SHA512: 38e2afc79426ae547131c8ad3db2e0a7f54a95512f341cfa0c06e4b2fe79521ae67d2795ef96b0192e683e4f1ba6183c010d7b4b8d6b3e68b9bf48c374c59e7d

UdjinM6

re-ACK

PastaPastaPasta · 2022-03-05T17:08:56Z

test/functional/wallet_dump.py

-        self.options.tmpdir = os.path.join(self.options.tmpdir, 'hd')
-        self.options.cachedir = os.path.join(self.options.cachedir, 'hd')
-        self._initialize_chain(extra_args=self.extra_args[0])
-        self.set_cache_mocktime()


15415 why are these changes included

This was a workaround for the hd/non-hd wallets conflict (cache is created with non-hd). 15415 fixed it, so this hack is no longer need.

PastaPastaPasta · 2022-03-05T17:09:59Z

src/miner.h

@@ -1,17 +1,19 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2018 The Bitcoin Core developers


nit should've bumped to 2019

PastaPastaPasta · 2022-03-05T17:11:28Z

test/functional/mining_basic.py

+
+    def mine_chain(self):
+        self.log.info('Create some old blocks')
+        for _ in range(0, 200):


not sure why we changed this logic

Have to bump mocktime on all nodes because otherwise other nodes will ban us for relaying blocks from the future.

PastaPastaPasta · 2022-03-05T17:13:08Z

src/wallet/rpcwallet.cpp

-    if (fHDEnabled) {
-        obj.pushKV("keypoolsize_hd_internal",   (int64_t)(pwallet->KeypoolCountInternalKeys()));
-    }
+    obj.pushKV("keypoolsize_hd_internal",   (int64_t)(pwallet->KeypoolCountInternalKeys()));


why'd we get rid of this check?

With 14075 we can use importmulti to import pubkeys via desc option into internal keypool even for non-HD/empty wallets. Another option would be to can go with if (pwallet->CanSupportFeature(FEATURE_HD)) { (like in btc) here and require users to upgrade their wallets for this to work correctly.

PastaPastaPasta

utACK for merging via merge commit

github-actions bot added the needs rebase label Dec 23, 2021

Munkybooty force-pushed the backports-0.18-pr18 branch from 4569f42 to 8d9527c Compare December 24, 2021 02:18

github-actions bot removed the needs rebase label Dec 24, 2021

UdjinM6 requested changes Dec 25, 2021

View reviewed changes

Munkybooty force-pushed the backports-0.18-pr18 branch 2 times, most recently from 10757d5 to 03ef14e Compare December 29, 2021 02:35

github-actions bot mentioned this pull request Dec 30, 2021

Merge bitcoin#14890 and bitcoin#15390 #4643

Merged

Munkybooty force-pushed the backports-0.18-pr18 branch 3 times, most recently from 706ed24 to fbddb83 Compare January 3, 2022 17:47

PastaPastaPasta reviewed Jan 21, 2022

View reviewed changes

src/wallet/rpcdump.cpp Outdated

Comment on lines 1343 to 1351

Copy link

Member

PastaPastaPasta Jan 21, 2022

Choose a reason for hiding this comment

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

both of these references should be left aligned

Munkybooty force-pushed the backports-0.18-pr18 branch from fbddb83 to 18c5815 Compare January 21, 2022 17:07

github-actions bot added the needs rebase label Jan 24, 2022

Munkybooty force-pushed the backports-0.18-pr18 branch from 18c5815 to 514a0d7 Compare January 24, 2022 20:29

github-actions bot removed the needs rebase label Jan 24, 2022

PastaPastaPasta reviewed Jan 26, 2022

View reviewed changes

UdjinM6 mentioned this pull request Feb 22, 2022

Backports 0.18 pr19 #4642

Merged

UdjinM6 requested changes Feb 22, 2022

View reviewed changes

github-actions bot added the needs rebase label Feb 23, 2022

Munkybooty force-pushed the backports-0.18-pr18 branch from 514a0d7 to 9928292 Compare February 26, 2022 06:23

github-actions bot removed the needs rebase label Feb 26, 2022

Munkybooty force-pushed the backports-0.18-pr18 branch 2 times, most recently from 9503d8a to f22f947 Compare February 26, 2022 07:32

MarcoFalke added 2 commits February 27, 2022 13:33

Munkybooty force-pushed the backports-0.18-pr18 branch from e45a168 to 43870c7 Compare February 27, 2022 18:34

UdjinM6 added this to the 18 milestone Feb 28, 2022

UdjinM6 previously approved these changes Mar 4, 2022

View reviewed changes

src/wallet/rpcdump.cpp Outdated Show resolved Hide resolved

src/wallet/rpcdump.cpp Outdated Show resolved Hide resolved

meshcollider and others added 4 commits March 4, 2022 23:38

Munkybooty dismissed UdjinM6’s stale review via 0d59e4d March 5, 2022 04:39

Munkybooty force-pushed the backports-0.18-pr18 branch from 43870c7 to 0d59e4d Compare March 5, 2022 04:39

UdjinM6 approved these changes Mar 5, 2022

View reviewed changes

PastaPastaPasta reviewed Mar 5, 2022

View reviewed changes

PastaPastaPasta approved these changes Mar 5, 2022

View reviewed changes

PastaPastaPasta merged commit c678675 into dashpay:develop Mar 5, 2022

Liquid369 mentioned this pull request Oct 27, 2022

Backports stakecube/StakeCubeCoin#27

Merged

kwvg mentioned this pull request Jan 25, 2024

backport: merge bitcoin#19289, #19998, #17775, #19401, #20167, #20187, #19961, #21114, #21170 (auxiliary backports: part 12) #5842

Merged

Backports 0.18 pr18 #4638

Backports 0.18 pr18 #4638

Uh oh!

Conversation

Munkybooty commented Dec 23, 2021

Uh oh!

github-actions bot commented Dec 23, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Dec 30, 2021

Uh oh!

Munkybooty commented Jan 4, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jan 24, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Feb 23, 2022

Uh oh!

UdjinM6 commented Feb 26, 2022

Uh oh!

Munkybooty commented Feb 26, 2022

Uh oh!

Munkybooty commented Feb 27, 2022

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta Mar 5, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

PastaPastaPasta Mar 5, 2022 •

edited

Loading