fix: address issue based on feedback (#803)

Co-authored-by: fx0x55 <80245546+fx0x55@users.noreply.github.com>
PundiAI · Nov 4, 2024 · 5ffff9f · 5ffff9f
1 parent fc560de
commit 5ffff9f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/contract/ifx_bridge_logic.sol.go b/contract/ifx_bridge_logic.sol.go
diff --git a/contract/quote.go b/contract/quote.go
@@ -6,5 +6,5 @@ import (
 )
 
 func (i IBridgeFeeQuoteQuoteInfo) IsTimeout(blockTime time.Time) bool {
-	return new(big.Int).Sub(i.Expiry, big.NewInt(int64(blockTime.Second()))).Sign() <= 0
+	return new(big.Int).Sub(i.Expiry, big.NewInt(blockTime.Unix())).Sign() <= 0
 }
diff --git a/solidity/contracts/bridge/IFxBridgeLogic.sol b/solidity/contracts/bridge/IFxBridgeLogic.sol
@@ -229,12 +229,12 @@ interface IFxBridgeLogic is IBridgeCall {
         address indexed _refund,
         address indexed _to,
         address _txOrigin,
-        uint256 _value,
         uint256 _eventNonce,
         string _dstChain,
         address[] _tokens,
         uint256[] _amounts,
         bytes _data,
+        uint256 _quoteId,
         bytes _memo
     );
 

diff --git a/x/crosschain/types/msgs.go b/x/crosschain/types/msgs.go
@@ -387,7 +387,7 @@ func (m *MsgBridgeCallClaim) validate() (err error) {
 		return sdkerrors.ErrInvalidAddress.Wrapf("invalid refund address: %s", err)
 	}
 	if m.QuoteId.IsNil() || m.QuoteId.IsNegative() {
-		return sdkerrors.ErrInvalidRequest.Wrap("invalid value")
+		return sdkerrors.ErrInvalidRequest.Wrap("invalid quote ID")
 	}
 	if len(m.Data) > 0 {
 		if _, err = hex.DecodeString(m.Data); err != nil {

diff --git a/x/erc20/keeper/cache.go b/x/erc20/keeper/cache.go
@@ -27,7 +27,10 @@ func (k Keeper) GetCache(ctx context.Context, key string) (sdkmath.Int, error) {
 func (k Keeper) ReSetCache(ctx context.Context, oldKey, newKey string) error {
 	amount, err := k.Cache.Get(ctx, oldKey)
 	if err == nil {
-		return k.Cache.Set(ctx, newKey, amount)
+		if err = k.Cache.Set(ctx, newKey, amount); err != nil {
+			return err
+		}
+		return k.Cache.Remove(ctx, oldKey)
 	}
 
 	if !errors.IsOf(err, collections.ErrNotFound) {