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

feat:upgraded the app with the valset module #1037

Merged
merged 9 commits into from
Dec 18, 2023
Merged

feat:upgraded the app with the valset module #1037

merged 9 commits into from
Dec 18, 2023

Conversation

vishal-kanna
Copy link
Contributor

No description provided.

@vishal-kanna vishal-kanna marked this pull request as ready for review November 28, 2023 12:31
@aleem1314
Copy link
Contributor

Check #1036 PR review comments. Apply relevant changes here too.

byte-bandit
byte-bandit requested changes Dec 1, 2023
View reviewed changes
Copy link
Contributor

@byte-bandit byte-bandit 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.

Also #1044

aleem1314
aleem1314 reviewed Dec 8, 2023
View reviewed changes
Makefile Outdated Show resolved Hide resolved
aleem1314
aleem1314 reviewed Dec 8, 2023
View reviewed changes
app/app.go Outdated Show resolved Hide resolved
aleem1314
aleem1314 reviewed Dec 8, 2023
View reviewed changes
app/app.go Outdated Show resolved Hide resolved
aleem1314
aleem1314 reviewed Dec 8, 2023
View reviewed changes
app/app.go Outdated Show resolved Hide resolved
aleem1314
aleem1314 reviewed Dec 8, 2023
View reviewed changes
app/app.go Outdated Show resolved Hide resolved
aleem1314
aleem1314 reviewed Dec 8, 2023
View reviewed changes
app/app.go Outdated Show resolved Hide resolved
aleem1314
aleem1314 reviewed Dec 8, 2023
View reviewed changes
app/app.go Outdated Show resolved Hide resolved
aleem1314
aleem1314 reviewed Dec 8, 2023
View reviewed changes
app/app.go Outdated Show resolved Hide resolved
@aleem1314
Copy link
Contributor

@vishal-kanna update your PR and resolve conflicts

byte-bandit
byte-bandit requested changes Dec 8, 2023
View reviewed changes
Copy link
Contributor

@byte-bandit byte-bandit left a comment

Choose a reason for hiding this comment

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

Please rebase v0.50.0-upgrade onto the latest master, then rebase this branch on on v0.50.0-upgrade as well. There's a lot of old and removed content in here that's now being reintroduced.

Please make sure you rebase frequently on master to keep the divergence as small as possible and keep up with the upstream development.

util/liblog/liblog_test.go Outdated Show resolved Hide resolved
x/evm/genesis_test.go Outdated Show resolved Hide resolved
x/evm/keeper/attest.go Outdated Show resolved Hide resolved
x/paloma/ante.go Outdated Show resolved Hide resolved
x/valset/keeper/keep_alive.go Outdated Show resolved Hide resolved
x/valset/keeper/keeper.go Outdated Show resolved Hide resolved
byte-bandit
byte-bandit requested changes Dec 11, 2023
View reviewed changes
x/valset/keeper/keep_alive.go Outdated Show resolved Hide resolved
byte-bandit
byte-bandit requested changes Dec 11, 2023
View reviewed changes
x/valset/keeper/keep_alive.go Outdated Show resolved Hide resolved
aleem1314
aleem1314 reviewed Dec 12, 2023
View reviewed changes
app/app.go Outdated Show resolved Hide resolved
aleem1314
aleem1314 reviewed Dec 12, 2023
View reviewed changes
app/app.go Outdated Show resolved Hide resolved
aleem1314
aleem1314 reviewed Dec 12, 2023
View reviewed changes
app/app.go Outdated Show resolved Hide resolved
aleem1314
aleem1314 reviewed Dec 13, 2023
View reviewed changes
app/app.go Outdated Show resolved Hide resolved
aleem1314
aleem1314 reviewed Dec 13, 2023
View reviewed changes
x/paloma/ante.go Outdated Show resolved Hide resolved
@vishal-kanna vishal-kanna changed the title feat:Upgraded the app with the valset module feat:upgraded the app with the valset module Dec 15, 2023
aleem1314
aleem1314 previously approved these changes Dec 15, 2023
View reviewed changes
Copy link
Contributor

@aleem1314 aleem1314 left a comment

Choose a reason for hiding this comment

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

LGTM. Please resolve conflicts.

aleem1314
aleem1314 previously approved these changes Dec 15, 2023
View reviewed changes
byte-bandit
byte-bandit reviewed Dec 16, 2023
View reviewed changes
Copy link
Contributor

@byte-bandit byte-bandit left a comment

Choose a reason for hiding this comment

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

Two things.

Makefile Outdated Show resolved Hide resolved
x/valset/keeper/keep_alive.go Outdated Show resolved Hide resolved
@aleem1314 aleem1314 merged commit d704173 into v0.50.0-upgrade Dec 18, 2023
0 of 2 checks passed
@aleem1314 aleem1314 deleted the valset-changes branch December 18, 2023 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deepan95dev deepan95dev deepan95dev left review comments

@aleem1314 aleem1314 aleem1314 approved these changes

@byte-bandit byte-bandit byte-bandit approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@vishal-kanna @aleem1314 @byte-bandit @deepan95dev