refactor: refactor code & replace coinConvert with sdk RegisterDenom

app/app.go

@@ -40,7 +40,6 @@ import (
 	"github.com/irisnet/irishub/v3/app/params"
 	"github.com/irisnet/irishub/v3/app/rpc"
 	"github.com/irisnet/irishub/v3/client/lite"
-	iristypes "github.com/irisnet/irishub/v3/types"
 )
 
 var (
@@ -85,7 +84,7 @@ func NewIrisApp(
 	baseAppOptions = append(baseAppOptions, NoOpMempoolOption())
 
 	bApp := baseapp.NewBaseApp(
-		iristypes.AppName,
+		params.AppName,
 		logger,
 		db,
 		encodingConfig.TxConfig.TxDecoder(),
@@ -237,7 +236,7 @@ func (app *IrisApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.R
 
 // InitChainer application update at chain initialization
 func (app *IrisApp) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain {
-	var genesisState iristypes.GenesisState
+	var genesisState GenesisState
 	if err := tmjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
 		panic(err)
 	}
@@ -360,7 +359,7 @@ func (app *IrisApp) DefaultGenesis() map[string]json.RawMessage {
 
 // Init initializes the IrisApp.
 func (app *IrisApp) Init() {
-	iristypes.InjectCodec(app.legacyAmino, app.interfaceRegistry)
+	params.InjectCodec(app.legacyAmino, app.interfaceRegistry)
 }
 
 // NoOpMempoolOption returns a function that sets up a no-op mempool for the given BaseApp.

app/genesis.go

@@ -1,11 +1,12 @@
 package app
 
-import (
-	"github.com/irisnet/irishub/v3/types"
-)
+import "encoding/json"
 
-// NewDefaultGenesisState generates the default state for the application.
-func NewDefaultGenesisState() types.GenesisState {
-	encCfg := RegisterEncodingConfig()
-	return ModuleBasics.DefaultGenesis(encCfg.Marshaler)
-}
+// GenesisState The genesis state of the blockchain is represented here as a map of raw json
+// messages key'd by a identifier string.
+// The identifier is used to determine which module genesis information belongs
+// to so it may be appropriately routed during init chain.
+// Within this application default genesis information is retrieved from
+// the ModuleBasicManager which populates json from each BasicModule
+// object provided to it during init.
+type GenesisState map[string]json.RawMessage

app/keepers/keepers.go

@@ -105,12 +105,12 @@ import (
 	tokentypes "github.com/irisnet/irismod/modules/token/types"
 	tokenv1 "github.com/irisnet/irismod/modules/token/types/v1"
 
+	appparams "github.com/irisnet/irishub/v3/app/params"
 	guardiankeeper "github.com/irisnet/irishub/v3/modules/guardian/keeper"
 	guardiantypes "github.com/irisnet/irishub/v3/modules/guardian/types"
 	"github.com/irisnet/irishub/v3/modules/internft"
 	mintkeeper "github.com/irisnet/irishub/v3/modules/mint/keeper"
 	minttypes "github.com/irisnet/irishub/v3/modules/mint/types"
-	iristypes "github.com/irisnet/irishub/v3/types"
 	"github.com/irisnet/irishub/v3/wrapper"
 )
 
@@ -232,7 +232,7 @@ func New(
 		appKeepers.keys[authtypes.StoreKey],
 		ethermint.ProtoAccount,
 		maccPerms,
-		iristypes.Bech32PrefixAccAddr,
+		appparams.Bech32PrefixAccAddr,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
@@ -556,12 +556,12 @@ func New(
 		authtypes.FeeCollectorName,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	).WithSwapRegistry(tokenv1.SwapRegistry{
-		iristypes.NativeToken.MinUnit: tokenv1.SwapParams{
-			MinUnit: iristypes.EvmToken.MinUnit,
+		appparams.BaseToken.MinUnit: tokenv1.SwapParams{
+			MinUnit: appparams.EvmToken.MinUnit,
 			Ratio:   sdk.OneDec(),
 		},
-		iristypes.EvmToken.MinUnit: tokenv1.SwapParams{
-			MinUnit: iristypes.NativeToken.MinUnit,
+		appparams.EvmToken.MinUnit: tokenv1.SwapParams{
+			MinUnit: appparams.BaseToken.MinUnit,
 			Ratio:   sdk.OneDec(),
 		},
 	})

types/address.go → app/params/address.go

@@ -1,4 +1,4 @@
-package types
+package params
 
 import sdk "github.com/cosmos/cosmos-sdk/types"
 

app/params/params.go

@@ -1,7 +1,117 @@
 package params
 
-// Simulation parameter constants
+// MUST be loaded before running
+import (
+	"fmt"
+	"math/big"
+	"os"
+	"path/filepath"
+
+	"github.com/cometbft/cometbft/crypto"
+	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/codec/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	"github.com/evmos/ethermint/ethereum/eip712"
+	etherminttypes "github.com/evmos/ethermint/types"
+
+	tokentypes "github.com/irisnet/irismod/modules/token/types"
+	tokenv1 "github.com/irisnet/irismod/modules/token/types/v1"
+)
+
 const (
-	StakePerAccount           = "stake_per_account"
-	InitiallyBondedValidators = "initially_bonded_validators"
+	// AppName is the name of the app
+	AppName       = "IrisApp"
+	EIP155ChainID = "6688"
 )
+
+var (
+	// BaseToken represents the native token
+	BaseToken tokenv1.Token
+	// EvmToken represents the EVM token
+	EvmToken tokenv1.Token
+	// DefaultNodeHome default home directories for the application daemon
+	DefaultNodeHome string
+)
+
+func init() {
+	// set bech32 prefix
+	ConfigureBech32Prefix()
+
+	// set coin denom regexs
+	sdk.SetCoinDenomRegex(func() string {
+		return `[a-zA-Z][a-zA-Z0-9/-]{2,127}`
+	})
+
+	BaseToken = tokenv1.Token{
+		Symbol:        "iris",
+		Name:          "Irishub staking token",
+		Scale:         6,
+		MinUnit:       "uiris",
+		InitialSupply: 2000000000,
+		MaxSupply:     10000000000,
+		Mintable:      true,
+		Owner:         sdk.AccAddress(crypto.AddressHash([]byte(tokentypes.ModuleName))).String(),
+	}
+
+	EvmToken = tokenv1.Token{
+		Symbol:        "eris",
+		Name:          "IRISHub EVM Fee Token",
+		Scale:         18,
+		MinUnit:       "weris",
+		InitialSupply: 0,
+		MaxSupply:     10000000000,
+		Mintable:      true,
+		Owner:         sdk.AccAddress(crypto.AddressHash([]byte(tokentypes.ModuleName))).String(),
+	}
+	sdk.DefaultBondDenom = BaseToken.MinUnit
+
+	if err := sdk.RegisterDenom(BaseToken.Symbol, sdk.OneDec()); err != nil {
+		panic(err)
+	}
+
+	if err := sdk.RegisterDenom(BaseToken.MinUnit, sdk.NewDecFromIntWithPrec(sdk.OneInt(), int64(BaseToken.Scale))); err != nil {
+		panic(err)
+	}
+
+	userHomeDir, err := os.UserHomeDir()
+	if err != nil {
+		panic(err)
+	}
+
+	DefaultNodeHome = filepath.Join(userHomeDir, ".iris")
+	owner, err := sdk.AccAddressFromBech32(BaseToken.Owner)
+	if err != nil {
+		panic(err)
+	}
+
+	// replace the default token
+	tokenv1.SetNativeToken(
+		BaseToken.Symbol,
+		BaseToken.Name,
+		BaseToken.MinUnit,
+		BaseToken.Scale,
+		BaseToken.InitialSupply,
+		BaseToken.MaxSupply,
+		BaseToken.Mintable,
+		owner,
+	)
+
+	etherminttypes.InjectChainIDParser(parseChainID)
+}
+
+// InjectCodec injects an app codec
+func InjectCodec(legacyAmino *codec.LegacyAmino, interfaceRegistry types.InterfaceRegistry) {
+	eip712.InjectCodec(eip712.Codec{
+		InterfaceRegistry: interfaceRegistry,
+		Amino:             legacyAmino,
+	})
+}
+
+func parseChainID(_ string) (*big.Int, error) {
+	eip155ChainID, ok := new(big.Int).SetString(EIP155ChainID, 10)
+	if !ok {
+		return nil, fmt.Errorf("invalid chain-id: %s", EIP155ChainID)
+	}
+	return eip155ChainID, nil
+}

app/sim_test.go

@@ -19,13 +19,11 @@ import (
 	tokentypes "github.com/irisnet/irismod/modules/token/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/irisnet/irishub/v3/app/params"
-	iristypes "github.com/irisnet/irishub/v3/types"
-
 	dbm "github.com/cometbft/cometbft-db"
 	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cometbft/cometbft/libs/log"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+	"github.com/irisnet/irishub/v3/app/params"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/store"
@@ -129,7 +127,7 @@ func TestAppImportExport(t *testing.T) {
 	config := simcli.NewConfigFromFlags()
 	config.ChainID = AppChainID
 
-	sdk.DefaultBondDenom = iristypes.NativeToken.Symbol
+	sdk.DefaultBondDenom = params.BaseToken.Symbol
 
 	db, dir, logger, skip, err := simtestutil.SetupSimulation(
 		config,
@@ -199,7 +197,7 @@ func TestAppImportExport(t *testing.T) {
 	newApp := createApp(logger, db, encfg, fauxMerkleModeOpt)
 	require.Equal(t, "IrisApp", newApp.Name())
 
-	var genesisState iristypes.GenesisState
+	var genesisState GenesisState
 	err = json.Unmarshal(exported.AppState, &genesisState)
 	require.NoError(t, err)
 
@@ -393,7 +391,7 @@ func TestAppStateDeterminism(t *testing.T) {
 	if !simcli.FlagEnabledValue {
 		t.Skip("skipping application simulation")
 	}
-	sdk.DefaultBondDenom = iristypes.NativeToken.Symbol
+	sdk.DefaultBondDenom = params.BaseToken.Symbol
 
 	config := simcli.NewConfigFromFlags()
 	config.InitialBlockHeight = 1

app/upgrades/v200/config.go

@@ -5,8 +5,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	etherminttypes "github.com/evmos/ethermint/x/evm/types"
 	feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
-
-	"github.com/irisnet/irishub/v3/types"
+	"github.com/irisnet/irishub/v3/app/params"
 )
 
 // NOTE: Before the release of irishub 2.0.0, the configuration in this file must be modified
@@ -16,7 +15,7 @@ const (
 )
 
 var (
-	evmToken  = types.EvmToken
+	evmToken  = params.EvmToken
 	evmParams = etherminttypes.Params{
 		EvmDenom:            evmToken.MinUnit,
 		EnableCreate:        true,

cmd/iris/cmd/root.go

@@ -33,7 +33,6 @@ import (
 
 	"github.com/irisnet/irishub/v3/app"
 	"github.com/irisnet/irishub/v3/app/params"
-	iristypes "github.com/irisnet/irishub/v3/types"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the
@@ -48,7 +47,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
 		WithInput(os.Stdin).
 		WithAccountRetriever(types.AccountRetriever{}).
 		WithBroadcastMode(flags.BroadcastSync).
-		WithHomeDir(iristypes.DefaultNodeHome).
+		WithHomeDir(params.DefaultNodeHome).
 		WithKeyringOptions(etherminthd.EthSecp256k1Option()).
 		WithViper("")
 
@@ -70,8 +69,6 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
 				return err
 			}
 
-			converter.handlePreRun(cmd, args)
-
 			customTemplate, customIRISHubConfig := initAppConfig()
 			customTMConfig := initTendermintConfig()
 			return server.InterceptConfigsPreRunHandler(
@@ -106,7 +103,7 @@ func initTendermintConfig() *tmcfg.Config {
 // initAppConfig helps to override default appConfig template and configs.
 // return "", nil if no custom configuration is required for the application.
 func initAppConfig() (string, interface{}) {
-	customAppTemplate, customAppConfig := servercfg.AppConfig(iristypes.NativeToken.MinUnit)
+	customAppTemplate, customAppConfig := servercfg.AppConfig(params.BaseToken.MinUnit)
 	srvCfg, ok := customAppConfig.(servercfg.Config)
 	if !ok {
 		panic(fmt.Errorf("unknown app config type %T", customAppConfig))
@@ -124,20 +121,20 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 	}
 
 	rootCmd.AddCommand(
-		genutilcli.InitCmd(app.ModuleBasics, iristypes.DefaultNodeHome),
+		genutilcli.InitCmd(app.ModuleBasics, params.DefaultNodeHome),
 		genutilcli.ValidateGenesisCmd(app.ModuleBasics),
-		AddGenesisAccountCmd(iristypes.DefaultNodeHome),
+		AddGenesisAccountCmd(params.DefaultNodeHome),
 		tmcli.NewCompletionCmd(rootCmd, true),
 		testnetCmd(app.ModuleBasics, banktypes.GenesisBalancesIterator{}),
 		ethermintdebug.Cmd(),
 		config.Cmd(),
 		mergeGenesisCmd(encodingConfig),
-		pruning.Cmd(ac.newApp, iristypes.DefaultNodeHome),
+		pruning.Cmd(ac.newApp, params.DefaultNodeHome),
 	)
 
 	ethermintserver.AddCommands(
 		rootCmd,
-		ethermintserver.NewDefaultStartOptions(ac.newApp, iristypes.DefaultNodeHome),
+		ethermintserver.NewDefaultStartOptions(ac.newApp, params.DefaultNodeHome),
 		ac.appExport,
 		addModuleInitFlags,
 	)
@@ -155,7 +152,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 		genesisCommand(encodingConfig),
 		queryCommand(),
 		txCommand(),
-		Commands(iristypes.DefaultNodeHome),
+		Commands(params.DefaultNodeHome),
 	)
 }
 
@@ -164,7 +161,7 @@ func genesisCommand(encodingConfig params.EncodingConfig, cmds ...*cobra.Command
 	cmd := genutilcli.GenesisCoreCommand(
 		encodingConfig.TxConfig,
 		app.ModuleBasics,
-		iristypes.DefaultNodeHome,
+		params.DefaultNodeHome,
 	)
 
 	for _, subCmd := range cmds {