privacycash 1.1.24 → 1.2.0

package/__tests__/store-alias.test.ts

@@ -0,0 +1,67 @@
+import { PublicKey } from '@solana/web3.js';
+import { describe, expect, it } from 'vitest';
+import { depositSPL } from '../src/depositSPL';
+import {
+    getRelayerTokenName,
+    LEGACY_STORE_MINT,
+    normalizeRelayerTokenMap,
+    resolveToken,
+    resolveTokenName,
+    STORE_MINT,
+    tokens,
+} from '../src/utils/constants';
+
+describe('stORE token aliases', () => {
+    it('exports latest stORE as store and old stORE as legacyStore', () => {
+        const tokenNames = tokens.map(token => token.name);
+
+        expect(tokenNames).toContain('store');
+        expect(tokenNames).toContain('legacyStore');
+        expect(tokenNames).not.toContain('newstore' as any);
+
+        expect(tokens.find(token => token.name === 'store')?.pubkey.toString()).toBe(STORE_MINT.toString());
+        expect(tokens.find(token => token.name === 'legacyStore')?.pubkey.toString()).toBe(LEGACY_STORE_MINT.toString());
+    });
+
+    it('maps public stORE names to relayer token names', () => {
+        expect(getRelayerTokenName('store')).toBe('newstore');
+        expect(getRelayerTokenName('legacyStore')).toBe('store');
+        expect(getRelayerTokenName('usdc')).toBe('usdc');
+    });
+
+    it('resolves CLI token aliases without exposing newstore', () => {
+        expect(resolveTokenName('store')).toBe('store');
+        expect(resolveTokenName('newstore')).toBe('store');
+        expect(resolveTokenName('legacyStore')).toBe('legacyStore');
+        expect(resolveTokenName('legacystore')).toBe('legacyStore');
+
+        expect(resolveToken('newstore')?.pubkey.toString()).toBe(STORE_MINT.toString());
+        expect(resolveToken('legacyStore')?.pubkey.toString()).toBe(LEGACY_STORE_MINT.toString());
+    });
+
+    it('normalizes relayer config maps without exposing newstore', () => {
+        expect(normalizeRelayerTokenMap({
+            sol: 1,
+            store: 2,
+            newstore: 3,
+        })).toEqual({
+            sol: 1,
+            store: 3,
+            legacyStore: 2,
+        });
+    });
+
+    it('rejects legacy stORE deposits before transaction work starts', async () => {
+        await expect(depositSPL({
+            mintAddress: new PublicKey(LEGACY_STORE_MINT),
+            lightWasm: {} as any,
+            storage: {} as any,
+            keyBasePath: '',
+            publicKey: PublicKey.default,
+            connection: {} as any,
+            base_units: 1,
+            encryptionService: {} as any,
+            transactionSigner: async tx => tx,
+        })).rejects.toThrow('Legacy stORE deposit has been disabled. Please use the latest stORE.');
+    });
+});

package/dist/config.d.ts

@@ -3,7 +3,9 @@ type Config = {
     withdraw_rent_fee: number;
     deposit_fee_rate: number;
     usdc_withdraw_rent_fee: number;
-    rent_fees: any;
+    rent_fees: Record<string, number>;
+    minimum_withdrawal: Record<string, number>;
+    prices: Record<string, number>;
 };
 export declare function getConfig<K extends keyof Config>(key: K): Promise<Config[K]>;
 export {};

package/dist/config.js

@@ -1,12 +1,20 @@
-import { RELAYER_API_URL } from "./utils/constants.js";
+import { normalizeRelayerTokenMap, RELAYER_API_URL } from "./utils/constants.js";
 let config;
 export async function getConfig(key) {
     if (!config) {
         const res = await fetch(RELAYER_API_URL + '/config');
-        config = await res.json();
+        config = normalizeConfig(await res.json());
     }
     if (typeof config[key] == 'undefined') {
         throw new Error(`can not get ${key} from ${RELAYER_API_URL}/config`);
     }
     return config[key];
 }
+function normalizeConfig(raw) {
+    return {
+        ...raw,
+        rent_fees: normalizeRelayerTokenMap(raw.rent_fees) ?? {},
+        minimum_withdrawal: normalizeRelayerTokenMap(raw.minimum_withdrawal) ?? {},
+        prices: normalizeRelayerTokenMap(raw.prices) ?? {},
+    };
+}

package/dist/depositSPL.js

@@ -5,7 +5,7 @@ import { getUtxosSPL } from './getUtxosSPL.js';
 import { Keypair as UtxoKeypair } from './models/keypair.js';
 import { Utxo } from './models/utxo.js';
 import { useExistingALT } from './utils/address_lookup_table.js';
-import { ALT_ADDRESS, FEE_RECIPIENT, FIELD_SIZE, MERKLE_TREE_DEPTH, PROGRAM_ID, RELAYER_API_URL, tokens } from './utils/constants.js';
+import { ALT_ADDRESS, FEE_RECIPIENT, FIELD_SIZE, getRelayerTokenName, MERKLE_TREE_DEPTH, PROGRAM_ID, RELAYER_API_URL, tokens } from './utils/constants.js';
 import { serializeProofAndExtData } from './utils/encryption.js';
 import { logger } from './utils/logger.js';
 import { MerkleTree } from './utils/merkle_tree.js';
@@ -61,6 +61,10 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     if (!token) {
         throw new Error('token not found: ' + mintAddress.toString());
     }
+    if (token.name === 'legacyStore') {
+        throw new Error('Legacy stORE deposit has been disabled. Please use the latest stORE.');
+    }
+    const relayerTokenName = getRelayerTokenName(token.name);
     if (amount) {
         base_units = amount * token.units_per_token;
     }
@@ -125,7 +129,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     let root;
     let nextIndex;
     if (mintUtxos.length === 0) {
-        const treeState = await queryRemoteTreeState(token.name);
+        const treeState = await queryRemoteTreeState(relayerTokenName);
         root = treeState.root;
         nextIndex = treeState.nextIndex;
         // Scenario 1: Fresh deposit with dummy inputs - add new funds to the system
@@ -193,7 +197,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
             logger.debug('\nSecond UTXO to be consolidated:');
             await secondUtxo.log();
         }
-        let data = await fetchMerkleProof(commitmentsToFetch, token.name);
+        let data = await fetchMerkleProof(commitmentsToFetch, relayerTokenName);
         root = data.root;
         nextIndex = data.nextIndex;
         let [firstUtxoMerkleProof, secondUtxoMerkleProof] = data.proofs;
@@ -425,7 +429,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
         logger.debug(`retryTimes: ${retryTimes}`);
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
         logger.debug('Fetching updated onchain state...');
-        let url = RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr + '?token=' + token.name;
+        let url = RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr + '?token=' + relayerTokenName;
         let res = await fetch(url);
         let resJson = await res.json();
         if (resJson.exists) {

package/dist/exportUtils.d.ts

@@ -7,4 +7,4 @@ export { getBalanceFromUtxos, getUtxos, localstorageKey } from './getUtxos.js';
 export { depositSPL } from './depositSPL.js';
 export { withdrawSPL } from './withdrawSPL.js';
 export { getBalanceFromUtxosSPL, getUtxosSPL } from './getUtxosSPL.js';
-export { type TokenList, type SplList, tokens } from './utils/constants.js';
+export { getRelayerTokenName, LEGACY_STORE_MINT, normalizeRelayerTokenMap, STORE_MINT, type TokenList, type SplList, tokens } from './utils/constants.js';

package/dist/exportUtils.js

@@ -7,4 +7,4 @@ export { getBalanceFromUtxos, getUtxos, localstorageKey } from './getUtxos.js';
 export { depositSPL } from './depositSPL.js';
 export { withdrawSPL } from './withdrawSPL.js';
 export { getBalanceFromUtxosSPL, getUtxosSPL } from './getUtxosSPL.js';
-export { tokens } from './utils/constants.js';
+export { getRelayerTokenName, LEGACY_STORE_MINT, normalizeRelayerTokenMap, STORE_MINT, tokens } from './utils/constants.js';

package/dist/getUtxosSPL.js

@@ -4,7 +4,7 @@ import { Keypair as UtxoKeypair } from './models/keypair.js';
 import { WasmFactory } from '@lightprotocol/hasher.rs';
 //@ts-ignore
 import * as ffjavascript from 'ffjavascript';
-import { FETCH_UTXOS_GROUP_SIZE, RELAYER_API_URL, LSK_ENCRYPTED_OUTPUTS, LSK_FETCH_OFFSET, PROGRAM_ID, tokens } from './utils/constants.js';
+import { FETCH_UTXOS_GROUP_SIZE, getRelayerTokenName, RELAYER_API_URL, LSK_ENCRYPTED_OUTPUTS, LSK_FETCH_OFFSET, PROGRAM_ID, tokens } from './utils/constants.js';
 import { logger } from './utils/logger.js';
 import { getAssociatedTokenAddress } from '@solana/spl-token';
 // Use type assertion for the utility functions (same pattern as in get_verification_keys.ts)
@@ -40,6 +40,7 @@ export async function getUtxosSPL({ publicKey, connection, encryptionService, st
     if (!token) {
         throw new Error('token not found: ' + mintAddress.toString());
     }
+    const relayerTokenName = getRelayerTokenName(token.name);
     logger.debug('token name: ' + token.name + ', token address' + token.pubkey.toString());
     try {
         publicKey_ata = await getAssociatedTokenAddress(token.pubkey, publicKey);
@@ -66,8 +67,8 @@ export async function getUtxosSPL({ publicKey, connection, encryptionService, st
             }
             logger.debug(' ####fetch_utxo_offset', fetch_utxo_offset);
             let fetch_utxo_end = fetch_utxo_offset + FETCH_UTXOS_GROUP_SIZE;
-            let fetch_utxo_url = `${RELAYER_API_URL}/utxos/range?token=${token.name}&start=${fetch_utxo_offset}&end=${fetch_utxo_end}`;
-            let fetched = await fetchUserUtxos({ url: fetch_utxo_url, encryptionService, storage, publicKey_ata, tokenName: token.name });
+            let fetch_utxo_url = `${RELAYER_API_URL}/utxos/range?token=${relayerTokenName}&start=${fetch_utxo_offset}&end=${fetch_utxo_end}`;
+            let fetched = await fetchUserUtxos({ url: fetch_utxo_url, encryptionService, storage, publicKey_ata, tokenName: relayerTokenName });
             let am = 0;
             const nonZeroUtxos = [];
             const nonZeroEncrypted = [];

package/dist/utils/constants.d.ts

@@ -13,9 +13,11 @@ export declare const SIGN_MESSAGE = "Privacy Money account sign in";
 export declare const LSK_FETCH_OFFSET = "fetch_offset";
 export declare const LSK_ENCRYPTED_OUTPUTS = "encrypted_outputs";
 export declare const USDC_MINT: PublicKey;
-declare const tokenList: readonly ["sol", "usdc", "usdt", "zec", "ore", "store", "jlusdc", "jlwsol"];
+export declare const STORE_MINT: PublicKey;
+export declare const LEGACY_STORE_MINT: PublicKey;
+declare const tokenList: readonly ["sol", "usdc", "usdt", "zec", "ore", "store", "legacyStore", "jlusdc", "jlwsol"];
 export type TokenList = typeof tokenList[number];
-declare const splList: readonly ["usdc", "usdt", "zec", "ore", "store", "jlusdc", "jlwsol"];
+declare const splList: readonly ["usdc", "usdt", "zec", "ore", "store", "legacyStore", "jlusdc", "jlwsol"];
 export type SplList = typeof splList[number];
 export type Token = {
     name: TokenList;
@@ -24,4 +26,8 @@ export type Token = {
     pubkey: PublicKey;
 };
 export declare const tokens: Token[];
+export declare function getRelayerTokenName(tokenName: string): string;
+export declare function resolveTokenName(tokenName: string): TokenList | undefined;
+export declare function resolveToken(tokenName: string): Token | undefined;
+export declare function normalizeRelayerTokenMap(values?: Record<string, number>): Record<string, number> | undefined;
 export {};

package/dist/utils/constants.js

@@ -14,8 +14,14 @@ export const SIGN_MESSAGE = `Privacy Money account sign in`;
 export const LSK_FETCH_OFFSET = 'fetch_offset';
 export const LSK_ENCRYPTED_OUTPUTS = 'encrypted_outputs';
 export const USDC_MINT = process.env.NEXT_PUBLIC_USDC_MINT ? new PublicKey(process.env.NEXT_PUBLIC_USDC_MINT) : new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
-const tokenList = ['sol', 'usdc', 'usdt', 'zec', 'ore', 'store', 'jlusdc', 'jlwsol'];
-const splList = ['usdc', 'usdt', 'zec', 'ore', 'store', 'jlusdc', 'jlwsol'];
+export const STORE_MINT = process.env.NEXT_PUBLIC_NEWSTORE_MINT ? new PublicKey(process.env.NEXT_PUBLIC_NEWSTORE_MINT) : new PublicKey('storenSbvkfzircixnaosc5CbzNZVrHJ6S3EKrS1yqR');
+export const LEGACY_STORE_MINT = process.env.NEXT_PUBLIC_LEGACY_STORE_MINT
+    ? new PublicKey(process.env.NEXT_PUBLIC_LEGACY_STORE_MINT)
+    : process.env.NEXT_PUBLIC_STORE_MINT
+        ? new PublicKey(process.env.NEXT_PUBLIC_STORE_MINT)
+        : new PublicKey('sTorERYB6xAZ1SSbwpK3zoK2EEwbBrc7TZAzg1uCGiH');
+const tokenList = ['sol', 'usdc', 'usdt', 'zec', 'ore', 'store', 'legacyStore', 'jlusdc', 'jlwsol'];
+const splList = ['usdc', 'usdt', 'zec', 'ore', 'store', 'legacyStore', 'jlusdc', 'jlwsol'];
 export const tokens = [
     {
         name: 'sol',
@@ -49,10 +55,16 @@ export const tokens = [
     },
     {
         name: 'store',
-        pubkey: process.env.NEXT_PUBLIC_STORE_MINT ? new PublicKey(process.env.NEXT_PUBLIC_STORE_MINT) : new PublicKey('sTorERYB6xAZ1SSbwpK3zoK2EEwbBrc7TZAzg1uCGiH'),
+        pubkey: STORE_MINT,
         prefix: 'store_',
         units_per_token: 1e11
     },
+    {
+        name: 'legacyStore',
+        pubkey: LEGACY_STORE_MINT,
+        prefix: 'legacyStore_',
+        units_per_token: 1e11
+    },
     {
         name: 'jlusdc',
         pubkey: process.env.NEXT_PUBLIC_JLUSDC_MINT ? new PublicKey(process.env.NEXT_PUBLIC_JLUSDC_MINT) : new PublicKey('9BEcn9aPEmhSPbPQeFGjidRiEKki46fVQDyPpSQXPA2D'),
@@ -66,3 +78,40 @@ export const tokens = [
         units_per_token: 1e9
     }
 ];
+export function getRelayerTokenName(tokenName) {
+    if (tokenName === 'store') {
+        return 'newstore';
+    }
+    if (tokenName === 'legacyStore') {
+        return 'store';
+    }
+    return tokenName;
+}
+export function resolveTokenName(tokenName) {
+    const normalized = tokenName.trim().toLowerCase();
+    if (normalized === 'newstore') {
+        return 'store';
+    }
+    if (normalized === 'legacystore') {
+        return 'legacyStore';
+    }
+    return tokens.find(token => token.name.toLowerCase() === normalized)?.name;
+}
+export function resolveToken(tokenName) {
+    const resolvedName = resolveTokenName(tokenName);
+    return resolvedName ? tokens.find(token => token.name === resolvedName) : undefined;
+}
+export function normalizeRelayerTokenMap(values) {
+    if (!values) {
+        return values;
+    }
+    const normalized = { ...values };
+    if (values.newstore !== undefined) {
+        normalized.store = values.newstore;
+    }
+    if (values.store !== undefined) {
+        normalized.legacyStore = values.store;
+    }
+    delete normalized.newstore;
+    return normalized;
+}

package/dist/withdrawSPL.js

@@ -4,7 +4,7 @@ import { Buffer } from 'buffer';
 import { Keypair as UtxoKeypair } from './models/keypair.js';
 import { Utxo } from './models/utxo.js';
 import { parseProofToBytesArray, parseToBytesArray, prove } from './utils/prover.js';
-import { ALT_ADDRESS, FEE_RECIPIENT, FIELD_SIZE, PROGRAM_ID, RELAYER_API_URL, tokens } from './utils/constants.js';
+import { ALT_ADDRESS, FEE_RECIPIENT, FIELD_SIZE, getRelayerTokenName, PROGRAM_ID, RELAYER_API_URL, tokens } from './utils/constants.js';
 import { serializeProofAndExtData } from './utils/encryption.js';
 import { fetchMerkleProof, findCrossCheckNullifierPDAs, findNullifierPDAs, getExtDataHash, getMintAddressField, getProgramAccounts } from './utils/utils.js';
 import { getAssociatedTokenAddressSync, getMint } from '@solana/spl-token';
@@ -44,6 +44,7 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     if (!token) {
         throw new Error('token not found: ' + mintAddress.toString());
     }
+    const relayerTokenName = getRelayerTokenName(token.name);
     if (amount) {
         base_units = amount * token.units_per_token;
     }
@@ -53,7 +54,7 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     let mintInfo = await getMint(connection, token.pubkey);
     let units_per_token = 10 ** mintInfo.decimals;
     let withdraw_fee_rate = await getConfig('withdraw_fee_rate');
-    if (token.name === 'store') {
+    if (token.name === 'legacyStore') {
         withdraw_fee_rate = 0;
     }
     let withdraw_rent_fees = await getConfig('rent_fees');
@@ -119,7 +120,7 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     const changeAmount = totalInputAmount.sub(new BN(base_units)).sub(new BN(fee_base_units));
     logger.debug(`Withdrawing ${base_units} lamports with ${fee_base_units} fee, ${changeAmount.toString()} as change`);
     let commitmentsToFetch = inputs.map(utxo => utxo.getCommitment());
-    const { root, nextIndex, proofs } = await fetchMerkleProof(commitmentsToFetch, token.name);
+    const { root, nextIndex, proofs } = await fetchMerkleProof(commitmentsToFetch, relayerTokenName);
     // Extract path elements and indices
     const inputMerklePathElements = proofs.map(proof => proof.pathElements);
     const inputMerklePathIndices = inputs.map(utxo => utxo.index || 0);
@@ -281,7 +282,7 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
         logger.debug(`retryTimes: ${retryTimes}`);
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
         logger.info('Fetching updated onchain state...');
-        let res = await fetch(RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr + '?token=' + token.name);
+        let res = await fetch(RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr + '?token=' + relayerTokenName);
         let resJson = await res.json();
         logger.debug('resJson:', resJson);
         if (resJson.exists) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "privacycash",
-  "version": "1.1.24",
+  "version": "1.2.0",
   "description": "",
   "main": "dist/index.js",
   "repository": "https://github.com/Privacy-Cash/privacy-cash-sdk",
@@ -12,7 +12,9 @@
   "type": "module",
   "scripts": {
     "build": "tsc",
-    "test": "vitest run --exclude \"**/__tests__/e2e.test.ts,**/__tests__/e2espl.test.ts\"",
+    "postinstall": "cp node_modules/@lightprotocol/hasher.rs/dist/hasher_wasm_simd_bg.wasm node_modules/@lightprotocol/hasher.rs/dist/browser-fat/es/ && cp node_modules/@lightprotocol/hasher.rs/dist/light_wasm_hasher_bg.wasm node_modules/@lightprotocol/hasher.rs/dist/browser-fat/es/",
+    "prepare": "npm run build",
+    "test": "vitest run --exclude \"**/__tests__/e2e.test.ts\" --exclude \"**/__tests__/e2espl.test.ts\"",
     "teste2e": "vitest run e2e.test.ts",
     "teste2espl": "vitest run e2espl.test.ts"
   },

package/src/config.ts

@@ -1,11 +1,13 @@
-import { RELAYER_API_URL } from "./utils/constants.js";
+import { normalizeRelayerTokenMap, RELAYER_API_URL } from "./utils/constants.js";
 
 type Config = {
     withdraw_fee_rate: number
     withdraw_rent_fee: number
     deposit_fee_rate: number
     usdc_withdraw_rent_fee: number
-    rent_fees: any
+    rent_fees: Record<string, number>
+    minimum_withdrawal: Record<string, number>
+    prices: Record<string, number>
 }
 
 let config: Config | undefined
@@ -13,10 +15,19 @@ let config: Config | undefined
 export async function getConfig<K extends keyof Config>(key: K): Promise<Config[K]> {
     if (!config) {
         const res = await fetch(RELAYER_API_URL + '/config')
-        config = await res.json()
+        config = normalizeConfig(await res.json())
     }
     if (typeof config![key] == 'undefined') {
         throw new Error(`can not get ${key} from ${RELAYER_API_URL}/config`)
     }
     return config![key]
-}
+}
+
+function normalizeConfig(raw: Config): Config {
+    return {
+        ...raw,
+        rent_fees: normalizeRelayerTokenMap(raw.rent_fees) ?? {},
+        minimum_withdrawal: normalizeRelayerTokenMap(raw.minimum_withdrawal) ?? {},
+        prices: normalizeRelayerTokenMap(raw.prices) ?? {},
+    }
+}

package/src/depositSPL.ts

@@ -6,7 +6,7 @@ import { getUtxosSPL } from './getUtxosSPL.js';
 import { Keypair as UtxoKeypair } from './models/keypair.js';
 import { Utxo } from './models/utxo.js';
 import { useExistingALT } from './utils/address_lookup_table.js';
-import { ALT_ADDRESS, FEE_RECIPIENT, FIELD_SIZE, MERKLE_TREE_DEPTH, PROGRAM_ID, RELAYER_API_URL, Token, tokens } from './utils/constants.js';
+import { ALT_ADDRESS, FEE_RECIPIENT, FIELD_SIZE, getRelayerTokenName, MERKLE_TREE_DEPTH, PROGRAM_ID, RELAYER_API_URL, Token, tokens } from './utils/constants.js';
 import { EncryptionService, serializeProofAndExtData } from './utils/encryption.js';
 import { logger } from './utils/logger.js';
 import { MerkleTree } from './utils/merkle_tree.js';
@@ -88,6 +88,10 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     if (!token) {
         throw new Error('token not found: ' + mintAddress.toString())
     }
+    if (token.name === 'legacyStore') {
+        throw new Error('Legacy stORE deposit has been disabled. Please use the latest stORE.')
+    }
+    const relayerTokenName = getRelayerTokenName(token.name)
 
     if (amount) {
         base_units = amount * token.units_per_token
@@ -185,7 +189,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     let root: string;
     let nextIndex: number;
     if (mintUtxos.length === 0) {
-        const treeState = await queryRemoteTreeState(token.name);
+        const treeState = await queryRemoteTreeState(relayerTokenName);
         root = treeState.root
         nextIndex = treeState.nextIndex
         // Scenario 1: Fresh deposit with dummy inputs - add new funds to the system
@@ -264,7 +268,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
             await secondUtxo.log();
         }
 
-        let data = await fetchMerkleProof(commitmentsToFetch, token.name)
+        let data = await fetchMerkleProof(commitmentsToFetch, relayerTokenName)
         root = data.root
         nextIndex = data.nextIndex
         let [firstUtxoMerkleProof, secondUtxoMerkleProof] = data.proofs
@@ -542,7 +546,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
         logger.debug(`retryTimes: ${retryTimes}`)
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
         logger.debug('Fetching updated onchain state...');
-        let url = RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr + '?token=' + token.name
+        let url = RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr + '?token=' + relayerTokenName
         let res = await fetch(url)
         let resJson = await res.json()
         if (resJson.exists) {
@@ -595,4 +599,4 @@ async function checkDepositLimit(connection: Connection, treeAccount: PublicKey,
         console.log('❌ Error reading deposit limit:', error);
         throw error
     }
-}
+}

package/src/exportUtils.ts

@@ -9,4 +9,4 @@ export { depositSPL } from './depositSPL.js'
 export { withdrawSPL } from './withdrawSPL.js'
 export { getBalanceFromUtxosSPL, getUtxosSPL } from './getUtxosSPL.js'
 
-export { type TokenList, type SplList, tokens } from './utils/constants.js'
+export { getRelayerTokenName, LEGACY_STORE_MINT, normalizeRelayerTokenMap, STORE_MINT, type TokenList, type SplList, tokens } from './utils/constants.js'

package/src/getUtxosSPL.ts

@@ -6,7 +6,7 @@ import { EncryptionService } from './utils/encryption.js';
 import { WasmFactory } from '@lightprotocol/hasher.rs';
 //@ts-ignore
 import * as ffjavascript from 'ffjavascript';
-import { FETCH_UTXOS_GROUP_SIZE, RELAYER_API_URL, LSK_ENCRYPTED_OUTPUTS, LSK_FETCH_OFFSET, PROGRAM_ID, SplList, tokens } from './utils/constants.js';
+import { FETCH_UTXOS_GROUP_SIZE, getRelayerTokenName, RELAYER_API_URL, LSK_ENCRYPTED_OUTPUTS, LSK_FETCH_OFFSET, PROGRAM_ID, tokens } from './utils/constants.js';
 import { logger } from './utils/logger.js';
 import { getAssociatedTokenAddress } from '@solana/spl-token';
 
@@ -77,6 +77,7 @@ export async function getUtxosSPL({ publicKey, connection, encryptionService, st
     if (!token) {
         throw new Error('token not found: ' + mintAddress.toString())
     }
+    const relayerTokenName = getRelayerTokenName(token.name)
 
     logger.debug('token name: ' + token.name + ', token address' + token.pubkey.toString())
 
@@ -107,8 +108,8 @@ export async function getUtxosSPL({ publicKey, connection, encryptionService, st
             }
             logger.debug(' ####fetch_utxo_offset', fetch_utxo_offset)
             let fetch_utxo_end = fetch_utxo_offset + FETCH_UTXOS_GROUP_SIZE
-            let fetch_utxo_url = `${RELAYER_API_URL}/utxos/range?token=${token.name}&start=${fetch_utxo_offset}&end=${fetch_utxo_end}`
-            let fetched = await fetchUserUtxos({ url: fetch_utxo_url, encryptionService, storage, publicKey_ata, tokenName: token.name })
+            let fetch_utxo_url = `${RELAYER_API_URL}/utxos/range?token=${relayerTokenName}&start=${fetch_utxo_offset}&end=${fetch_utxo_end}`
+            let fetched = await fetchUserUtxos({ url: fetch_utxo_url, encryptionService, storage, publicKey_ata, tokenName: relayerTokenName })
             let am = 0
 
             const nonZeroUtxos: Utxo[] = [];
@@ -525,4 +526,4 @@ async function decrypt_outputs(
     }
 
     return results;
-}
+}

package/src/utils/constants.ts

@@ -26,10 +26,16 @@ export const LSK_FETCH_OFFSET = 'fetch_offset'
 export const LSK_ENCRYPTED_OUTPUTS = 'encrypted_outputs'
 
 export const USDC_MINT = process.env.NEXT_PUBLIC_USDC_MINT ? new PublicKey(process.env.NEXT_PUBLIC_USDC_MINT) : new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v')
+export const STORE_MINT = process.env.NEXT_PUBLIC_NEWSTORE_MINT ? new PublicKey(process.env.NEXT_PUBLIC_NEWSTORE_MINT) : new PublicKey('storenSbvkfzircixnaosc5CbzNZVrHJ6S3EKrS1yqR')
+export const LEGACY_STORE_MINT = process.env.NEXT_PUBLIC_LEGACY_STORE_MINT
+    ? new PublicKey(process.env.NEXT_PUBLIC_LEGACY_STORE_MINT)
+    : process.env.NEXT_PUBLIC_STORE_MINT
+        ? new PublicKey(process.env.NEXT_PUBLIC_STORE_MINT)
+        : new PublicKey('sTorERYB6xAZ1SSbwpK3zoK2EEwbBrc7TZAzg1uCGiH')
 
-const tokenList = ['sol', 'usdc', 'usdt', 'zec', 'ore', 'store', 'jlusdc', 'jlwsol'] as const;
+const tokenList = ['sol', 'usdc', 'usdt', 'zec', 'ore', 'store', 'legacyStore', 'jlusdc', 'jlwsol'] as const;
 export type TokenList = typeof tokenList[number];
-const splList = ['usdc', 'usdt', 'zec', 'ore', 'store', 'jlusdc', 'jlwsol'] as const;
+const splList = ['usdc', 'usdt', 'zec', 'ore', 'store', 'legacyStore', 'jlusdc', 'jlwsol'] as const;
 export type SplList = typeof splList[number];
 export type Token = {
     name: TokenList
@@ -70,10 +76,16 @@ export const tokens: Token[] = [
     },
     {
         name: 'store',
-        pubkey: process.env.NEXT_PUBLIC_STORE_MINT ? new PublicKey(process.env.NEXT_PUBLIC_STORE_MINT) : new PublicKey('sTorERYB6xAZ1SSbwpK3zoK2EEwbBrc7TZAzg1uCGiH'),
+        pubkey: STORE_MINT,
         prefix: 'store_',
         units_per_token: 1e11
     },
+    {
+        name: 'legacyStore',
+        pubkey: LEGACY_STORE_MINT,
+        prefix: 'legacyStore_',
+        units_per_token: 1e11
+    },
     {
         name: 'jlusdc',
         pubkey: process.env.NEXT_PUBLIC_JLUSDC_MINT ? new PublicKey(process.env.NEXT_PUBLIC_JLUSDC_MINT) : new PublicKey('9BEcn9aPEmhSPbPQeFGjidRiEKki46fVQDyPpSQXPA2D'),
@@ -86,4 +98,45 @@ export const tokens: Token[] = [
         prefix: 'jlwsol_',
         units_per_token: 1e9
     }
-]
+]
+
+export function getRelayerTokenName(tokenName: string) {
+    if (tokenName === 'store') {
+        return 'newstore'
+    }
+    if (tokenName === 'legacyStore') {
+        return 'store'
+    }
+    return tokenName
+}
+
+export function resolveTokenName(tokenName: string): TokenList | undefined {
+    const normalized = tokenName.trim().toLowerCase()
+    if (normalized === 'newstore') {
+        return 'store'
+    }
+    if (normalized === 'legacystore') {
+        return 'legacyStore'
+    }
+    return tokens.find(token => token.name.toLowerCase() === normalized)?.name
+}
+
+export function resolveToken(tokenName: string): Token | undefined {
+    const resolvedName = resolveTokenName(tokenName)
+    return resolvedName ? tokens.find(token => token.name === resolvedName) : undefined
+}
+
+export function normalizeRelayerTokenMap(values?: Record<string, number>): Record<string, number> | undefined {
+    if (!values) {
+        return values
+    }
+    const normalized = { ...values }
+    if (values.newstore !== undefined) {
+        normalized.store = values.newstore
+    }
+    if (values.store !== undefined) {
+        normalized.legacyStore = values.store
+    }
+    delete normalized.newstore
+    return normalized
+}

package/src/withdrawSPL.ts

@@ -6,7 +6,7 @@ import { Keypair as UtxoKeypair } from './models/keypair.js';
 import { Utxo } from './models/utxo.js';
 import { parseProofToBytesArray, parseToBytesArray, prove } from './utils/prover.js';
 
-import { ALT_ADDRESS, FEE_RECIPIENT, FIELD_SIZE, PROGRAM_ID, RELAYER_API_URL, tokens } from './utils/constants.js';
+import { ALT_ADDRESS, FEE_RECIPIENT, FIELD_SIZE, getRelayerTokenName, PROGRAM_ID, RELAYER_API_URL, tokens } from './utils/constants.js';
 import { EncryptionService, serializeProofAndExtData } from './utils/encryption.js';
 import { fetchMerkleProof, findCrossCheckNullifierPDAs, findNullifierPDAs, getExtDataHash, getMintAddressField, getProgramAccounts } from './utils/utils.js';
 
@@ -66,6 +66,7 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     if (!token) {
         throw new Error('token not found: ' + mintAddress.toString())
     }
+    const relayerTokenName = getRelayerTokenName(token.name)
 
     if (amount) {
         base_units = amount * token.units_per_token
@@ -80,7 +81,7 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     let units_per_token = 10 ** mintInfo.decimals
 
     let withdraw_fee_rate = await getConfig('withdraw_fee_rate')
-    if (token.name === 'store') {
+    if (token.name === 'legacyStore') {
         withdraw_fee_rate = 0
     }
     let withdraw_rent_fees = await getConfig('rent_fees')
@@ -179,7 +180,7 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     logger.debug(`Withdrawing ${base_units} lamports with ${fee_base_units} fee, ${changeAmount.toString()} as change`);
 
     let commitmentsToFetch = inputs.map(utxo => utxo.getCommitment());
-    const { root, nextIndex, proofs } = await fetchMerkleProof(commitmentsToFetch, token.name);
+    const { root, nextIndex, proofs } = await fetchMerkleProof(commitmentsToFetch, relayerTokenName);
 
     // Extract path elements and indices
     const inputMerklePathElements = proofs.map(proof => proof.pathElements);
@@ -368,7 +369,7 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
         logger.debug(`retryTimes: ${retryTimes}`)
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
         logger.info('Fetching updated onchain state...');
-        let res = await fetch(RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr + '?token=' + token.name)
+        let res = await fetch(RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr + '?token=' + relayerTokenName)
         let resJson = await res.json()
         logger.debug('resJson:', resJson)
         if (resJson.exists) {