refactor: ConvertGasToZeta RPC now takes chainID instead chainName st…

…ring. This is more precise and less ambiguous.
zeta-chain · Jul 25, 2023 · e997a2d · e997a2d
1 parent 8f3a7e1
commit e997a2d
Show file tree

Hide file tree

Showing 3 changed files with 134 additions and 150 deletions.
diff --git a/proto/crosschain/query.proto b/proto/crosschain/query.proto
@@ -342,7 +342,7 @@ message QueryLastZetaHeightResponse {
 }
 
 message QueryConvertGasToZetaRequest {
-	string chain = 1;
+	int64 chainId = 1;
 	string gasLimit = 2;
 }
 

diff --git a/x/crosschain/keeper/zeta_conversion_rate.go b/x/crosschain/keeper/zeta_conversion_rate.go
@@ -14,8 +14,8 @@ import (
 
 func (k Keeper) ConvertGasToZeta(context context.Context, request *types.QueryConvertGasToZetaRequest) (*types.QueryConvertGasToZetaResponse, error) {
 	ctx := sdk.UnwrapSDKContext(context)
-	chainName := common.ParseChainName(request.Chain)
-	chain := k.zetaObserverKeeper.GetParams(ctx).GetChainFromChainName(chainName)
+	chain := common.GetChainFromChainID(request.ChainId)
+
 	if chain == nil {
 		return nil, zetaObserverTypes.ErrSupportedChains
 	}
@@ -24,7 +24,7 @@ func (k Keeper) ConvertGasToZeta(context context.Context, request *types.QueryCo
 		return nil, status.Error(codes.InvalidArgument, "invalid request: param chain")
 	}
 	gasLimit := math.NewUintFromString(request.GasLimit)
-	outTxGasFee := medianGasPrice.Mul(gasLimit)
+	outTxGasFee := medianGasPrice.Mul(gasLimit).MulUint64(2) //FIXME: parameterize this to sync with where this fee is charged
 	zrc20, err := k.fungibleKeeper.QuerySystemContractGasCoinZRC20(ctx, big.NewInt(chain.ChainId))
 	if err != nil {
 		return nil, status.Error(codes.NotFound, "zrc20 not found")