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

chore!: bump sdk fork to v1.17.0 #2278

Merged
merged 6 commits into from
Aug 16, 2023
Merged

chore!: bump sdk fork to v1.17.0 #2278

merged 6 commits into from
Aug 16, 2023

Conversation

cmwaters
Copy link
Contributor

Bumps to the latest version of the SDK. Note that this deactivates the use of the EVM address. To fulfill that functionality we will need to reintroduce a mapping in #2169

Checklist

  • New and updated code has appropriate documentation
  • New and updated code has new and/or updated testing
  • Required CI checks are passing
  • Visual proof for any user facing features like CLI or documentation updates
  • Linked issues closed with keywords

@MSevey MSevey requested a review from a team August 15, 2023 13:15
@github-actions github-actions bot added the bot item was created by a bot label Aug 15, 2023
Copy link
Member

@rach-id rach-id left a comment

Choose a reason for hiding this comment

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

[not blocking]
This is super cool, but as long as the mapping PR is not merged, the QGB will be broken, therefore main will be broken.
Does it make sense to postpone bumping until we have that PR reviewed and ready to be merge? so that we don't have a list of commits which all contain a broken QGB in between

@cmwaters cmwaters added the backport:v1.x PR will be backported automatically to the v1.x branch upon merging label Aug 15, 2023
@cmwaters
Copy link
Contributor Author

[not blocking] This is super cool, but as long as the mapping PR is not merged, the QGB will be broken, therefore main will be broken. Does it make sense to postpone bumping until we have that PR reviewed and ready to be merge? so that we don't have a list of commits which all contain a broken QGB in between

I was hoping I could kind of do these as two separate commits. Maybe it makes sense to merge the other one first

@MSevey MSevey requested a review from a team August 15, 2023 13:46
@codecov-commenter
Copy link

codecov-commenter commented Aug 15, 2023

Codecov Report

Merging #2278 (651c3db) into main (3e9ce1f) will decrease coverage by 0.01%.
The diff coverage is 60.00%.

@@            Coverage Diff             @@
##             main    #2278      +/-   ##
==========================================
- Coverage   21.72%   21.72%   -0.01%     
==========================================
  Files         129      129              
  Lines       14453    14450       -3     
==========================================
- Hits         3140     3139       -1     
+ Misses      11008    11006       -2     
  Partials      305      305              
Files Changed Coverage Δ
test/e2e/setup.go 0.00% <ø> (ø)
test/tokenfilter/setup.go 100.00% <ø> (ø)
x/qgb/keeper/keeper.go 69.23% <ø> (ø)
x/qgb/types/query.pb.go 0.81% <ø> (ø)
x/qgb/types/validator.go 39.39% <0.00%> (-0.41%) ⬇️
x/qgb/keeper/keeper_valset.go 39.83% <100.00%> (+0.49%) ⬆️

rootulp
rootulp previously approved these changes Aug 15, 2023
Copy link
Collaborator

@rootulp rootulp left a comment

Choose a reason for hiding this comment

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

require.NoError(t, err)
staking.EndBlocker(ctx, input.StakingKeeper)
qgb.EndBlocker(ctx, *pk)
ctx = ctx.WithBlockHeight(ctx.BlockHeight() + 10)

assert.Equal(t, currentAttestationNonce+1, pk.GetLatestAttestationNonce(ctx))
// FIXME: this needs to change to 2 once we have a proper implementation of editing the EVM address
Copy link
Collaborator

Choose a reason for hiding this comment

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

[question] not sure what you mean by "2"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah it's currently 1 but we should be asserting that the latest nonce is 2

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I also should have @-ed myself but forgot to

@rach-id
Copy link
Member

rach-id commented Aug 15, 2023

I was hoping I could kind of do these as two separate commits

Yes, as separate commit, but better they are sequential. Like we merge this one and the next commit on main would be the mapping commit.
This would keep main not breaking the qgb as low as possible

@MSevey MSevey requested a review from a team August 15, 2023 14:08
Copy link
Member

@evan-forbes evan-forbes left a comment

Choose a reason for hiding this comment

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

this LGTM

fwiw I think its fine to merge to main and but then just not backport it yet to v1.x. This avoids using some temporaray feature branch, which is arguably just as bad as leaving main in a temporary unreleasable state (a property I'm not sure we need to preserve any more since we never want to cut releases directly from main)

@cmwaters cmwaters removed bot item was created by a bot backport:v1.x PR will be backported automatically to the v1.x branch upon merging labels Aug 15, 2023
@MSevey MSevey requested a review from a team August 16, 2023 13:31
@cmwaters cmwaters merged commit 63a05a2 into main Aug 16, 2023
26 checks passed
@cmwaters cmwaters deleted the cal/bump-sdk branch August 16, 2023 15:55
cmwaters added a commit that referenced this pull request Aug 17, 2023
Bumps to the latest version of the SDK. Note that this deactivates the
use of the EVM address. To fulfill that functionality we will need to
reintroduce a mapping in
#2169
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.

6 participants