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#21983, 21756, 21927, revert dashpay#855 #6008

Merged
merged 4 commits into from May 24, 2024

Conversation

vijaydasmp
Copy link

bitcoin backport

@vijaydasmp vijaydasmp changed the title backport backport: Merge bitcoin#21983, 21756, 21910, 21927 May 5, 2024
@vijaydasmp vijaydasmp force-pushed the bp22_38 branch 5 times, most recently from cfbbddd to 5657738 Compare May 7, 2024 12:21
@vijaydasmp vijaydasmp force-pushed the bp22_38 branch 2 times, most recently from 81d7bab to 8674c25 Compare May 14, 2024 14:20
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#21983, 21756, 21910, 21927 backport: Merge bitcoin#21983, 21756, 21927 May 14, 2024
@vijaydasmp vijaydasmp marked this pull request as ready for review May 14, 2024 17:00
UdjinM6
UdjinM6 previously approved these changes May 17, 2024
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.

light ACK

sizeof(name), nullptr, 0, NI_NUMERICHOST))
return std::string(name);
}
}
Copy link

Choose a reason for hiding this comment

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

21756: fUseGetnameinfo is no longer used, could revert #855 now 3e8dd82. Or it could be done in a follow-up PR.

@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#21983, 21756, 21927 backport: Merge bitcoin#21983, 21756, 21927, Revert "merge dashpay#855 May 18, 2024
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#21983, 21756, 21927, Revert "merge dashpay#855 backport: Merge bitcoin#21983, 21756, 21927, revert "merge dashpay#855 May 18, 2024
@UdjinM6 UdjinM6 changed the title backport: Merge bitcoin#21983, 21756, 21927, revert "merge dashpay#855 backport: Merge bitcoin#21983, 21756, 21927, revert dashpay#855 May 18, 2024
src/evo/providertx.h Outdated Show resolved Hide resolved
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

@vijaydasmp
Copy link
Author

Hello @knst @PastaPastaPasta requesting review

1 similar comment
@vijaydasmp
Copy link
Author

Hello @knst @PastaPastaPasta requesting review

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 def4a6b

laanwj and others added 4 commits May 24, 2024 13:33
… warnings

88bdc4d build: Silent lupdate "unknown namespace/class" warnings (Hennadii Stepanov)

Pull request description:

  This PR removes multiple _"Qualifying with unknown namespace/class"_ warnings in `make -C src translate` output.
  Also all of the `lupdate` options are moved before input files (as documented).

  The remaining warnings are fixed in Qt 5.12.2 (see [QTBUG-42736](https://bugreports.qt.io/browse/QTBUG-42736)).

ACKs for top commit:
  laanwj:
    Tested ACK 88bdc4d

Tree-SHA512: 9c12ff5425a84758aaf8073554891ffe7eb2d75650a12be14ece364b6b7a4461626654885e35c5543462f0941abb020cc36dc64e656c85c8d6d2da36efc7ea2c
… addresses in `CNetAddr::ToStringIP`

54548ba net: Avoid calling getnameinfo when formatting IPv6 addresses in CNetAddr::ToStringIP (practicalswift)
c10f27f net: Make IPv6ToString do zero compression as described in RFC 5952 (practicalswift)

Pull request description:

  Avoid calling `getnameinfo` when formatting IPv6 addresses in `CNetAddr::ToStringIP`.

  Fixes bitcoin#21466.
  Fixes bitcoin#21967.

  The IPv4 case was fixed in bitcoin#21564.

ACKs for top commit:
  laanwj:
    Code review ACK 54548ba
  vasild:
    ACK 54548ba

Tree-SHA512: 8404e458b29efdb7bf78b91adc075d05e0385969d1532cccaa2c7cb69cd77411c42d95fcefc4000137b9f2076fe395731c7d9844b7d42b58a6d3bec69eed6fce
fa74bfc fuzz: Run const CScript member functions only once (MarcoFalke)

Pull request description:

  Those functions should be O(N) in the input size (or maybe worse, I didn't check), so if the fuzz input dictates to run them N times, the complexity is N^2.

  Fix this by calling them only once.

  Can be reviewed with: `--ignore-all-space  --word-diff-regex=.`

  Input: https://github.com/bitcoin/bitcoin/files/6464685/clusterfuzz-testcase-minimized-input.log

  Hopefully fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34101

ACKs for top commit:
  practicalswift:
    cr ACK fa74bfc: patch looks correct, rationale makes sense and patch touches only `src/test/fuzz/`

Tree-SHA512: d579f7a2103ec154bf482a872142e55a1d9e7673d33a22a4c4230186fdd1b6618846463f4e25941031cc8c4bd1ea8d06cb49ae1bb1ec4af115497f5e5de1e19c
@PastaPastaPasta PastaPastaPasta merged commit e4c848b into dashpay:develop May 24, 2024
3 of 6 checks passed
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.

None yet

4 participants