Skip to content

Backport 15826, 15530, 16243, 15824, 16587, 16555, 16629, 16847, 16857, 14877 - #4535

Merged
PastaPastaPasta merged 10 commits into
dashpay:developfrom
vijaydasmp:bp_19_3
Nov 17, 2021
Merged

Backport 15826, 15530, 16243, 15824, 16587, 16555, 16629, 16847, 16857, 14877#4535
PastaPastaPasta merged 10 commits into
dashpay:developfrom
vijaydasmp:bp_19_3

Conversation

@vijaydasmp

Copy link
Copy Markdown

No description provided.

@vijaydasmp
vijaydasmp force-pushed the bp_19_3 branch 10 times, most recently from 2850d22 to 245c036 Compare October 29, 2021 13:55

@UdjinM6 UdjinM6 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

16097 missed quite a few Dash-specific args + see below

Comment thread src/chainparams.cpp Outdated
Comment thread test/functional/feature_block.py Outdated
Comment thread src/wallet/rpcwallet.cpp Outdated
@vijaydasmp
vijaydasmp force-pushed the bp_19_3 branch 5 times, most recently from f1d527d to a4a8828 Compare November 2, 2021 13:38
@vijaydasmp
vijaydasmp force-pushed the bp_19_3 branch 3 times, most recently from 717c7a4 to f4c049f Compare November 7, 2021 11:15
@vijaydasmp
vijaydasmp marked this pull request as ready for review November 7, 2021 11:54
@vijaydasmp
vijaydasmp requested a review from UdjinM6 November 7, 2021 11:55
@vijaydasmp

Copy link
Copy Markdown
Author

@PastaPastaPasta @UdjinM6

Comment thread test/functional/test_framework/key.py Outdated
Comment thread test/functional/test_runner.py Outdated
Comment thread src/rpc/rawtransaction.cpp Outdated
@vijaydasmp
vijaydasmp force-pushed the bp_19_3 branch 2 times, most recently from dc4ea3e to d44cb33 Compare November 12, 2021 11:40
Comment thread src/wallet/rpcwallet.cpp Outdated
Comment thread src/wallet/rpcwallet.cpp Outdated
@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@vijaydasmp

Copy link
Copy Markdown
Author

After merge #4567, my PR had merge conflicts, I have tried to resolve those
@UdjinM6 @PastaPastaPasta and @dzutte-cpp please confirm if merging looks ok to you

@vijaydasmp
vijaydasmp marked this pull request as draft November 14, 2021 14:19
b679785 Add comments to Python ECDSA implementation (John Newbery)
8c7b932 Pure python EC (Pieter Wuille)

Pull request description:

  This removes the dependency on OpenSSL for the interaction tests, by providing a pure-Python
  toy implementation of secp256k1.

ACKs for commit b67978:
  jnewbery:
    utACK b679785

Tree-SHA512: 181445eb08b316c46937b80dc10aa50d103ab1fdddaf834896c0ea22204889f7b13fd33cbcbd00ddba15f7e4686fe0d9f8e8bb4c0ad0e9587490c90be83966dc
@vijaydasmp
vijaydasmp force-pushed the bp_19_3 branch 2 times, most recently from 04b877f to 783bd31 Compare November 14, 2021 17:29
@vijaydasmp
vijaydasmp marked this pull request as ready for review November 14, 2021 18:09
@vijaydasmp
vijaydasmp requested a review from UdjinM6 November 14, 2021 18:09
Comment thread src/rpc/rawtransaction.cpp Outdated
MarcoFalke and others added 8 commits November 16, 2021 07:13
faebd2e doc: Move wallet lock annotations to header (MarcoFalke)

Pull request description:

  We put the annotations in a central place (the header) as opposed to spreading them over the cpp files, where they easily get outdated.

Tree-SHA512: 18d8c7329efd3471713de18fe8d63d67c50fcb9fa99bc372294d829aa7668ea33e10d44e9e50121a04d8cc3302d5fd7759224f7935451a4693c4498a555257e6
e91f0a7 doc: Remove travis badge from readme (MarcoFalke)

Pull request description:

  The readme(s) are shipped in the released source-code archive, in which case the travis badge is useless since it doesn't link to the travis result of the correct commit/tag/branch. GitHub embeds the correct links for each tag or commit that ci ran on, so we don't need this link in the readme.

ACKs for commit e91f0a:
  hebasto:
    ACK e91f0a7

Tree-SHA512: 860435a58b38a9bd0bc62a1e74b3a63c138c9a2f09008a090d5ecc7fd86fa908d2e5eda41d16606507a238d9488fa5323405364a9556b670684a2e4838aead2d
c7f6ce7 docs: Improve netbase comments (Carl Dong)

Pull request description:

  Second in a series of PRs documenting the net stack. Contributed with sincere thanks to sipa, laanwj, and gmaxwell for providing much of the history, context, and rationale.

ACKs for top commit:
  laanwj:
    ACK c7f6ce7

Tree-SHA512: ad83054d3b8d0c8c3fb55be011bcf294176e7509513bf61326866afd53e8159644e0d59bb3a2f404717f525cbf736096d4c1990e61cfd89845d51fa6b5394b7c
6576a87 doc: Improve versionbits.h documentation (Antoine Riard)

Pull request description:

  While reviewing burying of BIP 9 deployments, seen that versionbits.h wasn't that much documented. This is an attempt to improve it. It can be useful, given after burying this code isn't going to be used anymore and isn't straightforward at first sight.

ACKs for top commit:
  jnewbery:
    ACK 6576a87
  ajtowns:
    ACK 6576a87
  fanquake:
    ACK 6576a87

Tree-SHA512: 906463e0b22b988f89d77f798bf94d294f70467d29975088b87384764fb5d0dd1350be67562cc264656f61f1eada2cba20f99c0d797d1d7f90203c269e34c714
…o blocksonly

20ea9ef [doc] mention whitelist is inbound, and applies to blocksonly (Sjors Provoost)

Pull request description:

  * `-whitelist` only impacts inbound nodes (see bitcoin#9923). This is obvious in the context of allowing those nodes to connect to you, but there are additional whitelist features where this is less obvious, such as mempool relay behavior.

  * `whitelistrelay` (on by default) explains that `-blocksonly` makes an exception for transactions from whitelisted nodes, but it wasn't documented (nor obvious imo) the other way around. See also bitcoin#15984 (comment)

Top commit has no ACKs.

Tree-SHA512: 03e363a5da5d81ad147d1c7e38bf11114df8bb89bdd66fb551520b25f810efa886ec6e649d3b435c4935e0ae4f39bb718bc7bb5778b9de6aa0b71e970a431af8
…missions

66ad754 [Doc] Add documentation for the new whitelist permissions (nicolas.dorier)

Pull request description:

  Documenting the new feature bitcoin#16248 . Ping Sjors .

ACKs for top commit:
  Sjors:
    Indeed, re-ACK 66ad754

Tree-SHA512: e6860bb6fae921287da7920a8db534e6a1a23871dd78dd6da030f00adf23e204cd23b194d67361bf34d4ef5a7815fc3fd7c81a3f2f35e4cfbe6ee2f2e6daec25
…are advertised

82e53f3 doc: add comments clarifying how local services are advertised (James O'Beirne)

Pull request description:

  Recent questions have come up regarding dynamic service registration
  (see bitcoin#16442 (comment)
  and the assumeutxo project ~~which needs to dynamically flip NODE_NETWORK~~).

  While investigating how dynamic service registration might work, I was
  confused about how we convey local services to peers. This adds some
  documentation that hopefully clarifies this process.

ACKs for top commit:
  laanwj:
    ACK 82e53f3
  darosior:
    ACK 82e53f3

Tree-SHA512: a30c1020387d7a75b5b3cdde45f8b7f2ae46293da97e6227b2ee17e290b93deb5b16c0bbc2b1676972300e5c3c2ad74eb8b3910d6b93e028dac1ae2700468ef9
…after usermod for Tor group

7063401 Elaborate on the need to re-login on Debian-based systems to use tor following usermod (clashicly)

Pull request description:

  Starting bitcoind with `-onlynet=onion` immediately after adding bitcoind user to debian-tor group will yield the following notice on debug.log:

  	"tor: Authentication cookie /run/tor/control.authcookie could not be opened (check permissions)"

  Elaborate on the need to re-login to ensure debian-tor group has been applied to bitcoind user after:

  	sudo usermod -a -G debian-tor username

  Verification can be done via `groups` command in shell.
  Otherwise operator may not be aware at first launch they are not running a tor enabled node.

ACKs for top commit:
  fanquake:
    ACK 7063401 - Thanks for following up.

Tree-SHA512: 3473966fb43b4f1c86bd8841dd6ea8c2798256c2ca926b10bd08cd655b954a9e77f0278c4fe63160e69cc75e240a3580af00ea46bf960fde2788aa88f03510b2
@vijaydasmp

vijaydasmp commented Nov 16, 2021 via email

Copy link
Copy Markdown
Author

fa0c24c rpc: Document default values for optional arguments (MarcoFalke)

Pull request description:

Tree-SHA512: e1f5ea67d7ac67526ae87bffaeb308a9ad68632e161fe0148cd431a340bb7a30def18f1dbc7e98c6c1c269ac8942fd5d5334c85c48e4fb1cead70a42536b6eef

@UdjinM6 UdjinM6 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

utACK

@vijaydasmp vijaydasmp changed the title backport 19.0 batch 3 Merge bitcoin#15826,bitcoin#15530,bitcoin#16243,bitcoin#15824,bitcoin#16587,bitcoin#16555,bitcoin#16629,bitcoin#16847,bitcoin#16857,bitcoin#14877, Nov 17, 2021
@UdjinM6 UdjinM6 changed the title Merge bitcoin#15826,bitcoin#15530,bitcoin#16243,bitcoin#15824,bitcoin#16587,bitcoin#16555,bitcoin#16629,bitcoin#16847,bitcoin#16857,bitcoin#14877, Backport 15826, 15530, 16243, 15824, 16587, 16555, 16629, 16847, 16857, 14877 Nov 17, 2021
# bytes).
rb = r.to_bytes((r.bit_length() + 8) // 8, 'big')
sb = s.to_bytes((s.bit_length() + 8) // 8, 'big')
return b'\x30' + bytes([4 + len(rb) + len(sb), 2, len(rb)]) + rb + bytes([2, len(sb)]) + sb

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This file was removed in 313d79e#diff-f3972aca3482ea96a5267ce8f92f6900d18740e6b9f80bd1fd8d115499e1d466 and re-added in dbfa929#diff-f3972aca3482ea96a5267ce8f92f6900d18740e6b9f80bd1fd8d115499e1d466 but with --min-confidence 100 and no ignore list (both via #4487), all pre- 313d79e changes can/must be ignored now.

@PastaPastaPasta PastaPastaPasta left a comment

Copy link
Copy Markdown
Member

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 84ade68 into dashpay:develop Nov 17, 2021
@vijaydasmp
vijaydasmp deleted the bp_19_3 branch November 24, 2021 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants