use evm standard

Author: Tanut Lertwarachai

relayer/chains/evm/provider.go

@@ -457,7 +457,7 @@ func (cp *EVMChainProvider) prepareTransaction(
 						WithChainName(cp.ChainName), err.Error())
 				} else {
 					diff := new(big.Int).Sub(newBalance, oldBalance)
-					balanceDelta = decimal.NewNullDecimal(decimal.NewFromBigInt(diff, -18))
+					balanceDelta = decimal.NewNullDecimal(decimal.NewFromBigInt(diff, 0))
 					alert.HandleReset(cp.Alert, alert.NewTopic(alert.GetBalanceErrorMsg).
 						WithTunnelID(packet.TunnelID).
 						WithChainName(cp.ChainName))
@@ -502,9 +502,8 @@ func (cp *EVMChainProvider) CheckConfirmedTx(
 	}
 
 	// calculate gas used and effective gas price
-	// gas_used is gas units (dimensionless), effective_gas_price stored in ETH (converted from wei)
 	gasUsed := decimal.NewNullDecimal(decimal.New(int64(receipt.GasUsed), 0))
-	gasPrice := decimal.NewNullDecimal(decimal.NewFromBigInt(receipt.EffectiveGasPrice, -18))
+	gasPrice := decimal.NewNullDecimal(decimal.New(int64(receipt.EffectiveGasPrice.Uint64()), 0))
 
 	if receipt.Status == gethtypes.ReceiptStatusFailed {
 		return NewTxResult(

relayer/chains/evm/provider_test.go

@@ -235,7 +235,7 @@ func (s *ProviderTestSuite) TestCheckConfirmedTx() {
 			out: evm.NewTxResult(
 				chaintypes.TX_STATUS_SUCCESS,
 				decimal.NewNullDecimal(decimal.New(21000, 0)),
-				decimal.NewNullDecimal(decimal.NewFromBigInt(big.NewInt(20000), -18)),
+				decimal.NewNullDecimal(decimal.New(20000, 0)),
 				big.NewInt(100),
 				"",
 			),
@@ -253,7 +253,7 @@ func (s *ProviderTestSuite) TestCheckConfirmedTx() {
 			out: evm.NewTxResult(
 				chaintypes.TX_STATUS_FAILED,
 				decimal.NewNullDecimal(decimal.New(21000, 0)),
-				decimal.NewNullDecimal(decimal.NewFromBigInt(big.NewInt(20000), -18)),
+				decimal.NewNullDecimal(decimal.New(20000, 0)),
 				big.NewInt(100),
 				"transaction reverted on-chain",
 			),

relayer/chains/xrpl/provider.go

@@ -22,6 +22,8 @@ import (
 	"github.com/bandprotocol/falcon/relayer/wallet/xrpl"
 )
 
+const xrplToWeiExp = 12
+
 var _ chains.ChainProvider = (*XRPLChainProvider)(nil)
 
 // XRPLChainProvider handles interactions with XRPL.
@@ -342,13 +344,13 @@ func (cp *XRPLChainProvider) prepareTransaction(
 	fee := decimal.NullDecimal{}
 	balanceDelta := decimal.NullDecimal{}
 
-	// Convert fee from drops (string) to XRP decimal
+	// Convert fee from drops (string) to XRP decimal, scaled by 10^12 to match EVM wei
 	if txResult.Fee != "" {
 		feeDecimal, err := decimal.NewFromString(txResult.Fee)
 		if err != nil {
 			log.Error("Failed to parse fee", "fee", txResult.Fee, "retry_count", retryCount, err)
 		} else {
-			fee = decimal.NewNullDecimal(feeDecimal.Shift(-6))
+			fee = decimal.NewNullDecimal(feeDecimal.Mul(decimal.NewFromInt(1).Shift(xrplToWeiExp)))
 		}
 	}
 
@@ -363,7 +365,7 @@ func (cp *XRPLChainProvider) prepareTransaction(
 				WithChainName(cp.ChainName), err.Error())
 		} else {
 			diff := new(big.Int).Sub(newBalance, oldBalance)
-			balanceDelta = decimal.NewNullDecimal(decimal.NewFromBigInt(diff, -6))
+			balanceDelta = decimal.NewNullDecimal(decimal.NewFromBigInt(diff, xrplToWeiExp))
 			alert.HandleReset(cp.Alert, alert.NewTopic(alert.GetBalanceErrorMsg).
 				WithTunnelID(packet.TunnelID).
 				WithChainName(cp.ChainName))