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#24041, 20591 #6259

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

vijaydasmp
Copy link

backporting bitcoin

@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23157 backport: Merge bitcoin#23157, 19101 Sep 9, 2024
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23157, 19101 backport: Merge bitcoin#23157, 24041, 22362, 23307, 23054 Sep 9, 2024
@vijaydasmp vijaydasmp force-pushed the bp23_2024_09_04 branch 4 times, most recently from b9f947a to ebe61aa Compare September 11, 2024 08:05
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23157, 24041, 22362, 23307, 23054 backport: Merge bitcoin#23157, 24041, 22362, 23054 Sep 11, 2024
Copy link

This pull request has conflicts, please rebase.

Copy link

This pull request has conflicts, please rebase.

@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23157, 24041, 22362, 23054 backport: Merge bitcoin#23157, 24041, 22362, 20591, 23054 Sep 14, 2024
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23157, 24041, 22362, 20591, 23054 backport: Merge bitcoin#23157, 24041, 22362, 20591, 22677 Sep 14, 2024
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23157, 24041, 22362, 20591, 22677 backport: Merge bitcoin#23157, 24041, 20591, 22677 Sep 14, 2024
@vijaydasmp vijaydasmp force-pushed the bp23_2024_09_04 branch 3 times, most recently from 7f4b4f4 to 2856dca Compare September 15, 2024 08:41
@vijaydasmp
Copy link
Author

Hi @UdjinM6 , This is stuck at ci/gitlab/gitlab.com Expected — Waiting for status to be reported

@UdjinM6
Copy link

UdjinM6 commented Sep 16, 2024

Hi @UdjinM6 , This is stuck at ci/gitlab/gitlab.com Expected — Waiting for status to be reported

Yes, this happens... try rebasing and force-pushing

Copy link

This pull request has conflicts, please rebase.

@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23157, 24041, 20591, 22677 backport: Merge bitcoin#24041, 20591 Jan 2, 2025
Copy link

This pull request has conflicts, please rebase.

b5c9bb5 util: Restore GetIntArg saturating behavior (James O'Beirne)

Pull request description:

  The new locale-independent atoi64 method introduced in bitcoin#20452 parses large integer values higher than maximum representable value as 0 instead of the maximum value, which breaks backwards compatibility. This commit restores compatibility and adds test coverage for this case in terms of the related GetIntArg and strtoll functions.

  Specifically, command line or bitcoin.conf integer values greater than `9223372036854775807` (`2**63-1`) used to be parsed as `9223372036854775807` before bitcoin#20452. Then bitcoin#20452 caused them to be parsed as `0`. And after this PR they will be parsed as `9223372036854775807` again.

  This change is a stripped-down alternative version of bitcoin#23841 by jamesob

ACKs for top commit:
  jamesob:
    Github ACK bitcoin@b5c9bb5
  vincenzopalazzo:
    ACK bitcoin@b5c9bb5
  MarcoFalke:
    review ACK b5c9bb5 🌘

Tree-SHA512: 4e8abdbabf3cf4713cf5a7c5169539159f359ab4109a4e7e644cc2e9b2b0c3c532fad9f6b772daf015e1c5340ce59280cd9a41f2730afda6099cbf636b7d23ae
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.

2 participants