From 723a2e645f642987e17a3a2d5e4910e130a0d41f Mon Sep 17 00:00:00 2001 From: Hau Nguyen Van Date: Fri, 6 Dec 2024 11:08:17 +0700 Subject: [PATCH] fix type timeoutTimestamp --- src/pages/Balance/helpers.ts | 18 +++++++++++------- src/rest/api.ts | 4 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/pages/Balance/helpers.ts b/src/pages/Balance/helpers.ts index e7b71c5f3..9df8654de 100644 --- a/src/pages/Balance/helpers.ts +++ b/src/pages/Balance/helpers.ts @@ -29,7 +29,6 @@ import { cosmosNetworks, feeEstimate, getNetworkGasPrice } from 'helper'; import { CwIcs20LatestClient } from '@oraichain/common-contracts-sdk'; import { TransferBackMsg } from '@oraichain/common-contracts-sdk/build/CwIcs20Latest.types'; import { OraiswapRouterQueryClient, OraiswapTokenClient } from '@oraichain/oraidex-contracts-sdk'; -import { Long } from 'cosmjs-types/helpers'; import { MsgTransfer } from 'cosmjs-types/ibc/applications/transfer/v1/tx'; import CosmJs, { collectWallet, connectWithSigner, getCosmWasmClient } from 'libs/cosmjs'; import KawaiiverseJs from 'libs/kawaiiversejs'; @@ -73,7 +72,7 @@ export const transferIBC = async (data: { sender: fromAddress, receiver: toAddress, memo, - timeoutTimestamp: Long.fromString(calculateTimeoutTimestamp(ibcInfo.timeout)), + timeoutTimestamp: BigInt(calculateTimeoutTimestamp(ibcInfo.timeout)), timeoutHeight: undefined }; let feeDenom = fromToken.denom; @@ -191,10 +190,15 @@ export const transferIBCMultiple = async ( })); const offlineSigner = await collectWallet(fromChainId); // Initialize the gaia api with the offline signer that is injected by Keplr extension. - const client = await connectWithSigner(rpc, offlineSigner, fromChainId === 'injective-1' ? 'injective' : 'cosmwasm', { - gasPrice: GasPrice.fromString(`${await getNetworkGasPrice(fromChainId)}${feeDenom}`), - broadcastPollIntervalMs: 600 - }); + const client = await connectWithSigner( + rpc, + offlineSigner as any, + fromChainId === 'injective-1' ? 'injective' : 'cosmwasm', + { + gasPrice: GasPrice.fromString(`${await getNetworkGasPrice(fromChainId)}${feeDenom}`), + broadcastPollIntervalMs: 600 + } + ); // hardcode fix bug osmosis let fee: 'auto' | number = 'auto'; if (fromChainId === 'osmosis-1') fee = 3; @@ -236,7 +240,7 @@ export const transferTokenErc20Cw20Map = async ({ sender: fromAddress, receiver: toAddress, memo: ibcMemo, - timeoutTimestamp: calculateTimeoutTimestamp(ibcInfo.timeout) + timeoutTimestamp: BigInt(calculateTimeoutTimestamp(ibcInfo.timeout)) }) }; diff --git a/src/rest/api.ts b/src/rest/api.ts index e930abb32..23bb19a85 100644 --- a/src/rest/api.ts +++ b/src/rest/api.ts @@ -43,7 +43,6 @@ import { Position } from '@oraichain/oraidex-contracts-sdk/build/OraiswapV3.type import { generateSwapOperationMsgs, simulateSwap } from '@oraichain/oraidex-universal-swap'; import { oraichainTokens, tokenMap, tokens } from 'config/bridgeTokens'; import { network } from 'config/networks'; -import { Long } from 'cosmjs-types/helpers'; import { MsgTransfer } from 'cosmjs-types/ibc/applications/transfer/v1/tx'; import isEqual from 'lodash/isEqual'; import { RemainingOraibTokenItem } from 'pages/Balance/StuckOraib/useGetOraiBridgeBalances'; @@ -685,7 +684,8 @@ function generateMoveOraib2OraiMessages( sender: fromAddress, receiver: toAddress, memo: '', - timeoutTimestamp: Long.fromString(calculateTimeoutTimestamp(ibcInfo.timeout)) + timeoutHeight: undefined, + timeoutTimestamp: BigInt(calculateTimeoutTimestamp(ibcInfo.timeout)) }); } return transferMsgs;