-
Notifications
You must be signed in to change notification settings - Fork 202
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
v4 upgrade #393
v4 upgrade #393
Conversation
Co-authored-by: Hieu Vu <72878483+hieuvubk@users.noreply.github.com> Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
I couldn't push to the other branch (#384) to resolve the linting errors, so created a new one here. There are no changes aside from merging main into the original branch. |
See comments in #384 |
Others should have a look also note that I merged in main. |
@asalzmann this diverged from #384 - wanna merge in the recent changes into this one? |
Co-authored-by: Hieu Vu <72878483+hieuvubk@users.noreply.github.com>
Merged in. @faddat is it possible for me to get access to the notional stride fork? It would simplify the collaboration workflow (right now my workflow is to merge the notional branch into a separate stride branch, then that stride branch into main, which is a bit cumbersome) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm! Two nit comments
app/apptesting/test_helpers.go
Outdated
@@ -36,6 +39,7 @@ var ( | |||
type AppTestHelper struct { | |||
suite.Suite | |||
|
|||
Context sdk.Context |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: rm
app/apptesting/test_helpers.go
Outdated
@@ -57,6 +61,7 @@ func (s *AppTestHelper) Setup() { | |||
GRPCQueryRouter: s.App.GRPCQueryRouter(), | |||
Ctx: s.Ctx(), | |||
} | |||
s.Context = s.App.BaseApp.NewContext(false, tmtypes.Header{Height: 1, ChainID: StrideChainID, Time: time.Now().UTC()}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: rm
Yes, I'll add you there. |
@asalzmann there's an invite for you at: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR should change the import path, I think. If we'd like to do that separately, please let me know, and I'll un-request these changes :)
@asalzmann was the renaming of |
I reverted the v4 import path updates - let's do that in a separate PR as we continue to debug this handler. @faddat can you remove the change request? |
@@ -0,0 +1,6 @@ | |||
# Upgrade v4 Changelog |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rm this file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
app/app.go
Outdated
@@ -1002,6 +1002,8 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino | |||
paramsKeeper.Subspace(icacallbacksmoduletypes.ModuleName) | |||
// this line is used by starport scaffolding # stargate/app/paramSubspace | |||
|
|||
paramsKeeper.Subspace(claimtypes.ModuleName) | |||
paramsKeeper.Subspace(authz.ModuleName) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's leave this out of this upgrade
app/upgrades.go
Outdated
app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, storeUpgrades)) | ||
case "v4": | ||
app.SetStoreLoader(AuthzHeightAdjustmentUpgradeStoreLoader(upgradeInfo.Height)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's move this to v5
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
app/upgrades/v4/upgrades_test.go
Outdated
// make sure authz module was init | ||
afterCtx := suite.Ctx().WithBlockHeight(dummyUpgradeHeight) | ||
actGenState := suite.App.AuthzKeeper.ExportGenesis(afterCtx) | ||
expGenState := authz.DefaultGenesisState() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rm
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
Co-authored-by: Aidan Salzmann <aidan@stridelabs.co>
Co-authored-by: Hieu Vu <72878483+hieuvubk@users.noreply.github.com> Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com> Co-authored-by: sampocs <sam.pochyly@gmail.com> Co-authored-by: khanh-notional <50263489+catShaark@users.noreply.github.com> Co-authored-by: sampocs <sam@stridelabs.co>
Co-authored-by: Hieu Vu 72878483+hieuvubk@users.noreply.github.com
Co-authored-by: Jacob Gadikian jacobgadikian@gmail.com
Closes: #384
Context and purpose of the change
As part of the v3 upgrade, we added authz. However, we forgot to set the store key as part of the upgrade. As a consequence, after the upgrade, validators that attempted to prune had apphash errors. More details from @chillyvee here.
Brief Changelog
authzkeeper.StoreKey
Author's Checklist
I have...
If skipped any of the tests above, explain.
Reviewers Checklist
All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.
I have...
Documentation and Release Note
Unreleased
section inCHANGELOG.md
?How is the feature or change documented?
XXX
x/<module>/spec/
)