merge Bitcoin #16325 #16210 #15784 #15757 : Backport by vijaydasmp · Pull Request #4613 · dashpay/dash

vijaydasmp · 2021-12-07T18:39:32Z

No description provided.

vijaydasmp · 2021-12-15T05:04:02Z

64 bit Test Failed due to Disk space
print("{0} {1: <5} {2} {3}".format(colors[event.source.rstrip()], event.source, lines[0], colors["reset"]))
OSError: [Errno 28] No space left on device
Exception ignored in: <_io.TextIOWrapper name='' mode='w' encoding='utf-8'>
OSError: [Errno 28] No space left on device, please retrigger once the space is reclaimed

vijaydasmp · 2021-12-15T11:49:57Z

Hello @UdjinM6 requesting review

vijaydasmp · 2021-12-17T07:51:36Z

Hello @PastaPastaPasta , Requesting review

github-actions · 2021-12-17T17:23:39Z

This pull request has conflicts, please rebase.

UdjinM6

utACK

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/rpc/rawtransaction_util.cpp,src/wallet/rpcwallet.cpp

9b085f4 Mention new descriptor RPCs in descriptors.md (Pieter Wuille) 28d78de Mention new PSBT RPCs in psbt.md (Pieter Wuille) Pull request description: The documentation in `psbt.md` and `descriptors.md` does not list new and updated RPCs (`analyzepsbt`, `utxoupdatepsbt`, `joinpsbts`, `deriveaddresses`, `getdescriptorinfo`, `listunspent`). Fix this. It'd be good to have this in 0.18 (only documentation). ACKs for commit 9b085f: fanquake: utACK 9b085f4 Tree-SHA512: ee16907e8c15351a530f11fc0a585c50835a7bf5aec997ac0e897949d9b9e41a28ddebbeaba69753fee7d2de75e518091518185085fcd1f6ada94b7231097b2e

…ignTransaction 99e88a3 rpc: Remove dependency on interfaces::Chain in SignTransaction (Antoine Riard) Pull request description: Assuming wallet RPCs and node RPCs will go into different processes, signrawtransactionwithkey doesn't need to access Coins via interfaces::Chain, it may use directly utility in node/coins.cpp Obviously will need rebase after bitcoin#15638 Tree-SHA512: 42ee8fcbcd38643bbd82210db6f68249bed5ee036a4c930a1db534d0469a133e287b8869c977bf0cc79a7296dde04f72adb74d24e1cd20f4a280f4c2b7fceb74

…amples 71fd628 Add example 2nd arg to signrawtransactionwithkey (Chris Moore) Pull request description: The RPC examples for signrawtransactionwithkey are missing the 2nd parameter. Before this change the help text showed: Examples: > bitcoin-cli signrawtransactionwithkey "myhex" > curl --user myusername --data-binary '{"jsonrpc": "1.0", "id":"curltest", "method": "signrawtransactionwithkey", "params": ["myhex"] }' -H 'content-type: text/plain;' http://127.0.0.1:8332/ With the change, it shows: Examples: > bitcoin-cli signrawtransactionwithkey "myhex" "[\"key1\",\"key2\"]" > curl --user myusername --data-binary '{"jsonrpc": "1.0", "id":"curltest", "method": "signrawtransactionwithkey", "params": ["myhex", "[\"key1\",\"key2\"]"] }' -H 'content-type: text/plain;' http://127.0.0.1:8332/ ACKs for commit 71fd62: Tree-SHA512: dadf6bf0ba64ac356b7b8f9ed4d483384b70080ac4b1664b27a2e72b97f25d7266f3dae89fbeade73c1bae802b5bae7b84d596c93a9ae9c748851ae35758d9a6

…ht excl genesis fab0c82 rpc: Clarify that block count means height excl genesis (MarcoFalke) Pull request description: There is a common misconception that the block count returned by the blockchain rpcs includes the genesis block. See for example the discussion in bitcoin#16292 (comment). However, it really returns the height, which is `0` for the genesis block. So clarify that and also remove the misleading "longest blockchain" comment. Finally, fix the wallet test that incorrectly used this rpc. ACKs for top commit: instagibbs: utACK bitcoin@fab0c82 promag: ACK fab0c82, sorry for the misconception. Tree-SHA512: 0d087cbb628d3866352bca6420402f392e6a997e579941701a408a7fca355d84645045661f39b022e4479cc07f85a6cddaa9095b6fd9911b245692482420a5e4

PastaPastaPasta

utACK for merging via merge commit

nit: please name 16325 as not being partial (all substance was done), but that's not a blocker imo

vijaydasmp · 2022-01-04T08:20:50Z

Sure, will do

…

On Tue, 4 Jan 2022, 13:31 PastaPastaPasta, ***@***.***> wrote: ***@***.**** approved this pull request. utACK for merging via merge commit nit: please name 16325 as not being partial (all substance was done), but that's not a blocker imo — Reply to this email directly, view it on GitHub <#4613 (review)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAR5IIWRQWHMQEGIQANGXJDUUKSOHANCNFSM5JR6AYHQ> . Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>. You are receiving this because you authored the thread.Message ID: ***@***.***>

vijaydasmp · 2022-01-04T13:57:39Z

Hello @UdjinM6 please re approve , approval got dismissed after force push after rebase

UdjinM6

utACK

vijaydasmp changed the title ~~merge Bitcoin #16244 #16325 #16210 #15784 #15757 Backport~~merge Bitcoin #16244 #16325 #16210 #15784 #15757 : BackportDec 7, 2021

vijaydasmp force-pushed the bp197 branch 11 times, most recently from 350423a to 33cd5f5Compare December 15, 2021 01:03

vijaydasmp changed the title ~~merge Bitcoin #16244 #16325 #16210 #15784 #15757 : Backport~~merge Bitcoin #16325 #16210 #15784 #15757 : BackportDec 15, 2021

vijaydasmp force-pushed the bp197 branch 2 times, most recently from d55180d to 867371bCompare December 15, 2021 04:27

vijaydasmp marked this pull request as ready for review December 15, 2021 05:04

vijaydasmp changed the title ~~merge Bitcoin #16325 #16210 #15784 #15757 : Backport~~merge Bitcoin #15497 #16325 #16210 #15784 #15757 : BackportDec 15, 2021

vijaydasmp force-pushed the bp197 branch from 601c8b8 to 867371bCompare December 15, 2021 15:02

github-actionsBot added the needs rebase label Dec 17, 2021

vijaydasmp force-pushed the bp197 branch from 867371b to 59d4b0aCompare December 18, 2021 10:56

github-actionsBot removed the needs rebase label Dec 18, 2021

vijaydasmp changed the title ~~merge Bitcoin #15497 #16325 #16210 #15784 #15757 : Backport~~merge Bitcoin #16325 #16210 #15784 #15757 : BackportDec 18, 2021

vijaydasmp changed the title ~~merge Bitcoin #16325 #16210 #15784 #15757 : Backport~~merge Bitcoin #16226 #16325 #16210 #15784 #15757 : BackportDec 19, 2021

vijaydasmp force-pushed the bp197 branch 3 times, most recently from 29bb873 to 59d4b0aCompare December 20, 2021 06:04

vijaydasmp changed the title ~~merge Bitcoin #16226 #16325 #16210 #15784 #15757 : Backport~~merge Bitcoin #16325 #16210 #15784 #15757 : BackportDec 25, 2021

UdjinM6 requested changes Dec 25, 2021
View reviewed changes

Comment threaddoc/psbt.md Outdated
Comment threadsrc/rpc/blockchain.cpp Outdated

vijaydasmp force-pushed the bp197 branch 4 times, most recently from c0d1304 to bc302aeCompare December 27, 2021 06:11

vijaydasmp requested a review from UdjinM6 December 27, 2021 08:00

vijaydasmp force-pushed the bp197 branch from bc302ae to b17a79aCompare December 29, 2021 11:18

UdjinM6 previously approved these changes Dec 30, 2021
View reviewed changes

github-actionsBot mentioned this pull request Dec 30, 2021
Merge bitcoin#14890 and bitcoin#15390 #4643
Merged

UdjinM6 added this to the 18 milestone Jan 3, 2022

UdjinM6 requested a review from PastaPastaPasta January 3, 2022 12:11

laanwjand others added 4 commits January 3, 2022 18:55

vijaydasmp dismissed UdjinM6’s stale review via 036c953January 3, 2022 13:26

vijaydasmp force-pushed the bp197 branch from b17a79a to 036c953Compare January 3, 2022 13:26

vijaydasmp requested a review from UdjinM6 January 4, 2022 03:20

PastaPastaPasta approved these changes Jan 4, 2022
View reviewed changes

UdjinM6 approved these changes Jan 4, 2022
View reviewed changes

UdjinM6 merged commit e706b59 into dashpay:developJan 4, 2022

Navigation Menu

Uh oh!

merge Bitcoin #16325 #16210 #15784 #15757 : Backport - #4613

merge Bitcoin #16325 #16210 #15784 #15757 : Backport#4613
UdjinM6 merged 4 commits into
dashpay:developfrom
vijaydasmp:bp197

vijaydasmp commented Dec 7, 2021

Uh oh!

vijaydasmp commented Dec 15, 2021

Uh oh!

vijaydasmp commented Dec 15, 2021

Uh oh!

vijaydasmp commented Dec 17, 2021

Uh oh!

github-actionsBot commented Dec 17, 2021

Uh oh!

Uh oh!

Uh oh!

UdjinM6 left a comment

Uh oh!

github-actionsBot commented Dec 30, 2021

Uh oh!

PastaPastaPasta left a comment

Uh oh!

vijaydasmp commented Jan 4, 2022 via email

Uh oh!

vijaydasmp commented Jan 4, 2022

Uh oh!

UdjinM6 left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

vijaydasmp commented Dec 7, 2021

Uh oh!

vijaydasmp commented Dec 15, 2021

Uh oh!

vijaydasmp commented Dec 15, 2021

Uh oh!

vijaydasmp commented Dec 17, 2021

Uh oh!

github-actionsBot commented Dec 17, 2021

Uh oh!

Uh oh!

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

github-actionsBot commented Dec 30, 2021

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

vijaydasmp commented Jan 4, 2022 via email

Uh oh!

vijaydasmp commented Jan 4, 2022

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants