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.

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

backport: Merge bitcoin#24367 #6439

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from

Conversation

vijaydasmp
Copy link

@vijaydasmp vijaydasmp commented Nov 29, 2024

Bitcoin backports cryptotura

@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#24367: User-facing content and codebase doc fix… backport: Merge bitcoin#24367 Nov 29, 2024
… transifex translator feedback

4874269 Replace "can not" with "cannot" in docs, user messages, and tests (Jon Atack)
e670edd User-facing content fixups from transifex translator feedback (Jon Atack)

Pull request description:

  Closes bitcoin#24366.

ACKs for top commit:
  laanwj:
    Code review re-ACK 4874269
  hebasto:
    re-ACK 4874269, only suggested change since my previous [review](bitcoin#24367 (review)).

Tree-SHA512: 4dcdcb417251a413e65fab6070515e13a1267c8e0dbcf521386b842511391f24c84a0c2168fe13458c977682034466509bf2a3453719d4d94d3c568fd9f4adb4
achow101 and others added 2 commits November 30, 2024 23:46
…d for rescanning

6a5b348 test: test rescanning encrypted wallets (ishaanam)
493b813 wallet: ensure that the passphrase is not deleted from memory when being used to rescan (ishaanam)
66a86eb wallet: keep track of when the passphrase is needed when rescanning (ishaanam)

Pull request description:

  Wallet passphrases are needed to top up the keypool of encrypted wallets
  during a rescan. The following RPCs need the passphrase when rescanning:
      - `importdescriptors`
      - `rescanblockchain`

  The following RPCs use the information about whether or not the
  passphrase is being used to ensure that full rescans are able to
  take place (meaning the following RPCs should not be able to run
  if a rescan requiring the wallet to be unlocked  is taking place):
      - `walletlock`
      - `encryptwallet`
      - `walletpassphrasechange`

  `m_relock_mutex` is also introduced so that the passphrase is not
  deleted from memory when the timeout provided in
  `walletpassphrase` is up and the wallet is still rescanning.
  Fixes bitcoin#25702, bitcoin#11249

  Thanks to achow101 for coming up with the idea of using a new mutex to solve this issue and for answering related questions.

ACKs for top commit:
  achow101:
    ACK 6a5b348
  hernanmarino:
    ACK 6a5b348
  furszy:
    Tested ACK 6a5b348

Tree-SHA512: 0b6db692714f6f94594fa47249f5ee24f85713bfa70ac295a7e84b9ca6c07dda65df7b47781a2dc73e5b603a8725343a2f864428ae20d3e126c5b4802abc4ab5
…n non-default ports

36ee76d net: remove unused CNetAddr::GetHash() (Vasil Dimov)
d0abce9 net: include the port when deciding a relay destination (Vasil Dimov)
2e38a0e net: add CServiceHash constructor so the caller can provide the salts (Vasil Dimov)
9720863 net: open p2p connections to nodes that listen on non-default ports (Vasil Dimov)

Pull request description:

  By default, for mainnet, the p2p listening port is 8333. Bitcoin Core
  has a strong preference for only connecting to nodes that listen on that
  port.

  Remove that preference because connections over clearnet that involve
  port 8333 make it easy to detect, analyze, block or divert Bitcoin p2p
  traffic before the connection is even established (at TCP SYN time).

  For further justification see the OP of:
  bitcoin#23306

ACKs for top commit:
  laanwj:
    Concept and light code review ACK 36ee76d
  prayank23:
    ACK bitcoin@36ee76d
  stickies-v:
    tACK 36ee76d
  jonatack:
    ACK 36ee76d
  glozow:
    utACK 36ee76d

Tree-SHA512: 7f45ab7567c51c19fc50fabbaf84f0cc8883a8eef84272b76435c014c31d89144271d70dd387212cc1114213165d76b4d20a5ddb8dbc958fe7e74e6ddbd56d11
Copy link

github-actions bot commented Dec 4, 2024

This pull request has conflicts, please rebase.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants