Skip to content

Commit

Permalink
Merge branch 'main' into spoorthi/implement-cwregistry-module
Browse files Browse the repository at this point in the history
  • Loading branch information
spoo-bar committed Jul 4, 2024
2 parents fd9860c + 4526629 commit 296e049
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 12 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@ Contains bug fixes.
Contains all the PRs that improved the code without changing the behaviors.
-->

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

### Added
- [#577](https://github.com/archway-network/archway/pull/577) - Adding a cute ascii art of Archway for the cli

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

### Fixed
- [#569](https://github.com/archway-network/archway/pull/569) - Audit remidiations for x/cwerrors and x/cwica
Expand Down
5 changes: 2 additions & 3 deletions app/app_upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
upgrade4_0_2 "github.com/archway-network/archway/app/upgrades/4_0_2"
upgrade6_0_0 "github.com/archway-network/archway/app/upgrades/6_0_0"
upgrade7_0_0 "github.com/archway-network/archway/app/upgrades/7_0_0"
upgradelatest "github.com/archway-network/archway/app/upgrades/latest"
upgrade8_0_0 "github.com/archway-network/archway/app/upgrades/8_0_0"
)

// UPGRADES
Expand All @@ -28,8 +28,7 @@ var Upgrades = []upgrades.Upgrade{
upgrade4_0_2.Upgrade, // v4.0.2
upgrade6_0_0.Upgrade, // v6.0.0
upgrade7_0_0.Upgrade, // v7.0.0

upgradelatest.Upgrade, // latest - This upgrade handler is used for all the current changes to the protocol
upgrade8_0_0.Upgrade, // v8.0.0
}

func (app *ArchwayApp) RegisterUpgradeHandlers() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package upgradelatest
package upgrade8_0_0

import (
"context"
Expand All @@ -13,10 +13,15 @@ import (
cwregistrytypes "github.com/archway-network/archway/x/cwregistry/types"
)

// This upgrade handler is used for all the current changes to the protocol
const Name = "v8.0.0"
const NameAsciiArt = `
### ### ###
# # # # # # # #
# # ### # # # #
# # # # # # #
### # ### # ###
const Name = "latest"
const NameAsciiArt = ""
`

var Upgrade = upgrades.Upgrade{
UpgradeName: Name,
Expand Down
11 changes: 11 additions & 0 deletions cmd/archwayd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ import (
"github.com/archway-network/archway/app"
)

const ArchwayASCII = `
##### ##### ##### ## ## ## ## ##### ## ##
####### ####### ####### ## ## ## ## ####### ## ##
## ## ## ## ## ## ## ## # ## ## ## ## ##
## ## ###### ## #### ## ####### ## ## ####
####### ## ## ## ## ## ## ####### ####### ##
## ## ## ## ####### ## ## ### ### ## ## ##
## ## ## ## ##### ## ## ## ## ## ## ##
`

func main() {
rootCmd, _ := NewRootCmd()

Expand Down
2 changes: 1 addition & 1 deletion cmd/archwayd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {

rootCmd := &cobra.Command{
Use: version.AppName,
Short: "Archway Daemon (server)",
Short: ArchwayASCII,
PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
// set the default command outputs
cmd.SetOut(cmd.OutOrStdout())
Expand Down
2 changes: 1 addition & 1 deletion docs/static/swagger.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion interchaintest/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

const (
initialVersion = "v7.0.1" // The last release of the chain. The one the mainnet is running on
upgradeName = "latest" // The next upgrade name. Should match the upgrade handler.
upgradeName = "v8.0.0" // The next upgrade name. Should match the upgrade handler.
chainName = "archway"
)

Expand Down

0 comments on commit 296e049

Please sign in to comment.