@ton/appkit 0.0.5-alpha.3 → 1.0.0-alpha.0

package/src/actions/swap/set-default-swap-provider.ts

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { AppKit } from '../../core/app-kit';
+
+export interface SetDefaultSwapProviderParameters {
+    providerId: string;
+}
+
+export type SetDefaultSwapProviderReturnType = void;
+
+/**
+ * Set the default swap provider.
+ * Subsequent quote and swap-transaction calls will use this provider when none is specified.
+ */
+export const setDefaultSwapProvider = (
+    appKit: AppKit,
+    parameters: SetDefaultSwapProviderParameters,
+): SetDefaultSwapProviderReturnType => {
+    appKit.swapManager.setDefaultProvider(parameters.providerId);
+};

package/src/actions/swap/watch-swap-providers.ts

@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { AppKit } from '../../core/app-kit';
+
+export interface WatchSwapProvidersParameters {
+    onChange: () => void;
+}
+
+export type WatchSwapProvidersReturnType = () => void;
+
+/**
+ * Watch for new swap providers registration
+ */
+export const watchSwapProviders = (
+    appKit: AppKit,
+    parameters: WatchSwapProvidersParameters,
+): WatchSwapProvidersReturnType => {
+    const { onChange } = parameters;
+
+    const unsubscribeRegistered = appKit.emitter.on('provider:registered', (event) => {
+        if (event.payload.type === 'swap') onChange();
+    });
+
+    const unsubscribeDefaultChanged = appKit.emitter.on('provider:default-changed', (event) => {
+        if (event.payload.type === 'swap') onChange();
+    });
+
+    return () => {
+        unsubscribeRegistered();
+        unsubscribeDefaultChanged();
+    };
+};

package/src/connectors/tonconnect/connectors/ton-connect-connector.ts

@@ -29,7 +29,7 @@ export type TonConnectConnector = Connector & {
 };
 
 export const createTonConnectConnector = (config: TonConnectConnectorConfig) => {
-    return createConnector(({ eventEmitter, networkManager, ssr }): TonConnectConnector => {
+    return createConnector(({ eventEmitter, networkManager }): TonConnectConnector => {
         let originalTonConnectUI: TonConnectUI | null = null;
         let unsubscribeTonConnect: (() => void) | null = null;
 
@@ -40,7 +40,7 @@ export const createTonConnectConnector = (config: TonConnectConnectorConfig) =>
                 return originalTonConnectUI;
             }
 
-            if (ssr && typeof window === 'undefined') {
+            if (typeof window === 'undefined') {
                 return null;
             }
 

package/src/core/app-kit/constants/events.ts

@@ -29,10 +29,3 @@ export const NETWORKS_EVENTS = {
     UPDATED: 'networks:updated',
     DEFAULT_CHANGED: 'networks:default-changed',
 } as const;
-
-/**
- * Plugin events
- */
-export const PLUGIN_EVENTS = {
-    REGISTERED: 'plugin:registered',
-} as const;

package/src/core/app-kit/index.ts

@@ -7,7 +7,7 @@
  */
 
 export { AppKit } from './services/app-kit';
-export { CONNECTOR_EVENTS, WALLETS_EVENTS, PLUGIN_EVENTS, NETWORKS_EVENTS } from './constants/events';
+export { CONNECTOR_EVENTS, WALLETS_EVENTS, NETWORKS_EVENTS } from './constants/events';
 
 export type { AppKitConfig } from './types/config';
 export type {
@@ -15,6 +15,5 @@ export type {
     AppKitEvents,
     WalletConnectedPayload,
     WalletDisconnectedPayload,
-    PluginRegisteredPayload,
     DefaultNetworkChangedPayload,
 } from './types/events';

package/src/core/app-kit/services/app-kit.ts

@@ -9,16 +9,18 @@
 import { SwapManager, StreamingManager } from '@ton/walletkit';
 import type { ProviderInput, SwapProviderInterface, StakingProviderInterface } from '@ton/walletkit';
 
+import type { AppKitConfig } from '../types/config';
+import { CONNECTOR_EVENTS, WALLETS_EVENTS } from '../constants/events';
 import { StakingManager } from '../../../staking';
 import type { Connector, ConnectorFactoryContext, ConnectorInput } from '../../../types/connector';
 import { EventEmitter } from '../../emitter';
-import { CONNECTOR_EVENTS, WALLETS_EVENTS } from '../constants/events';
 import type { AppKitEmitter, AppKitEvents } from '../types/events';
 import type { WalletInterface } from '../../../types/wallet';
 import { WalletsManager } from '../../wallets-manager';
 import { AppKitNetworkManager } from '../../network';
 import { Network } from '../../../types/network';
-import type { AppKitConfig } from '../types/config';
+import type { AppKitCache } from '../../cache';
+import { LruAppKitCache } from '../../cache';
 
 /**
  * Central hub for wallet management.
@@ -34,9 +36,11 @@ export class AppKit {
     readonly networkManager: AppKitNetworkManager;
     readonly streamingManager: StreamingManager;
     readonly config: AppKitConfig;
+    readonly cache: AppKitCache;
 
     constructor(config: AppKitConfig) {
         this.config = config;
+        this.cache = config.cache ?? new LruAppKitCache();
 
         this.emitter = new EventEmitter<AppKitEvents>();
         this.emitter.on(CONNECTOR_EVENTS.CONNECTED, this.updateWalletsFromConnectors.bind(this));
@@ -68,7 +72,7 @@ export class AppKit {
     }
 
     createFactoryContext(): ConnectorFactoryContext {
-        return { eventEmitter: this.emitter, networkManager: this.networkManager, ssr: this.config?.ssr };
+        return { eventEmitter: this.emitter, networkManager: this.networkManager };
     }
 
     /**

package/src/core/app-kit/types/config.ts

@@ -8,6 +8,7 @@
 
 import type { NetworkAdapters, ProviderInput } from '@ton/walletkit';
 
+import type { AppKitCache } from '../../cache';
 import type { ConnectorInput } from '../../../types/connector';
 import type { Network } from '../../../types/network';
 
@@ -39,7 +40,8 @@ export interface AppKitConfig {
     providers?: ProviderInput[];
 
     /**
-     * Enable server-side rendering support
+     * Custom cache implementation.
+     * Defaults to an LRU cache with a 10-minute TTL and a maximum of 1000 entries.
      */
-    ssr?: boolean;
+    cache?: AppKitCache;
 }

package/src/core/app-kit/types/events.ts

@@ -6,9 +6,9 @@
  *
  */
 
-import type { SharedKitEvents } from '../../emitter';
-import type { CONNECTOR_EVENTS, WALLETS_EVENTS, PLUGIN_EVENTS, NETWORKS_EVENTS } from '../constants/events';
 import type { Network } from '../../../types/network';
+import type { CONNECTOR_EVENTS, WALLETS_EVENTS, NETWORKS_EVENTS } from '../constants/events';
+import type { SharedKitEvents } from '../../emitter';
 import type { EventEmitter } from '../../emitter';
 import type { WalletInterface } from '../../../types/wallet';
 
@@ -21,11 +21,6 @@ export interface WalletDisconnectedPayload {
     connectorId: string;
 }
 
-export interface PluginRegisteredPayload {
-    pluginId: string;
-    pluginType: string;
-}
-
 export interface DefaultNetworkChangedPayload {
     network: Network | undefined;
 }
@@ -42,9 +37,6 @@ export type AppKitEvents = {
     // Networks events
     [NETWORKS_EVENTS.UPDATED]: Record<string, never>;
     [NETWORKS_EVENTS.DEFAULT_CHANGED]: DefaultNetworkChangedPayload;
-
-    // Plugin events
-    [PLUGIN_EVENTS.REGISTERED]: PluginRegisteredPayload;
 } & SharedKitEvents;
 
 export type AppKitEmitter = EventEmitter<AppKitEvents>;

package/src/core/cache/adapters/lru-app-kit-cache.test.ts

@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { describe, expect, it } from 'vitest';
+
+import { LruAppKitCache } from './lru-app-kit-cache';
+
+describe('LruAppKitCache', () => {
+    it('should return undefined for a missing key', async () => {
+        const cache = new LruAppKitCache();
+        expect(await cache.get('missing')).toBeUndefined();
+    });
+
+    it('should store and retrieve a value', async () => {
+        const cache = new LruAppKitCache();
+        await cache.set('key', 'value');
+        expect(await cache.get('key')).toBe('value');
+    });
+
+    it('should store and retrieve null', async () => {
+        const cache = new LruAppKitCache();
+        await cache.set('key', null);
+        expect(await cache.get('key')).toBeNull();
+    });
+
+    it('should store and retrieve an object', async () => {
+        const cache = new LruAppKitCache();
+        const obj = { address: 'EQabc', name: 'Test', decimals: 6 };
+        await cache.set('key', obj);
+        expect(await cache.get('key')).toEqual(obj);
+    });
+
+    it('should overwrite an existing value', async () => {
+        const cache = new LruAppKitCache();
+        await cache.set('key', 'first');
+        await cache.set('key', 'second');
+        expect(await cache.get('key')).toBe('second');
+    });
+
+    it('should remove a key', async () => {
+        const cache = new LruAppKitCache();
+        await cache.set('key', 'value');
+        await cache.remove('key');
+        expect(await cache.get('key')).toBeUndefined();
+    });
+
+    it('should clear all keys', async () => {
+        const cache = new LruAppKitCache();
+        await cache.set('a', 1);
+        await cache.set('b', 2);
+        await cache.clear();
+        expect(await cache.get('a')).toBeUndefined();
+        expect(await cache.get('b')).toBeUndefined();
+    });
+
+    it('should evict entries when max is exceeded', async () => {
+        const cache = new LruAppKitCache({ max: 2 });
+        await cache.set('a', 1);
+        await cache.set('b', 2);
+        await cache.set('c', 3);
+        expect(await cache.get('a')).toBeUndefined();
+        expect(await cache.get('b')).toBe(2);
+        expect(await cache.get('c')).toBe(3);
+    });
+
+    it('should expire entries after ttl', async () => {
+        const cache = new LruAppKitCache({ ttl: 10 });
+        await cache.set('key', 'value');
+        await new Promise((resolve) => setTimeout(resolve, 20));
+        expect(await cache.get('key')).toBeUndefined();
+    });
+});

package/src/core/cache/adapters/lru-app-kit-cache.ts

@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { LRUCache } from 'lru-cache';
+
+import type { AppKitCache } from '../types/app-kit-cache';
+
+export class LruAppKitCache implements AppKitCache {
+    private readonly cache: LRUCache<string, { value: unknown }>;
+
+    constructor(options?: { max?: number; ttl?: number }) {
+        this.cache = new LRUCache({
+            max: options?.max ?? 1000,
+            ttl: options?.ttl ?? 1000 * 60 * 10,
+        });
+    }
+
+    async get<T = unknown>(key: string): Promise<T | undefined> {
+        return this.cache.get(key)?.value as T | undefined;
+    }
+
+    async set(key: string, value: unknown): Promise<void> {
+        this.cache.set(key, { value });
+    }
+
+    async remove(key: string): Promise<void> {
+        this.cache.delete(key);
+    }
+
+    async clear(): Promise<void> {
+        this.cache.clear();
+    }
+}

package/src/core/cache/index.ts

@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export { LruAppKitCache } from './adapters/lru-app-kit-cache';
+export { getCacheKey } from './utils/get-cache-key';
+
+export type { AppKitCache } from './types/app-kit-cache';

package/src/core/cache/types/app-kit-cache.ts

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export interface AppKitCache {
+    get<T = unknown>(key: string): Promise<T | undefined>;
+    set(key: string, value: unknown): Promise<void>;
+    remove(key: string): Promise<void>;
+    clear(): Promise<void>;
+}

package/src/core/cache/utils/get-cache-key.test.ts

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { describe, expect, it } from 'vitest';
+
+import { getCacheKey } from './get-cache-key';
+
+describe('getCacheKey', () => {
+    it('should build a key with a single param', () => {
+        const key = getCacheKey('jetton-info');
+        expect(key('EQabc')).toBe('jetton-info:EQabc');
+    });
+
+    it('should build a key with multiple params', () => {
+        const key = getCacheKey('jetton-info');
+        expect(key('mainnet', 'EQabc')).toBe('jetton-info:mainnet:EQabc');
+    });
+
+    it('should build a key with no params', () => {
+        const key = getCacheKey('jetton-info');
+        expect(key()).toBe('jetton-info:');
+    });
+
+    it('should scope keys independently per prefix', () => {
+        const infoKey = getCacheKey('jetton-info');
+        const walletKey = getCacheKey('jetton-wallet');
+        expect(infoKey('EQabc')).not.toBe(walletKey('EQabc'));
+    });
+});

package/src/core/cache/utils/get-cache-key.ts

@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export const getCacheKey =
+    (prefix: string) =>
+    (...params: string[]): string =>
+        `${prefix}:${params.join(':')}`;

package/src/index.ts

@@ -27,6 +27,7 @@
 
 // Core
 export * from './core/app-kit';
+export * from './core/cache';
 export * from './core/emitter';
 export * from './core/network';
 export * from './core/streaming';

package/src/queries/balances/get-balance-by-address.ts

@@ -13,7 +13,7 @@ import { getBalanceByAddress } from '../../actions/balances/get-balance-by-addre
 import type { GetBalanceByAddressOptions } from '../../actions/balances/get-balance-by-address';
 import type { QueryOptions, QueryParameter } from '../../types/query';
 import type { Compute, ExactPartial } from '../../types/utils';
-import { filterQueryOptions, resolveNetwork, sleep } from '../../utils';
+import { filterQueryOptions, resolveNetwork, sleep, tryToBounceableAddress } from '../../utils';
 import type { GetBalanceByAddressReturnType } from '../../actions/balances/get-balance-by-address';
 import type { BalanceUpdate } from '../../core/streaming';
 import type { Network } from '../../types/network';
@@ -32,7 +32,11 @@ export const getBalanceByAddressQueryOptions = <selectData = GetBalanceByAddress
     initialOptions: GetBalanceByAddressQueryConfig<selectData> = {},
 ): GetBalanceByAddressQueryOptions<selectData> => {
     const network = resolveNetwork(appKit, initialOptions.network);
-    const options = { ...initialOptions, network };
+    const options = {
+        ...initialOptions,
+        network,
+        address: tryToBounceableAddress(initialOptions.address) ?? initialOptions.address,
+    };
 
     return {
         ...options.query,
@@ -72,14 +76,17 @@ export const handleBalanceUpdate = (
     { address, network }: { address: string; network: Network },
     update: BalanceUpdate,
 ) => {
+    const queryKey = getBalanceByAddressQueryKey({
+        address: tryToBounceableAddress(address) ?? address,
+        network,
+    });
+
     if (update.status === 'finalized') {
-        const queryKey = getBalanceByAddressQueryKey({ address, network });
         queryClient.setQueryData(queryKey, update.balance);
         sleep(5000).then(() => queryClient.invalidateQueries({ queryKey }));
     }
 
     if (update.status === 'invalidated') {
-        const queryKey = getBalanceByAddressQueryKey({ address, network });
         queryClient.invalidateQueries({ queryKey });
     }
 };

package/src/queries/index.ts

@@ -166,12 +166,6 @@ export {
 } from './swap/build-swap-transaction';
 
 // Staking
-export {
-    getStakingProvidersQueryOptions,
-    type GetStakingProvidersData,
-    type GetStakingProvidersErrorType,
-    type GetStakingProvidersQueryConfig,
-} from './staking/get-staking-providers';
 export {
     getStakingQuoteQueryOptions,
     type GetStakingQuoteQueryConfig,

package/src/queries/jettons/get-jetton-balance-by-address.ts

@@ -14,7 +14,7 @@ import { getJettonBalance } from '../../actions/jettons/get-jetton-balance';
 import type { GetJettonBalanceOptions as GetJettonBalanceParameters } from '../../actions/jettons/get-jetton-balance';
 import type { QueryOptions, QueryParameter } from '../../types/query';
 import type { Compute, ExactPartial } from '../../types/utils';
-import { filterQueryOptions, resolveNetwork, sleep } from '../../utils';
+import { filterQueryOptions, resolveNetwork, sleep, tryToBounceableAddress } from '../../utils';
 import type { JettonUpdate } from '../../core/streaming';
 import type { Network } from '../../types/network';
 
@@ -37,7 +37,12 @@ export const getJettonBalanceByAddressQueryOptions = <selectData = GetJettonBala
     initialOptions: GetJettonBalanceByAddressQueryConfig<selectData> = {},
 ): GetJettonBalanceByAddressQueryOptions<selectData> => {
     const network = resolveNetwork(appKit, initialOptions.network);
-    const options = { ...initialOptions, network };
+    const options = {
+        ...initialOptions,
+        network,
+        jettonAddress: tryToBounceableAddress(initialOptions.jettonAddress) ?? initialOptions.jettonAddress,
+        ownerAddress: tryToBounceableAddress(initialOptions.ownerAddress) ?? initialOptions.ownerAddress,
+    };
 
     return {
         ...options.query,
@@ -82,22 +87,18 @@ export const handleJettonBalanceUpdate = (
     { ownerAddress, jettonAddress, network }: { ownerAddress: string; jettonAddress: string; network: Network },
     update: JettonUpdate,
 ) => {
+    const queryKey = getJettonBalanceByAddressQueryKey({
+        ownerAddress: tryToBounceableAddress(ownerAddress) ?? ownerAddress,
+        jettonAddress: tryToBounceableAddress(jettonAddress) ?? jettonAddress,
+        network,
+    });
+
     if (update.status === 'finalized') {
-        const queryKey = getJettonBalanceByAddressQueryKey({
-            ownerAddress,
-            jettonAddress,
-            network,
-        });
         queryClient.setQueryData(queryKey, update.balance);
         sleep(5000).then(() => queryClient.invalidateQueries({ queryKey }));
     }
 
     if (update.status === 'invalidated') {
-        const queryKey = getJettonBalanceByAddressQueryKey({
-            ownerAddress,
-            jettonAddress,
-            network,
-        });
         queryClient.invalidateQueries({ queryKey });
     }
 };

package/src/queries/jettons/get-jetton-info.ts

@@ -12,7 +12,7 @@ import type { GetJettonInfoOptions } from '../../actions/jettons/get-jetton-info
 import type { GetJettonInfoReturnType } from '../../actions/jettons/get-jetton-info';
 import type { QueryOptions, QueryParameter } from '../../types/query';
 import type { Compute, ExactPartial } from '../../types/utils';
-import { filterQueryOptions, resolveNetwork } from '../../utils';
+import { filterQueryOptions, resolveNetwork, tryToBounceableAddress } from '../../utils';
 
 export type GetJettonInfoErrorType = Error;
 
@@ -24,7 +24,11 @@ export const getJettonInfoQueryOptions = <selectData = GetJettonInfoData>(
     initialOptions: GetJettonInfoQueryConfig<selectData> = {},
 ): GetJettonInfoQueryOptions<selectData> => {
     const network = resolveNetwork(appKit, initialOptions.network);
-    const options = { ...initialOptions, network };
+    const options = {
+        ...initialOptions,
+        network,
+        address: tryToBounceableAddress(initialOptions.address) ?? initialOptions.address,
+    };
 
     return {
         ...options.query,

package/src/queries/jettons/get-jetton-wallet-address.ts

@@ -13,7 +13,7 @@ import { getJettonWalletAddress } from '../../actions/jettons/get-jetton-wallet-
 import type { GetJettonWalletAddressOptions as GetJettonWalletAddressParameters } from '../../actions/jettons/get-jetton-wallet-address';
 import type { QueryOptions, QueryParameter } from '../../types/query';
 import type { Compute, ExactPartial } from '../../types/utils';
-import { filterQueryOptions, resolveNetwork } from '../../utils';
+import { filterQueryOptions, resolveNetwork, tryToBounceableAddress } from '../../utils';
 
 export type GetJettonWalletAddressErrorType = Error;
 
@@ -32,7 +32,12 @@ export const getJettonWalletAddressQueryOptions = <selectData = GetJettonWalletA
     initialOptions: GetJettonWalletAddressQueryConfig<selectData> = {},
 ): GetJettonWalletAddressQueryOptions<selectData> => {
     const network = resolveNetwork(appKit, initialOptions.network);
-    const options = { ...initialOptions, network };
+    const options = {
+        ...initialOptions,
+        network,
+        jettonAddress: tryToBounceableAddress(initialOptions.jettonAddress) ?? initialOptions.jettonAddress,
+        ownerAddress: tryToBounceableAddress(initialOptions.ownerAddress) ?? initialOptions.ownerAddress,
+    };
 
     return {
         ...options.query,

package/src/queries/jettons/get-jettons-by-address.ts

@@ -13,7 +13,14 @@ import { getJettonsByAddress } from '../../actions/jettons/get-jettons-by-addres
 import type { GetJettonsByAddressOptions } from '../../actions/jettons/get-jettons-by-address';
 import type { QueryOptions, QueryParameter } from '../../types/query';
 import type { Compute, ExactPartial } from '../../types/utils';
-import { filterQueryOptions, resolveNetwork, compareAddress, formatUnits, sleep } from '../../utils';
+import {
+    filterQueryOptions,
+    resolveNetwork,
+    compareAddress,
+    formatUnits,
+    sleep,
+    tryToBounceableAddress,
+} from '../../utils';
 import type { GetJettonsByAddressReturnType } from '../../actions/jettons/get-jettons-by-address';
 import type { JettonUpdate } from '../../core/streaming';
 import type { Network } from '../../types/network';
@@ -32,7 +39,11 @@ export const getJettonsByAddressQueryOptions = <selectData = GetJettonsByAddress
     initialOptions: GetJettonsByAddressQueryConfig<selectData> = {},
 ): GetJettonsByAddressQueryOptions<selectData> => {
     const network = resolveNetwork(appKit, initialOptions.network);
-    const options = { ...initialOptions, network };
+    const options = {
+        ...initialOptions,
+        network,
+        address: tryToBounceableAddress(initialOptions.address) ?? initialOptions.address,
+    };
 
     return {
         ...options.query,
@@ -73,8 +84,12 @@ export const handleJettonsUpdate = (
     { address, network }: { address: string; network: Network },
     update: JettonUpdate,
 ) => {
+    const queryKey = getJettonsByAddressQueryKey({
+        address: tryToBounceableAddress(address) ?? address,
+        network,
+    });
+
     if (update.status === 'finalized') {
-        const queryKey = getJettonsByAddressQueryKey({ address, network });
         const currentData = queryClient.getQueryData(queryKey) as GetJettonsByAddressData | undefined;
 
         if (currentData?.jettons) {
@@ -99,7 +114,6 @@ export const handleJettonsUpdate = (
     }
 
     if (update.status === 'invalidated') {
-        const queryKey = getJettonsByAddressQueryKey({ address, network });
         queryClient.invalidateQueries({ queryKey });
     }
 };

package/src/queries/nft/get-nft.ts

@@ -13,7 +13,7 @@ import { getNft } from '../../actions/nft/get-nft';
 import type { GetNftOptions as GetNftParameters } from '../../actions/nft/get-nft';
 import type { QueryOptions, QueryParameter } from '../../types/query';
 import type { Compute, ExactPartial } from '../../types/utils';
-import { filterQueryOptions, resolveNetwork } from '../../utils';
+import { filterQueryOptions, resolveNetwork, tryToBounceableAddress } from '../../utils';
 
 export type GetNftErrorType = Error;
 
@@ -25,7 +25,11 @@ export const getNftQueryOptions = <selectData = GetNftData>(
     initialOptions: GetNftQueryConfig<selectData> = {},
 ): GetNftQueryOptions<selectData> => {
     const network = resolveNetwork(appKit, initialOptions.network);
-    const options = { ...initialOptions, network };
+    const options = {
+        ...initialOptions,
+        network,
+        address: tryToBounceableAddress(initialOptions.address) ?? initialOptions.address,
+    };
 
     return {
         ...options.query,
@@ -41,7 +45,7 @@ export const getNftQueryOptions = <selectData = GetNftData>(
     };
 };
 
-export type GetNftQueryFnData = Compute<NFT | null>;
+export type GetNftQueryFnData = Compute<NFT | undefined>;
 
 export type GetNftData = GetNftQueryFnData;