Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backports 0.18 pr20 #4675

Merged
merged 9 commits into from
Mar 11, 2022
Merged

Backports 0.18 pr20 #4675

merged 9 commits into from
Mar 11, 2022

Conversation

Munkybooty
Copy link

I fixed as much as i could in terms of test failures, but not everything passes on the functional tests

PastaPastaPasta
PastaPastaPasta reviewed Feb 7, 2022
View reviewed changes
src/wallet/rpcwallet.cpp
@@ -4030,7 +4030,7 @@ UniValue walletcreatefundedpsbt(const JSONRPCRequest& request)
return NullUniValue;
}

if (request.fHelp || request.params.size() < 2 || request.params.size() > 6)
if (request.fHelp || request.params.size() < 2 || request.params.size() > 5)
Copy link
Member

Choose a reason for hiding this comment

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

13968: I'm not sure we want just this. Why is this just this?

Copy link
Author

Choose a reason for hiding this comment

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

iirc, the remainder of the pr deals entirely with rbf

PastaPastaPasta
PastaPastaPasta reviewed Feb 7, 2022
View reviewed changes
test/functional/feature_block.py Outdated
Comment on lines 1288 to 1296
self.sync_blocks([b_v1], success=False, force_send=True, reject_reason='bad-version(0x00000001)')

self.move_tip(chain1_tip + 2)
b_cb34 = self.next_block('b_cb34', version=4)
b_cb34.vtx[0].vin[0].scriptSig = b_cb34.vtx[0].vin[0].scriptSig[:-1]
b_cb34.vtx[0].rehash()
b_cb34.hashMerkleRoot = b_cb34.calc_merkle_root()
b_cb34.solve()
self.sync_blocks([b_cb34], success=False, reject_reason='bad-cb-height', reconnect=True)
Copy link
Member

@PastaPastaPasta PastaPastaPasta Feb 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

This is missing some previous back port to allow us to use success and reject_reason

EDIT: need to backport (at least part of) 11817

Copy link
Member

Choose a reason for hiding this comment

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

did you see this?

Copy link
Author

Choose a reason for hiding this comment

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

Oh shoot, I'm seeing this now. Will get on it

Copy link
Author

Choose a reason for hiding this comment

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

Are you sure its 11817, it only touches feature_csv_activation.py

@github-actions
Copy link

This pull request has conflicts, please rebase.

@PastaPastaPasta
Copy link
Member

c++20 build fails + tests fail

@github-actions
Copy link

github-actions bot commented Mar 5, 2022

This pull request has conflicts, please rebase.

@laanwj @Munkybooty
Merge bitcoin#13968: [wallet] couple of walletcreatefundedpsbt fixes
c23ba61 
faaac5c RPCTypeCheck bip32derivs arg in walletcreatefunded (Gregory Sanders)
1f0c428 QA: add basic walletcreatefunded optional arg test (Gregory Sanders)
1f18d7b walletcreatefundedpsbt: remove duplicate replaceable arg (Gregory Sanders)
2252ec5 Allow ConstructTransaction to not throw error with 0-input txn (Gregory Sanders)

Pull request description:

  1) Previously an empty input argument transaction that is marked for replaceability fails to pass the `SignalsOptInRBF` check right before funding it. Explicitly check for that condition before throwing an error.

  2) The rpc call had two separate `replaceable` arguments, each of which being used in mutually exclusive places. I preserved the `options` version to retain compatability with `fundtransaction`.

Tree-SHA512: 26eb0c9e2d38ea51d11f741d61100223253271a084adadeb7e78c6d4e9004636f089e4273c5bf64a41bd7e9ff795317acf30531cb36aeb0d8db9304b3c8270c3
@Munkybooty
Copy link
Author

c++20 build fixed by rebase, need to still investigate these test failures

UdjinM6
UdjinM6 requested changes Mar 7, 2022
View reviewed changes
Copy link

@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.

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

test/functional/test_framework/test_framework.py Outdated
@@ -493,11 +493,6 @@ def sync_all(self, nodes=None, **kwargs):
self.sync_blocks(nodes, **kwargs)
self.sync_mempools(nodes, **kwargs)

def disable_mocktime(self):
Copy link

Choose a reason for hiding this comment

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

14738: it fixed an issue we never had (14732), pls drop it (and ea64227, 8ddf9db).

@jonasschnelli @Munkybooty
Merge bitcoin#13381: RPC: creates possibility to preserve labels on i…
cabaeaa 
…mportprivkey

a6b5ec1 rpc: creates possibility to preserve labels on importprivkey (marcoagner)

Pull request description:

  Closes bitcoin#13087.

  As discussed in the issue, this is a feature request instead of a bug report since the behaviour was as intended (i.e. label with default: `''`). With this, the old behaviour is kept while the possibility to achieve the preservation of labels, as expected in the open issue, is added.

Tree-SHA512: b33be50e1e7f62f7ddfae953177ba0926e2d848961f9fac7501c2b513322c0cb95787745d07d137488267bad1104ecfdbe800c6747f94162eb07c976835c1386
UdjinM6
UdjinM6 requested changes Mar 8, 2022
View reviewed changes
Copy link

@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.

LGTM, pls drop all commits related to 14738 (3b6848a, f82c23d, d4bafcb, cc86ef8, 71e16e2, 9d625c7) and it should be ready to merge imo

@UdjinM6 UdjinM6 added this to the 18 milestone Mar 8, 2022
laanwj and others added 7 commits March 8, 2022 22:53
@laanwj @Munkybooty
Merge bitcoin#15057: [rpc] Correct reconsiderblock help text, add test
5d6e256 
fa38d3d [rpc] Correct reconsiderblock help text, add test (MarcoFalke)

Pull request description:

  Rework documentation and test to match the implementation

Tree-SHA512: d0adef6b054a341bcc1cb87783a4e4cf9be124ba6812e1ac88246a5e01b2861a8071b12dba880b2b428c37da3fa860bfec3fe3e5fbb7c28696872113faa84a9f
@laanwj @Munkybooty
Merge bitcoin#15059: test: Add basic test for BIP34
67c41a3 
fab17e8 test: Add basic test for BIP34 (MarcoFalke)

Pull request description:

  BIP34 was disabled for testing, which explains why it had no test.

  Fix that by enabling it and adding a test.

Tree-SHA512: 9cb5702d474117ce6420226eb93ee09d6fb5fc856fabc8b67abe56a088cd727674e0e5462000e1afa83b911374036f90abdbdde56a8c236a75572ed47e10a00f
@Munkybooty
Merge bitcoin#15108: [tests] tidy up wallet_importmulti.py
91a8867 
2d5f1ea [tests] move wallet util functions to wallet_util.py (John Newbery)
6be64ef [tests] tidy up wallet_importmulti.py (John Newbery)

Pull request description:

  Cherry picks un-merged commits from bitcoin#14952, which "fixes review comments from @ryanofsky here: bitcoin#14886 (review)"

Tree-SHA512: 5f389196b0140d013a533d500f1812786a3a5cfb65980e13eaeacc459fddb55f43d05da3ab5e7cc8c997f26c0b667eed081ab6de2d125e631c70a7dd4c06e350
@laanwj @Munkybooty
Merge bitcoin#15122: [RPC] Expand help text for importmulti changes
ce4fc11 
b745e14 [docs] Expand help text for importmulti changes (John Newbery)

Pull request description:

  Expands the RPC help text for changes to the importmulti RPC method.

Tree-SHA512: e90e5abf66bba3863e7519b5f79c26d18a4d624e6e7878293bdd4ebb57f1a01c67de52e4a5621901a8cb87fb3516264b3b1a826997c7c3c17b11216f1f1a3db0
@Munkybooty
Merge bitcoin#15248: rpc: Compile on GCC4.8
7788f0d 
fa5f890 rpc: Compile on GCC4.8 (MarcoFalke)

Pull request description:

  GCC 4.8 is lacking some C++11 signatures (see "Adjust C++11 signatures to take a const_iterator." in GCC 4.9: gcc-mirror/gcc@3d2b2f4)

  Fix that by changing the code to use the pre-GCC 4.9 signature.

  Can be reverted after bitcoin#13356.

  Fixes bitcoin#15172 (reports on `Linux Mint 17.3 Rosa` and `CentOS Linux release 7.5.1804 (Core)`)

Tree-SHA512: 0c0b18968270ad4fcd0c2000c57485be881a461135dac3ad0bdab22c1a2292cf6b28ebeb930ccaa0290ff20ce87547fd07ab8189c4c4fb54d652a3d0bc9615f8
@UdjinM6 @Munkybooty
fix 13381/15108 - no embedded
ab8ef17
@UdjinM6 @Munkybooty
3880 follow-up (fix 10583 backport)
ec162d7
UdjinM6
UdjinM6 approved these changes Mar 11, 2022
View reviewed changes
Copy link

@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

PastaPastaPasta
PastaPastaPasta approved these changes Mar 11, 2022
View reviewed changes
Copy link
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 for merging via merge commit

@PastaPastaPasta PastaPastaPasta merged commit cbbe801 into dashpay:develop Mar 11, 2022
@Liquid369 Liquid369 mentioned this pull request Oct 27, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
18
Development

Successfully merging this pull request may close these issues.
5 participants
@Munkybooty @PastaPastaPasta @UdjinM6 @laanwj @jonasschnelli