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

Upgrade cosmos sdk to latest release. #1343

Merged
merged 9 commits into from
Aug 19, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
make codegen
arijitAD committed Aug 19, 2021
commit ecc58af25f93c9d46cef848a4509f70b980af877
16 changes: 0 additions & 16 deletions app/app.go
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@ import (
"github.com/cosmos/cosmos-sdk/server/api"
"github.com/cosmos/cosmos-sdk/server/config"
"github.com/cosmos/cosmos-sdk/simapp"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
@@ -489,21 +488,6 @@ func (app *AkashApp) registerUpgradeHandlers() {

return app.mm.RunMigrations(ctx, app.configurator, fromVM)
})

upgradeInfo, err := app.keeper.upgrade.ReadUpgradeInfoFromDisk()
if err != nil {
panic(err)
}

// TODO: check if this piece is needed?
if upgradeInfo.Name == "v0.43" && !app.keeper.upgrade.IsSkipHeight(upgradeInfo.Height) {
storeUpgrades := storetypes.StoreUpgrades{
Added: []string{"authz", "feegrant"},
}

// configure store loader that checks if version == upgradeHeight and applies store upgrades
app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
}
}

// MakeCodecs constructs the *std.Codec and *codec.LegacyAmino instances used by
2 changes: 1 addition & 1 deletion client/docs/statik/statik.go

Large diffs are not rendered by default.

35,726 changes: 20,892 additions & 14,834 deletions client/docs/swagger-ui/swagger.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion script/protoc-swagger-gen.sh
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ done
# combine swagger files
# uses nodejs package `swagger-combine`.
# all the individual swagger files need to be configured in `config.json` for merging
swagger-combine ./client/docs/config.json \
.cache/node_modules/.bin/swagger-combine ./client/docs/config.json \
Copy link
Member

Choose a reason for hiding this comment

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

it should pick swagger-combine from PATH as we manually set it. doesn't it work?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

simply running make codegen wasn't working locally for me without this change.

-o ./client/docs/swagger-ui/swagger.yaml -f yaml \
--continueOnConflictingPaths true \
--includeDefinitions true
15 changes: 3 additions & 12 deletions types/attribute.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions types/endpoint.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 4 additions & 16 deletions types/resource.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions types/resourcevalue.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 8 additions & 32 deletions x/audit/types/audit.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions x/audit/types/genesis.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 6 additions & 24 deletions x/audit/types/query.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading