fix: refine function handling in 807 (#808)

Co-authored-by: todd <81545601+todd-woko@users.noreply.github.com>

app/app.go

@@ -349,7 +349,7 @@ func (app *App) InitChainer(ctx sdk.Context, req *abci.RequestInitChain) (*abci.
 	}
 
 	bridgeFeeQuoteKeeper := contract.NewBridgeFeeQuoteKeeper(app.EvmKeeper, contract.BridgeFeeAddress)
-	bridgeFeeOracleKeeper := contract.NewBrideFeeOracleKeeper(app.EvmKeeper, contract.BridgeFeeOracleAddress)
+	bridgeFeeOracleKeeper := contract.NewBridgeFeeOracleKeeper(app.EvmKeeper, contract.BridgeFeeOracleAddress)
 
 	acc := app.AccountKeeper.GetModuleAddress(evmtypes.ModuleName)
 	moduleAddress := common.BytesToAddress(acc.Bytes())
@@ -361,15 +361,18 @@ func (app *App) InitChainer(ctx sdk.Context, req *abci.RequestInitChain) (*abci.
 	if len(delegations) == 0 {
 		return nil, errors.New("no delegations found")
 	}
-
+	bridgeDenoms := []contract.BridgeDenoms{
+		{
+			ChainName: ethtypes.ModuleName,
+			Denoms:    []string{fxtypes.DefaultDenom},
+		},
+	}
 	if err = contract.DeployBridgeFeeContract(
 		ctx,
 		app.EvmKeeper,
 		bridgeFeeQuoteKeeper,
 		bridgeFeeOracleKeeper,
-		map[string][]string{
-			ethtypes.ModuleName: {fxtypes.DefaultDenom},
-		},
+		bridgeDenoms,
 		moduleAddress, moduleAddress,
 		common.BytesToAddress(sdk.MustAccAddressFromBech32(delegations[0].DelegatorAddress).Bytes()),
 	); err != nil {

app/upgrades/v8/upgrade.go

@@ -76,19 +76,22 @@ func CreateUpgradeHandler(cdc codec.Codec, mm *module.Manager, configurator modu
 		store.RemoveStoreKeys(cacheCtx, app.GetKey(erc20types.StoreKey), erc20v8.GetRemovedStoreKeys())
 
 		quoteKeeper := contract.NewBridgeFeeQuoteKeeper(app.EvmKeeper, contract.BridgeFeeAddress)
-		oracleKeeper := contract.NewBrideFeeOracleKeeper(app.EvmKeeper, contract.BridgeFeeOracleAddress)
-		bridgeDenomWithChain := make(map[string][]string)
+		oracleKeeper := contract.NewBridgeFeeOracleKeeper(app.EvmKeeper, contract.BridgeFeeOracleAddress)
 		chains := crosschaintypes.GetSupportChains()
-		for _, chain := range chains {
+		bridgeDenoms := make([]contract.BridgeDenoms, len(chains))
+		for index, chain := range chains {
 			denoms := make([]string, 0)
-			bridgeTokens, err := app.Erc20Keeper.GetBridgeTokens(ctx, chain)
+			bridgeTokens, err := app.Erc20Keeper.GetBridgeTokens(cacheCtx, chain)
 			if err != nil {
 				return fromVM, err
 			}
 			for _, token := range bridgeTokens {
 				denoms = append(denoms, token.GetDenom())
 			}
-			bridgeDenomWithChain[chain] = denoms
+			bridgeDenoms[index] = contract.BridgeDenoms{
+				ChainName: chain,
+				Denoms:    denoms,
+			}
 		}
 		acc := app.AccountKeeper.GetModuleAddress(evmtypes.ModuleName)
 		moduleAddress := common.BytesToAddress(acc.Bytes())
@@ -103,7 +106,7 @@ func CreateUpgradeHandler(cdc codec.Codec, mm *module.Manager, configurator modu
 			app.EvmKeeper,
 			quoteKeeper,
 			oracleKeeper,
-			bridgeDenomWithChain,
+			bridgeDenoms,
 			moduleAddress,
 			// TODO set bridge fee contract owner address before mainnet upgrade
 			moduleAddress,

contract/bridge_fee.go

@@ -13,7 +13,7 @@ func DeployBridgeFeeContract(
 	evmKeeper EvmKeeper,
 	bridgeFeeQuoteKeeper BridgeFeeQuoteKeeper,
 	bridgeFeeOracleKeeper BridgeFeeOracleKeeper,
-	bridgeDenomWithChain map[string][]string,
+	bridgeDenoms []BridgeDenoms,
 	evmModuleAddress, owner, defaultOracleAddress common.Address,
 ) error {
 	if err := deployBridgeProxy(
@@ -40,7 +40,7 @@ func DeployBridgeFeeContract(
 	if err := initBridgeFeeOracle(ctx, bridgeFeeOracleKeeper, owner, defaultOracleAddress); err != nil {
 		return err
 	}
-	return initBridgeFeeQuote(ctx, bridgeFeeQuoteKeeper, bridgeDenomWithChain, owner)
+	return initBridgeFeeQuote(ctx, bridgeFeeQuoteKeeper, bridgeDenoms, owner)
 }
 
 func deployBridgeProxy(
@@ -101,7 +101,7 @@ func initBridgeFeeOracle(
 func initBridgeFeeQuote(
 	ctx sdk.Context,
 	bridgeFeeQuoteKeeper BridgeFeeQuoteKeeper,
-	bridgeDenomWithChain map[string][]string,
+	bridgeDenoms []BridgeDenoms,
 	owner common.Address,
 ) error {
 	if _, err := bridgeFeeQuoteKeeper.Initialize(ctx, common.HexToAddress(BridgeFeeOracleAddress), big.NewInt(DefaultMaxQuoteIndex)); err != nil {
@@ -121,8 +121,8 @@ func initBridgeFeeQuote(
 	if _, err = bridgeFeeQuoteKeeper.GrantRole(ctx, upgradeRole, owner); err != nil {
 		return err
 	}
-	for chainName, denoms := range bridgeDenomWithChain {
-		if _, err = bridgeFeeQuoteKeeper.RegisterChain(ctx, chainName, denoms...); err != nil {
+	for _, bridgeDenom := range bridgeDenoms {
+		if _, err = bridgeFeeQuoteKeeper.RegisterChain(ctx, bridgeDenom.ChainName, bridgeDenom.Denoms...); err != nil {
 			return err
 		}
 	}

contract/bridge_fee_oracle.go

@@ -17,7 +17,7 @@ type BridgeFeeOracleKeeper struct {
 	contract common.Address
 }
 
-func NewBrideFeeOracleKeeper(caller Caller, contract string) BridgeFeeOracleKeeper {
+func NewBridgeFeeOracleKeeper(caller Caller, contract string) BridgeFeeOracleKeeper {
 	return BridgeFeeOracleKeeper{
 		Caller:   caller,
 		abi:      GetBridgeFeeOracle().ABI,

contract/types.go

@@ -1,3 +1,8 @@
 package contract
 
 const DefaultMaxQuoteIndex = 3
+
+type BridgeDenoms struct {
+	ChainName string
+	Denoms    []string
+}

solidity/contracts/bridge/BridgeFeeOracle.sol

@@ -36,13 +36,13 @@ contract BridgeFeeOracle is
     function initialize(address _crosschain) public initializer {
         crosschainContract = _crosschain;
 
-        _grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
-        _grantRole(UPGRADE_ROLE, msg.sender);
-        _grantRole(OWNER_ROLE, msg.sender);
-
         __AccessControl_init();
         __UUPSUpgradeable_init();
         __ReentrancyGuard_init();
+
+        _grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
+        _grantRole(UPGRADE_ROLE, msg.sender);
+        _grantRole(OWNER_ROLE, msg.sender);
     }
 
     /**

solidity/contracts/bridge/BridgeFeeQuote.sol

@@ -65,13 +65,13 @@ contract BridgeFeeQuote is
         oracleContract = _oracleContract;
         maxQuoteIndex = _maxQuoteIndex;
 
-        _grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
-        _grantRole(UPGRADE_ROLE, msg.sender);
-        _grantRole(OWNER_ROLE, msg.sender);
-
         __AccessControl_init();
         __UUPSUpgradeable_init();
         __ReentrancyGuard_init();
+
+        _grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
+        _grantRole(UPGRADE_ROLE, msg.sender);
+        _grantRole(OWNER_ROLE, msg.sender);
     }
 
     event NewQuote(
@@ -415,6 +415,9 @@ contract BridgeFeeQuote is
         if (assets[_chainName].isActive) {
             revert ChainNameAlreadyExists();
         }
+        if (_chainName.equal("")) {
+            revert ChainNameInvalid();
+        }
         assets[_chainName] = Asset({isActive: true, tokenNames: _tokenNames});
         chainNames.push(_chainName);
         return true;