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

depends: update 'src/dashbls' to dashpay/bls-signatures@7e747e8a as 62fa6652 #6451

Merged
merged 4 commits into from
Dec 4, 2024

Conversation

kwvg
Copy link
Collaborator

@kwvg kwvg commented Dec 4, 2024

Additional Information

Breaking Changes

None expected.

Checklist:

  • I have performed a self-review of my own code (note: N/A)
  • I have commented my code, particularly in hard-to-understand areas (note: N/A)
  • I have added or updated relevant unit/integration/functional/e2e tests (note: N/A)
  • I have made corresponding changes to the documentation (note: N/A)
  • I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

kwvg added 4 commits December 4, 2024 16:03
7e747e8a07 Merge pull request dashpay#105 from kwvg/bump_1.3.4
f8703c9971 chore: bump version to 1.3.4
5cc55ce222 Merge pull request dashpay#104 from UdjinM6/fix_gmp_freebsd
aad89e3e86 Merge pull request dashpay#103 from kwvg/pyci_upd
a52d7ed109 Merge pull request dashpay#102 from kwvg/autoconf
56b2d4a0ac ci: replace EoL Go 1.17 with 1.22
17f3ab47a0 ci: drop EoL Python 3.7 and 3.8, replace with Python 3.12
a3fcdde7c5 fix: gmp detection on FreeBSD
e73acdd304 build: consolidate `TARGET_OS` assignments into `OPSYS` assignment case
343c6244ac build: remove unnecessary `BUILD_`{`BENCH`, `TEST`} variables
af9a6906c3 build: account for FreeBSD's `amd64` `host_cpu` in optim. CPU detection
34a7c60e86 build: replace `bash`-isms with `sh`-friendly `test` and `case`

git-subtree-dir: src/dashbls
git-subtree-split: 7e747e8a0769f6e4d308d8d2e3dd254c240cbdd9
@kwvg kwvg added this to the 22.1 milestone Dec 4, 2024
@kwvg kwvg marked this pull request as ready for review December 4, 2024 16:32
@PastaPastaPasta PastaPastaPasta modified the milestones: 22.1, 22 Dec 4, 2024
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 f25a936

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.

subtree looks good

utACK f25a936

@PastaPastaPasta PastaPastaPasta merged commit 9e846b1 into dashpay:develop Dec 4, 2024
18 of 21 checks passed
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Dec 6, 2024
…atures@7e747e8a as 62fa665

f25a936 build: stop tracking cmake dependency relic_conf.h.in (Kittywhiskers Van Gogh)
62fa665 Squashed 'src/dashbls/' changes from 4e070243ae..7e747e8a07 (Kittywhiskers Van Gogh)
b1b3840 revert: stop tracking cmake dependency relic_conf.h.in (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Closes dashpay#6343
  * Includes [bls-signatures#102](dashpay/bls-signatures#102) and [bls-signatures#104](dashpay/bls-signatures#104)

  ## Breaking Changes

  None expected.

  ## Checklist:

  - [x] I have performed a self-review of my own code **(note: N/A)**
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)**
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  PastaPastaPasta:
    utACK f25a936
  UdjinM6:
    utACK f25a936

Tree-SHA512: 394a02a50f57538e9d12f836fd1ea1598d8a20e2d0079fcb44bb317a42a64a638a1ef906222f2d3bab06d2c0b8cfac43c6e0055d87fbdb86abe680c53ecd6b7a
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Dec 6, 2024
…atures@7e747e8a as 62fa665

f25a936 build: stop tracking cmake dependency relic_conf.h.in (Kittywhiskers Van Gogh)
62fa665 Squashed 'src/dashbls/' changes from 4e070243ae..7e747e8a07 (Kittywhiskers Van Gogh)
b1b3840 revert: stop tracking cmake dependency relic_conf.h.in (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Closes dashpay#6343
  * Includes [bls-signatures#102](dashpay/bls-signatures#102) and [bls-signatures#104](dashpay/bls-signatures#104)

  ## Breaking Changes

  None expected.

  ## Checklist:

  - [x] I have performed a self-review of my own code **(note: N/A)**
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)**
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  PastaPastaPasta:
    utACK f25a936
  UdjinM6:
    utACK f25a936

Tree-SHA512: 394a02a50f57538e9d12f836fd1ea1598d8a20e2d0079fcb44bb317a42a64a638a1ef906222f2d3bab06d2c0b8cfac43c6e0055d87fbdb86abe680c53ecd6b7a
PastaPastaPasta added a commit that referenced this pull request Dec 6, 2024
fa29ed5 Merge #6456: fix(qt): allow refreshing wallet data without crashing (pasta)
758cd64 Merge #6452: fix: store ready queues on the mixing masternode (pasta)
395447b Merge #6451: depends: update 'src/dashbls' to dashpay/bls-signatures@7e747e8a as 62fa665 (pasta)

Pull request description:

  ## Issue being fixed or feature implemented
  batch of backports to go into rc.4

  ## What was done?
  Bls library updated to compile on freebsd, fix for mixing

  ## How Has This Been Tested?

  ## Breaking Changes

  ## Checklist:
    _Go over all the following points, and put an `x` in all the boxes that apply._
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK fa29ed5

Tree-SHA512: 6a050bca13ca2e5324a6a8a7966d2d6aa3c0c97ee3c884aa35102f949dfef62e976d053cd05a549908c30e8bb6a81d996a82181852841809d8959ca78c96e823
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Dec 14, 2024
1c7bfcb chore: set release true (pasta)
c90339e Merge dashpay#6459: docs: add release notes for v22.0.0 (pasta)
a6f1fc5 Merge dashpay#6475: chore: bumped chain assumed sizes based on latest usage (pasta)
d7cd9f1 Merge dashpay#6464: chore: update man pages for v22 (pasta)
212f91c Merge dashpay#6461: docs: update supported versions in SECURITY.md (pasta)
9a8b685 Merge dashpay#6460: chore: Translations 2024-12 (pasta)
2f71f4d Merge dashpay#6458: chore: bump MIN_MASTERNODE_PROTO_VERSION to latest proto (pasta)
fa29ed5 Merge dashpay#6456: fix(qt): allow refreshing wallet data without crashing (pasta)
758cd64 Merge dashpay#6452: fix: store ready queues on the mixing masternode (pasta)
395447b Merge dashpay#6451: depends: update 'src/dashbls' to dashpay/bls-signatures@7e747e8a as 62fa665 (pasta)
c7b0d80 Merge dashpay#6441: fix: hold wallet shared pointer in CJ Manager/Sessions to prevent concurrent unload (pasta)
c074e09 Merge dashpay#6444: fix: add platform transfer to "most common" filter (pasta)
cb04114 Merge dashpay#6442: fix: coin selection with `include_unsafe` option should respect `nCoinType` (pasta)
db5b53a Merge dashpay#6434: fix: early EHF and buried EHF are indistinguish (pasta)
8b88ff7 Merge dashpay#6414: chore: bump seeds for v22 (pasta)
02ad523 Merge dashpay#6411: chore: update nMinimumChainWork, defaultAssumeValid, checkpointData, chainTxData for mainnet and testnet (pasta)
3bbcd3d Merge dashpay#6393: docs: mention building for some HOSTs only in `release-process.md` (pasta)
18f636f Merge dashpay#6426: fix: respect SENDDSQUEUE message, move DSQ relay into net processing / peerman (pasta)
9fed456 Merge dashpay#6407: fix: dataraces (pasta)
86105da Merge dashpay#6408: refactor: removed pre-MN_RR logic of validation of CL (pasta)
a1f7e96 Merge dashpay#6406: ci: use `actions/cache` to manage depends cache (pasta)
90a3807 Merge dashpay#6402: ci: cache built (pasta)
66f6787 Merge dashpay#6401: ci: deduplicate depends building (pasta)
7ca5663 Merge dashpay#6397: ci: add powerpc64 to GH Guix job matrix (pasta)

Pull request description:

  ## Issue being fixed or feature implemented

  ## What was done?
  Suppressed changes from 1c7bfcb and resolved merge conflicts.

  ```
  Auto-merging .github/workflows/build.yml
  Auto-merging configure.ac
  Auto-merging src/chainparams.cpp
  Auto-merging src/coinjoin/client.cpp
  CONFLICT (content): Merge conflict in src/coinjoin/client.cpp
  Auto-merging src/coinjoin/client.h
  CONFLICT (content): Merge conflict in src/coinjoin/client.h
  Auto-merging src/coinjoin/util.cpp
  CONFLICT (content): Merge conflict in src/coinjoin/util.cpp
  Auto-merging src/coinjoin/util.h
  CONFLICT (content): Merge conflict in src/coinjoin/util.h
  Auto-merging src/evo/specialtxman.cpp
  Auto-merging src/init.cpp
  Auto-merging src/net_processing.cpp
  CONFLICT (content): Merge conflict in src/net_processing.cpp
  Auto-merging src/net_processing.h
  Auto-merging src/qt/transactiontablemodel.cpp
  Auto-merging src/wallet/wallet.cpp
  Auto-merging src/wallet/wallet.h
  CONFLICT (content): Merge conflict in src/wallet/wallet.h
  Auto-merging test/functional/feature_llmq_chainlocks.py
  CONFLICT (content): Merge conflict in test/functional/feature_llmq_chainlocks.py
  ```

  ## How Has This Been Tested?

  ## Breaking Changes

  ## Checklist:
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  PastaPastaPasta:
    utACK d108579; no diff to develop

Tree-SHA512: 3f063011224880fee35edb04ce265dff33a52273c3d45ef1dbcebcecb22c25d8ad7c91b83514f36142716a6fbd0ddd3a8a3f2a9b59ce78ce975bbce69a2a13b5
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.

FreeBSD compilation fails with ./configure: [[: not found
3 participants