@ton/appkit 0.0.1 → 0.0.3

package/src/actions/nft/get-nfts-by-address.ts

@@ -8,9 +8,11 @@
 
 import { Address } from '@ton/core';
 import type { NFTsResponse } from '@ton/walletkit';
-import { Network, getNftsFromClient } from '@ton/walletkit';
+import { getNftsFromClient } from '@ton/walletkit';
 
 import type { AppKit } from '../../core/app-kit';
+import { resolveNetwork } from '../../utils/network/resolve-network';
+import type { Network } from '../../types/network';
 
 export interface GetNftsByAddressOptions {
     address: string | Address;
@@ -28,7 +30,7 @@ export const getNftsByAddress = async (
     const { address, network, limit, offset } = options;
     const addressString = Address.isAddress(address) ? address.toString() : Address.parse(address).toString();
 
-    const client = appKit.networkManager.getClient(network ?? Network.mainnet());
+    const client = appKit.networkManager.getClient(resolveNetwork(appKit, network));
 
     return getNftsFromClient(client, addressString, {
         pagination: {

package/src/actions/nft/get-nfts.ts

@@ -6,11 +6,12 @@
  *
  */
 
-import type { NFTsResponse, Network } from '@ton/walletkit';
+import type { NFTsResponse } from '@ton/walletkit';
 
 import type { AppKit } from '../../core/app-kit';
 import { getNftsByAddress } from './get-nfts-by-address';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
+import type { Network } from '../../types/network';
 
 export interface GetNftsOptions {
     network?: Network;

package/src/actions/signing/sign-binary.ts

@@ -6,12 +6,12 @@
  *
  */
 
-import type { Network } from '@ton/walletkit';
-
+import type { Network } from '../../types/network';
 import type { AppKit } from '../../core/app-kit';
 import type { SignDataResponse } from '../../types/signing';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 import type { Base64String } from '../../types/primitives';
+import { getDefaultNetwork } from '../network/get-default-network';
 
 export interface SignBinaryParameters {
     /** Binary data to sign (base64 encoded) */
@@ -39,7 +39,7 @@ export const signBinary = async (appKit: AppKit, parameters: SignBinaryParameter
     }
 
     return await wallet.signData({
-        network: parameters.network,
+        network: parameters.network ?? getDefaultNetwork(appKit),
         data: {
             type: 'binary',
             value: { content: parameters.bytes },

package/src/actions/signing/sign-cell.ts

@@ -6,12 +6,12 @@
  *
  */
 
-import type { Network } from '@ton/walletkit';
-
+import type { Network } from '../../types/network';
 import type { AppKit } from '../../core/app-kit';
 import type { SignDataResponse } from '../../types/signing';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 import type { Base64String } from '../../types/primitives';
+import { getDefaultNetwork } from '../network/get-default-network';
 
 export interface SignCellParameters {
     /** Base64 encoded Bag of Cells */
@@ -45,7 +45,7 @@ export const signCell = async (appKit: AppKit, parameters: SignCellParameters):
     }
 
     return await wallet.signData({
-        network: parameters.network,
+        network: parameters.network ?? getDefaultNetwork(appKit),
         data: {
             type: 'cell',
             value: {

package/src/actions/signing/sign-text.ts

@@ -6,11 +6,11 @@
  *
  */
 
-import type { Network } from '@ton/walletkit';
-
+import type { Network } from '../../types/network';
 import type { AppKit } from '../../core/app-kit';
 import type { SignDataResponse } from '../../types/signing';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
+import { getDefaultNetwork } from '../network/get-default-network';
 
 export interface SignTextParameters {
     /** Text message to sign */
@@ -38,7 +38,7 @@ export const signText = async (appKit: AppKit, parameters: SignTextParameters):
     }
 
     return await wallet.signData({
-        network: parameters.network,
+        network: parameters.network ?? getDefaultNetwork(appKit),
         data: {
             type: 'text',
             value: { content: parameters.text },

package/src/actions/transaction/get-transaction-status.ts

@@ -0,0 +1,71 @@
+/**
+ * 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 { TransactionStatusResponse } from '@ton/walletkit';
+import { getTransactionStatus as walletKitGetTransactionStatus } from '@ton/walletkit';
+
+import type { AppKit } from '../../core/app-kit';
+import type { Network } from '../../types/network';
+import { resolveNetwork } from '../../utils/network/resolve-network';
+
+export type GetTransactionStatusParameters = {
+    /** Network to check the transaction on */
+    network?: Network;
+} & (
+    | {
+          /** BOC of the sent transaction (base64) */
+          boc: string;
+          /** Hash of the sent transaction (hex) */
+          normalizedHash?: never;
+      }
+    | {
+          /** BOC of the sent transaction (base64) */
+          boc?: never;
+          /** Normalized Hash of the external-in transaction (hex) */
+          normalizedHash: string;
+      }
+);
+
+export type GetTransactionStatusReturnType = TransactionStatusResponse;
+
+export type GetTransactionStatusErrorType = Error;
+
+/**
+ * Get the status of a transaction by its BOC.
+ *
+ * In TON, a single external message triggers a tree of internal messages.
+ * The transaction is "complete" only when the entire trace finishes.
+ * This action checks toncenter's trace endpoints to determine the current status.
+ *
+ * @example
+ * ```ts
+ * const result = await sendTransaction(appKit, { messages: [...] });
+ * const status = await getTransactionStatus(appKit, { boc: result.boc });
+ * // status.status === 'pending' | 'completed' | 'failed'
+ * // status.completedMessages === 3
+ * // status.totalMessages === 5
+ * ```
+ */
+export const getTransactionStatus = async (
+    appKit: AppKit,
+    parameters: GetTransactionStatusParameters,
+): Promise<GetTransactionStatusReturnType> => {
+    const { boc, normalizedHash, network } = parameters;
+
+    const client = appKit.networkManager.getClient(resolveNetwork(appKit, network));
+
+    if (boc) {
+        return walletKitGetTransactionStatus(client, { boc });
+    }
+
+    if (normalizedHash) {
+        return walletKitGetTransactionStatus(client, { normalizedHash });
+    }
+
+    throw new Error('Either boc or normalizedHash must be provided');
+};

package/src/connectors/tonconnect/adapters/ton-connect-wallet-adapter.ts

@@ -8,10 +8,9 @@
 
 import { Address } from '@ton/core';
 import type { Wallet as TonConnectWallet } from '@tonconnect/sdk';
-import { CHAIN } from '@tonconnect/sdk';
 import type { SignDataPayload as TonConnectSignDataPayload } from '@tonconnect/sdk';
 import type { SendTransactionResponse, UserFriendlyAddress, Hex } from '@ton/walletkit';
-import { Network, asHex, createWalletId } from '@ton/walletkit';
+import { asHex, createWalletId, getNormalizedExtMessageHash } from '@ton/walletkit';
 import type { TonConnectUI } from '@tonconnect/ui';
 
 import type { TransactionRequest } from '../../../types/transaction';
@@ -19,6 +18,7 @@ import type { Base64String } from '../../../types/primitives';
 import { getValidUntil } from '../utils/transaction';
 import type { WalletInterface } from '../../../types/wallet';
 import type { SignDataRequest, SignDataResponse } from '../../../types/signing';
+import { Network } from '../../../types/network';
 
 /**
  * Configuration for TonConnectWalletAdapter
@@ -86,12 +86,17 @@ export class TonConnectWalletAdapter implements WalletInterface {
                 payload: msg.payload,
                 stateInit: msg.stateInit,
             })),
-            network: (request.network?.chainId as CHAIN) ?? this.tonConnectWallet.account?.chain,
+            network: request.network?.chainId ?? this.tonConnectWallet.account?.chain,
         };
 
         const result = await this.tonConnectUI.sendTransaction(transaction);
+        const { hash, boc: normalizedBoc } = getNormalizedExtMessageHash(result.boc);
 
-        return { boc: result.boc as Base64String };
+        return {
+            boc: result.boc as Base64String,
+            normalizedBoc,
+            normalizedHash: hash,
+        };
     }
 
     async signData(payload: SignDataRequest): Promise<SignDataResponse> {
@@ -110,21 +115,8 @@ export class TonConnectWalletAdapter implements WalletInterface {
     // Private helpers
     // ==========================================
 
-    private mapNetworkToChain(network: Network): CHAIN {
-        switch (network.chainId) {
-            case Network.mainnet().chainId:
-                return CHAIN.MAINNET;
-            case Network.testnet().chainId:
-                return CHAIN.TESTNET;
-            default:
-                return network.chainId as CHAIN;
-        }
-    }
-
     private mapSignDataRequest(request: SignDataRequest): TonConnectSignDataPayload {
-        const chainId = request.network
-            ? this.mapNetworkToChain(request.network)
-            : (this.getNetwork().chainId as CHAIN);
+        const chainId = request.network?.chainId ?? this.getNetwork().chainId;
 
         const { data } = request;
 

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

@@ -9,12 +9,14 @@
 import { TonConnectUI } from '@tonconnect/ui';
 import type { TonConnectUiCreateOptions } from '@tonconnect/ui';
 
+import type { Network } from '../../../types/network';
 import { TonConnectWalletAdapter } from '../adapters/ton-connect-wallet-adapter';
-import { CONNECTOR_EVENTS } from '../../../core/app-kit';
+import { CONNECTOR_EVENTS, NETWORKS_EVENTS } from '../../../core/app-kit';
 import type { Connector, ConnectorMetadata } from '../../../types/connector';
 import type { WalletInterface } from '../../../types/wallet';
 import type { AppKitEmitter } from '../../../core/app-kit';
 import { TONCONNECT_DEFAULT_CONNECTOR_ID } from '../constants/id';
+import type { AppKitNetworkManager } from '../../../core/network';
 
 export interface TonConnectConnectorConfig {
     id?: string;
@@ -49,7 +51,7 @@ export class TonConnectConnector implements Connector {
         };
     }
 
-    async initialize(emitter: AppKitEmitter): Promise<void> {
+    async initialize(emitter: AppKitEmitter, networkManager: AppKitNetworkManager): Promise<void> {
         this.emitter = emitter;
 
         // Subscribe to TonConnect status changes
@@ -63,6 +65,12 @@ export class TonConnectConnector implements Connector {
             }
         });
 
+        // Set default network and subscribe to changes
+        this.tonConnectUI.setConnectionNetwork(networkManager.getDefaultNetwork()?.chainId);
+        this.emitter?.on(NETWORKS_EVENTS.DEFAULT_CHANGED, ({ payload }) => {
+            this.tonConnectUI.setConnectionNetwork(payload.network?.chainId);
+        });
+
         // Restore existing connection
         await this.tonConnectUI.connector.restoreConnection();
     }
@@ -73,7 +81,8 @@ export class TonConnectConnector implements Connector {
         this.emitter = null;
     }
 
-    async connectWallet(): Promise<void> {
+    async connectWallet(network?: Network): Promise<void> {
+        this.tonConnectUI.setConnectionNetwork(network?.chainId);
         await this.tonConnectUI.openModal();
     }
 

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

@@ -27,6 +27,7 @@ export const WALLETS_EVENTS = {
  */
 export const NETWORKS_EVENTS = {
     UPDATED: 'networks:updated',
+    DEFAULT_CHANGED: 'networks:default-changed',
 } as const;
 
 /**

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

@@ -16,4 +16,5 @@ export type {
     WalletConnectedPayload,
     WalletDisconnectedPayload,
     PluginRegisteredPayload,
+    DefaultNetworkChangedPayload,
 } from './types/events';

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

@@ -6,8 +6,7 @@
  *
  */
 
-import type { NetworkManager } from '@ton/walletkit';
-import { Network, SwapManager } from '@ton/walletkit';
+import { SwapManager } from '@ton/walletkit';
 import type { Provider } from 'src/types/provider';
 
 import type { AppKitConfig } from '../types/config';
@@ -17,7 +16,8 @@ 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 './app-kit-network-manager';
+import { AppKitNetworkManager } from '../../network';
+import { Network } from '../../../types/network';
 
 /**
  * Central hub for wallet management.
@@ -29,7 +29,7 @@ export class AppKit {
     readonly walletsManager: WalletsManager;
     readonly swapManager: SwapManager;
 
-    readonly networkManager: NetworkManager;
+    readonly networkManager: AppKitNetworkManager;
     readonly config: AppKitConfig;
 
     constructor(config: AppKitConfig) {

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

@@ -10,6 +10,7 @@ import type { NetworkAdapters } from '@ton/walletkit';
 
 import type { Connector } from '../../../types/connector';
 import type { Provider } from '../../../types/provider';
+import type { Network } from '../../../types/network';
 
 /**
  * Configuration for AppKit
@@ -23,6 +24,14 @@ export interface AppKitConfig {
      * Values contain apiClient configuration (url and optional API key)
      */
     networks?: NetworkAdapters;
+
+    /**
+     * Default network for wallet connections.
+     * If set, connectors (e.g. TonConnect) will enforce this network when connecting.
+     * Set to `undefined` to allow any network.
+     */
+    defaultNetwork?: Network;
+
     connectors?: Connector[];
     providers?: Provider[];
 }

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

@@ -6,6 +6,7 @@
  *
  */
 
+import type { Network } from '../../../types/network';
 import type { Emitter } from '../../emitter';
 import type { CONNECTOR_EVENTS, WALLETS_EVENTS, PLUGIN_EVENTS, NETWORKS_EVENTS } from '../constants/events';
 import type { WalletInterface } from '../../../types/wallet';
@@ -24,6 +25,10 @@ export interface PluginRegisteredPayload {
     pluginType: string;
 }
 
+export interface DefaultNetworkChangedPayload {
+    network: Network | undefined;
+}
+
 export interface AppKitEvents {
     // Connector events
     [CONNECTOR_EVENTS.CONNECTED]: WalletConnectedPayload;
@@ -35,6 +40,7 @@ export interface AppKitEvents {
 
     // Networks events
     [NETWORKS_EVENTS.UPDATED]: Record<string, never>;
+    [NETWORKS_EVENTS.DEFAULT_CHANGED]: DefaultNetworkChangedPayload;
 
     // Plugin events
     [PLUGIN_EVENTS.REGISTERED]: PluginRegisteredPayload;

package/src/core/network/index.ts

@@ -0,0 +1,10 @@
+/**
+ * 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 { AppKitNetworkManager } from './services/app-kit-network-manager';
+export { ApiClient, ApiClientToncenter, ApiClientTonApi } from '@ton/walletkit';

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

@@ -0,0 +1,45 @@
+/**
+ * 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 { ApiClient } from '@ton/walletkit';
+import { KitNetworkManager } from '@ton/walletkit';
+
+import { NETWORKS_EVENTS } from '../../app-kit/constants/events';
+import type { AppKitEmitter } from '../../app-kit/types/events';
+import type { Network } from '../../../types/network';
+
+export class AppKitNetworkManager extends KitNetworkManager {
+    private emitter: AppKitEmitter;
+    private defaultNetwork: Network | undefined = undefined;
+
+    constructor(options: ConstructorParameters<typeof KitNetworkManager>[0], emitter: AppKitEmitter) {
+        super(options);
+        this.emitter = emitter;
+    }
+
+    /**
+     * Get the current default network
+     */
+    getDefaultNetwork(): Network | undefined {
+        return this.defaultNetwork;
+    }
+
+    /**
+     * Set the default network for wallet connections.
+     * Emits a change event and propagates to all connectors.
+     */
+    setDefaultNetwork(network: Network | undefined): void {
+        this.defaultNetwork = network;
+        this.emitter.emit(NETWORKS_EVENTS.DEFAULT_CHANGED, { network }, 'network-manager');
+    }
+
+    override setClient(network: Network, client: ApiClient): void {
+        super.setClient(network, client);
+        this.emitter.emit(NETWORKS_EVENTS.UPDATED, {}, 'network-manager');
+    }
+}

package/src/index.ts

@@ -28,6 +28,7 @@
 // Core
 export * from './core/app-kit';
 export * from './core/emitter';
+export * from './core/network';
 export * from './connectors/tonconnect';
 
 export * from './swap';

package/src/queries/index.ts

@@ -179,3 +179,12 @@ export {
     type SendTransactionParameters,
     type SendTransactionReturnType,
 } from './transaction/send-transaction';
+export {
+    getTransactionStatusQueryOptions,
+    type GetTransactionStatusData,
+    type GetTransactionStatusErrorType,
+    type GetTransactionStatusParameters,
+    type GetTransactionStatusReturnType,
+    type GetTransactionStatusQueryConfig,
+    type GetTransactionStatusQueryOptions,
+} from './transaction/get-transaction-status';

package/src/queries/transaction/get-transaction-status.ts

@@ -0,0 +1,50 @@
+/**
+ * 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 { getTransactionStatus } from '../../actions/transaction/get-transaction-status';
+import type {
+    GetTransactionStatusErrorType,
+    GetTransactionStatusParameters,
+    GetTransactionStatusReturnType,
+} from '../../actions/transaction/get-transaction-status';
+import type { AppKit } from '../../core/app-kit';
+import type { QueryOptions, QueryParameter } from '../../types/query';
+import type { Compute } from '../../types/utils';
+
+export type { GetTransactionStatusErrorType, GetTransactionStatusParameters, GetTransactionStatusReturnType };
+
+export type GetTransactionStatusData = Compute<GetTransactionStatusReturnType>;
+
+export type GetTransactionStatusQueryKey = readonly ['transactionStatus', string];
+
+export type GetTransactionStatusQueryConfig<selectData = GetTransactionStatusData> = QueryParameter<
+    GetTransactionStatusData,
+    GetTransactionStatusErrorType,
+    selectData,
+    GetTransactionStatusQueryKey
+>;
+
+export type GetTransactionStatusQueryOptions<selectData = GetTransactionStatusData> = QueryOptions<
+    GetTransactionStatusData,
+    GetTransactionStatusErrorType,
+    selectData,
+    GetTransactionStatusQueryKey
+>;
+
+export const getTransactionStatusQueryOptions = <selectData = GetTransactionStatusData>(
+    appKit: AppKit,
+    options: GetTransactionStatusParameters & GetTransactionStatusQueryConfig<selectData>,
+): GetTransactionStatusQueryOptions<selectData> => {
+    return {
+        ...options.query,
+        queryFn: () => {
+            return getTransactionStatus(appKit, options);
+        },
+        queryKey: ['transactionStatus', (options.boc ?? options.normalizedHash) as string] as const,
+    };
+};

package/src/swap/index.ts

@@ -6,4 +6,17 @@
  *
  */
 
-export type { SwapToken, TokenAmount, SwapParams } from '@ton/walletkit';
+export type {
+    SwapToken,
+    TokenAmount,
+    SwapParams,
+    SwapAPI,
+    SwapFee,
+    SwapQuote,
+    SwapQuoteParams,
+    DefiManagerAPI,
+    DefiProvider,
+    SwapProvider,
+    SwapError,
+    SwapManager,
+} from '@ton/walletkit';

package/src/types/connector.ts

@@ -6,10 +6,10 @@
  *
  */
 
-import type { NetworkManager } from '@ton/walletkit';
-
 import type { WalletInterface } from './wallet';
 import type { AppKitEmitter } from '../core/app-kit';
+import type { AppKitNetworkManager } from '../core/network';
+import type { Network } from './network';
 
 /**
  * Interface for wallet connectors
@@ -24,13 +24,13 @@ export interface Connector {
     readonly metadata: ConnectorMetadata;
 
     /** Initialize connector (restore connections, setup event listeners) */
-    initialize(emitter: AppKitEmitter, networkManager: NetworkManager): Promise<void>;
+    initialize(emitter: AppKitEmitter, networkManager: AppKitNetworkManager): Promise<void>;
 
     /** Cleanup connector resources */
     destroy(): void;
 
     /** Connect a wallet */
-    connectWallet(): Promise<void>;
+    connectWallet(network?: Network): Promise<void>;
 
     /** Disconnect a wallet */
     disconnectWallet(): Promise<void>;

package/src/types/transaction.ts

@@ -10,6 +10,8 @@ import type { ExtraCurrencies, TokenAmount } from '@ton/walletkit';
 
 import type { Network } from './network';
 
+export type { TransactionStatus } from '@ton/walletkit';
+
 export interface TransactionRequest {
     /**
      * List of messages to include in the transaction

package/src/types/wallet.ts

@@ -6,10 +6,11 @@
  *
  */
 
-import type { Network, SendTransactionResponse, Hex, UserFriendlyAddress } from '@ton/walletkit';
+import type { SendTransactionResponse, Hex, UserFriendlyAddress } from '@ton/walletkit';
 
 import type { TransactionRequest } from './transaction';
 import type { SignDataRequest, SignDataResponse } from './signing';
+import type { Network } from './network';
 
 /**
  * Minimal wallet interface for appkit.

package/src/utils/index.ts

@@ -20,4 +20,5 @@ export * from './predicate/is-string';
 export * from './promise/cancel-promise';
 export * from './promise/sleep';
 export * from './query/filter-query-options';
+export * from './network/resolve-network';
 export * from './string/middle-ellipsis';

package/src/utils/jetton/jetton-info.ts

@@ -6,7 +6,6 @@
  *
  */
 
-import { formatUnits } from '@ton/walletkit';
 import type { Jetton } from '@ton/walletkit';
 
 export const getJettonsSymbol = (jetton: Jetton): string | undefined => {
@@ -46,7 +45,6 @@ export const getFormattedJettonInfo = (jetton: Jetton) => {
     const jettonImage = getJettonsImage(jetton);
     const jettonBalance = jetton.balance || '0';
     const jettonDecimals = jetton.decimalsNumber;
-    const formattedBalance = jettonDecimals ? formatUnits(jettonBalance, jettonDecimals) : '0';
 
     return {
         address: jetton.address,
@@ -56,7 +54,7 @@ export const getFormattedJettonInfo = (jetton: Jetton) => {
         symbol: jettonSymbol,
         image: jettonImage,
         imageData: jetton.info?.image?.data,
-        balance: formattedBalance,
+        balance: jettonBalance,
         decimals: jettonDecimals,
     };
 };

package/src/utils/network/resolve-network.ts

@@ -0,0 +1,30 @@
+/**
+ * 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 { Network } from '../../types/network';
+import type { AppKit } from '../../core/app-kit';
+import { getSelectedWallet } from '../../actions/wallets/get-selected-wallet';
+import { getDefaultNetwork } from '../../actions/network/get-default-network';
+
+/**
+ * Resolve the network to use for API requests.
+ *
+ * Priority:
+ * 1. Explicitly passed `network` parameter
+ * 2. Selected wallet's network
+ * 3. Configured default network
+ * 4. Mainnet (last resort)
+ */
+export const resolveNetwork = (appKit: AppKit, network?: Network): Network => {
+    if (network) return network;
+
+    const wallet = getSelectedWallet(appKit);
+    if (wallet) return wallet.getNetwork();
+
+    return getDefaultNetwork(appKit) ?? Network.mainnet();
+};

package/tsconfig.cjs.json

@@ -0,0 +1,10 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "module": "commonjs",
+        "moduleResolution": "node",
+        "outDir": "dist/cjs",
+        "declaration": true,
+        "declarationDir": "dist/cjs",
+    }
+}