Release/v2.4

app/app.go

@@ -157,6 +157,7 @@ import (
 
 	v2_2_0 "github.com/terra-money/core/v2/app/upgrades/v2.2.0"
 	v2_3_0 "github.com/terra-money/core/v2/app/upgrades/v2.3.0"
+	v2_4 "github.com/terra-money/core/v2/app/upgrades/v2.4"
 
 	// unnamed import of statik for swagger UI support
 	_ "github.com/terra-money/core/v2/client/docs/statik"
@@ -499,12 +500,24 @@ func NewTerraApp(
 		AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)).
 		AddRoute(alliancetypes.RouterKey, alliance.NewAllianceProposalHandler(app.AllianceKeeper))
 
+	// Configure the hooks keeper
+	hooksKeeper := ibchookskeeper.NewKeeper(
+		keys[ibchookstypes.StoreKey],
+	)
+	app.IBCHooksKeeper = &hooksKeeper
+	wasmHooks := ibchooks.NewWasmHooks(&hooksKeeper, nil, terraappconfig.AccountAddressPrefix) // The contract keeper needs to be set later
+	app.Ics20WasmHooks = &wasmHooks
+	app.HooksICS4Wrapper = ibchooks.NewICS4Middleware(
+		app.IBCKeeper.ChannelKeeper,
+		app.Ics20WasmHooks,
+	)
+
 	// Create Transfer Keepers
 	app.TransferKeeper = ibctransferkeeper.NewKeeper(
 		appCodec,
 		keys[ibctransfertypes.StoreKey],
 		app.GetSubspace(ibctransfertypes.ModuleName),
-		app.IBCKeeper.ChannelKeeper,
+		app.HooksICS4Wrapper,
 		app.IBCKeeper.ChannelKeeper,
 		&app.IBCKeeper.PortKeeper,
 		app.AccountKeeper,
@@ -513,18 +526,6 @@ func NewTerraApp(
 	)
 	transferIBCModule := ibctransfer.NewIBCModule(app.TransferKeeper)
 
-	// Configure the hooks keeper
-	hooksKeeper := ibchookskeeper.NewKeeper(
-		keys[ibchookstypes.StoreKey],
-	)
-	app.IBCHooksKeeper = &hooksKeeper
-	wasmHooks := ibchooks.NewWasmHooks(&hooksKeeper, nil, terraappconfig.AccountAddressPrefix) // The contract keeper needs to be set later
-	app.Ics20WasmHooks = &wasmHooks
-	app.HooksICS4Wrapper = ibchooks.NewICS4Middleware(
-		app.IBCKeeper.ChannelKeeper,
-		app.Ics20WasmHooks,
-	)
-
 	// Hooks Middleware
 	hooksTransferStack := ibchooks.NewIBCMiddleware(&transferIBCModule, &app.HooksICS4Wrapper)
 	app.TransferStack = &hooksTransferStack
@@ -1007,6 +1008,10 @@ func (app *TerraApp) RegisterUpgradeHandlers(cfg module.Configurator) {
 		terraappconfig.Upgrade2_3_0,
 		v2_3_0.CreateUpgradeHandler(app.mm, app.configurator, app.TokenFactoryKeeper),
 	)
+	app.UpgradeKeeper.SetUpgradeHandler(
+		terraappconfig.Upgrade2_4,
+		v2_4.CreateUpgradeHandler(app.mm, app.configurator),
+	)
 }
 
 // RegisterSwaggerAPI registers swagger route with API Server

app/config/const.go

@@ -13,6 +13,12 @@ const (
 	// BondDenom staking denom
 	BondDenom = "uluna"
 
+	// More denoms
+	// Luna      = "luna"    // 1 (base denom unit)
+	// MilliLuna = "mluna"   // 10^-3 (milli)
+	MicroLuna = BondDenom // 10^-6 (micro)
+	// NanoLuna  = "nluna"   // 10^-9 (nano)
+
 	AuthzMsgExec                        = "/cosmos.authz.v1beta1.MsgExec"
 	AuthzMsgGrant                       = "/cosmos.authz.v1beta1.MsgGrant"
 	AuthzMsgRevoke                      = "/cosmos.authz.v1beta1.MsgRevoke"
@@ -43,4 +49,5 @@ const (
 	// UpgradeName gov proposal name
 	Upgrade2_2_0 = "2.2.0"
 	Upgrade2_3_0 = "2.3.0"
+	Upgrade2_4   = "v2.4"
 )

app/params/address.go

@@ -0,0 +1,24 @@
+package params
+
+import (
+	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/terra-money/core/v2/app/config"
+)
+
+func RegisterAddressesConfig() *sdk.Config {
+	sdkConfig := sdk.GetConfig()
+	sdkConfig.SetCoinType(config.CoinType)
+
+	accountPubKeyPrefix := config.AccountAddressPrefix + "pub"
+	validatorAddressPrefix := config.AccountAddressPrefix + "valoper"
+	validatorPubKeyPrefix := config.AccountAddressPrefix + "valoperpub"
+	consNodeAddressPrefix := config.AccountAddressPrefix + "valcons"
+	consNodePubKeyPrefix := config.AccountAddressPrefix + "valconspub"
+
+	sdkConfig.SetBech32PrefixForAccount(config.AccountAddressPrefix, accountPubKeyPrefix)
+	sdkConfig.SetBech32PrefixForValidator(validatorAddressPrefix, validatorPubKeyPrefix)
+	sdkConfig.SetBech32PrefixForConsensusNode(consNodeAddressPrefix, consNodePubKeyPrefix)
+	sdkConfig.SetAddressVerifier(wasmtypes.VerifyAddressLen())
+	return sdkConfig.Seal()
+}

app/params/denoms.go

@@ -0,0 +1,18 @@
+package params
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/terra-money/core/v2/app/config"
+)
+
+func RegisterDenomsConfig() error {
+	// sdk.RegisterDenom(config.Luna, sdk.OneDec())
+	// sdk.RegisterDenom(config.MilliLuna, sdk.NewDecWithPrec(1, 3))
+	err := sdk.RegisterDenom(config.MicroLuna, sdk.NewDecWithPrec(1, 6))
+	if err != nil {
+		return err
+	}
+	// sdk.RegisterDenom(config.NanoLuna, sdk.NewDecWithPrec(1, 9))
+
+	return nil
+}

app/upgrades/v2.4/upgrade.go

@@ -0,0 +1,14 @@
+package v2_4
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateUpgradeHandler(mm *module.Manager,
+	cfg module.Configurator) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		return mm.RunMigrations(ctx, cfg, fromVM)
+	}
+}

client/docs/config.json

@@ -2,8 +2,8 @@
   "swagger": "2.0",
   "info": {
     "title": "Terra Core Rest API",
-    "description": "Rest Interface for Terra Core v2.3.2 https://github.com/terra-money/core",
-    "version": "2.3.2"
+    "description": "Rest Interface for Terra Core v2.4 https://github.com/terra-money/core",
+    "version": "2.4"
   },
   "apis": [
     {

client/docs/swagger-ui/swagger.yaml

@@ -1,8 +1,8 @@
 swagger: '2.0'
 info:
   title: Terra Core Rest API
-  description: Rest Interface for Terra Core v2.3.2 https://github.com/terra-money/core
-  version: 2.3.2
+  description: Rest Interface for Terra Core v2.4 https://github.com/terra-money/core
+  version: 2.4
 paths:
   /terra/alliances:
     get:
@@ -728,6 +728,11 @@ paths:
       summary: >-
         Query a delegation to an alliance by delegator addr, validator_addr and
         denom
+
+        @deprecated: this endpoint will be replaced for by the encoded version
+
+        of the denom e.g.:
+        GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance
       operationId: IBCAllianceDelegation
       responses:
         '200':
@@ -1045,7 +1050,10 @@ paths:
         - Query
   /terra/alliances/ibc/{hash}:
     get:
-      summary: Query a specific alliance by ibc hash
+      summary: |-
+        Query a specific alliance by ibc hash
+        @deprecated: this endpoint will be replaced for by the encoded version
+        of the denom e.g.: GET:/terra/alliances/ibc%2Falliance
       operationId: IBCAlliance
       responses:
         '200':
@@ -1186,7 +1194,13 @@ paths:
         - Query
   /terra/alliances/rewards/{delegator_addr}/{validator_addr}/ibc/{hash}:
     get:
-      summary: Query for rewards by delegator addr, validator_addr and denom
+      summary: >-
+        Query for rewards by delegator addr, validator_addr and denom
+
+        @deprecated: this endpoint will be replaced for by the encoded version
+
+        of the denom e.g.:
+        GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance
       operationId: IBCAllianceDelegationRewards
       responses:
         '200':

cmd/terrad/root.go

@@ -13,7 +13,6 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	dbm "github.com/tendermint/tm-db"
 
-	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	sdkconfig "github.com/cosmos/cosmos-sdk/client/config"
@@ -35,7 +34,6 @@ import (
 	tmcfg "github.com/tendermint/tendermint/config"
 
 	terraapp "github.com/terra-money/core/v2/app"
-	config "github.com/terra-money/core/v2/app/config"
 	"github.com/terra-money/core/v2/app/params"
 	"github.com/terra-money/core/v2/app/wasmconfig"
 )
@@ -47,21 +45,11 @@ const flagIAVLCacheSize = "iavl-cache-size"
 // main function.
 func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
 	encodingConfig := terraapp.MakeEncodingConfig()
-
-	sdkConfig := sdk.GetConfig()
-	sdkConfig.SetCoinType(config.CoinType)
-
-	accountPubKeyPrefix := config.AccountAddressPrefix + "pub"
-	validatorAddressPrefix := config.AccountAddressPrefix + "valoper"
-	validatorPubKeyPrefix := config.AccountAddressPrefix + "valoperpub"
-	consNodeAddressPrefix := config.AccountAddressPrefix + "valcons"
-	consNodePubKeyPrefix := config.AccountAddressPrefix + "valconspub"
-
-	sdkConfig.SetBech32PrefixForAccount(config.AccountAddressPrefix, accountPubKeyPrefix)
-	sdkConfig.SetBech32PrefixForValidator(validatorAddressPrefix, validatorPubKeyPrefix)
-	sdkConfig.SetBech32PrefixForConsensusNode(consNodeAddressPrefix, consNodePubKeyPrefix)
-	sdkConfig.SetAddressVerifier(wasmtypes.VerifyAddressLen())
-	sdkConfig.Seal()
+	err := params.RegisterDenomsConfig()
+	if err != nil {
+		panic(err)
+	}
+	params.RegisterAddressesConfig()
 
 	initClientCtx := client.Context{}.
 		WithCodec(encodingConfig.Marshaler).