From 46257599cb0a586ac3dac7cfbb0ca9280db1a90a Mon Sep 17 00:00:00 2001 From: x1kk4 Date: Tue, 6 Oct 2026 02:00:43 +0400 Subject: [PATCH 01/12] fix: resolve display addresses through Toncenter --- src/components/PendingDeployLink.test.tsx | 31 +++ src/components/PendingDeployLink.tsx | 14 ++ src/hooks/useDisplayAddresses.test.tsx | 48 +++++ src/hooks/useDisplayAddresses.ts | 22 +++ src/lib/display-address.test.ts | 118 +++++++++++ src/lib/display-address.ts | 102 ++++++++++ src/pages/deployer/index.tsx | 8 +- src/pages/jetton/address-loading.test.tsx | 94 +++++++++ src/pages/jetton/dataRow/token/Token.tsx | 3 +- src/pages/jetton/wallet/Wallet.tsx | 13 +- src/store/jetton-store/index.ts | 4 + .../jetton-store/useJettonStore.test.tsx | 186 ++++++++++++++++++ src/store/jetton-store/useJettonStore.ts | 21 +- 13 files changed, 653 insertions(+), 11 deletions(-) create mode 100644 src/components/PendingDeployLink.test.tsx create mode 100644 src/components/PendingDeployLink.tsx create mode 100644 src/hooks/useDisplayAddresses.test.tsx create mode 100644 src/hooks/useDisplayAddresses.ts create mode 100644 src/lib/display-address.test.ts create mode 100644 src/lib/display-address.ts create mode 100644 src/pages/jetton/address-loading.test.tsx create mode 100644 src/store/jetton-store/useJettonStore.test.tsx diff --git a/src/components/PendingDeployLink.test.tsx b/src/components/PendingDeployLink.test.tsx new file mode 100644 index 0000000..771db1f --- /dev/null +++ b/src/components/PendingDeployLink.test.tsx @@ -0,0 +1,31 @@ +import { render, screen } from "@testing-library/react"; +import { Address } from "ton"; +import { formatAddress, Network, NETWORK_CONFIG } from "lib/network"; +import { PendingDeployLink } from "./PendingDeployLink"; + +const address = Address.parseRaw(`0:${"ab".repeat(32)}`); +const fetchMock = jest.spyOn(global, "fetch"); +afterEach(() => fetchMock.mockReset()); +afterAll(() => fetchMock.mockRestore()); + +test.each<[Network, boolean]>([ + ["mainnet", false], + ["testnet", false], + ["testnet", true], +])( + "pending deployment uses Toncenter's format on %s (bounceable %s)", + async (network, bounceable) => { + const friendly = formatAddress(address, network, bounceable); + fetchMock.mockResolvedValueOnce({ + ok: true, + json: async () => ({ + [address.toString()]: { user_friendly: friendly }, + }), + } as Response); + render(); + expect(await screen.findByRole("link", { name: "explorer" })).toHaveAttribute( + "href", + `${NETWORK_CONFIG[network].explorer}/address/${friendly}`, + ); + }, +); diff --git a/src/components/PendingDeployLink.tsx b/src/components/PendingDeployLink.tsx new file mode 100644 index 0000000..8c6e335 --- /dev/null +++ b/src/components/PendingDeployLink.tsx @@ -0,0 +1,14 @@ +import { Link } from "@mui/material"; +import { useDisplayAddresses } from "hooks/useDisplayAddresses"; +import { Network, NETWORK_CONFIG } from "lib/network"; + +export function PendingDeployLink({ address, network }: { address: string; network: Network }) { + const [displayAddress] = useDisplayAddresses([address], network); + return displayAddress ? ( + + explorer + + ) : ( + <>explorer (loading…) + ); +} diff --git a/src/hooks/useDisplayAddresses.test.tsx b/src/hooks/useDisplayAddresses.test.tsx new file mode 100644 index 0000000..a8b5a96 --- /dev/null +++ b/src/hooks/useDisplayAddresses.test.tsx @@ -0,0 +1,48 @@ +import { act, renderHook, waitFor } from "@testing-library/react"; +import { Address } from "ton"; +import { Network, formatAddress } from "lib/network"; +import { useDisplayAddresses } from "./useDisplayAddresses"; + +const address = Address.parseRaw(`0:${"ab".repeat(32)}`); +const other = Address.parseRaw(`0:${"cd".repeat(32)}`); +const fetchMock = jest.spyOn(global, "fetch"); +afterEach(() => fetchMock.mockReset()); +afterAll(() => fetchMock.mockRestore()); + +test("ignores a late result after the address and network change", async () => { + let finishOld!: (response: Response) => void; + fetchMock.mockImplementationOnce( + () => + new Promise((resolve) => { + finishOld = resolve; + }), + ); + fetchMock.mockResolvedValueOnce({ + ok: true, + json: async () => ({ + [other.toString()]: { user_friendly: formatAddress(other, "testnet", false) }, + }), + } as Response); + + const view = renderHook( + ({ value, network }: { value: string; network: Network }) => + useDisplayAddresses([value], network), + { + initialProps: { value: address.toString(), network: "mainnet" as Network }, + }, + ); + expect(view.result.current).toEqual([]); + view.rerender({ value: other.toString(), network: "testnet" }); + await waitFor(() => + expect(view.result.current).toEqual([formatAddress(other, "testnet", false)]), + ); + await act(async () => + finishOld({ + ok: true, + json: async () => ({ + [address.toString()]: { user_friendly: formatAddress(address, "mainnet", true) }, + }), + } as Response), + ); + expect(view.result.current).toEqual([formatAddress(other, "testnet", false)]); +}); diff --git a/src/hooks/useDisplayAddresses.ts b/src/hooks/useDisplayAddresses.ts new file mode 100644 index 0000000..9ab526c --- /dev/null +++ b/src/hooks/useDisplayAddresses.ts @@ -0,0 +1,22 @@ +import { useEffect, useState } from "react"; +import { getDisplayAddresses } from "lib/display-address"; +import { Network } from "lib/network"; + +export function useDisplayAddresses(addresses: string[], network: Network): string[] { + const requestKey = JSON.stringify([network, addresses]); + const [result, setResult] = useState({ requestKey: "", addresses: [] as string[] }); + + useEffect(() => { + let current = true; + const [requestNetwork, requestAddresses]: [Network, string[]] = JSON.parse(requestKey); + getDisplayAddresses(requestAddresses, requestNetwork).then((formatted) => { + if (current) setResult({ requestKey, addresses: formatted }); + }); + return () => { + current = false; + }; + }, [requestKey]); + + // Never show the preceding account/network while its replacement is loading. + return result.requestKey === requestKey ? result.addresses : []; +} diff --git a/src/lib/display-address.test.ts b/src/lib/display-address.test.ts new file mode 100644 index 0000000..0b15991 --- /dev/null +++ b/src/lib/display-address.test.ts @@ -0,0 +1,118 @@ +import { Address } from "ton"; +import { getDisplayAddress, getDisplayAddresses } from "./display-address"; +import { formatAddress, Network, NETWORK_CONFIG } from "./network"; + +const account = Address.parseRaw(`0:${"ab".repeat(32)}`); +const other = Address.parseRaw(`0:${"cd".repeat(32)}`); +const fetchMock = jest.spyOn(global, "fetch"); +const response = (book: unknown, ok = true) => ({ ok, json: async () => book } as Response); +const book = (address: Address, network: Network, bounceable: boolean) => ({ + [address.toString().toUpperCase()]: { + user_friendly: formatAddress(address, network, bounceable), + }, +}); + +beforeEach(() => fetchMock.mockReset()); +afterEach(() => jest.useRealTimers()); +afterAll(() => fetchMock.mockRestore()); + +test.each(["mainnet", "testnet"] as const)( + "uses Toncenter's account format on %s, preserving workchain and identity", + async (network) => { + for (const workchain of [0, -1]) { + for (const bounceable of [false, true]) { + const address = new Address(workchain, account.hash); + fetchMock.mockResolvedValueOnce(response(book(address, network, bounceable))); + const display = await getDisplayAddress(address, network); + const parsed = Address.parseFriendly(display); + expect(parsed.address.equals(address)).toBe(true); + expect(parsed.isBounceable).toBe(bounceable); + expect(parsed.isTestOnly).toBe(network === "testnet"); + expect( + new URL(fetchMock.mock.calls[fetchMock.mock.calls.length - 1][0] as string).origin, + ).toBe(new URL(NETWORK_CONFIG[network].toncenterV3).origin); + } + } + }, +); + +test("batches and deduplicates account lookups without changing result order", async () => { + fetchMock.mockResolvedValueOnce( + response({ + ...book(account, "mainnet", true), + ...book(other, "mainnet", false), + }), + ); + expect(await getDisplayAddresses([account, other, account], "mainnet")).toEqual([ + formatAddress(account, "mainnet", true), + formatAddress(other, "mainnet", false), + formatAddress(account, "mainnet", true), + ]); + const url = new URL(fetchMock.mock.calls[0][0] as string); + expect(url.pathname).toBe("/api/v3/addressBook"); + expect(url.searchParams.getAll("address")).toEqual([account.toString(), other.toString()]); +}); + +test.each([ + {}, + { error: "unavailable" }, + null, + [], + { [account.toString()]: { user_friendly: "invalid" } }, + { [account.toString()]: { user_friendly: account.toString() } }, + { [account.toString()]: { user_friendly: formatAddress(other, "mainnet", false) } }, + book(account, "testnet", false), +])("falls back for missing, malformed or mismatched API data: %j", async (data) => { + fetchMock.mockResolvedValueOnce(response(data)); + const previous = formatAddress(account, "mainnet", false); + expect(await getDisplayAddress(account, "mainnet", previous)).toBe(previous); +}); + +test("does not reuse a previous address from a different account or network", async () => { + fetchMock.mockRejectedValue(new Error("offline")); + expect( + await getDisplayAddress(account, "testnet", formatAddress(account, "mainnet", false)), + ).toBe(formatAddress(account, "testnet")); + expect(await getDisplayAddress(account, "mainnet", formatAddress(other, "mainnet", false))).toBe( + formatAddress(account, "mainnet"), + ); +}); + +test("HTTP and JSON errors do not prevent displaying the account", async () => { + fetchMock.mockResolvedValueOnce(response(book(account, "mainnet", false), false)); + expect(await getDisplayAddress(account, "mainnet")).toBe(formatAddress(account, "mainnet")); + fetchMock.mockResolvedValueOnce({ + ok: true, + json: async () => { + throw new Error("Bad JSON"); + }, + } as unknown as Response); + expect(await getDisplayAddress(account, "mainnet")).toBe(formatAddress(account, "mainnet")); +}); + +test("does not cache failure or the state before a contract was deployed", async () => { + fetchMock + .mockRejectedValueOnce(new Error("offline")) + .mockResolvedValueOnce(response(book(account, "mainnet", false))) + .mockResolvedValueOnce(response(book(account, "mainnet", true))); + await getDisplayAddress(account, "mainnet"); + expect(await getDisplayAddress(account, "mainnet")).toBe( + formatAddress(account, "mainnet", false), + ); + expect(await getDisplayAddress(account, "mainnet")).toBe(formatAddress(account, "mainnet", true)); + expect(fetchMock).toHaveBeenCalledTimes(3); +}); + +test("times out even if fetch ignores abort, and aborts the request", async () => { + jest.useFakeTimers(); + fetchMock.mockReturnValueOnce(new Promise(() => {})); + const pending = getDisplayAddress(account, "testnet"); + jest.advanceTimersByTime(10_000); + expect(await pending).toBe(formatAddress(account, "testnet")); + expect(fetchMock.mock.calls[0][1]?.signal?.aborted).toBe(true); +}); + +test("rejects invalid inputs without making a request", async () => { + expect(await getDisplayAddresses(["invalid", "0:ab"], "mainnet")).toEqual(["", ""]); + expect(fetchMock).not.toHaveBeenCalled(); +}); diff --git a/src/lib/display-address.ts b/src/lib/display-address.ts new file mode 100644 index 0000000..2511511 --- /dev/null +++ b/src/lib/display-address.ts @@ -0,0 +1,102 @@ +import { Address } from "ton"; +import { formatAddress, Network, NETWORK_CONFIG, TONCENTER_API_KEY } from "./network"; + +function parseAccount(value: Address | string): Address { + const address = typeof value === "string" ? Address.parse(value) : value; + if (address.hash.length !== 32) throw new Error("Invalid address hash"); + if ( + typeof value === "string" && + !Address.isFriendly(value) && + value.toUpperCase() !== address.toString().toUpperCase() + ) { + throw new Error("Invalid raw address"); + } + return address; +} + +function checkedFriendly(value: unknown, address: Address, network: Network): string | undefined { + if (typeof value !== "string") return; + try { + const parsed = Address.parseFriendly(value); + if (parsed.address.equals(address) && parsed.isTestOnly === (network === "testnet")) { + return formatAddress(address, network, parsed.isBounceable); + } + } catch {} +} + +// Like DNS, resolve presentation through Toncenter without persisting account state. +// A fallback is only a display format, not a classification of the account. +export async function getDisplayAddresses( + values: (Address | string)[], + network: Network, + previousAddresses: (string | undefined)[] = [], +): Promise { + const addresses = values.map((value) => { + try { + return parseAccount(value); + } catch { + return null; + } + }); + const fallback = addresses.map((address, index) => + address + ? checkedFriendly(previousAddresses[index], address, network) || + formatAddress(address, network) + : "", + ); + const rawAddresses = Array.from( + new Set(addresses.flatMap((address) => (address ? [address.toString()] : []))), + ); + if (!rawAddresses.length) return fallback; + + const params = new URLSearchParams(); + rawAddresses.forEach((address) => params.append("address", address)); + const controller = new AbortController(); + let timeout: ReturnType | undefined; + + const request = async () => { + const response = await fetch(`${NETWORK_CONFIG[network].toncenterV3}/addressBook?${params}`, { + headers: { "X-API-Key": TONCENTER_API_KEY }, + signal: controller.signal, + }); + if (!response.ok) throw new Error("Unable to load address book"); + const book: unknown = await response.json(); + if (!book || typeof book !== "object" || Array.isArray(book)) return fallback; + + const entries = new Map(); + Object.entries(book).forEach(([key, entry]) => { + try { + entries.set(parseAccount(key).toString(), entry?.user_friendly); + } catch {} + }); + return addresses.map((address, index) => + address + ? checkedFriendly(entries.get(address.toString()), address, network) || fallback[index] + : "", + ); + }; + + try { + return await Promise.race([ + request(), + new Promise((resolve) => { + timeout = setTimeout(() => { + controller.abort(); + resolve(fallback); + }, 10_000); + }), + ]); + } catch { + return fallback; + } finally { + clearTimeout(timeout); + } +} + +export async function getDisplayAddress( + value: Address | string, + network: Network, + previousAddress?: string, +): Promise { + return (await getDisplayAddresses([value], network, [previousAddress]))[0]; +} diff --git a/src/pages/deployer/index.tsx b/src/pages/deployer/index.tsx index caa22c7..04d00c0 100644 --- a/src/pages/deployer/index.tsx +++ b/src/pages/deployer/index.tsx @@ -25,8 +25,9 @@ import { GithubButton } from "pages/deployer/githubButton"; import { useNavigatePreserveQuery } from "lib/hooks/useNavigatePreserveQuery"; import { useTonAddress, useTonConnectUI } from "@tonconnect/ui-react"; import { useNetwork } from "lib/hooks/useNetwork"; -import { formatAddress, NETWORK_CONFIG } from "lib/network"; +import { formatAddress } from "lib/network"; import { fetchJettonMetadata } from "lib/jetton-minter"; +import { PendingDeployLink } from "components/PendingDeployLink"; const DEFAULT_DECIMALS = 9; @@ -57,10 +58,7 @@ function DeployerPage() { <> Deployment was submitted, but final confirmation is still pending. Do not retry it. Check the deterministic contract address in the{" "} - - explorer - - . + . , "warning", undefined, diff --git a/src/pages/jetton/address-loading.test.tsx b/src/pages/jetton/address-loading.test.tsx new file mode 100644 index 0000000..166b3f0 --- /dev/null +++ b/src/pages/jetton/address-loading.test.tsx @@ -0,0 +1,94 @@ +import { act, render, screen } from "@testing-library/react"; +import { ThemeProvider } from "@mui/material/styles"; +import BN from "bn.js"; +import { MemoryRouter, Route, Routes } from "react-router-dom"; +import { RecoilRoot } from "recoil"; +import { Address } from "ton"; +import { formatAddress } from "lib/network"; +import theme from "theme"; +import { Jetton } from "."; + +const mockGetDetails = jest.fn(); +const mockShowNotification = jest.fn(); +jest.mock("lib/deploy-controller", () => ({ + jettonDeployController: { getJettonDetails: (...args: unknown[]) => mockGetDetails(...args) }, +})); +jest.mock("@tonconnect/ui-react", () => ({ + useTonAddress: () => "", + useTonConnectUI: () => [{}], + TonConnectButton: () => null, +})); +jest.mock("hooks/useNotification", () => () => ({ showNotification: mockShowNotification })); +jest.mock("react-markdown", () => ({ children }: { children: React.ReactNode }) => <>{children}); + +const master = Address.parseRaw(`0:${"11".repeat(32)}`); +const admin = Address.parseRaw(`-1:${"22".repeat(32)}`); +const owner = Address.parseRaw(`0:${"33".repeat(32)}`); +const fetchMock = jest.spyOn(global, "fetch"); +beforeEach(() => { + fetchMock.mockReset(); + mockGetDetails.mockResolvedValue({ + minter: { + admin, + totalSupply: new BN("100000000000"), + metadata: { name: "Example", symbol: "EX", decimals: "9" }, + }, + jettonWallet: { balance: new BN("1000000000"), jWalletAddress: owner }, + }); +}); +afterAll(() => fetchMock.mockRestore()); + +test.each([true, false])( + "shows jetton data while only address rows wait (selected owner: %s)", + async (hasOwner) => { + let finish!: (response: Response) => void; + fetchMock.mockReturnValueOnce( + new Promise((resolve) => { + finish = resolve; + }), + ); + const { container } = render( + + + + + } /> + + + + , + ); + + expect(await screen.findByText("Example (EX)")).toBeVisible(); + expect(screen.getByRole("link", { name: formatAddress(master, "testnet") })).toBeVisible(); + expect(container.querySelectorAll(".MuiSkeleton-root")).toHaveLength(hasOwner ? 2 : 1); + expect(screen.queryByRole("link", { name: formatAddress(admin, "testnet", true) })).toBeNull(); + if (hasOwner) { + expect(screen.queryByRole("button", { name: "Connect Wallet" })).toBeNull(); + } else { + expect(screen.getByRole("button", { name: "Connect Wallet" })).toBeVisible(); + } + + await act(async () => + finish({ + ok: true, + json: async () => ({ + [admin.toString()]: { user_friendly: formatAddress(admin, "testnet", true) }, + [owner.toString()]: { user_friendly: formatAddress(owner, "testnet", false) }, + }), + } as Response), + ); + expect(screen.getByRole("link", { name: formatAddress(admin, "testnet", true) })).toBeVisible(); + if (hasOwner) { + expect( + screen.getByRole("link", { name: formatAddress(owner, "testnet", false) }), + ).toBeVisible(); + } + expect(container.querySelectorAll(".MuiSkeleton-root")).toHaveLength(0); + }, +); diff --git a/src/pages/jetton/dataRow/token/Token.tsx b/src/pages/jetton/dataRow/token/Token.tsx index 1a9f572..b55c465 100644 --- a/src/pages/jetton/dataRow/token/Token.tsx +++ b/src/pages/jetton/dataRow/token/Token.tsx @@ -32,6 +32,7 @@ export const Token = () => { const { jettonImage, adminAddress, + adminAddressLoading, isAdmin, adminRevokedOwnership, symbol, @@ -136,7 +137,7 @@ export const Token = () => { isAdmin, jettonMaster, )} - dataLoading={jettonLoading} + dataLoading={jettonLoading || adminAddressLoading} actions={adminActions} hasButton={isAdmin && !adminRevokedOwnership} showIcon={!isAdmin} diff --git a/src/pages/jetton/wallet/Wallet.tsx b/src/pages/jetton/wallet/Wallet.tsx index defe92c..30a0a21 100644 --- a/src/pages/jetton/wallet/Wallet.tsx +++ b/src/pages/jetton/wallet/Wallet.tsx @@ -14,7 +14,14 @@ import { CheckWalletBalancePopup } from "components/checkWalletBalancePopup"; import { setSearchParam } from "lib/network"; export const Wallet = () => { - const { balance, symbol, jettonLoading, selectedWalletAddress, decimals } = useJettonStore(); + const { + balance, + symbol, + jettonLoading, + selectedWalletAddress, + selectedWalletAddressLoading, + decimals, + } = useJettonStore(); const [params, setParams] = useSearchParams(); const [showPopup, setShowPopup] = useState(false); @@ -32,7 +39,7 @@ export const Wallet = () => { { /> - {!selectedWalletAddress && !jettonLoading && ( + {!selectedWalletAddress && !jettonLoading && !selectedWalletAddressLoading && ( diff --git a/src/store/jetton-store/index.ts b/src/store/jetton-store/index.ts index d5fb542..2c2dd6e 100644 --- a/src/store/jetton-store/index.ts +++ b/src/store/jetton-store/index.ts @@ -15,6 +15,7 @@ export interface JettonStoreState { isImageBroken?: boolean; description?: string; adminAddress?: string; + adminAddressLoading: boolean; balance?: BN; jettonMaster?: string; persistenceType?: PersistenceType; @@ -24,6 +25,7 @@ export interface JettonStoreState { jettonLoading: boolean; isMyWallet: boolean; selectedWalletAddress?: string | null; + selectedWalletAddressLoading: boolean; } const jettonStateAtom = atom({ @@ -43,6 +45,7 @@ const jettonStateAtom = atom({ isImageBroken: false, description: undefined, adminAddress: undefined, + adminAddressLoading: false, balance: undefined, jettonMaster: undefined, totalSupply: undefined, @@ -50,6 +53,7 @@ const jettonStateAtom = atom({ isJettonDeployerFaultyOnChainData: false, isMyWallet: false, selectedWalletAddress: undefined, + selectedWalletAddressLoading: false, }, }); diff --git a/src/store/jetton-store/useJettonStore.test.tsx b/src/store/jetton-store/useJettonStore.test.tsx new file mode 100644 index 0000000..2d3ae37 --- /dev/null +++ b/src/store/jetton-store/useJettonStore.test.tsx @@ -0,0 +1,186 @@ +import { act, renderHook, waitFor } from "@testing-library/react"; +import BN from "bn.js"; +import { MemoryRouter, Route, Routes } from "react-router-dom"; +import { RecoilRoot } from "recoil"; +import { Address } from "ton"; +import { formatAddress } from "lib/network"; +import useJettonStore from "./useJettonStore"; + +const mockGetDetails = jest.fn(); +const mockNotification = jest.fn(); +jest.mock("lib/deploy-controller", () => ({ + jettonDeployController: { getJettonDetails: (...args: unknown[]) => mockGetDetails(...args) }, +})); +jest.mock("@tonconnect/ui-react", () => ({ useTonAddress: () => "" })); +jest.mock("hooks/useNotification", () => () => ({ showNotification: mockNotification })); + +const master = Address.parseRaw(`0:${"11".repeat(32)}`); +const admin = Address.parseRaw(`-1:${"22".repeat(32)}`); +const owner = Address.parseRaw(`0:${"33".repeat(32)}`); +const fetchMock = jest.spyOn(global, "fetch"); +beforeEach(() => { + fetchMock.mockReset(); + mockGetDetails.mockReset(); + mockGetDetails.mockResolvedValue({ + minter: { + admin, + totalSupply: new BN("100000000000"), + metadata: { name: "Example", symbol: "EX", decimals: "9" }, + }, + jettonWallet: { balance: new BN("1000000000"), jWalletAddress: owner }, + }); +}); +afterEach(() => jest.useRealTimers()); +afterAll(() => fetchMock.mockRestore()); + +function renderStore(balanceOwner: Address | null = owner) { + return renderHook(() => useJettonStore(), { + wrapper: ({ children }) => ( + + + + + + + + ), + }); +} + +function addressBook(adminAddress = admin, bounceable = false): Response { + return { + ok: true, + json: async () => ({ + [adminAddress.toString()]: { + user_friendly: formatAddress(adminAddress, "testnet", bounceable), + }, + [owner.toString()]: { user_friendly: formatAddress(owner, "testnet", bounceable) }, + }), + } as Response; +} + +function delayAddressBook() { + let finish!: (response: Response) => void; + fetchMock.mockReturnValueOnce( + new Promise((resolve) => { + finish = resolve; + }), + ); + return finish; +} + +test.each([false, true])( + "admin and balance owner use the API's bounceable flag (%s)", + async (bounceable) => { + fetchMock.mockResolvedValueOnce(addressBook(admin, bounceable)); + const { result } = renderStore(); + await act(async () => { + await result.current.getJettonDetails(); + }); + await waitFor(() => + expect(result.current.adminAddress).toBe(formatAddress(admin, "testnet", bounceable)), + ); + expect(result.current.selectedWalletAddress).toBe(formatAddress(owner, "testnet", bounceable)); + expect(result.current.jettonLoading).toBe(false); + }, +); + +test("loads jetton data before addressBook returns, leaving only addresses pending", async () => { + const finish = delayAddressBook(); + const { result } = renderStore(); + + await act(async () => { + expect(await result.current.getJettonDetails()).toBe(true); + }); + expect(result.current.jettonLoading).toBe(false); + expect(result.current.name).toBe("Example"); + expect(result.current.totalSupply?.toString()).toBe("100000000000"); + expect(result.current.balance?.toString()).toBe("1000000000"); + expect(result.current.adminAddress).toBeUndefined(); + expect(result.current.selectedWalletAddress).toBeUndefined(); + expect(result.current.adminAddressLoading).toBe(true); + expect(result.current.selectedWalletAddressLoading).toBe(true); + + await act(async () => finish(addressBook())); + expect(result.current.adminAddress).toBe(formatAddress(admin, "testnet", false)); + expect(result.current.selectedWalletAddress).toBe(formatAddress(owner, "testnet", false)); + expect(result.current.adminAddressLoading).toBe(false); + expect(result.current.selectedWalletAddressLoading).toBe(false); +}); + +test("does not mark the wallet address as loading when no owner is selected", async () => { + const finish = delayAddressBook(); + const { result } = renderStore(null); + await act(async () => { + await result.current.getJettonDetails(); + }); + expect(result.current.jettonLoading).toBe(false); + expect(result.current.adminAddressLoading).toBe(true); + expect(result.current.selectedWalletAddressLoading).toBe(false); + await act(async () => finish(addressBook())); + expect(result.current.selectedWalletAddress).toBeUndefined(); +}); + +test("ends address placeholders with the existing fallback after a timeout", async () => { + jest.useFakeTimers(); + delayAddressBook(); + const { result } = renderStore(); + await act(async () => { + await result.current.getJettonDetails(); + }); + expect(result.current.name).toBe("Example"); + expect(result.current.jettonLoading).toBe(false); + expect(result.current.adminAddressLoading).toBe(true); + + await act(async () => { + jest.advanceTimersByTime(10_000); + }); + expect(result.current.adminAddress).toBe(formatAddress(admin, "testnet")); + expect(result.current.selectedWalletAddress).toBe(formatAddress(owner, "testnet")); + expect(result.current.adminAddressLoading).toBe(false); + expect(result.current.selectedWalletAddressLoading).toBe(false); + expect(result.current.name).toBe("Example"); +}); + +test("ignores the earlier address result after a newer load", async () => { + const finishOld = delayAddressBook(); + const { result } = renderStore(); + await act(async () => { + await result.current.getJettonDetails(); + }); + + mockGetDetails.mockResolvedValueOnce({ + minter: { admin: master, metadata: { name: "New token", decimals: "9" } }, + }); + fetchMock.mockResolvedValueOnce(addressBook(master, true)); + await act(async () => { + await result.current.getJettonDetails(); + }); + await waitFor(() => expect(result.current.adminAddressLoading).toBe(false)); + expect(result.current.adminAddress).toBe(formatAddress(master, "testnet", true)); + + await act(async () => finishOld(addressBook())); + expect(result.current.name).toBe("New token"); + expect(result.current.adminAddress).toBe(formatAddress(master, "testnet", true)); + expect(result.current.selectedWalletAddress).toBe(formatAddress(owner, "testnet", true)); +}); + +test("does not restore addresses after the page invalidates the request", async () => { + const finish = delayAddressBook(); + const { result } = renderStore(); + await act(async () => { + await result.current.getJettonDetails(); + }); + act(() => result.current.invalidateJettonDetails()); + await act(async () => finish(addressBook())); + expect(result.current.name).toBeUndefined(); + expect(result.current.adminAddress).toBeUndefined(); + expect(result.current.selectedWalletAddress).toBeUndefined(); + expect(result.current.adminAddressLoading).toBe(false); + expect(result.current.selectedWalletAddressLoading).toBe(false); +}); diff --git a/src/store/jetton-store/useJettonStore.ts b/src/store/jetton-store/useJettonStore.ts index f0671c7..20fd1f2 100644 --- a/src/store/jetton-store/useJettonStore.ts +++ b/src/store/jetton-store/useJettonStore.ts @@ -13,6 +13,7 @@ import { jettonStateAtom } from "."; import { useNetwork } from "lib/hooks/useNetwork"; import { formatAddress, setSearchParam } from "lib/network"; import { useSearchParams } from "react-router-dom"; +import { getDisplayAddresses } from "lib/display-address"; let latestRequest = 0; @@ -166,16 +167,32 @@ function useJettonStore() { adminRevokedOwnership: zeroAddress().equals(adminAddress), isAdmin: admin, decimals: validDecimals ? decimals : undefined, - adminAddress: formatAddress(adminAddress, network, false), + adminAddress: undefined, + adminAddressLoading: true, balance: result.jettonWallet ? result.jettonWallet.balance : undefined, jettonWalletAddress: result.jettonWallet ? formatAddress(result.jettonWallet.jWalletAddress, network) : undefined, jettonMaster: jettonAddress, isMyWallet, - selectedWalletAddress: address ? formatAddress(address, network, false) : undefined, + selectedWalletAddress: undefined, + selectedWalletAddressLoading: !!address, }; }); + + // Resolve presentation separately so addressBook cannot hold up on-chain data. + void getDisplayAddresses([adminAddress, ...(address ? [address] : [])], network).then( + ([displayAdmin, displayOwner]) => { + if (requestId !== latestRequest) return; + setState((prevState) => ({ + ...prevState, + adminAddress: displayAdmin, + adminAddressLoading: false, + selectedWalletAddress: address ? displayOwner : undefined, + selectedWalletAddressLoading: false, + })); + }, + ); return true; } catch (error) { if (requestId !== latestRequest) return false; From 4966e93d6e170fa1544d6771f41f36366887b025 Mon Sep 17 00:00:00 2001 From: x1kk4 Date: Tue, 6 Oct 2026 02:00:48 +0400 Subject: [PATCH 02/12] fix: separate address history by network --- .../HeaderSearchResults.tsx | 9 ++++- src/hooks/useAddressHistory.test.tsx | 37 +++++++++++++++++++ src/hooks/useAddressHistory.ts | 36 ++++++++++++------ src/lib/address-history.test.ts | 26 +++++++++++++ src/lib/address-history.ts | 33 +++++++++++++++++ 5 files changed, 127 insertions(+), 14 deletions(-) create mode 100644 src/hooks/useAddressHistory.test.tsx create mode 100644 src/lib/address-history.test.ts create mode 100644 src/lib/address-history.ts diff --git a/src/components/header/headerSearchResults/HeaderSearchResults.tsx b/src/components/header/headerSearchResults/HeaderSearchResults.tsx index f4302c8..e088bef 100644 --- a/src/components/header/headerSearchResults/HeaderSearchResults.tsx +++ b/src/components/header/headerSearchResults/HeaderSearchResults.tsx @@ -8,6 +8,8 @@ import recentSearch from "assets/icons/recent-search.svg"; import { IconButton, Typography } from "@mui/material"; import close from "assets/icons/close.svg"; import { AppButton } from "components/appButton"; +import { useDisplayAddresses } from "hooks/useDisplayAddresses"; +import { useNetwork } from "lib/hooks/useNetwork"; interface HeaderSearchResultsProps { searchResults: string[]; @@ -22,15 +24,18 @@ export const HeaderSearchResults: React.FC = ({ onItemDelete, onHistoryClear, }) => { + const { network } = useNetwork(); + const displayAddresses = useDisplayAddresses(searchResults, network); + return ( - {searchResults.map((result) => ( + {searchResults.map((result, index) => ( onItemClick(result)}> Search Icon - {result} + {displayAddresses[index] || "…"} onItemDelete(e, result)}> Close Icon diff --git a/src/hooks/useAddressHistory.test.tsx b/src/hooks/useAddressHistory.test.tsx new file mode 100644 index 0000000..af73247 --- /dev/null +++ b/src/hooks/useAddressHistory.test.tsx @@ -0,0 +1,37 @@ +import { act, renderHook } from "@testing-library/react"; +import { MemoryRouter, useNavigate } from "react-router-dom"; +import { RecoilRoot } from "recoil"; +import { Address } from "ton"; +import { formatAddress } from "lib/network"; +import { useAddressHistory } from "./useAddressHistory"; + +jest.mock("hooks/useNotification", () => () => ({ showNotification: jest.fn() })); +const account = Address.parseRaw(`0:${"ab".repeat(32)}`); +const other = Address.parseRaw(`0:${"cd".repeat(32)}`); + +beforeEach(() => localStorage.clear()); + +test("deduplicates accounts, separates networks and clears only the current network", () => { + const { result } = renderHook(() => ({ history: useAddressHistory(), navigate: useNavigate() }), { + wrapper: ({ children }) => ( + + {children} + + ), + }); + act(() => result.current.history.onSubmit(formatAddress(account, "mainnet", false))); + act(() => result.current.history.onSubmit(formatAddress(account, "mainnet", true))); + expect(result.current.history.addresses).toEqual([account.toString()]); + + act(() => result.current.navigate("/?testnet=true")); + expect(result.current.history.addresses).toEqual([]); + act(() => result.current.history.onSubmit(formatAddress(other, "testnet", false))); + expect(result.current.history.addresses).toEqual([other.toString()]); + + act(() => result.current.history.resetAddresses()); + expect(result.current.history.addresses).toEqual([]); + act(() => result.current.navigate("/")); + expect(result.current.history.addresses).toEqual([account.toString()]); + act(() => result.current.history.removeAddress(formatAddress(account, "mainnet", false))); + expect(result.current.history.addresses).toEqual([]); +}); diff --git a/src/hooks/useAddressHistory.ts b/src/hooks/useAddressHistory.ts index 053a105..1e90e67 100644 --- a/src/hooks/useAddressHistory.ts +++ b/src/hooks/useAddressHistory.ts @@ -5,45 +5,57 @@ import useNotification from "hooks/useNotification"; import { ROUTES } from "consts"; import { recoilPersist } from "recoil-persist"; import { Address } from "ton"; -import { useCallback, useEffect } from "react"; +import { useCallback, useEffect, useMemo } from "react"; import { useJettonAddress } from "hooks/useJettonAddress"; import { useNavigatePreserveQuery } from "lib/hooks/useNavigatePreserveQuery"; import { useNetwork } from "lib/hooks/useNetwork"; import { formatAddress } from "lib/network"; +import { AddressHistory, normalizeAddressHistory } from "lib/address-history"; const { persistAtom } = recoilPersist({ key: "addressHistory", }); -const addressHistoryState = atom({ +const addressHistoryState = atom({ key: "addressHistory", - default: [] as string[], + default: { mainnet: [], testnet: [] }, effects_UNSTABLE: [persistAtom], }); export function useAddressHistory() { - const [addresses, setAddresses] = useRecoilState(addressHistoryState); + const [history, setHistory] = useRecoilState(addressHistoryState); const { setActive, setValue, addressInput } = useAddressInput(); const navigate = useNavigatePreserveQuery(); const { showNotification } = useNotification(); const { jettonAddress } = useJettonAddress(); const { network } = useNetwork(); + const addresses = useMemo(() => normalizeAddressHistory(history)[network], [history, network]); const addAddress = useCallback( - (address: string) => - setAddresses((prev: string[]) => - [address, ...prev.filter((a) => a !== address)].slice(0, 20), - ), - [setAddresses], + (address: string) => { + const raw = Address.parse(address).toString(); + setHistory((prev) => { + const next = normalizeAddressHistory(prev); + if (next[network][0] === raw && !Array.isArray(prev)) return prev; + next[network] = [raw, ...next[network].filter((a) => a !== raw)].slice(0, 20); + return next; + }); + }, + [network, setHistory], ); const resetAddresses = () => { - setAddresses([]); + setHistory((prev) => ({ ...normalizeAddressHistory(prev), [network]: [] })); setActive(false); }; - const removeAddress = (address: string) => - setAddresses((prev: string[]) => [...prev.filter((a) => a !== address)]); + const removeAddress = (address: string) => { + const raw = Address.parse(address).toString(); + setHistory((prev) => { + const next = normalizeAddressHistory(prev); + return { ...next, [network]: next[network].filter((a) => a !== raw) }; + }); + }; const onAddressClick = (address: string) => { setActive(false); diff --git a/src/lib/address-history.test.ts b/src/lib/address-history.test.ts new file mode 100644 index 0000000..c8dd98e --- /dev/null +++ b/src/lib/address-history.test.ts @@ -0,0 +1,26 @@ +import { Address } from "ton"; +import { normalizeAddressHistory } from "./address-history"; +import { formatAddress } from "./network"; + +const account = Address.parseRaw(`0:${"ab".repeat(32)}`); + +test("migrates legacy history by network and deduplicates bounceable variants", () => { + expect( + normalizeAddressHistory([ + formatAddress(account, "testnet", false), + formatAddress(account, "mainnet", true), + formatAddress(account, "mainnet", false), + "invalid", + ]), + ).toEqual({ mainnet: [account.toString()], testnet: [account.toString()] }); +}); + +test("keeps raw identities separate by network and limits each history to 20", () => { + const raw = Array.from({ length: 22 }, (_, index) => + new Address(-1, Buffer.alloc(32, index)).toString(), + ); + expect(normalizeAddressHistory({ mainnet: raw, testnet: [account.toString()] })).toEqual({ + mainnet: raw.slice(0, 20), + testnet: [account.toString()], + }); +}); diff --git a/src/lib/address-history.ts b/src/lib/address-history.ts new file mode 100644 index 0000000..9eb80ae --- /dev/null +++ b/src/lib/address-history.ts @@ -0,0 +1,33 @@ +import { Address } from "ton"; +import { Network } from "./network"; + +export type AddressHistory = Record; + +export function normalizeAddressHistory(value: AddressHistory | string[]): AddressHistory { + const history: AddressHistory = { mainnet: [], testnet: [] }; + const add = (value: string, network: Network) => { + try { + const raw = Address.parse(value).toString(); + if (!history[network].includes(raw) && history[network].length < 20) { + history[network].push(raw); + } + } catch {} + }; + + if (Array.isArray(value)) { + // The old shared history stored friendly addresses with their network flag. + value.forEach((address) => { + try { + const { isTestOnly } = Address.parseFriendly(address); + add(address, isTestOnly ? "testnet" : "mainnet"); + } catch {} + }); + } else { + (["mainnet", "testnet"] as const).forEach((network) => { + if (Array.isArray(value?.[network])) { + value[network].forEach((address) => add(address, network)); + } + }); + } + return history; +} From f5e37374e67a9be2c16985f0eb780860ce031e76 Mon Sep 17 00:00:00 2001 From: x1kk4 Date: Tue, 6 Oct 2026 02:00:52 +0400 Subject: [PATCH 03/12] refactor: remove obsolete sandbox explorer support --- src/App.tsx | 56 ++++++++++++---------------------- src/components/AddressLink.tsx | 5 +-- src/lib/network.test.ts | 8 ++--- src/utils/index.ts | 6 +--- 4 files changed, 26 insertions(+), 49 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 7e1c19d..6ffc55f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,6 +1,6 @@ import { styled } from "@mui/material"; import { Box } from "@mui/system"; -import { createContext, useEffect } from "react"; +import { useEffect } from "react"; import { APP_GRID, ROUTES } from "consts"; import { Navigate, Outlet, Route, Routes, useLocation } from "react-router-dom"; import { DeployerPage, Jetton } from "pages"; @@ -9,7 +9,6 @@ import { Footer } from "components/footer"; import { Header } from "components/header"; import { useResetJettonLogoOnPathChange } from "hooks/useJettonLogo"; import useNotification from "hooks/useNotification"; -import { useNetwork } from "lib/hooks/useNetwork"; analytics.init(); @@ -50,11 +49,6 @@ const FlexibleBox = styled(Box)(({ theme }) => ({ }, })); -export const EnvContext = createContext({ - isSandbox: false, - isTestnet: false, -}); - const PageNotFound = () => { const { showNotification } = useNotification(); @@ -80,41 +74,31 @@ const ContentWrapper = ({ children }: ContentWrapperProps) => { const App = () => { const location = useLocation(); - const { network } = useNetwork(); useResetJettonLogoOnPathChange(location.pathname); - const isSandbox = window.location.search.includes("sandbox"); - const isTestnet = network === "testnet"; - return ( - - - - -
- - - - } - /> - }> - }> - } /> - } /> - + + + +
+ + + + } + /> + }> + }> + } /> + } /> - - - + + +