Skip to content

Commit

Permalink
chore: cosmos-sdk bump to v0.50 (#573)
Browse files Browse the repository at this point in the history
This PR upgrades the following on Archway
1. archway-wasmd `v0.45.0-archway` => `v0.50.0-archway`
2. ibc-go `v7.4.0` => `v8.2.1`
3. cosmos-sdk `v0.47.11` => `v0.50.6`

Additionally, at the protocol level it does the following
1. Migrating sdk and wasmd module from using storekey to using
storeservice
2. Integrate the new logger
3. Lots of places where err is returned from the sdk, handling those
errors
4. Implement interface registry
5. Add autocli configuration
6. Use default baseapp options instead of building it by hand
7. Adding cwfees interchaintest
8. Added mock keepers for all our custom modules
9. Update all proto Msg to include `option (cosmos.msg.v1.service) =
true;`
10. Updating Swagger UI
11. Commenting out e2e tests to migrate to interchaintest
12. Removing chain v4.0.2 interchaintests as its not needed anymore
13. Commenting out wasmbinding tests to migrate to interchaintest
14. Upgrading some existing tests to use mocks
15. Upgrading some existing test to use the e2e framework accurately
(with keeper manipulation)
16. Updating the modules to implement module.HasABCIEndBlock and
module.HasGenesis
17. Removing panics from endblockers as the sdk deals with this now
18. Adding a wrapper gov keeper which will perform the GetVote from
collections
19. Removing the x/rewards module migration as the paramstoare is not
used anymore

Misc changes
1. Use heighliner `v1.5.5` as the `latest` is not currently stable.

---------

Signed-off-by: Spoorthi <9302666+spoo-bar@users.noreply.github.com>
  • Loading branch information
spoo-bar authored Jun 21, 2024
1 parent e815f98 commit bb559de
Show file tree
Hide file tree
Showing 194 changed files with 10,772 additions and 9,464 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/release_checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ This checklist is to be used for tracking the final things to do to wrap up a ne
package upgradelatest

import (
storetypes "github.com/cosmos/cosmos-sdk/store/types"
storetypes "cosmossdk.io/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/auth/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
upgradetypes "cosmossdk.io/x/upgrade/types"

"github.com/archway-network/archway/app/keepers"
"github.com/archway-network/archway/app/upgrades"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/interchaintest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
with:
repository: strangelove-ventures/heighliner
path: heighliner
ref: 'v1.5.5'


- name: Setup up Golang
uses: actions/setup-go@v4
Expand Down
19 changes: 11 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,21 @@ Contains all the PRs that improved the code without changing the behaviors.

## [Unreleased]

### Added

### Changed
- [#573](https://github.com/archway-network/archway/pull/573) - Bump cosmos-sdk to v0.50.6

### Fixed
- [#569](https://github.com/archway-network/archway/pull/569) - Audit remidiations for x/cwerrors and x/cwica
- [#566](https://github.com/archway-network/archway/pull/566) - Fixing the localnet script to correctly set gov params post sdk v47

### Improvements

- [#567](https://github.com/archway-network/archway/pull/567) - Remove redundant params fetching in SaveCallback
- [#572](https://github.com/archway-network/archway/pull/572) - Using buf 1.31 to push files

## [v7.0.1](https://github.com/archway-network/archway/releases/tag/v7.0.1)
## [v7.0.1](https://github.com/archway-network/archway/releases/tag/v7.0.0)

### Added

Expand All @@ -44,13 +54,6 @@ Contains all the PRs that improved the code without changing the behaviors.

- [#568](https://github.com/archway-network/archway/pull/568) - Update Swagger doc and config to include CWICA and CWErrors modules
- [#570](https://github.com/archway-network/archway/pull/570) - Fix the Docker.deprecated file to build
- [#569](https://github.com/archway-network/archway/pull/569) - Audit remidiations for x/cwerrors and x/cwica

- [#566](https://github.com/archway-network/archway/pull/566) - Fixing the localnet script to correctly set gov params post sdk v47

### Improvements

- [#567](https://github.com/archway-network/archway/pull/567) - Remove redundant params fetching in SaveCallback

## [v7.0.0](https://github.com/archway-network/archway/releases/tag/v7.0.0)

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.deprecated
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ RUN archwayd ensure-binary

# rest server
EXPOSE 1317
# tendermint p2p
# comet p2p
EXPOSE 26656
# tendermint rpc
# comet rpc
EXPOSE 26657

ENTRYPOINT [ "/usr/bin/archwayd" ]
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ RUN apk add --no-cache bash jq

# rest server
EXPOSE 1317
# tendermint p2p
# comet p2p
EXPOSE 26656
# tendermint rpc
# comet rpc
EXPOSE 26657

ENTRYPOINT [ "/usr/bin/archwayd" ]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The core implementation of the Archway protocol leverages the [Cosmos SDK](https
The following specifications have been found to work well:

- An x86-64 (amd64) multi-core CPU (AMD / Intel);
- Higher clock speeds are preferred as Tendermint is mostly single-threaded;
- Higher clock speeds are preferred as CometBFT is mostly single-threaded;
- 64GB RAM;
- 1TB NVMe SSD Storage (disk i/o is crucial);
- 100Mbps bi-directional Internet connection;
Expand Down
12 changes: 6 additions & 6 deletions app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
package app

import (
corestoretypes "cosmossdk.io/core/store"
errorsmod "cosmossdk.io/errors"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/cosmos/cosmos-sdk/codec"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"

"github.com/archway-network/archway/x/cwfees"

Expand All @@ -30,7 +30,7 @@ type HandlerOptions struct {
WasmConfig *wasmTypes.WasmConfig
RewardsAnteBankKeeper rewardsAnte.BankKeeper

TXCounterStoreKey storetypes.StoreKey
TXCounterStoreService corestoretypes.KVStoreService

TrackingKeeper trackingKeeper.Keeper
RewardsKeeper rewardsKeeper.Keeper
Expand All @@ -52,7 +52,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
if options.WasmConfig == nil {
return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder")
}
if options.TXCounterStoreKey == nil {
if options.TXCounterStoreService == nil {
return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "tx counter key is required for ante builder")
}

Expand All @@ -70,7 +70,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
ante.NewSetUpContextDecorator(),
// After setup context to enforce limits early
wasmkeeper.NewLimitSimulationGasDecorator(options.WasmConfig.SimulationGasLimit),
wasmkeeper.NewCountTXDecorator(options.TXCounterStoreKey),
wasmkeeper.NewCountTXDecorator(options.TXCounterStoreService),
ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
ante.NewValidateBasicDecorator(),
ante.NewTxTimeoutHeightDecorator(),
Expand Down
Loading

0 comments on commit bb559de

Please sign in to comment.