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: merge release/v0.30 into master #2865

Closed
wants to merge 9 commits into from
Closed

chore: merge release/v0.30 into master #2865

wants to merge 9 commits into from

Conversation

Ivansete-status
Copy link
Collaborator

Description

We are adding the recent RLN_V2 changes into master so that we can benefit from that.

rymnc and others added 9 commits June 20, 2024 14:55
@rymnc @Ivansete-status
feat(rlnv2): clean fork of rlnv2 (#2828)
a02832f 
* chore(rlnv2): contract interface changes (#2770)
* fix: tests
* fix: remove stuint[32]
* chore(submodule): update zerokit submodule to v0.5.1 (#2782)
* fix: remove cond comp for lightpush test
* fix: ci and nonceManager
@rymnc @Ivansete-status
chore(zerokit): bump submodule (#2830)
bd06488
@Ivansete-status
CHANGELOG.md add info for v0.30.0
2f79d69
@rymnc
fix(rln-relay): clear nullifier log only if length is over max epoch …
c567853 
…gap (#2836)
@alrevuelta
chore: add TWN parameters for RLNv2 (#2843)
7b97c80
@alrevuelta
fix(rln): nullifierlog vulnerability (#2855)
dad054d
@rymnc
chore(rln-relay): add chain-id flag to wakunode and restrict usage if…
05356ab 
… mismatches rpc provider (#2858)
@Ivansete-status
CHANGELOG.md: simply update the date to reflect the current release date
b3041d5
@Ivansete-status
CHANGELOG.md: add better details of version v0.30.0
799e08c
@Ivansete-status Ivansete-status marked this pull request as ready for review July 1, 2024 15:35
@github-actions GitHub Actions
Copy link

github-actions bot commented Jul 1, 2024 •
edited
Loading

You can find the image built from this PR at

quay.io/wakuorg/nwaku-pr:2865

Built from f643e00

@rymnc
Copy link
Contributor

rymnc commented Jul 1, 2024 •
edited
Loading

Not sure if I'm missing something, shouldn't the diff be much larger?
looks like this commit is duplicated a02832f in this branch and master, no worries though

@Ivansete-status
Copy link
Collaborator Author

Ivansete-status commented Jul 1, 2024 •
edited
Loading

Not sure if I'm missing something, shouldn't the diff be much larger? looks like this commit is duplicated a02832f in this branch and master, no worries though

That happens because I had to fix some minor conflicts. Then, I resolved them from GitHub and that caused a merge from master into release/v0.30:

image

If you want to see the changes better I suggest comparing the versions: v0.29.0...v0.30.0

@Ivansete-status
Copy link
Collaborator Author

@rymnc - I reverted the commit where I solved the small conflicts so that you can see them and see the effect of resolving them :) Ping me if you want to make it together

@Ivansete-status Ivansete-status self-assigned this Jul 1, 2024
@rymnc
Copy link
Contributor

rymnc commented Jul 2, 2024

@rymnc - I reverted the commit where I solved the small conflicts so that you can see them and see the effect of resolving them :) Ping me if you want to make it together

no worries, please go ahead!t

gabrielmer
gabrielmer approved these changes Jul 2, 2024
View reviewed changes
Copy link
Contributor

@gabrielmer gabrielmer left a comment

Choose a reason for hiding this comment

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

Thanks so much!

@Ivansete-status
Copy link
Collaborator Author

I'm closing this PR because that will mess up the release/v0.30 branch.
Instead, the following PR is considered to bring the release/v0.30 changes into master: #2866

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gabrielmer gabrielmer gabrielmer approved these changes

@alrevuelta alrevuelta Awaiting requested review from alrevuelta

@rymnc rymnc Awaiting requested review from rymnc

@NagyZoltanPeter NagyZoltanPeter Awaiting requested review from NagyZoltanPeter

Assignees

@Ivansete-status Ivansete-status

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Ivansete-status @rymnc @gabrielmer @alrevuelta