feat: convert crosschain FX to apundiai (#900)

app/genesis.go

@@ -102,7 +102,7 @@ func newDefAppGenesisByDenom(cdc codec.JSONCodec, moduleBasics module.BasicManag
 			genesis[m.Name()] = cdc.MustMarshalJSON(state)
 		case banktypes.ModuleName:
 			state := banktypes.DefaultGenesisState()
-			state.DenomMetadata = []banktypes.Metadata{fxtypes.NewFXMetaData()}
+			state.DenomMetadata = []banktypes.Metadata{fxtypes.NewDefaultMetadata()}
 
 			ethModuleInitCoins := sdk.NewCoins(sdk.NewCoin(denom, ethInitAmount))
 			state.Balances = append(state.Balances, banktypes.Balance{

app/genesis.json

@@ -12,7 +12,7 @@
       "ibc_transfer_timeout_height": "20000",
       "oracles": [],
       "delegate_threshold": {
-        "denom": "FX",
+        "denom": "apundiai",
         "amount": "10000000000000000000000"
       },
       "delegate_multiple": "10",
@@ -69,7 +69,7 @@
       "ibc_transfer_timeout_height": "20000",
       "oracles": [],
       "delegate_threshold": {
-        "denom": "FX",
+        "denom": "apundiai",
         "amount": "10000000000000000000000"
       },
       "delegate_multiple": "10",
@@ -111,32 +111,37 @@
         "address": "cosmos1c602zv38ht8xu8u2qcmymyl55mcyvvjrzq9ur3",
         "coins": [
           {
-            "denom": "FX",
+            "denom": "apundiai",
             "amount": "378600525462891000000000000"
           }
         ]
       }
     ],
     "supply": [
       {
-        "denom": "FX",
+        "denom": "apundiai",
         "amount": "378600525462891000000000000"
       }
     ],
     "denom_metadata": [
       {
-        "description": "The native staking token of the Function X",
+        "description": "The native staking token of the Pundi AIFX",
         "denom_units": [
           {
-            "denom": "FX",
+            "denom": "apundiai",
             "exponent": 0,
             "aliases": []
+          },
+          {
+            "denom": "pundiai",
+            "exponent": 18,
+            "aliases": []
           }
         ],
-        "base": "FX",
-        "display": "FX",
-        "name": "Function X",
-        "symbol": "FX",
+        "base": "apundiai",
+        "display": "pundiai",
+        "name": "Pundi AIFX Token",
+        "symbol": "PUNDIAI",
         "uri": "",
         "uri_hash": ""
       }
@@ -155,7 +160,7 @@
       "ibc_transfer_timeout_height": "20000",
       "oracles": [],
       "delegate_threshold": {
-        "denom": "FX",
+        "denom": "apundiai",
         "amount": "10000000000000000000000"
       },
       "delegate_multiple": "10",
@@ -194,7 +199,7 @@
   "consensus": null,
   "crisis": {
     "constant_fee": {
-      "denom": "FX",
+      "denom": "apundiai",
       "amount": "13333000000000000000000"
     }
   },
@@ -235,7 +240,7 @@
       "ibc_transfer_timeout_height": "20000",
       "oracles": [],
       "delegate_threshold": {
-        "denom": "FX",
+        "denom": "apundiai",
         "amount": "10000000000000000000000"
       },
       "delegate_multiple": "10",
@@ -273,7 +278,7 @@
   "evm": {
     "accounts": [],
     "params": {
-      "evm_denom": "FX",
+      "evm_denom": "apundiai",
       "enable_create": true,
       "enable_call": true,
       "extra_eips": [],
@@ -332,7 +337,7 @@
     "params": {
       "min_deposit": [
         {
-          "denom": "FX",
+          "denom": "apundiai",
           "amount": "10000000000000000000000"
         }
       ],
@@ -412,7 +417,7 @@
       "ibc_transfer_timeout_height": "20000",
       "oracles": [],
       "delegate_threshold": {
-        "denom": "FX",
+        "denom": "apundiai",
         "amount": "10000000000000000000000"
       },
       "delegate_multiple": "10",
@@ -451,7 +456,7 @@
       "annual_provisions": "0.000000000000000000"
     },
     "params": {
-      "mint_denom": "FX",
+      "mint_denom": "apundiai",
       "inflation_rate_change": "0.300000000000000000",
       "inflation_max": "0.416762000000000000",
       "inflation_min": "0.170000000000000000",
@@ -471,7 +476,7 @@
       "ibc_transfer_timeout_height": "20000",
       "oracles": [],
       "delegate_threshold": {
-        "denom": "FX",
+        "denom": "apundiai",
         "amount": "10000000000000000000000"
       },
       "delegate_multiple": "10",
@@ -516,7 +521,7 @@
       "ibc_transfer_timeout_height": "20000",
       "oracles": [],
       "delegate_threshold": {
-        "denom": "FX",
+        "denom": "apundiai",
         "amount": "10000000000000000000000"
       },
       "delegate_multiple": "10",
@@ -565,7 +570,7 @@
       "max_validators": 20,
       "max_entries": 7,
       "historical_entries": 20000,
-      "bond_denom": "FX",
+      "bond_denom": "apundiai",
       "min_commission_rate": "0.000000000000000000"
     },
     "last_total_power": "0",
@@ -597,7 +602,7 @@
       "ibc_transfer_timeout_height": "20000",
       "oracles": [],
       "delegate_threshold": {
-        "denom": "FX",
+        "denom": "apundiai",
         "amount": "10000000000000000000000"
       },
       "delegate_multiple": "10",

local-node.sh

@@ -3,6 +3,7 @@
 set -eo pipefail
 
 export FX_HOME=${FX_HOME:-"/tmp/fxcore"}
+readonly default_denom=apundiai
 
 if [[ "$1" == "init" ]]; then
   if [ -d "$FX_HOME" ]; then
@@ -13,7 +14,7 @@ if [[ "$1" == "init" ]]; then
   fi
 
   # Initialize private validator, p2p, genesis, and application configuration files
-  fxcored init local --chain-id fxcore --default-denom FX
+  fxcored init local --chain-id fxcore --default-denom $default_denom
 
   fxcored config config.toml rpc.cors_allowed_origins "*"
   # open prometheus
@@ -39,11 +40,11 @@ if [[ "$1" == "init" ]]; then
 
   echo "test test test test test test test test test test test junk" | fxcored keys add fx1 --recover
   if [ -n "${2:-""}" ]; then
-    fxcored genesis add-genesis-account fx1 10004000000000000000000000FX
+    fxcored genesis add-genesis-account fx1 10004000000000000000000000$default_denom
   else
-    fxcored genesis add-genesis-account fx1 4000000000000000000000FX
+    fxcored genesis add-genesis-account fx1 4000000000000000000000$default_denom
   fi
-  fxcored genesis gentx fx1 100000000000000000000FX --chain-id=fxcore \
+  fxcored genesis gentx fx1 100000000000000000000$default_denom --chain-id=fxcore \
     --gas="200000" \
     --moniker="fx-validator" \
     --commission-max-change-rate="0.01" \

server/config/data/app.json

@@ -66,7 +66,7 @@
     "max-txs": -1
   },
   "min-retain-blocks": 0,
-  "minimum-gas-prices": "4000000000000FX",
+  "minimum-gas-prices": "4000000000000apundiai",
   "pruning": "default",
   "pruning-interval": "0",
   "pruning-keep-recent": "0",

testutil/network.go

@@ -101,7 +101,7 @@ func NoSupplyGenesisState(myApp *app.App) app.GenesisState {
 
 	// reset supply
 	bankState := banktypes.DefaultGenesisState()
-	bankState.DenomMetadata = []banktypes.Metadata{fxtypes.NewFXMetaData()}
+	bankState.DenomMetadata = []banktypes.Metadata{fxtypes.NewDefaultMetadata()}
 	genesisState[banktypes.ModuleName] = cdc.MustMarshalJSON(bankState)
 
 	var govGenState govv1.GenesisState

types/constant.go

@@ -16,8 +16,11 @@ const (
 	AddressPrefix = "fx"
 	EnvPrefix     = "FX"
 
-	DefaultDenom = "FX"
-	DenomUnit    = 18
+	DefaultDenom  = "apundiai"
+	DefaultSymbol = "PUNDIAI"
+	DenomUnit     = 18
+
+	FXDenom = "FX"
 
 	AddrLen = 20
 )
@@ -33,11 +36,12 @@ func init() {
 	// votingPower = delegateToken / sdk.PowerReduction  --  sdk.TokensToConsensusPower(tokens Int)
 	sdk.DefaultPowerReduction = sdkmath.NewIntFromBigInt(new(big.Int).Exp(big.NewInt(10), big.NewInt(20), nil))
 
-	fxHome := os.ExpandEnv("$FX_HOME")
-	if len(fxHome) > 0 {
-		defaultNodeHome = fxHome
+	nodeHome := os.ExpandEnv("$FX_HOME")
+	if len(nodeHome) > 0 {
+		defaultNodeHome = nodeHome
 		return
 	}
+
 	userHomeDir, err := os.UserHomeDir()
 	if err != nil {
 		stdlog.Println("Failed to get home dir %2", err)
@@ -84,6 +88,14 @@ func VerifyAddressFormat(bz []byte) error {
 	return nil
 }
 
-func IsOriginDenom(denom string) bool {
-	return denom == DefaultDenom
+func SwapAmount(amount sdkmath.Int) sdkmath.Int {
+	return amount.QuoRaw(100)
+}
+
+func SwapCoin(coin sdk.Coin) sdk.Coin {
+	if coin.Denom != FXDenom {
+		return coin
+	}
+	coin.Amount = SwapAmount(coin.Amount)
+	return coin
 }

types/constant_test.go

@@ -28,11 +28,11 @@ func Test_NormalizeCoin(t *testing.T) {
 	coin := sdk.NewCoin(DefaultDenom, sdkmath.NewInt(1e18))
 	assert.Equal(t, coin, sdk.NormalizeCoin(coin))
 
-	myCoin, err := sdk.ParseCoinNormalized("1000000000000000000FX")
+	myCoin, err := sdk.ParseCoinNormalized("1000000000000000000" + DefaultDenom)
 	require.NoError(t, err)
 	assert.Equal(t, myCoin, sdk.NewCoin(DefaultDenom, sdkmath.NewInt(1e18)))
 
-	myCoin, err = sdk.ParseCoinNormalized("1FX")
+	myCoin, err = sdk.ParseCoinNormalized("1" + DefaultDenom)
 	require.NoError(t, err)
 	assert.Equal(t, myCoin, sdk.NewCoin(DefaultDenom, sdkmath.NewInt(1)))
 }

types/metadata.go

@@ -6,25 +6,29 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 )
 
-func NewFXMetaData() banktypes.Metadata {
+func NewDefaultMetadata() banktypes.Metadata {
 	return banktypes.Metadata{
-		Description: "The native staking token of the Function X",
+		Description: "The native staking token of the Pundi AIFX",
 		DenomUnits: []*banktypes.DenomUnit{
 			{
 				Denom:    DefaultDenom,
 				Exponent: 0,
 			},
+			{
+				Denom:    strings.ToLower(DefaultSymbol),
+				Exponent: DenomUnit,
+			},
 		},
 		Base:    DefaultDenom,
-		Display: DefaultDenom,
-		Name:    "Function X",
-		Symbol:  DefaultDenom,
+		Display: strings.ToLower(DefaultSymbol),
+		Name:    "Pundi AIFX Token",
+		Symbol:  DefaultSymbol,
 	}
 }
 
 func NewMetadata(name, symbol string, decimals uint32) banktypes.Metadata {
 	return banktypes.Metadata{
-		Description: "The crosschain token of the Function X",
+		Description: "The crosschain token of the Pundi AIFX",
 		DenomUnits: []*banktypes.DenomUnit{
 			{
 				Denom:    strings.ToLower(symbol),
@@ -36,7 +40,7 @@ func NewMetadata(name, symbol string, decimals uint32) banktypes.Metadata {
 			},
 		},
 		Base:    strings.ToLower(symbol),
-		Display: strings.ToLower(symbol),
+		Display: symbol,
 		Name:    name,
 		Symbol:  symbol,
 	}

types/metadata_test.go

@@ -0,0 +1,14 @@
+package types
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewMetadata(t *testing.T) {
+	metadata := NewMetadata("ABC Token", "ABC", 18)
+	assert.NoError(t, metadata.Validate())
+
+	assert.NoError(t, NewDefaultMetadata().Validate())
+}

x/crosschain/keeper/bridge_call_in.go

@@ -30,11 +30,7 @@ func (k Keeper) BridgeCallExecuted(ctx sdk.Context, caller contract.Caller, msg
 
 	baseCoins := sdk.NewCoins()
 	for i, tokenAddr := range msg.TokenContracts {
-		bridgeToken, err := k.DepositBridgeToken(ctx, receiverAddr.Bytes(), msg.Amounts[i], tokenAddr)
-		if err != nil {
-			return err
-		}
-		baseCoin, err := k.BridgeTokenToBaseCoin(ctx, receiverAddr.Bytes(), msg.Amounts[i], bridgeToken)
+		baseCoin, err := k.DepositBridgeTokenToBaseCoin(ctx, receiverAddr.Bytes(), msg.Amounts[i], tokenAddr)
 		if err != nil {
 			return err
 		}
@@ -73,7 +69,7 @@ func (k Keeper) BridgeCallExecuted(ctx sdk.Context, caller contract.Caller, msg
 		}
 
 		for _, coin := range baseCoins {
-			if fxtypes.IsOriginDenom(coin.Denom) {
+			if coin.Denom == fxtypes.DefaultDenom {
 				continue
 			}
 			if _, err = k.erc20Keeper.BaseCoinToEvm(ctx, caller, msg.GetRefundAddr(), coin); err != nil {

x/crosschain/keeper/bridge_call_out.go

@@ -153,11 +153,7 @@ func (k Keeper) RefundOutgoingBridgeCall(ctx sdk.Context, caller contract.Caller
 	refund := fxtypes.ExternalAddrToAccAddr(k.moduleName, data.GetRefund())
 	baseCoins := sdk.NewCoins()
 	for _, token := range data.Tokens {
-		bridgeToken, err := k.DepositBridgeToken(ctx, refund.Bytes(), token.Amount, token.Contract)
-		if err != nil {
-			return err
-		}
-		baseCoin, err := k.BridgeTokenToBaseCoin(ctx, refund.Bytes(), token.Amount, bridgeToken)
+		baseCoin, err := k.DepositBridgeTokenToBaseCoin(ctx, refund.Bytes(), token.Amount, token.Contract)
 		if err != nil {
 			return err
 		}

x/crosschain/keeper/bridge_token.go

@@ -15,12 +15,12 @@ import (
 func (k Keeper) AddBridgeTokenExecuted(ctx sdk.Context, claim *types.MsgBridgeTokenClaim) error {
 	k.Logger(ctx).Info("add bridge token claim", "symbol", claim.Symbol, "token", claim.TokenContract)
 
-	if claim.Symbol == fxtypes.DefaultDenom {
+	if claim.Symbol == fxtypes.DefaultSymbol {
 		if uint64(fxtypes.DenomUnit) != claim.Decimals {
 			return types.ErrInvalid.Wrapf("%s denom decimals not match %d, expect %d",
 				fxtypes.DefaultDenom, claim.Decimals, fxtypes.DenomUnit)
 		}
-		return k.erc20Keeper.AddBridgeToken(ctx, claim.Symbol, k.moduleName, claim.TokenContract, false)
+		return k.erc20Keeper.AddBridgeToken(ctx, fxtypes.DefaultDenom, k.moduleName, claim.TokenContract, false)
 	}
 
 	return k.erc20Keeper.AddBridgeToken(ctx, strings.ToLower(claim.Symbol), k.moduleName, claim.TokenContract, false)