Merge pull request #378 from neutron-org/releases/v2.x

v2: release
neutron-org · Nov 28, 2023 · e605ed3 · e605ed3
2 parents 4d831b3 + d30ed2f
commit e605ed3
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/app/app.go b/app/app.go
@@ -21,9 +21,9 @@ import (
 	"github.com/neutron-org/neutron/docs"
 
 	"github.com/neutron-org/neutron/app/upgrades"
+	v030 "github.com/neutron-org/neutron/app/upgrades/v0.3.0"
 	v044 "github.com/neutron-org/neutron/app/upgrades/v0.4.4"
-	v110 "github.com/neutron-org/neutron/app/upgrades/v1.1.0"
-	v3 "github.com/neutron-org/neutron/app/upgrades/v3"
+	v200 "github.com/neutron-org/neutron/app/upgrades/v2.0.0"
 	"github.com/neutron-org/neutron/x/cron"
 
 	"github.com/CosmWasm/wasmd/x/wasm"
@@ -165,7 +165,7 @@ const (
 )
 
 var (
-	Upgrades = []upgrades.Upgrade{v3.Upgrade, v044.Upgrade, v110.Upgrade}
+	Upgrades = []upgrades.Upgrade{v030.Upgrade, v044.Upgrade, v200.Upgrade}
 
 	// DefaultNodeHome default home directories for the application daemon
 	DefaultNodeHome string

diff --git a/app/upgrades/v3/constants.go → app/upgrades/v0.3.0/constants.go b/app/upgrades/v3/constants.go → app/upgrades/v0.3.0/constants.go
@@ -1,4 +1,4 @@
-package v3
+package v030
 
 import (
 	store "github.com/cosmos/cosmos-sdk/store/types"

diff --git a/app/upgrades/v3/upgrades.go → app/upgrades/v0.3.0/upgrades.go b/app/upgrades/v3/upgrades.go → app/upgrades/v0.3.0/upgrades.go
@@ -1,4 +1,4 @@
-package v3
+package v030
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"

diff --git a/app/upgrades/v1.1.0/constants.go → app/upgrades/v2.0.0/constants.go b/app/upgrades/v1.1.0/constants.go → app/upgrades/v2.0.0/constants.go
@@ -1,4 +1,4 @@
-package v110
+package v200
 
 import (
 	"github.com/cosmos/cosmos-sdk/store/types"
@@ -11,7 +11,7 @@ import (
 
 const (
 	// UpgradeName defines the on-chain upgrade name.
-	UpgradeName     = "v1.1.0"
+	UpgradeName     = "v2.0.0"
 	AtomDenom       = "ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9"
 	AxelarUsdcDenom = "ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349"
 )

diff --git a/....1.0/testdata/neutron_interchain_txs.wasm → ....0.0/testdata/neutron_interchain_txs.wasm b/....1.0/testdata/neutron_interchain_txs.wasm → ....0.0/testdata/neutron_interchain_txs.wasm
diff --git a/app/upgrades/v1.1.0/upgrades.go → app/upgrades/v2.0.0/upgrades.go b/app/upgrades/v1.1.0/upgrades.go → app/upgrades/v2.0.0/upgrades.go
@@ -1,4 +1,4 @@
-package v110
+package v200
 
 import (
 	"fmt"

diff --git a/app/upgrades/v1.1.0/upgrades_test.go → app/upgrades/v2.0.0/upgrades_test.go b/app/upgrades/v1.1.0/upgrades_test.go → app/upgrades/v2.0.0/upgrades_test.go
@@ -1,4 +1,4 @@
-package v110_test
+package v200_test
 
 import (
 	"testing"
@@ -24,7 +24,7 @@ import (
 	globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types"
 	"github.com/stretchr/testify/suite"
 
-	v110 "github.com/neutron-org/neutron/app/upgrades/v1.1.0"
+	v110 "github.com/neutron-org/neutron/app/upgrades/v2.0.0"
 	"github.com/neutron-org/neutron/testutil"
 )
 

diff --git a/docs/static/swagger-ui-bundle.js b/docs/static/swagger-ui-bundle.js
diff --git a/docs/static/swagger-ui-es-bundle-core.js b/docs/static/swagger-ui-es-bundle-core.js
diff --git a/docs/static/swagger-ui-es-bundle.js b/docs/static/swagger-ui-es-bundle.js
diff --git a/docs/static/swagger-ui.js b/docs/static/swagger-ui.js
diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go
@@ -316,7 +316,7 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk.
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "invalid proposal quantity")
 	}
-	// here we handle pre-v1.1.0 style of proposals: param change, upgrade, client update
+	// here we handle pre-v2.0.0 style of proposals: param change, upgrade, client update
 	if m.isLegacyProposal(adminProposal) {
 		resp, err := m.performSubmitAdminProposalLegacy(ctx, contractAddr, adminProposal)
 		if err != nil {