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.

Sign up for GitHub

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

Jump to bottom

chore: bump dashbls subtree to 1.3.3 #6323

Merged
merged 4 commits into from
Oct 10, 2024
Merged

chore: bump dashbls subtree to 1.3.3 #6323

merged 4 commits into from
Oct 10, 2024

Conversation

ogabrielides
Copy link
Collaborator

@ogabrielides ogabrielides commented Oct 9, 2024 •
edited
Loading

Issue being fixed or feature implemented

Bumped blsdash to version 1.3.3

What was done?

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)

ogabrielides and others added 4 commits October 9, 2024 17:24
@ogabrielides
Revert "build: stop tracking cmake dependency relic_conf.h.in"
314102e 
This reverts commit a891c78.
@ogabrielides
Squashed 'src/dashbls/' changes from 795660db76..4e070243ae
0210745 
4e070243ae chore: bump version to 1.3.3 (dashpay#99)
d93956254e ci: disable Go bindings CI for macos for now (dashpay#98)
ae40c5c86d Merge pull request dashpay#97 from PastaPastaPasta/refac/pybind-bump-2.13.6
e835ece935 refactor: bump pybind version to 2.13.6
eda5d6a402 chore: change of gmp source (dashpay#95)
61f95aa80e chore: cleanup 6.2.1 left overs (dashpay#96)
adbd094409 Merge pull request dashpay#92 from kwvg/darwin_gmp
062ee6726b Merge pull request dashpay#90 from UdjinM6/fix_aarch_arch
3538d8b033 fix: aarch64 is not supported, should set ARCH to RELIC_NONE
e27a62f4a2 revert: disable gmp if targeting darwin on aarch64 when on 'auto'
bb2fe6ee55 build: enforce minimum version of libgmp based on arch and platform
9832b7a132 build: replace deprecated macros `AC_PROG_CC_C99` and `AM_PROG_CC_C_O`
b2428718b9 Merge pull request dashpay#91 from UdjinM6/fix_macos_test_build
3ffa7fa2b6 chore: bump version to 1.3.2 (dashpay#94)
0f4efc9327 Merge pull request dashpay#88 from HashEngineering/feat/support-android
a181889489 fix: rust bindings build for macos (dashpay#89)
738d187359 fix: detect gmp via brew earlier
ce4d6a47b6 fix: install libtool
4fa46ccaff fix: use macos-latest for test build
69bdc1aac7 Merge pull request dashpay#85 from kwvg/debug
39791d4e31 build: print build options after configure
73106a0121 build: use `-mbranch-protection=bti` on supporting `aarch64` compilers
6a3c28f6ca build: use stricter `-Werror` when testing compile flags
7a1b227637 build: rename {`NO`}`WARN_CFLAGS` to {`NO`}`WARN_FLAGS`, use with C{++}
28bea63838 build: set {`NO`}`WARN_CFLAGS` flags if not overridden and uniformly
32c2f0f5f8 trivial: rename `CORE_CXXFLAGS` to `CORE_FLAGS`, use with C{++}
b630c2c323 build: append `HARDENED_FLAGS` to `AM_CFLAGS`
e6008148e4 trivial: rename `HARDENED_CXXFLAGS` to `HARDENED_FLAGS`
af0e3daef5 build: subsume `PI{C,E}_FLAGS` into `HARDENED_CXXFLAGS`
9ff8618a1b build: expand `--disable-optimizations` to include `-O0` and `-fwrapv`
3036b83181 build: expand `--enable-debug` to include `-O0`, `-ftrapv` and dbg info
c90d43d43b build: add check to see if `CFLAGS` has been overridden
2d77f7ae49 build: remove vestigial `LIBTOOL_{CXX,CPP,LD}FLAGS`, `HARDENED_CPPFLAGS`
883a098868 build: autodetect i?86 and arm as 32-bit
deb3269820 build: don't specify exact `{CPU_}ARCH` if optimizations are disabled
720d49a44b trivial: fix indentation for `want_backend` check
f9328320af build: use `easy` backend if optimizations are disabled unless specified
3687cd59e0 build: define new flag `--enable-optimizations`
f82bfee5dd build: ensure help string format matches Autotool defaults
d68920063e build: define arguments as `--enable-[term]` instead of `--disable-[term]`
7f41e7dd16 fix: support android
1c2fc79c19 feat(rust): allow to move G1 and G2 elements between threads (dashpay#87)
3540b8bbed feat: debug with data hex (dashpay#86)

git-subtree-dir: src/dashbls
git-subtree-split: 4e070243aed142bc458472f8807ab77527dd879a
@ogabrielides
Merge commit '02107450d0c68a372f720974c92fe16acf3961f9' into bump_bls…
c05fdde 
…dash_1.3.3
@UdjinM6 @ogabrielides
build: stop tracking cmake dependency relic_conf.h.in
02260cb 
This reverts commit 0b3ab8d.
@ogabrielides ogabrielides requested review from kwvg, UdjinM6 and PastaPastaPasta and removed request for kwvg October 9, 2024 14:27
kwvg
kwvg approved these changes Oct 9, 2024
View reviewed changes
Copy link
Collaborator

@kwvg kwvg left a comment •
edited
Loading

Choose a reason for hiding this comment

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

This PR:

$ git checkout ogabrielides/bump_blsdash_1.3.3
$ git revert 02260cb
$ git ls-tree $(git rev-parse HEAD) ./src/dashbls/ | sed 's|src/dashbls/||g' | sha256sum
4167e558a3b6b1ca439e2ed6689c154a3e2cf44247ef55a5ea908fa7c8800a14  -

On dashpay/bls-signatures:

$ git ls-tree 1.3.3 | sha256sum
4167e558a3b6b1ca439e2ed6689c154a3e2cf44247ef55a5ea908fa7c8800a14  -

utACK 02260cb

@PastaPastaPasta
Copy link
Member

I think it may be a problem that 0210745 isn't signed

UdjinM6
UdjinM6 approved these changes Oct 10, 2024
View reviewed changes
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 02260cb

@PastaPastaPasta
Copy link
Member

Yeah, GH does complain about lack of sig

@PastaPastaPasta PastaPastaPasta merged commit 3f0c2ff into dashpay:develop Oct 10, 2024
28 of 35 checks passed
@ogabrielides ogabrielides deleted the bump_blsdash_1.3.3 branch October 11, 2024 08:01
@UdjinM6 UdjinM6 added this to the 22 milestone Oct 29, 2024
@kwvg kwvg mentioned this pull request Nov 2, 2024
Merged
5 tasks
PastaPastaPasta added a commit that referenced this pull request Nov 4, 2024
@PastaPastaPasta
Merge #6377: depends: update 'src/immer' to arximboldi/immer@5875f773 …
a8e2316 
…as c0b716f2

f18e839 build: drop symlinks in immer subtree (Kittywhiskers Van Gogh)
d761111 build: fix gitian builds (Kittywhiskers Van Gogh)
a9f46b3 Squashed 'src/immer/' changes from 9cb6a5a845..5875f7739a (Kittywhiskers Van Gogh)
e4ee302 revert: fix gitian builds (Kittywhiskers Van Gogh)
fb00300 revert: drop symlinks in immer subtree (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Dependency for #6380

  #6380 will be using `std::ranges` as a replacement for [dash#4622](#4622) and currently, it will fail to compile due to the current version of `immer` (last updated two years ago in #4911) not meeting constraints ([source](https://en.cppreference.com/w/cpp/language/constraints)) set by `std::ranges` (see below).

  ```
  ./evo/deterministicmns.h:243:16: error: no matching function for call to object of type 'const __count_if_fn'
          return ranges::count_if(mnMap, [](const auto& p) { return IsMNValid(*p.second); });
                 ^~~~~~~~~~~~~~~~
  /usr/bin/../lib/gcc/x86_64-linux-gnu/11/../../../../include/c++/11/bits/ranges_algo.h:331:7: note: candidate template ignored: substitution failure [with _Range = const MnMap &, _Proj = identity, _Pred = (lambda at ./evo/deterministicmns.h:243:40)]: constraints not satisfied for alias template 'range_difference_t' [with _Range = const immer::map<uint256, std::shared_ptr<const CDeterministicMN>, CDeterministicMNList::ImmerHasher> &]
        operator()(_Range&& __r, _Pred __pred, _Proj __proj = {}) const
        ^
  /usr/bin/../lib/gcc/x86_64-linux-gnu/11/../../../../include/c++/11/bits/ranges_algo.h:316:7: note: candidate function template not viable: requires at least 3 arguments, but 2 were provided
        operator()(_Iter __first, _Sent __last,
        ^
  ```

  This has been resolved by updating `immer` to the latest available release, [v0.8.1](https://github.com/arximboldi/immer/releases/tag/v0.8.1).

  Expected subtree hash **without changes** are `a5ded361aec714bc74149909c5e1984c10ab132c4c539c63fe57362dccd95556` (see [here](#6323 (review)) for verification instructions).

  ## 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 f18e839
  UdjinM6:
    utACK f18e839

Tree-SHA512: 99d1b577eb4cf3fcc3ebfd28f19006700f085d23ccdabe802a2aa5844e4b39314347b0c0e49a352c5fc034d6584a0109edf08fa3c0846514967f1fb16e7f127a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kwvg kwvg kwvg approved these changes

@UdjinM6 UdjinM6 UdjinM6 approved these changes

@PastaPastaPasta PastaPastaPasta Awaiting requested review from PastaPastaPasta

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
22
Development

Successfully merging this pull request may close these issues.
4 participants
@ogabrielides @PastaPastaPasta @UdjinM6 @kwvg