Skip to content

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

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
Merged
UdjinM6 merged 4 commits into from
Jan 4, 2022
Merged

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

UdjinM6 merged 4 commits into from
Jan 4, 2022

Conversation

@vijaydasmp
Copy link

@vijaydasmp vijaydasmp commented Dec 7, 2021

No description provided.

@vijaydasmp vijaydasmp changed the title merge Bitcoin #16244 #16325 #16210 #15784 #15757 Backport merge Bitcoin #16244 #16325 #16210 #15784 #15757 : Backport Dec 7, 2021
@vijaydasmp vijaydasmp force-pushed the bp197 branch 11 times, most recently from 350423a to 33cd5f5 Compare December 15, 2021 01:03
@vijaydasmp vijaydasmp changed the title merge Bitcoin #16244 #16325 #16210 #15784 #15757 : Backport merge Bitcoin #16325 #16210 #15784 #15757 : Backport Dec 15, 2021
@vijaydasmp vijaydasmp force-pushed the bp197 branch 2 times, most recently from d55180d to 867371b Compare December 15, 2021 04:27
@vijaydasmp
Copy link
Author

vijaydasmp commented Dec 15, 2021

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 vijaydasmp marked this pull request as ready for review December 15, 2021 05:04
@vijaydasmp
Copy link
Author

vijaydasmp commented Dec 15, 2021

Hello @UdjinM6 requesting review

@vijaydasmp vijaydasmp changed the title merge Bitcoin #16325 #16210 #15784 #15757 : Backport merge Bitcoin #15497 #16325 #16210 #15784 #15757 : Backport Dec 15, 2021
@vijaydasmp
Copy link
Author

vijaydasmp commented Dec 17, 2021

Hello @PastaPastaPasta , Requesting review

@github-actions
Copy link

github-actions bot commented Dec 17, 2021

This pull request has conflicts, please rebase.

@vijaydasmp vijaydasmp changed the title merge Bitcoin #15497 #16325 #16210 #15784 #15757 : Backport merge Bitcoin #16325 #16210 #15784 #15757 : Backport Dec 18, 2021
@vijaydasmp vijaydasmp changed the title merge Bitcoin #16325 #16210 #15784 #15757 : Backport merge Bitcoin #16226 #16325 #16210 #15784 #15757 : Backport Dec 19, 2021
@vijaydasmp vijaydasmp force-pushed the bp197 branch 3 times, most recently from 29bb873 to 59d4b0a Compare December 20, 2021 06:04
@vijaydasmp vijaydasmp changed the title merge Bitcoin #16226 #16325 #16210 #15784 #15757 : Backport merge Bitcoin #16325 #16210 #15784 #15757 : Backport Dec 25, 2021
UdjinM6
UdjinM6 requested changes Dec 25, 2021
View reviewed changes
@vijaydasmp vijaydasmp force-pushed the bp197 branch 4 times, most recently from c0d1304 to bc302ae Compare December 27, 2021 06:11
@vijaydasmp vijaydasmp requested a review from UdjinM6 December 27, 2021 08:00
UdjinM6
UdjinM6 previously approved these changes Dec 30, 2021
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

@github-actions
Copy link

github-actions bot commented Dec 30, 2021

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

@github-actions github-actions bot mentioned this pull request Dec 30, 2021
Merged
@UdjinM6 UdjinM6 added this to the 18 milestone Jan 3, 2022
laanwj and others added 4 commits January 3, 2022 18:55
@laanwj @vijaydasmp
Merge bitcoin#15757: List new RPCs in psbt.md and descriptors.md
e6a2d2b 
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
@meshcollider @vijaydasmp
Merge bitcoin#15784: rpc: Remove dependency on interfaces::Chain in S…
d5d3490 
…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
@vijaydasmp
Merge bitcoin#16210: rpc: add 2nd arg to signrawtransactionwithkey ex…
5e00c3e 
…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
@laanwj @vijaydasmp
partial Merge bitcoin#16325: rpc: Clarify that block count means heig…
036c953 
…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
@vijaydasmp vijaydasmp requested a review from UdjinM6 January 4, 2022 03:20
PastaPastaPasta
PastaPastaPasta approved these changes Jan 4, 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

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

@vijaydasmp
Copy link
Author

vijaydasmp commented Jan 4, 2022 via email

@vijaydasmp
Copy link
Author

vijaydasmp commented Jan 4, 2022

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

UdjinM6
UdjinM6 approved these changes Jan 4, 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

@UdjinM6 UdjinM6 merged commit e706b59 into dashpay:develop Jan 4, 2022
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

@vijaydasmp @UdjinM6 @PastaPastaPasta @laanwj @meshcollider