Skip to content

Commit

Permalink
chore: merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
peterpeterparker committed Nov 5, 2024
2 parents 327d1b9 + 74e8f4d commit 320e995
Show file tree
Hide file tree
Showing 58 changed files with 57 additions and 57 deletions.
2 changes: 1 addition & 1 deletion src/frontend/src/env/networks.icrc.env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { ETHEREUM_TOKEN, SEPOLIA_TOKEN } from '$env/tokens.env';
import type { EnvTokens } from '$env/types/env-token-ckerc20';
import type { EnvTokenSymbol } from '$env/types/env-token-common';
import type { LedgerCanisterIdText } from '$icp/types/canister';
import type { IcCkInterface, IcInterface } from '$icp/types/ic';
import type { IcCkInterface, IcInterface } from '$icp/types/ic-token';
import { BETA, LOCAL, PROD, STAGING } from '$lib/constants/app.constants';
import type { CanisterIdText, OptionCanisterIdText } from '$lib/types/canister';
import type { NetworkEnvironment } from '$lib/types/network';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/env/tokens.env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { ICP_INDEX_CANISTER_ID, ICP_LEDGER_CANISTER_ID } from '$env/networks.icp
import eth from '$icp-eth/assets/eth.svg';
import icpLight from '$icp/assets/icp_light.svg';
import { ICP_TRANSACTION_FEE_E8S } from '$icp/constants/icp.constants';
import type { IcToken } from '$icp/types/ic';
import type { IcToken } from '$icp/types/ic-token';
import type { RequiredToken, RequiredTokenWithLinkedData, TokenId } from '$lib/types/token';
import { parseTokenId } from '$lib/validation/token.validation';

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp-eth/derived/cketh.derived.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
toCkEthHelperContractAddress
} from '$icp-eth/utils/cketh.utils';
import { tokenWithFallbackAsIcToken } from '$icp/derived/ic-token.derived';
import type { IcCkToken } from '$icp/types/ic';
import type { IcCkToken } from '$icp/types/ic-token';
import { isTokenCkErc20Ledger, isTokenCkEthLedger } from '$icp/utils/ic-send.utils';
import { DEFAULT_ETHEREUM_TOKEN } from '$lib/constants/tokens.constants';
import { tokenStandard, tokenWithFallback } from '$lib/derived/token.derived';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp-eth/derived/icrc-erc20.derived.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { enabledErc20TokensAddresses } from '$eth/derived/erc20.derived';
import type { ContractAddressText } from '$eth/types/address';
import type { Erc20ContractAddress, Erc20Token } from '$eth/types/erc20';
import { enabledIcrcTokens } from '$icp/derived/icrc.derived';
import type { IcCkToken, IcToken } from '$icp/types/ic';
import type { IcCkToken, IcToken } from '$icp/types/ic-token';
import { nonNullish } from '@dfinity/utils';
import { derived, type Readable } from 'svelte/store';

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp-eth/services/cketh.services.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { minterInfo } from '$icp-eth/api/cketh-minter.api';
import { ckEthMinterInfoStore } from '$icp-eth/stores/cketh.store';
import type { OptionCertifiedMinterInfo } from '$icp-eth/types/cketh-minter';
import type { IcCkMetadata } from '$icp/types/ic';
import type { IcCkMetadata } from '$icp/types/ic-token';
import { queryAndUpdate } from '$lib/actors/query.ic';
import { i18n } from '$lib/stores/i18n.store';
import { toastsError } from '$lib/stores/toasts.store';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp-eth/services/eth.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
type MapCkEthereumPendingTransactionParams
} from '$icp-eth/utils/cketh-transactions.utils';
import { icPendingTransactionsStore } from '$icp/stores/ic-pending-transactions.store';
import type { IcCkLinkedAssets, IcToken } from '$icp/types/ic';
import type { IcCkLinkedAssets, IcToken } from '$icp/types/ic-token';
import type { IcTransactionUi } from '$icp/types/ic-transaction';
import { nullishSignOut } from '$lib/services/auth.services';
import { i18n } from '$lib/stores/i18n.store';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp-eth/services/user-token.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { loadUserTokens } from '$eth/services/erc20.services';
import type { Erc20Token } from '$eth/types/erc20';
import type { Erc20UserToken } from '$eth/types/erc20-user-token';
import type { EthereumNetwork } from '$eth/types/network';
import type { IcCkToken } from '$icp/types/ic';
import type { IcCkToken } from '$icp/types/ic-token';
import { setUserToken as setUserTokenApi } from '$lib/api/backend.api';
import { autoLoadToken, type AutoLoadTokenResult } from '$lib/services/token.services';
import { i18n } from '$lib/stores/i18n.store';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp-eth/utils/cketh-transactions.utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { EthereumNetwork } from '$eth/types/network';
import type { IcCkLinkedAssets, IcToken } from '$icp/types/ic';
import type { IcCkLinkedAssets, IcToken } from '$icp/types/ic-token';
import type { IcTransactionUi } from '$icp/types/ic-transaction';
import { isNetworkIdETH, isTokenCkErc20Ledger, isTokenCkEthLedger } from '$icp/utils/ic-send.utils';
import { i18n } from '$lib/stores/i18n.store';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import { BTC_MAINNET_SYMBOL } from '$env/tokens.btc.env';
import IcSendModal from '$icp/components/send/IcSendModal.svelte';
import { ckBtcMinterInfoStore } from '$icp/stores/ckbtc.store';
import type { OptionIcCkToken } from '$icp/types/ic';
import type { OptionIcCkToken } from '$icp/types/ic-token';
import ButtonHero from '$lib/components/hero/ButtonHero.svelte';
import IconCkConvert from '$lib/components/icons/IconCkConvert.svelte';
import { isBusy } from '$lib/derived/busy.derived';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/components/core/IcCkListener.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { onDestroy, onMount } from 'svelte';
import type { IcCkWorker, IcCkWorkerInitResult } from '$icp/types/ck-listener';
import type { OptionIcCkToken } from '$icp/types/ic';
import type { OptionIcCkToken } from '$icp/types/ic-token';
import type { CanisterIdText } from '$lib/types/canister';
import type { Token } from '$lib/types/token';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
ETHEREUM_FEE_CONTEXT_KEY,
type EthereumFeeContext
} from '$icp/stores/ethereum-fee.store';
import type { IcToken } from '$icp/types/ic';
import type { IcToken } from '$icp/types/ic-token';
import { isTokenCkEthLedger } from '$icp/utils/ic-send.utils';
import { isTokenIcrcTestnet } from '$icp/utils/icrc-ledger.utils';
import {
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/components/fee/IcTokenFee.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { nonNullish } from '@dfinity/utils';
import { BigNumber } from '@ethersproject/bignumber';
import { getContext } from 'svelte';
import type { OptionIcToken } from '$icp/types/ic';
import type { OptionIcToken } from '$icp/types/ic-token';
import Value from '$lib/components/ui/Value.svelte';
import { i18n } from '$lib/stores/i18n.store';
import { SEND_CONTEXT_KEY, type SendContext } from '$lib/stores/send.store';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/components/info/Info.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
tokenCkErc20Ledger,
tokenCkEthLedger
} from '$icp/derived/ic-token.derived';
import type { OptionIcCkToken } from '$icp/types/ic';
import type { OptionIcCkToken } from '$icp/types/ic-token';
import type { HideInfoKey } from '$icp/utils/ck.utils';
import { isNetworkIdETHMainnet } from '$icp/utils/ic-send.utils';
import InfoEthereum from '$icp-eth/components/info/InfoEthereum.svelte';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/components/receive/IcReceive.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
RECEIVE_TOKEN_CONTEXT_KEY,
type ReceiveTokenContext
} from '$icp/stores/receive-token.store';
import type { IcToken } from '$icp/types/ic';
import type { IcToken } from '$icp/types/ic-token';
import {
isTokenCkBtcLedger,
isTokenCkErc20Ledger,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
RECEIVE_TOKEN_CONTEXT_KEY,
type ReceiveTokenContext
} from '$icp/stores/receive-token.store';
import type { IcCkToken } from '$icp/types/ic';
import type { IcCkToken } from '$icp/types/ic-token';
import ReceiveAddress from '$lib/components/receive/ReceiveAddress.svelte';
import ButtonDone from '$lib/components/ui/ButtonDone.svelte';
import ContentWithToolbar from '$lib/components/ui/ContentWithToolbar.svelte';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/components/send/IcSendAmount.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
ETHEREUM_FEE_CONTEXT_KEY,
type EthereumFeeContext
} from '$icp/stores/ethereum-fee.store';
import type { OptionIcToken } from '$icp/types/ic';
import { IcAmountAssertionError } from '$icp/types/ic-send';
import type { OptionIcToken } from '$icp/types/ic-token';
import { assertCkBTCUserInputAmount } from '$icp/utils/ckbtc.utils';
import {
assertCkETHBalanceEstimatedFee,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
type EthereumFeeContext as EthereumFeeContextType,
initEthereumFeeStore
} from '$icp/stores/ethereum-fee.store';
import type { IcToken } from '$icp/types/ic';
import type { IcTransferParams } from '$icp/types/ic-send';
import type { IcToken } from '$icp/types/ic-token';
import {
isConvertCkErc20ToErc20,
isConvertCkEthToEth
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/components/tokens/IcTokenMenu.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { nonNullish } from '@dfinity/utils';
import { fade } from 'svelte/transition';
import type { OptionIcCkToken } from '$icp/types/ic';
import type { OptionIcCkToken } from '$icp/types/ic-token';
import TokenMenu from '$lib/components/tokens/TokenMenu.svelte';
import ExternalLink from '$lib/components/ui/ExternalLink.svelte';
import { i18n } from '$lib/stores/i18n.store';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/components/tokens/IcTokenModal.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { Modal } from '@dfinity/gix-components';
import { nonNullish } from '@dfinity/utils';
import type { OptionIcCkToken } from '$icp/types/ic';
import type { OptionIcCkToken } from '$icp/types/ic-token';
import Token from '$lib/components/tokens/Token.svelte';
import ButtonDone from '$lib/components/ui/ButtonDone.svelte';
import ContentWithToolbar from '$lib/components/ui/ContentWithToolbar.svelte';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import type { OptionIcCkToken } from '$icp/types/ic';
import type { OptionIcCkToken } from '$icp/types/ic-token';
import { i18n } from '$lib/stores/i18n.store';
import { token } from '$lib/stores/token.store';
import type { Token } from '$lib/types/token';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import { initCkBTCMinterInfoWorker } from '$icp/services/worker.ck-minter-info.services';
import { initCkBTCUpdateBalanceWorker } from '$icp/services/worker.ckbtc-update-balance.services';
import { ckBtcMinterInfoStore } from '$icp/stores/ckbtc.store';
import type { OptionIcCkToken } from '$icp/types/ic';
import type { OptionIcCkToken } from '$icp/types/ic-token';
import { tokenId } from '$lib/derived/token.derived';
import { token } from '$lib/stores/token.store';
import type { Token } from '$lib/types/token';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import IcCkListener from '$icp/components/core/IcCkListener.svelte';
import { initCkETHMinterInfoWorker } from '$icp/services/worker.ck-minter-info.services';
import type { OptionIcCkToken } from '$icp/types/ic';
import type { OptionIcCkToken } from '$icp/types/ic-token';
import CkEthereumPendingTransactionsListener from '$icp-eth/components/core/CkEthereumPendingTransactionsListener.svelte';
import { ckEthereumNativeToken } from '$icp-eth/derived/cketh.derived';
import { token } from '$lib/stores/token.store';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/derived/ckbtc-transactions.derived.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ckBtcPendingUtxosStore } from '$icp/stores/ckbtc-utxos.store';
import { ckBtcMinterInfoStore } from '$icp/stores/ckbtc.store';
import type { IcTransactionsData } from '$icp/stores/ic-transactions.store';
import type { IcCkToken } from '$icp/types/ic';
import type { IcCkToken } from '$icp/types/ic-token';
import { mapCkBTCPendingUtxo } from '$icp/utils/ckbtc-transactions.utils';
import { isTokenCkBtcLedger } from '$icp/utils/ic-send.utils';
import { tokenWithFallback } from '$lib/derived/token.derived';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/derived/ethereum-fee.derived.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { icrcTokens } from '$icp/derived/icrc.derived';
import type { IcCkToken, IcToken } from '$icp/types/ic';
import type { IcCkToken, IcToken } from '$icp/types/ic-token';
import { isTokenCkEthLedger } from '$icp/utils/ic-send.utils';
import { token } from '$lib/stores/token.store';
import { isNullish, nonNullish } from '@dfinity/utils';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/derived/ic-token.derived.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IcToken } from '$icp/types/ic';
import type { IcToken } from '$icp/types/ic-token';
import {
isTokenCkBtcLedger,
isTokenCkErc20Ledger,
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/derived/icrc.derived.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
import { icrcCustomTokensStore } from '$icp/stores/icrc-custom-tokens.store';
import { icrcDefaultTokensStore } from '$icp/stores/icrc-default-tokens.store';
import type { LedgerCanisterIdText } from '$icp/types/canister';
import type { IcToken } from '$icp/types/ic';
import type { IcToken } from '$icp/types/ic-token';
import type { IcTokenToggleable } from '$icp/types/ic-token-toggleable';
import type { IcrcCustomToken } from '$icp/types/icrc-custom-token';
import { isTokenIcrcTestnet } from '$icp/utils/icrc-ledger.utils';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/services/ck.services.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { retrieveBtc } from '$icp/api/ckbtc-minter.api';
import { withdrawErc20, withdrawEth } from '$icp/api/cketh-minter.api';
import { approve } from '$icp/api/icrc-ledger.api';
import type { IcCanisters, IcCkMetadata, IcCkToken } from '$icp/types/ic';
import type { IcTransferParams } from '$icp/types/ic-send';
import type { IcCanisters, IcCkMetadata, IcCkToken } from '$icp/types/ic-token';
import { nowInBigIntNanoSeconds } from '$icp/utils/date.utils';
import { NANO_SECONDS_IN_MINUTE } from '$lib/constants/app.constants';
import { ProgressStepsSendIc } from '$lib/enums/progress-steps';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/services/ckbtc.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { btcAddressStore } from '$icp/stores/btc.store';
import { ckBtcPendingUtxosStore } from '$icp/stores/ckbtc-utxos.store';
import { ckBtcMinterInfoStore } from '$icp/stores/ckbtc.store';
import type { CkBtcUpdateBalanceParams } from '$icp/types/ckbtc';
import type { IcCkMetadata, IcCkToken, IcToken } from '$icp/types/ic';
import type { IcCkMetadata, IcCkToken, IcToken } from '$icp/types/ic-token';
import { queryAndUpdate, type QueryAndUpdateRequestParams } from '$lib/actors/query.ic';
import { ProgressStepsUpdateBalanceCkBtc } from '$lib/enums/progress-steps';
import { waitWalletReady } from '$lib/services/actions.services';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/services/cketh.services.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { eip1559TransactionPrice } from '$icp/api/cketh-minter.api';
import { eip1559TransactionPriceStore } from '$icp/stores/cketh.store';
import type { IcCkToken } from '$icp/types/ic';
import type { IcCkToken } from '$icp/types/ic-token';
import { isTokenCkErc20Ledger } from '$icp/utils/ic-send.utils';
import { queryAndUpdate } from '$lib/actors/query.ic';
import { i18n } from '$lib/stores/i18n.store';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { getLedgerId, getTransactions as getTransactionsIcrc } from '$icp/api/icrc-index-ng.api';
import { balance, metadata } from '$icp/api/icrc-ledger.api';
import type { IcCanisters, IcToken, IcTokenWithoutId } from '$icp/types/ic';
import type { IcCanisters, IcToken, IcTokenWithoutId } from '$icp/types/ic-token';
import { mapIcrcToken } from '$icp/utils/icrc.utils';
import { i18n } from '$lib/stores/i18n.store';
import { toastsError } from '$lib/stores/toasts.store';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/services/ic-send.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import {
convertCkETHToEth,
convertCkErc20ToErc20
} from '$icp/services/ck.services';
import type { IcToken } from '$icp/types/ic';
import type { IcTransferParams } from '$icp/types/ic-send';
import type { IcToken } from '$icp/types/ic-token';
import { invalidIcrcAddress } from '$icp/utils/icrc-account.utils';
import { ProgressStepsSendIc } from '$lib/enums/progress-steps';
import { i18n } from '$lib/stores/i18n.store';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/services/ic-transactions.services.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getTransactions as getTransactionsIcp } from '$icp/api/icp-index.api';
import { getTransactions as getTransactionsIcrc } from '$icp/api/icrc-index-ng.api';
import { icTransactionsStore } from '$icp/stores/ic-transactions.store';
import type { IcToken } from '$icp/types/ic';
import type { IcToken } from '$icp/types/ic-token';
import type { IcTransaction } from '$icp/types/ic-transaction';
import { mapIcTransaction } from '$icp/utils/ic-transactions.utils';
import { mapTransactionIcpToSelf } from '$icp/utils/icp-transactions.utils';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/services/icrc.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { metadata } from '$icp/api/icrc-ledger.api';
import { buildIndexedIcrcCustomTokens } from '$icp/services/icrc-custom-tokens.services';
import { icrcCustomTokensStore } from '$icp/stores/icrc-custom-tokens.store';
import { icrcDefaultTokensStore } from '$icp/stores/icrc-default-tokens.store';
import type { IcInterface } from '$icp/types/ic';
import type { IcInterface } from '$icp/types/ic-token';
import type { IcrcCustomTokenWithoutId } from '$icp/types/icrc-custom-token';
import {
buildIcrcCustomTokenMetadataPseudoResponse,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
} from '$icp/services/cketh-listener.services';
import type { SyncCkMinterInfoError, SyncCkMinterInfoSuccess } from '$icp/types/ck';
import type { IcCkWorker, IcCkWorkerInitResult, IcCkWorkerParams } from '$icp/types/ck-listener';
import type { IcCkMetadata } from '$icp/types/ic';
import type { IcCkMetadata } from '$icp/types/ic-token';
import type {
PostMessage,
PostMessageDataResponseError,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
onLoadTransactionsError,
onTransactionsCleanUp
} from '$icp/services/ic-transactions.services';
import type { IcToken } from '$icp/types/ic';
import type { IcToken } from '$icp/types/ic-token';
import type { WalletWorker } from '$lib/types/listener';
import type {
PostMessage,
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/stores/certified-icrc.store.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IcToken } from '$icp/types/ic';
import type { IcToken } from '$icp/types/ic-token';
import type { CanisterIdText } from '$lib/types/canister';
import type { CertifiedData } from '$lib/types/store';
import type { TokenId } from '$lib/types/token';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/stores/icrc-default-tokens.store.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { initCertifiedIcrcTokensStore } from '$icp/stores/certified-icrc.store';
import type { IcToken, IcTokenWithoutId } from '$icp/types/ic';
import type { IcToken, IcTokenWithoutId } from '$icp/types/ic-token';

export const icrcDefaultTokensStore = initCertifiedIcrcTokensStore<IcTokenWithoutId, IcToken>();
2 changes: 1 addition & 1 deletion src/frontend/src/icp/stores/receive-token.store.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ETHEREUM_NETWORK } from '$env/networks.env';
import { ETHEREUM_TOKEN } from '$env/tokens.env';
import type { EthereumNetwork } from '$eth/types/network';
import type { IcCkToken, IcToken } from '$icp/types/ic';
import type { IcCkToken, IcToken } from '$icp/types/ic-token';
import type { Token, TokenId, TokenStandard } from '$lib/types/token';
import { derived, writable, type Readable } from 'svelte/store';

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/types/ck-listener.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IcCkLinkedAssets } from '$icp/types/ic';
import type { IcCkLinkedAssets } from '$icp/types/ic-token';
import type { PostMessageDataRequestIcCk } from '$lib/types/post-message';
import type { Token } from '$lib/types/token';

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/types/ic-token-toggleable.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IcToken } from '$icp/types/ic';
import type { IcToken } from '$icp/types/ic-token';
import type { TokenToggleable } from '$lib/types/token-toggleable';

export type IcTokenToggleable = TokenToggleable<IcToken>;
File renamed without changes.
2 changes: 1 addition & 1 deletion src/frontend/src/icp/types/icrc-custom-token.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { EnvIcrcToken, EnvIcrcTokenMetadata } from '$env/types/env-icrc-token';
import type { IcToken, IcTokenWithoutId } from '$icp/types/ic';
import type { IcToken, IcTokenWithoutId } from '$icp/types/ic-token';
import type { TokenToggleable, UserTokenState } from '$lib/types/token-toggleable';
import type { Option } from '$lib/types/utils';

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/utils/ckbtc-transactions.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
import { IC_CKBTC_LEDGER_CANISTER_ID } from '$env/networks.icrc.env';
import type { BtcStatusesData } from '$icp/stores/btc.store';
import type { IcCertifiedTransaction } from '$icp/stores/ic-transactions.store';
import type { IcToken } from '$icp/types/ic';
import type { IcToken } from '$icp/types/ic-token';
import type { IcTransactionUi, IcrcTransaction } from '$icp/types/ic-transaction';
import { utxoTxIdToString } from '$icp/utils/btc.utils';
import { MINT_MEMO_KYT_FAIL, decodeBurnMemo, decodeMintMemo } from '$icp/utils/ckbtc-memo.utils';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/utils/cketh-transactions.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
STAGING_CKETH_LEDGER_CANISTER_ID
} from '$env/networks.icrc.env';
import { mapAddressStartsWith0x } from '$icp-eth/utils/eth.utils';
import type { IcToken } from '$icp/types/ic';
import type { IcToken } from '$icp/types/ic-token';
import type { IcTransactionUi, IcrcTransaction } from '$icp/types/ic-transaction';
import {
MINT_MEMO_REIMBURSE_TRANSACTION,
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/utils/cketh.utils.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { CkEthMinterInfoData } from '$icp-eth/stores/cketh.store';
import type { EthereumFeeStoreData } from '$icp/stores/ethereum-fee.store';
import type { IcToken } from '$icp/types/ic';
import { IcAmountAssertionError } from '$icp/types/ic-send';
import type { IcToken } from '$icp/types/ic-token';
import { ZERO } from '$lib/constants/app.constants';
import type { OptionBalance } from '$lib/types/balance';
import type { Option } from '$lib/types/utils';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/icp/utils/ic-send.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
CKERC20_LEDGER_CANISTER_IDS,
CKETH_LEDGER_CANISTER_IDS
} from '$env/networks.icrc.env';
import type { IcToken } from '$icp/types/ic';
import type { IcToken } from '$icp/types/ic-token';
import { invalidIcrcAddress } from '$icp/utils/icrc-account.utils';
import type { CanisterIdText } from '$lib/types/canister';
import type { NetworkId } from '$lib/types/network';
Expand Down
Loading

0 comments on commit 320e995

Please sign in to comment.