merge from develop2

notional-labs · Apr 25, 2024 · 1d9686b · 1d9686b
1 parent e9df7de
commit 1d9686b
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 780 deletions.
diff --git a/app/app.go b/app/app.go
@@ -152,7 +152,7 @@ var (
 	// https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34
 	EnableSpecificProposals = ""
 
-	Upgrades = []upgrades.Upgrade{v6_6_0.Upgrade, v7_0_1.Upgrade}
+	Upgrades = []upgrades.Upgrade{v7_0_1.Upgrade}
 	Forks    = []upgrades.Fork{}
 )
 
@@ -813,4 +813,4 @@ func (app *ComposableApp) AutoCliOpts() autocli.AppOptions {
 		ValidatorAddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ValidatorAddrPrefix()),
 		ConsensusAddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ConsensusAddrPrefix()),
 	}
-}
+}
diff --git a/app/upgrades/v6_6_0/upgrade.go b/app/upgrades/v6_6_0/upgrade.go