From c0b51ec9789b3ec959ba64f36f84000b1b6be4c4 Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Tue, 13 May 2025 15:29:10 +0530 Subject: [PATCH] Use alnt as native token --- app/ante.go | 6 +++--- app/params/config.go | 17 ++++++++++------- cmd/laconicd/cmd/root.go | 2 +- scripts/init.sh | 18 ++++++++---------- x/bond/params.go | 4 ++-- x/registry/keeper/naming_keeper.go | 2 +- x/registry/params.go | 20 ++++++++++---------- 7 files changed, 35 insertions(+), 34 deletions(-) diff --git a/app/ante.go b/app/ante.go index 2602db68..074fdeb0 100644 --- a/app/ante.go +++ b/app/ante.go @@ -25,10 +25,10 @@ func checkTxFeeWithValidatorMinGasPrices(ctx sdk.Context, tx sdk.Tx) (sdk.Coins, feeCoins := feeTx.GetFee() gas := feeTx.GetGas() - // Only allow alps | lps as a fee token + // Only allow alnt as a fee token for _, coin := range feeCoins { - if coin.Denom != params.BaseCoinUnit && coin.Denom != params.CoinUnit { - return nil, 0, errorsmod.Wrapf(sdkerrors.ErrInvalidCoins, "invalid fee denom %s, only %s or %s are accepted", coin.Denom, params.BaseCoinUnit, params.CoinUnit) + if coin.Denom != params.CoinUnit { + return nil, 0, errorsmod.Wrapf(sdkerrors.ErrInvalidCoins, "invalid fee denom %s, only %s is accepted", coin.Denom, params.CoinUnit) } } diff --git a/app/params/config.go b/app/params/config.go index d0373ff9..c17eed54 100644 --- a/app/params/config.go +++ b/app/params/config.go @@ -10,12 +10,15 @@ import ( ) const ( - CoinUnit = "lps" - BaseCoinUnit = "alps" - LpsExponent = 18 + // Registered token + LpsCoinUnit = "lps" + LpsBaseCoinUnit = "alps" + LpsExponent = 18 - LstakeCoinUnit = "lstake" - DefaultBondDenom = LstakeCoinUnit + // Native token, only denominated in alnt + // Used for staking, fees and laconic module ops + CoinUnit = "alnt" + DefaultBondDenom = CoinUnit // Bech32PrefixAccAddr defines the Bech32 prefix of an account's address. Bech32PrefixAccAddr = "laconic" @@ -40,11 +43,11 @@ func init() { } func RegisterDenoms() { - err := sdk.RegisterDenom(CoinUnit, math.LegacyOneDec()) + err := sdk.RegisterDenom(LpsCoinUnit, math.LegacyOneDec()) if err != nil { panic(err) } - err = sdk.RegisterDenom(BaseCoinUnit, math.LegacyNewDecWithPrec(1, LpsExponent)) + err = sdk.RegisterDenom(LpsBaseCoinUnit, math.LegacyNewDecWithPrec(1, LpsExponent)) if err != nil { panic(err) } diff --git a/cmd/laconicd/cmd/root.go b/cmd/laconicd/cmd/root.go index 4f6be850..957973e1 100644 --- a/cmd/laconicd/cmd/root.go +++ b/cmd/laconicd/cmd/root.go @@ -100,7 +100,7 @@ func NewRootCmd() *cobra.Command { // overwrite the minimum gas price from the app configuration srvCfg := serverconfig.DefaultConfig() - srvCfg.MinGasPrices = fmt.Sprintf("0%s", params.BaseCoinUnit) + srvCfg.MinGasPrices = fmt.Sprintf("0%s", params.CoinUnit) // overwrite the block timeout cmtCfg := cmtcfg.DefaultConfig() diff --git a/scripts/init.sh b/scripts/init.sh index 6460e7a9..00cb25c1 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -6,10 +6,11 @@ KEY="alice" CHAINID=${CHAINID:-"laconic_9000-1"} MONIKER=${MONIKER:-"localtestnet"} KEYRING=${KEYRING:-"test"} -DENOM=${DENOM:-"alps"} -BALANCE=${BALANCE:-"1000000000000000000000000000000"} # 10^32 alps | 10^12 lps -STAKING_DENOM=${STAKING_DENOM:-"lstake"} -STAKING_AMOUNT=${STAKING_AMOUNT:-"1000000000000000"} # 10^15 lstake +ALPS_DENOM=${ALPS_DENOM:-"alps"} +ALPS_BALANCE=${ALPS_BALANCE:-"1000000000000000000000000000000"} # 10^32 alps | 10^12 lps +DENOM=${DENOM:-"alnt"} +BALANCE=${BALANCE:-"1000000000000000000000000000000"} # 10^32 alnt +STAKING_AMOUNT=${STAKING_AMOUNT:-"1000000000000000"} # 10^15 alnt MIN_GAS_PRICE=${MIN_GAS_PRICE:-"0.001"} LOGLEVEL=${LOGLEVEL:-"info"} @@ -98,10 +99,7 @@ if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data" ]; then # Set gas limit in genesis update_genesis '.consensus["params"]["block"]["max_gas"]="10000000"' - # Disable bank transfers for the staking token (lstake) - update_genesis ".app_state[\"bank\"][\"send_enabled\"] += [{\"denom\": \"$STAKING_DENOM\", \"enabled\": false}]" - - update_genesis ".app_state[\"staking\"][\"params\"][\"bond_denom\"]=\"$STAKING_DENOM\"" + update_genesis ".app_state[\"staking\"][\"params\"][\"bond_denom\"]=\"$DENOM\"" # disable produce empty block if [[ "$OSTYPE" == "darwin"* ]]; then @@ -125,10 +123,10 @@ if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data" ]; then fi # Allocate genesis accounts (cosmos formatted addresses) - laconicd genesis add-genesis-account $KEY $BALANCE$DENOM,$STAKING_AMOUNT$STAKING_DENOM --keyring-backend $KEYRING + laconicd genesis add-genesis-account $KEY $ALPS_BALANCE$ALPS_DENOM,$BALANCE$DENOM --keyring-backend $KEYRING # Sign genesis transaction - laconicd genesis gentx $KEY $STAKING_AMOUNT$STAKING_DENOM --keyring-backend $KEYRING --chain-id $CHAINID + laconicd genesis gentx $KEY $STAKING_AMOUNT$DENOM --keyring-backend $KEYRING --chain-id $CHAINID # Collect genesis tx laconicd genesis collect-gentxs diff --git a/x/bond/params.go b/x/bond/params.go index f9b4161c..ea65c45e 100644 --- a/x/bond/params.go +++ b/x/bond/params.go @@ -10,7 +10,7 @@ import ( ) // DefaultMaxBondAmountTokens are the default parameter values. -var DefaultMaxBondAmountTokens = sdkmath.NewInt(1000000000000) // 10^12 alps +var DefaultMaxBondAmountTokens = sdkmath.NewInt(1000000000000) // 10^12 func NewParams(maxBondAmount sdk.Coin) Params { return Params{MaxBondAmount: maxBondAmount} @@ -18,7 +18,7 @@ func NewParams(maxBondAmount sdk.Coin) Params { // DefaultParams returns default module parameters func DefaultParams() Params { - return NewParams(sdk.NewCoin(params.BaseCoinUnit, DefaultMaxBondAmountTokens)) + return NewParams(sdk.NewCoin(params.CoinUnit, DefaultMaxBondAmountTokens)) } // Validate checks that the parameters have valid values diff --git a/x/registry/keeper/naming_keeper.go b/x/registry/keeper/naming_keeper.go index 925a4a42..096d1272 100644 --- a/x/registry/keeper/naming_keeper.go +++ b/x/registry/keeper/naming_keeper.go @@ -296,7 +296,7 @@ func (k Keeper) createAuthority(ctx sdk.Context, name string, owner string, isRo moduleParams.AuthorityAuctionCommitFee, moduleParams.AuthorityAuctionRevealFee, moduleParams.AuthorityAuctionMinimumBid, - sdk.NewCoin(params.BaseCoinUnit, math.NewInt(0)), + sdk.NewCoin(params.CoinUnit, math.NewInt(0)), 0, ownerAddress, ) diff --git a/x/registry/params.go b/x/registry/params.go index 88f2a6f1..1a794a20 100644 --- a/x/registry/params.go +++ b/x/registry/params.go @@ -13,21 +13,21 @@ import ( // Default parameter values. var ( // DefaultRecordRent is the default record rent for 1 time period (see expiry time). - DefaultRecordRent = sdkmath.NewInt(1000000) // 10^6 alps + DefaultRecordRent = sdkmath.NewInt(1000000) // 10^6 // DefaultRecordExpiryTime is the default record expiry time (1 year). DefaultRecordExpiryTime = time.Hour * 24 * 365 - DefaultAuthorityRent = sdkmath.NewInt(1000000) // 10^6 alps + DefaultAuthorityRent = sdkmath.NewInt(1000000) // 10^6 DefaultAuthorityExpiryTime = time.Hour * 24 * 365 DefaultAuthorityGracePeriod = time.Hour * 24 * 2 DefaultAuthorityAuctionEnabled = false DefaultCommitsDuration = time.Hour * 24 DefaultRevealsDuration = time.Hour * 24 - DefaultCommitFee = sdkmath.NewInt(1000000) // 10^6 alps - DefaultRevealFee = sdkmath.NewInt(1000000) // 10^6 alps - DefaultMinimumBid = sdkmath.NewInt(5000000) // 5 * 10^6 alps + DefaultCommitFee = sdkmath.NewInt(1000000) // 10^6 + DefaultRevealFee = sdkmath.NewInt(1000000) // 10^6 + DefaultMinimumBid = sdkmath.NewInt(5000000) // 5 * 10^6 ) // NewParams creates a new Params instance @@ -62,13 +62,13 @@ func NewParams( // DefaultParams returns a default set of parameters. func DefaultParams() Params { return NewParams( - sdk.NewCoin(params.BaseCoinUnit, DefaultRecordRent), DefaultRecordExpiryTime, - sdk.NewCoin(params.BaseCoinUnit, DefaultAuthorityRent), + sdk.NewCoin(params.CoinUnit, DefaultRecordRent), DefaultRecordExpiryTime, + sdk.NewCoin(params.CoinUnit, DefaultAuthorityRent), DefaultAuthorityExpiryTime, DefaultAuthorityGracePeriod, DefaultAuthorityAuctionEnabled, DefaultCommitsDuration, DefaultRevealsDuration, - sdk.NewCoin(params.BaseCoinUnit, DefaultCommitFee), - sdk.NewCoin(params.BaseCoinUnit, DefaultRevealFee), - sdk.NewCoin(params.BaseCoinUnit, DefaultMinimumBid), + sdk.NewCoin(params.CoinUnit, DefaultCommitFee), + sdk.NewCoin(params.CoinUnit, DefaultRevealFee), + sdk.NewCoin(params.CoinUnit, DefaultMinimumBid), ) }