@orbinum/sdk 0.20.0 → 0.21.0

package/dist/index.d.mts

@@ -721,6 +721,13 @@ type ZkNote = {
     spendingKey: bigint;
     /** Circuit version this note was created under (see `CURRENT_CIRCUIT_VERSION`). Required. */
     circuitVersion: number;
+    /**
+     * Global Merkle leaf index, when known. Optional so pre-forest vaults
+     * need no migration: notes without it predate the first tree seal and
+     * belong to tree 0. Populated on shield and on scan; used only to derive
+     * the forest tree for same-tree coin selection (`treeIdOf`).
+     */
+    leafIndex?: number;
     /** Whether the note has been spent/nullified on-chain. */
     spent: boolean;
     /** Local timestamp when this note was marked spent, or null if still active/unknown. */
@@ -1095,6 +1102,7 @@ type RpcV2MerkleProof = {
     path: string[];
     leafIndex: number;
     treeDepth: number;
+    treeId?: number | undefined;
 };
 type PrivacyMerkleProof = RpcV2MerkleProof & {
     root: string;
@@ -2301,22 +2309,52 @@ declare function generateTransferProof(params: PrivateTransferProofInputs, optio
     verbose?: boolean;
 }): Promise<ProofResult>;
 
+/**
+ * Forest tree a note belongs to.
+ *
+ * Falls back to tree 0 for a missing or malformed `leafIndex`. Both cases are
+ * expected rather than defensive noise:
+ *
+ *   - Notes persisted before the forest upgrade carry no index, and they all
+ *     predate the first seal, so tree 0 is the correct answer.
+ *   - The index originates in an indexer scan hint, which is untrusted. A
+ *     `NaN` reaching this function would make every same-tree comparison
+ *     false — no pair would ever be selectable and the whole balance would
+ *     look unspendable.
+ */
+declare function treeIdOf(note: Pick<ZkNote, 'leafIndex'>): number;
+/**
+ * Outcome of {@link selectNotes}.
+ *
+ *   - `[noteA, noteB | null]` — a spendable selection; a `null` second slot
+ *     means the transfer runs with a dummy input.
+ *   - `{ needsConsolidation: true }` — the balance covers the amount, but only
+ *     by pairing notes from different forest trees, which no single proof can
+ *     do. The caller should offer a consolidation, not an insufficient-funds
+ *     error.
+ *   - `null` — no combination covers the amount.
+ */
+type CoinSelection = [ZkNote, ZkNote | null] | {
+    needsConsolidation: true;
+} | null;
 /**
  * Selects up to 2 unspent notes that together cover `needed` planck.
  *
- * Priority:
- *   1. A single note whose value >= needed  →  [note, null]  (second input will be a dummy)
- *   2. The smallest pair whose sum >= needed →  [noteA, noteB]
- *   3. No combination covers needed          →  null  (consolidation via merge required)
+ * Both inputs of a transfer are proven together against ONE circuit VK and ONE
+ * public `merkle_root`, so a pair must agree on two things: mixing circuit
+ * versions produces an invalid proof, and notes in different forest trees
+ * anchor to different roots that can never converge. A single note needs
+ * neither check.
  *
- * Both inputs of a transfer are proven together against ONE circuit VK, so a
- * pair MUST share a circuitVersion — mixing v1 and v2 would produce an invalid
- * proof. Priority 2 only pairs notes of the same version; a single note (P1) is
- * always one version so it needs no check.
+ * Resolution order:
+ *   1. One note that alone covers `needed` → `[note, null]`.
+ *   2. Smallest same-version, same-tree pair whose sum covers it → `[a, b]`.
+ *   3. A cross-tree pair would cover it → `{ needsConsolidation: true }`.
+ *   4. Nothing covers it → `null`.
  *
  * Only unspent notes with value > 0 are considered.
  */
-declare function selectNotes(notes: ZkNote[], needed: bigint): [ZkNote, ZkNote | null] | null;
+declare function selectNotes(notes: ZkNote[], needed: bigint): CoinSelection;
 /**
  * Builds a dummy `TransferInputNote` for use as the second input in a single-note transfer.
  *
@@ -2450,6 +2488,42 @@ declare function deriveSpendingKeyTypedData(chainId: number, address: string): S
  */
 declare function deriveSpendingKeyMessageV2(chainId: number, address: string): string;
 
+/**
+ * Canonical account identifier for spending-key derivation.
+ *
+ * The address string is load-bearing twice: it goes into the signed payload AND
+ * into the HKDF `info`. So whatever identifies the account must be stable for
+ * the lifetime of that account — anything else silently rotates the spending key
+ * and orphans every note already shielded.
+ *
+ * SS58 IS NOT STABLE. The same public key encodes to a different string per
+ * network prefix:
+ *
+ *   prefix   42 → 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY
+ *   prefix 2700 → kcuMUgT1VAJR8MtE22C5cmoAR96qsTMLYzmEuyCKUj48jYHqR
+ *
+ * A wallet that lists an account under the generic prefix today and under the
+ * chain's own prefix tomorrow (a wallet setting, a chain-metadata update) would
+ * hand us a different string for the same key. Deriving from it directly means
+ * the user opens the app to an empty vault with no error and no explanation.
+ *
+ * So Substrate accounts are identified by their decoded 32-byte public key,
+ * which no prefix can change. EVM addresses are already canonical and pass
+ * through unchanged.
+ */
+/**
+ * Reduces an address to the form used for derivation.
+ *
+ * SS58 → `0x`-prefixed hex of the underlying public key, so every prefix of the
+ * same account maps to one identifier. Anything else (EVM `0x…`) is returned
+ * lowercased and unchanged.
+ *
+ * Not a validator: an unrecognised string passes through, because rejecting it
+ * here would break EVM callers. The signature guard in `PrivacyKeys` is what
+ * fails closed on unusable input.
+ */
+declare function canonicalAccountId(address: string): string;
+
 /**
  * PrivacyKeys
  *
@@ -4417,4 +4491,4 @@ interface ExtrinsicFailedData {
     dispatch_info: DispatchInfo;
 }
 
-export { type AccountListing, type AccountMappedData, type AccountMappedEvent, type AccountMappingCall, type AccountMappingEvent, AccountMappingModule, AccountMappingPrecompile, type AccountMetadata, type AccountUnmappedEvent, type ActiveVersionSetEvent, type AddChainLinkArgs, type AddChainLinkParams, type AddSupportedChainArgs, type AliasFullIdentity, type AliasInfo, type AliasListedForSaleEvent, type AliasOnSaleData, type AliasRegisteredData, type AliasRegisteredEvent, type AliasReleasedEvent, type AliasSaleCancelledEvent, type AliasSoldData, type AliasSoldEvent, type AliasTransferredData, type AliasTransferredEvent, type AssetRegisteredEvent, type AssetUnverifiedEvent, type AssetVerifiedEvent, BABYJUB_SUBORDER, BN254_R, type BatchRegisterVerificationKeysArgs, type BatchVerificationKeysRegisteredEvent, type BlockInfo, type BuyAliasArgs, type Bytes32, CURRENT_CIRCUIT_VERSION, type ChainInfo, type ChainLink, type ChainLinkAddedEvent, type ChainLinkRemovedEvent, CircuitId, CircuitId as CircuitIdType, CircuitVersionResolver, type ClaimShieldedFeesParams, type ClientProviderConfig, type CommitmentsInsertedEvent, type CommitmentsInsertedEventData, type ConnectionStatus, CryptoPrecompiles, type DecodedAddChainLinkArgs, type DecodedBatchArgs, type DecodedDispatchAsPrivateLinkArgs, type DecodedEthereumTransactArgs, type DecodedEvmCallArgs, type DecodedPrecompile, type DecodedPrivateTransferArgs, type DecodedPutAliasForSaleArgs, type DecodedRegisterAliasArgs, type DecodedRemarkArgs, type DecodedRevealPrivateLinkArgs, type DecodedSetAccountMetadataArgs, type DecodedShieldArgs, type DecodedShieldBatchArgs, type DecodedShieldBatchOperation, type DecodedSudoArgs, type DecodedTransferAllArgs, type DecodedTransferArgs, type DecodedTransferKeepAliveArgs, type DecodedUnshieldArgs, type DecryptedMemo, type DispatchAsLinkedAccountArgs, type DispatchAsLinkedParams, type DispatchAsPrivateLinkArgs, type DispatchError, type DispatchInfo, type DynamicBuilder, ENCRYPTED_MEMO_SIZE, EncryptedMemo, type EncryptedNoteRecord, type EndowedEventData, type EthereumExecutedData, type EventData, type EventPhase, type EventRecord, type EvmAddressInfo, type EvmBlock, EvmClient, type EvmExecutedData, type EvmExitReason, EvmExplorer, type EvmLog, type EvmSigner, type EvmTransaction, type EvmTxRequest, type EvmTxSummary, type ExtrinsicDecoder, type ExtrinsicFailedData, type ExtrinsicSuccessData, type FeeClaimProofInputs, type FormatOptions, KNOWN_PRECOMPILES, type KnownPrecompileInfo, type ListingInfo, MIN_SIGNATURE_BYTES, type MerkleRootUpdatedData, type MerkleRootUpdatedEvent, type MerkleTreeInfo, type MetadataUpdatedEvent, NoteBuilder, type NoteDisclosure, type NoteInput, type NoteStatusUpdate, type NullifiersSpentEvent, type NullifiersSpentEventData, OrbinumClient, type OrbinumClientConfig, OrbinumClientProvider, PRECOMPILE_ADDR, PrivacyKeyManager, type PrivacyMerkleProof, PrivacyModule, type PrivateChainLinkAddedEvent, type PrivateChainLinkRemovedEvent, type PrivateChainLinkRevealedEvent, type PrivateLink, type PrivateLinkDispatchExecutedEvent, type PrivateTransferArgs, type PrivateTransferInput, type PrivateTransferOutput, type PrivateTransferParams, type PrivateTransferProofInputs, type ProofVerificationFailedEvent, type ProofVerifiedEvent, type ProxyCallExecutedEvent, type PutAliasOnSaleArgs, type PutOnSaleParams, type RawBlock, type RawBlockHeader, type RawTransferInput, type RawTransferOutput, type RegisterAliasArgs, type RegisterAssetArgs, type RegisterPrivateLinkArgs, type RegisterVerificationKeyArgs, type RelayerInfo, RelayerStatusModule, type RemoveChainLinkArgs, type RemovePrivateLinkArgs, type RemoveSupportedChainArgs, type RemoveVerificationKeyArgs, type ReservedEventData, type ResolvedAlias, type ResolvedSpendVersion, type RevealPrivateLinkArgs, type RpcV2MerkleProof, type RpcV2NullifierStatus, type RpcV2PoolAssetBalance, type RpcV2PoolStats, SLIP0044_NAMESPACE, SPENDING_KEY_VERIFYING_CONTRACT, SPENDING_KEY_WARNING, type ScanCommitment, type SelfEphWindowEntry, type SetAccountMetadataArgs, type SetActiveVersionArgs, type SetMetadataParams, type ShieldArgs, type ShieldBatchArgs, type ShieldBatchItem, type ShieldBatchParams, type ShieldOperation, type ShieldParams, type ShieldedEvent, type ShieldedEventData, type ShieldedPoolCall, type ShieldedPoolEvent, ShieldedPoolModule, ShieldedPoolPrecompile, SignatureScheme, type SpendingKeyTypedData, type StatusChangeEvent, type StatusListener, SubstrateClient, type SupportedChain, type SupportedChainAddedEvent, type SupportedChainRemovedEvent, type SystemHealth, type TokenInfo, type TokenTransfer, type TransferAliasArgs, type TransferEventData, type TransferInputNote, type TransferOutputNote, type TryDecryptOptions, type TxResult, type UnsafeTxOptions, type UnshieldArgs, type UnshieldParams, type UnshieldProofInputs, type UnshieldedEvent, type UnshieldedEventData, type UnverifyAssetArgs, VaultLockedError, type VerificationKeyRegisteredEvent, type VerificationKeyRemovedEvent, type VerifyAssetArgs, type VerifyProofArgs, type VkEntry, type ZkNote, type ZkVerifierCall, type ZkVerifierCircuitVersionInfo, type ZkVerifierEvent, type ZkVerifierHistoricalVersion, ZkVerifierModule, type ZkVerifierVersionStats, type ZkVerifierVkHash, accountIdHexToSs58, addressToAccountIdHex, applyNoteStatus, bigintTo32Be, bigintTo32Le, bigintTo32LeArr, blindTag, buildDummyTransferInput, bytesToBigintLE, computeNoteCommitment, computeNullifier, computePathIndices, createNoteDisclosureKey, decodeNoteDisclosureKey, decodePrecompileCalldata, decryptJson, decryptNoteRecord, deriveMasterKeyBytes, deriveOwnerPk, deriveSelfEphSk, deriveSpendingKeyFromSignature, deriveSpendingKeyMessageV2, deriveSpendingKeyTypedData, deriveStealthOwnerPk, deriveStealthSk, deriveVaultBlindKey, deriveVaultKey, deriveViewTag, deriveViewingPublicKey, deriveViewingSecretKey, encryptJson, encryptNote, ensureHexPrefix, evmAddressToAccountId, evmToImplicitSubstrate, evmToMappedAccountHex, evmToSubstrate, formatBalance, formatORB, fromBase64, fromHex, generateFeeClaimProof, generateTransferProof, generateUnshieldProof, getPrecompileLabel, hexToBigint, hexToNumber, implicitSubstrateToEvm, isEvmAddress, isImplicitEvmAccount, isSs58, isSubstrateAddress, isUnifiedAddress, leHexToBigint, mapExtrinsicArgs, mapZkEventData, normalizeEvmAddress, noteBlindTag, randomBlinding, recoverOwnerPkPoint, selectNotes, selfEphWindow, shortHash, substrateSs58ToAccountIdHex, substrateToEvm, toBase64, toHex, toTxResult, truncateMiddle, tryDecryptNote, tryDecryptNoteVerbose, vaultReplacer, vaultReviver };
+export { type AccountListing, type AccountMappedData, type AccountMappedEvent, type AccountMappingCall, type AccountMappingEvent, AccountMappingModule, AccountMappingPrecompile, type AccountMetadata, type AccountUnmappedEvent, type ActiveVersionSetEvent, type AddChainLinkArgs, type AddChainLinkParams, type AddSupportedChainArgs, type AliasFullIdentity, type AliasInfo, type AliasListedForSaleEvent, type AliasOnSaleData, type AliasRegisteredData, type AliasRegisteredEvent, type AliasReleasedEvent, type AliasSaleCancelledEvent, type AliasSoldData, type AliasSoldEvent, type AliasTransferredData, type AliasTransferredEvent, type AssetRegisteredEvent, type AssetUnverifiedEvent, type AssetVerifiedEvent, BABYJUB_SUBORDER, BN254_R, type BatchRegisterVerificationKeysArgs, type BatchVerificationKeysRegisteredEvent, type BlockInfo, type BuyAliasArgs, type Bytes32, CURRENT_CIRCUIT_VERSION, type ChainInfo, type ChainLink, type ChainLinkAddedEvent, type ChainLinkRemovedEvent, CircuitId, CircuitId as CircuitIdType, CircuitVersionResolver, type ClaimShieldedFeesParams, type ClientProviderConfig, type CommitmentsInsertedEvent, type CommitmentsInsertedEventData, type ConnectionStatus, CryptoPrecompiles, type DecodedAddChainLinkArgs, type DecodedBatchArgs, type DecodedDispatchAsPrivateLinkArgs, type DecodedEthereumTransactArgs, type DecodedEvmCallArgs, type DecodedPrecompile, type DecodedPrivateTransferArgs, type DecodedPutAliasForSaleArgs, type DecodedRegisterAliasArgs, type DecodedRemarkArgs, type DecodedRevealPrivateLinkArgs, type DecodedSetAccountMetadataArgs, type DecodedShieldArgs, type DecodedShieldBatchArgs, type DecodedShieldBatchOperation, type DecodedSudoArgs, type DecodedTransferAllArgs, type DecodedTransferArgs, type DecodedTransferKeepAliveArgs, type DecodedUnshieldArgs, type DecryptedMemo, type DispatchAsLinkedAccountArgs, type DispatchAsLinkedParams, type DispatchAsPrivateLinkArgs, type DispatchError, type DispatchInfo, type DynamicBuilder, ENCRYPTED_MEMO_SIZE, EncryptedMemo, type EncryptedNoteRecord, type EndowedEventData, type EthereumExecutedData, type EventData, type EventPhase, type EventRecord, type EvmAddressInfo, type EvmBlock, EvmClient, type EvmExecutedData, type EvmExitReason, EvmExplorer, type EvmLog, type EvmSigner, type EvmTransaction, type EvmTxRequest, type EvmTxSummary, type ExtrinsicDecoder, type ExtrinsicFailedData, type ExtrinsicSuccessData, type FeeClaimProofInputs, type FormatOptions, KNOWN_PRECOMPILES, type KnownPrecompileInfo, type ListingInfo, MIN_SIGNATURE_BYTES, type MerkleRootUpdatedData, type MerkleRootUpdatedEvent, type MerkleTreeInfo, type MetadataUpdatedEvent, NoteBuilder, type NoteDisclosure, type NoteInput, type NoteStatusUpdate, type NullifiersSpentEvent, type NullifiersSpentEventData, OrbinumClient, type OrbinumClientConfig, OrbinumClientProvider, PRECOMPILE_ADDR, PrivacyKeyManager, type PrivacyMerkleProof, PrivacyModule, type PrivateChainLinkAddedEvent, type PrivateChainLinkRemovedEvent, type PrivateChainLinkRevealedEvent, type PrivateLink, type PrivateLinkDispatchExecutedEvent, type PrivateTransferArgs, type PrivateTransferInput, type PrivateTransferOutput, type PrivateTransferParams, type PrivateTransferProofInputs, type ProofVerificationFailedEvent, type ProofVerifiedEvent, type ProxyCallExecutedEvent, type PutAliasOnSaleArgs, type PutOnSaleParams, type RawBlock, type RawBlockHeader, type RawTransferInput, type RawTransferOutput, type RegisterAliasArgs, type RegisterAssetArgs, type RegisterPrivateLinkArgs, type RegisterVerificationKeyArgs, type RelayerInfo, RelayerStatusModule, type RemoveChainLinkArgs, type RemovePrivateLinkArgs, type RemoveSupportedChainArgs, type RemoveVerificationKeyArgs, type ReservedEventData, type ResolvedAlias, type ResolvedSpendVersion, type RevealPrivateLinkArgs, type RpcV2MerkleProof, type RpcV2NullifierStatus, type RpcV2PoolAssetBalance, type RpcV2PoolStats, SLIP0044_NAMESPACE, SPENDING_KEY_VERIFYING_CONTRACT, SPENDING_KEY_WARNING, type ScanCommitment, type SelfEphWindowEntry, type SetAccountMetadataArgs, type SetActiveVersionArgs, type SetMetadataParams, type ShieldArgs, type ShieldBatchArgs, type ShieldBatchItem, type ShieldBatchParams, type ShieldOperation, type ShieldParams, type ShieldedEvent, type ShieldedEventData, type ShieldedPoolCall, type ShieldedPoolEvent, ShieldedPoolModule, ShieldedPoolPrecompile, SignatureScheme, type SpendingKeyTypedData, type StatusChangeEvent, type StatusListener, SubstrateClient, type SupportedChain, type SupportedChainAddedEvent, type SupportedChainRemovedEvent, type SystemHealth, type TokenInfo, type TokenTransfer, type TransferAliasArgs, type TransferEventData, type TransferInputNote, type TransferOutputNote, type TryDecryptOptions, type TxResult, type UnsafeTxOptions, type UnshieldArgs, type UnshieldParams, type UnshieldProofInputs, type UnshieldedEvent, type UnshieldedEventData, type UnverifyAssetArgs, VaultLockedError, type VerificationKeyRegisteredEvent, type VerificationKeyRemovedEvent, type VerifyAssetArgs, type VerifyProofArgs, type VkEntry, type ZkNote, type ZkVerifierCall, type ZkVerifierCircuitVersionInfo, type ZkVerifierEvent, type ZkVerifierHistoricalVersion, ZkVerifierModule, type ZkVerifierVersionStats, type ZkVerifierVkHash, accountIdHexToSs58, addressToAccountIdHex, applyNoteStatus, bigintTo32Be, bigintTo32Le, bigintTo32LeArr, blindTag, buildDummyTransferInput, bytesToBigintLE, canonicalAccountId, computeNoteCommitment, computeNullifier, computePathIndices, createNoteDisclosureKey, decodeNoteDisclosureKey, decodePrecompileCalldata, decryptJson, decryptNoteRecord, deriveMasterKeyBytes, deriveOwnerPk, deriveSelfEphSk, deriveSpendingKeyFromSignature, deriveSpendingKeyMessageV2, deriveSpendingKeyTypedData, deriveStealthOwnerPk, deriveStealthSk, deriveVaultBlindKey, deriveVaultKey, deriveViewTag, deriveViewingPublicKey, deriveViewingSecretKey, encryptJson, encryptNote, ensureHexPrefix, evmAddressToAccountId, evmToImplicitSubstrate, evmToMappedAccountHex, evmToSubstrate, formatBalance, formatORB, fromBase64, fromHex, generateFeeClaimProof, generateTransferProof, generateUnshieldProof, getPrecompileLabel, hexToBigint, hexToNumber, implicitSubstrateToEvm, isEvmAddress, isImplicitEvmAccount, isSs58, isSubstrateAddress, isUnifiedAddress, leHexToBigint, mapExtrinsicArgs, mapZkEventData, normalizeEvmAddress, noteBlindTag, randomBlinding, recoverOwnerPkPoint, selectNotes, selfEphWindow, shortHash, substrateSs58ToAccountIdHex, substrateToEvm, toBase64, toHex, toTxResult, treeIdOf, truncateMiddle, tryDecryptNote, tryDecryptNoteVerbose, vaultReplacer, vaultReviver };

package/dist/index.d.ts

@@ -721,6 +721,13 @@ type ZkNote = {
     spendingKey: bigint;
     /** Circuit version this note was created under (see `CURRENT_CIRCUIT_VERSION`). Required. */
     circuitVersion: number;
+    /**
+     * Global Merkle leaf index, when known. Optional so pre-forest vaults
+     * need no migration: notes without it predate the first tree seal and
+     * belong to tree 0. Populated on shield and on scan; used only to derive
+     * the forest tree for same-tree coin selection (`treeIdOf`).
+     */
+    leafIndex?: number;
     /** Whether the note has been spent/nullified on-chain. */
     spent: boolean;
     /** Local timestamp when this note was marked spent, or null if still active/unknown. */
@@ -1095,6 +1102,7 @@ type RpcV2MerkleProof = {
     path: string[];
     leafIndex: number;
     treeDepth: number;
+    treeId?: number | undefined;
 };
 type PrivacyMerkleProof = RpcV2MerkleProof & {
     root: string;
@@ -2301,22 +2309,52 @@ declare function generateTransferProof(params: PrivateTransferProofInputs, optio
     verbose?: boolean;
 }): Promise<ProofResult>;
 
+/**
+ * Forest tree a note belongs to.
+ *
+ * Falls back to tree 0 for a missing or malformed `leafIndex`. Both cases are
+ * expected rather than defensive noise:
+ *
+ *   - Notes persisted before the forest upgrade carry no index, and they all
+ *     predate the first seal, so tree 0 is the correct answer.
+ *   - The index originates in an indexer scan hint, which is untrusted. A
+ *     `NaN` reaching this function would make every same-tree comparison
+ *     false — no pair would ever be selectable and the whole balance would
+ *     look unspendable.
+ */
+declare function treeIdOf(note: Pick<ZkNote, 'leafIndex'>): number;
+/**
+ * Outcome of {@link selectNotes}.
+ *
+ *   - `[noteA, noteB | null]` — a spendable selection; a `null` second slot
+ *     means the transfer runs with a dummy input.
+ *   - `{ needsConsolidation: true }` — the balance covers the amount, but only
+ *     by pairing notes from different forest trees, which no single proof can
+ *     do. The caller should offer a consolidation, not an insufficient-funds
+ *     error.
+ *   - `null` — no combination covers the amount.
+ */
+type CoinSelection = [ZkNote, ZkNote | null] | {
+    needsConsolidation: true;
+} | null;
 /**
  * Selects up to 2 unspent notes that together cover `needed` planck.
  *
- * Priority:
- *   1. A single note whose value >= needed  →  [note, null]  (second input will be a dummy)
- *   2. The smallest pair whose sum >= needed →  [noteA, noteB]
- *   3. No combination covers needed          →  null  (consolidation via merge required)
+ * Both inputs of a transfer are proven together against ONE circuit VK and ONE
+ * public `merkle_root`, so a pair must agree on two things: mixing circuit
+ * versions produces an invalid proof, and notes in different forest trees
+ * anchor to different roots that can never converge. A single note needs
+ * neither check.
  *
- * Both inputs of a transfer are proven together against ONE circuit VK, so a
- * pair MUST share a circuitVersion — mixing v1 and v2 would produce an invalid
- * proof. Priority 2 only pairs notes of the same version; a single note (P1) is
- * always one version so it needs no check.
+ * Resolution order:
+ *   1. One note that alone covers `needed` → `[note, null]`.
+ *   2. Smallest same-version, same-tree pair whose sum covers it → `[a, b]`.
+ *   3. A cross-tree pair would cover it → `{ needsConsolidation: true }`.
+ *   4. Nothing covers it → `null`.
  *
  * Only unspent notes with value > 0 are considered.
  */
-declare function selectNotes(notes: ZkNote[], needed: bigint): [ZkNote, ZkNote | null] | null;
+declare function selectNotes(notes: ZkNote[], needed: bigint): CoinSelection;
 /**
  * Builds a dummy `TransferInputNote` for use as the second input in a single-note transfer.
  *
@@ -2450,6 +2488,42 @@ declare function deriveSpendingKeyTypedData(chainId: number, address: string): S
  */
 declare function deriveSpendingKeyMessageV2(chainId: number, address: string): string;
 
+/**
+ * Canonical account identifier for spending-key derivation.
+ *
+ * The address string is load-bearing twice: it goes into the signed payload AND
+ * into the HKDF `info`. So whatever identifies the account must be stable for
+ * the lifetime of that account — anything else silently rotates the spending key
+ * and orphans every note already shielded.
+ *
+ * SS58 IS NOT STABLE. The same public key encodes to a different string per
+ * network prefix:
+ *
+ *   prefix   42 → 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY
+ *   prefix 2700 → kcuMUgT1VAJR8MtE22C5cmoAR96qsTMLYzmEuyCKUj48jYHqR
+ *
+ * A wallet that lists an account under the generic prefix today and under the
+ * chain's own prefix tomorrow (a wallet setting, a chain-metadata update) would
+ * hand us a different string for the same key. Deriving from it directly means
+ * the user opens the app to an empty vault with no error and no explanation.
+ *
+ * So Substrate accounts are identified by their decoded 32-byte public key,
+ * which no prefix can change. EVM addresses are already canonical and pass
+ * through unchanged.
+ */
+/**
+ * Reduces an address to the form used for derivation.
+ *
+ * SS58 → `0x`-prefixed hex of the underlying public key, so every prefix of the
+ * same account maps to one identifier. Anything else (EVM `0x…`) is returned
+ * lowercased and unchanged.
+ *
+ * Not a validator: an unrecognised string passes through, because rejecting it
+ * here would break EVM callers. The signature guard in `PrivacyKeys` is what
+ * fails closed on unusable input.
+ */
+declare function canonicalAccountId(address: string): string;
+
 /**
  * PrivacyKeys
  *
@@ -4417,4 +4491,4 @@ interface ExtrinsicFailedData {
     dispatch_info: DispatchInfo;
 }
 
-export { type AccountListing, type AccountMappedData, type AccountMappedEvent, type AccountMappingCall, type AccountMappingEvent, AccountMappingModule, AccountMappingPrecompile, type AccountMetadata, type AccountUnmappedEvent, type ActiveVersionSetEvent, type AddChainLinkArgs, type AddChainLinkParams, type AddSupportedChainArgs, type AliasFullIdentity, type AliasInfo, type AliasListedForSaleEvent, type AliasOnSaleData, type AliasRegisteredData, type AliasRegisteredEvent, type AliasReleasedEvent, type AliasSaleCancelledEvent, type AliasSoldData, type AliasSoldEvent, type AliasTransferredData, type AliasTransferredEvent, type AssetRegisteredEvent, type AssetUnverifiedEvent, type AssetVerifiedEvent, BABYJUB_SUBORDER, BN254_R, type BatchRegisterVerificationKeysArgs, type BatchVerificationKeysRegisteredEvent, type BlockInfo, type BuyAliasArgs, type Bytes32, CURRENT_CIRCUIT_VERSION, type ChainInfo, type ChainLink, type ChainLinkAddedEvent, type ChainLinkRemovedEvent, CircuitId, CircuitId as CircuitIdType, CircuitVersionResolver, type ClaimShieldedFeesParams, type ClientProviderConfig, type CommitmentsInsertedEvent, type CommitmentsInsertedEventData, type ConnectionStatus, CryptoPrecompiles, type DecodedAddChainLinkArgs, type DecodedBatchArgs, type DecodedDispatchAsPrivateLinkArgs, type DecodedEthereumTransactArgs, type DecodedEvmCallArgs, type DecodedPrecompile, type DecodedPrivateTransferArgs, type DecodedPutAliasForSaleArgs, type DecodedRegisterAliasArgs, type DecodedRemarkArgs, type DecodedRevealPrivateLinkArgs, type DecodedSetAccountMetadataArgs, type DecodedShieldArgs, type DecodedShieldBatchArgs, type DecodedShieldBatchOperation, type DecodedSudoArgs, type DecodedTransferAllArgs, type DecodedTransferArgs, type DecodedTransferKeepAliveArgs, type DecodedUnshieldArgs, type DecryptedMemo, type DispatchAsLinkedAccountArgs, type DispatchAsLinkedParams, type DispatchAsPrivateLinkArgs, type DispatchError, type DispatchInfo, type DynamicBuilder, ENCRYPTED_MEMO_SIZE, EncryptedMemo, type EncryptedNoteRecord, type EndowedEventData, type EthereumExecutedData, type EventData, type EventPhase, type EventRecord, type EvmAddressInfo, type EvmBlock, EvmClient, type EvmExecutedData, type EvmExitReason, EvmExplorer, type EvmLog, type EvmSigner, type EvmTransaction, type EvmTxRequest, type EvmTxSummary, type ExtrinsicDecoder, type ExtrinsicFailedData, type ExtrinsicSuccessData, type FeeClaimProofInputs, type FormatOptions, KNOWN_PRECOMPILES, type KnownPrecompileInfo, type ListingInfo, MIN_SIGNATURE_BYTES, type MerkleRootUpdatedData, type MerkleRootUpdatedEvent, type MerkleTreeInfo, type MetadataUpdatedEvent, NoteBuilder, type NoteDisclosure, type NoteInput, type NoteStatusUpdate, type NullifiersSpentEvent, type NullifiersSpentEventData, OrbinumClient, type OrbinumClientConfig, OrbinumClientProvider, PRECOMPILE_ADDR, PrivacyKeyManager, type PrivacyMerkleProof, PrivacyModule, type PrivateChainLinkAddedEvent, type PrivateChainLinkRemovedEvent, type PrivateChainLinkRevealedEvent, type PrivateLink, type PrivateLinkDispatchExecutedEvent, type PrivateTransferArgs, type PrivateTransferInput, type PrivateTransferOutput, type PrivateTransferParams, type PrivateTransferProofInputs, type ProofVerificationFailedEvent, type ProofVerifiedEvent, type ProxyCallExecutedEvent, type PutAliasOnSaleArgs, type PutOnSaleParams, type RawBlock, type RawBlockHeader, type RawTransferInput, type RawTransferOutput, type RegisterAliasArgs, type RegisterAssetArgs, type RegisterPrivateLinkArgs, type RegisterVerificationKeyArgs, type RelayerInfo, RelayerStatusModule, type RemoveChainLinkArgs, type RemovePrivateLinkArgs, type RemoveSupportedChainArgs, type RemoveVerificationKeyArgs, type ReservedEventData, type ResolvedAlias, type ResolvedSpendVersion, type RevealPrivateLinkArgs, type RpcV2MerkleProof, type RpcV2NullifierStatus, type RpcV2PoolAssetBalance, type RpcV2PoolStats, SLIP0044_NAMESPACE, SPENDING_KEY_VERIFYING_CONTRACT, SPENDING_KEY_WARNING, type ScanCommitment, type SelfEphWindowEntry, type SetAccountMetadataArgs, type SetActiveVersionArgs, type SetMetadataParams, type ShieldArgs, type ShieldBatchArgs, type ShieldBatchItem, type ShieldBatchParams, type ShieldOperation, type ShieldParams, type ShieldedEvent, type ShieldedEventData, type ShieldedPoolCall, type ShieldedPoolEvent, ShieldedPoolModule, ShieldedPoolPrecompile, SignatureScheme, type SpendingKeyTypedData, type StatusChangeEvent, type StatusListener, SubstrateClient, type SupportedChain, type SupportedChainAddedEvent, type SupportedChainRemovedEvent, type SystemHealth, type TokenInfo, type TokenTransfer, type TransferAliasArgs, type TransferEventData, type TransferInputNote, type TransferOutputNote, type TryDecryptOptions, type TxResult, type UnsafeTxOptions, type UnshieldArgs, type UnshieldParams, type UnshieldProofInputs, type UnshieldedEvent, type UnshieldedEventData, type UnverifyAssetArgs, VaultLockedError, type VerificationKeyRegisteredEvent, type VerificationKeyRemovedEvent, type VerifyAssetArgs, type VerifyProofArgs, type VkEntry, type ZkNote, type ZkVerifierCall, type ZkVerifierCircuitVersionInfo, type ZkVerifierEvent, type ZkVerifierHistoricalVersion, ZkVerifierModule, type ZkVerifierVersionStats, type ZkVerifierVkHash, accountIdHexToSs58, addressToAccountIdHex, applyNoteStatus, bigintTo32Be, bigintTo32Le, bigintTo32LeArr, blindTag, buildDummyTransferInput, bytesToBigintLE, computeNoteCommitment, computeNullifier, computePathIndices, createNoteDisclosureKey, decodeNoteDisclosureKey, decodePrecompileCalldata, decryptJson, decryptNoteRecord, deriveMasterKeyBytes, deriveOwnerPk, deriveSelfEphSk, deriveSpendingKeyFromSignature, deriveSpendingKeyMessageV2, deriveSpendingKeyTypedData, deriveStealthOwnerPk, deriveStealthSk, deriveVaultBlindKey, deriveVaultKey, deriveViewTag, deriveViewingPublicKey, deriveViewingSecretKey, encryptJson, encryptNote, ensureHexPrefix, evmAddressToAccountId, evmToImplicitSubstrate, evmToMappedAccountHex, evmToSubstrate, formatBalance, formatORB, fromBase64, fromHex, generateFeeClaimProof, generateTransferProof, generateUnshieldProof, getPrecompileLabel, hexToBigint, hexToNumber, implicitSubstrateToEvm, isEvmAddress, isImplicitEvmAccount, isSs58, isSubstrateAddress, isUnifiedAddress, leHexToBigint, mapExtrinsicArgs, mapZkEventData, normalizeEvmAddress, noteBlindTag, randomBlinding, recoverOwnerPkPoint, selectNotes, selfEphWindow, shortHash, substrateSs58ToAccountIdHex, substrateToEvm, toBase64, toHex, toTxResult, truncateMiddle, tryDecryptNote, tryDecryptNoteVerbose, vaultReplacer, vaultReviver };
+export { type AccountListing, type AccountMappedData, type AccountMappedEvent, type AccountMappingCall, type AccountMappingEvent, AccountMappingModule, AccountMappingPrecompile, type AccountMetadata, type AccountUnmappedEvent, type ActiveVersionSetEvent, type AddChainLinkArgs, type AddChainLinkParams, type AddSupportedChainArgs, type AliasFullIdentity, type AliasInfo, type AliasListedForSaleEvent, type AliasOnSaleData, type AliasRegisteredData, type AliasRegisteredEvent, type AliasReleasedEvent, type AliasSaleCancelledEvent, type AliasSoldData, type AliasSoldEvent, type AliasTransferredData, type AliasTransferredEvent, type AssetRegisteredEvent, type AssetUnverifiedEvent, type AssetVerifiedEvent, BABYJUB_SUBORDER, BN254_R, type BatchRegisterVerificationKeysArgs, type BatchVerificationKeysRegisteredEvent, type BlockInfo, type BuyAliasArgs, type Bytes32, CURRENT_CIRCUIT_VERSION, type ChainInfo, type ChainLink, type ChainLinkAddedEvent, type ChainLinkRemovedEvent, CircuitId, CircuitId as CircuitIdType, CircuitVersionResolver, type ClaimShieldedFeesParams, type ClientProviderConfig, type CommitmentsInsertedEvent, type CommitmentsInsertedEventData, type ConnectionStatus, CryptoPrecompiles, type DecodedAddChainLinkArgs, type DecodedBatchArgs, type DecodedDispatchAsPrivateLinkArgs, type DecodedEthereumTransactArgs, type DecodedEvmCallArgs, type DecodedPrecompile, type DecodedPrivateTransferArgs, type DecodedPutAliasForSaleArgs, type DecodedRegisterAliasArgs, type DecodedRemarkArgs, type DecodedRevealPrivateLinkArgs, type DecodedSetAccountMetadataArgs, type DecodedShieldArgs, type DecodedShieldBatchArgs, type DecodedShieldBatchOperation, type DecodedSudoArgs, type DecodedTransferAllArgs, type DecodedTransferArgs, type DecodedTransferKeepAliveArgs, type DecodedUnshieldArgs, type DecryptedMemo, type DispatchAsLinkedAccountArgs, type DispatchAsLinkedParams, type DispatchAsPrivateLinkArgs, type DispatchError, type DispatchInfo, type DynamicBuilder, ENCRYPTED_MEMO_SIZE, EncryptedMemo, type EncryptedNoteRecord, type EndowedEventData, type EthereumExecutedData, type EventData, type EventPhase, type EventRecord, type EvmAddressInfo, type EvmBlock, EvmClient, type EvmExecutedData, type EvmExitReason, EvmExplorer, type EvmLog, type EvmSigner, type EvmTransaction, type EvmTxRequest, type EvmTxSummary, type ExtrinsicDecoder, type ExtrinsicFailedData, type ExtrinsicSuccessData, type FeeClaimProofInputs, type FormatOptions, KNOWN_PRECOMPILES, type KnownPrecompileInfo, type ListingInfo, MIN_SIGNATURE_BYTES, type MerkleRootUpdatedData, type MerkleRootUpdatedEvent, type MerkleTreeInfo, type MetadataUpdatedEvent, NoteBuilder, type NoteDisclosure, type NoteInput, type NoteStatusUpdate, type NullifiersSpentEvent, type NullifiersSpentEventData, OrbinumClient, type OrbinumClientConfig, OrbinumClientProvider, PRECOMPILE_ADDR, PrivacyKeyManager, type PrivacyMerkleProof, PrivacyModule, type PrivateChainLinkAddedEvent, type PrivateChainLinkRemovedEvent, type PrivateChainLinkRevealedEvent, type PrivateLink, type PrivateLinkDispatchExecutedEvent, type PrivateTransferArgs, type PrivateTransferInput, type PrivateTransferOutput, type PrivateTransferParams, type PrivateTransferProofInputs, type ProofVerificationFailedEvent, type ProofVerifiedEvent, type ProxyCallExecutedEvent, type PutAliasOnSaleArgs, type PutOnSaleParams, type RawBlock, type RawBlockHeader, type RawTransferInput, type RawTransferOutput, type RegisterAliasArgs, type RegisterAssetArgs, type RegisterPrivateLinkArgs, type RegisterVerificationKeyArgs, type RelayerInfo, RelayerStatusModule, type RemoveChainLinkArgs, type RemovePrivateLinkArgs, type RemoveSupportedChainArgs, type RemoveVerificationKeyArgs, type ReservedEventData, type ResolvedAlias, type ResolvedSpendVersion, type RevealPrivateLinkArgs, type RpcV2MerkleProof, type RpcV2NullifierStatus, type RpcV2PoolAssetBalance, type RpcV2PoolStats, SLIP0044_NAMESPACE, SPENDING_KEY_VERIFYING_CONTRACT, SPENDING_KEY_WARNING, type ScanCommitment, type SelfEphWindowEntry, type SetAccountMetadataArgs, type SetActiveVersionArgs, type SetMetadataParams, type ShieldArgs, type ShieldBatchArgs, type ShieldBatchItem, type ShieldBatchParams, type ShieldOperation, type ShieldParams, type ShieldedEvent, type ShieldedEventData, type ShieldedPoolCall, type ShieldedPoolEvent, ShieldedPoolModule, ShieldedPoolPrecompile, SignatureScheme, type SpendingKeyTypedData, type StatusChangeEvent, type StatusListener, SubstrateClient, type SupportedChain, type SupportedChainAddedEvent, type SupportedChainRemovedEvent, type SystemHealth, type TokenInfo, type TokenTransfer, type TransferAliasArgs, type TransferEventData, type TransferInputNote, type TransferOutputNote, type TryDecryptOptions, type TxResult, type UnsafeTxOptions, type UnshieldArgs, type UnshieldParams, type UnshieldProofInputs, type UnshieldedEvent, type UnshieldedEventData, type UnverifyAssetArgs, VaultLockedError, type VerificationKeyRegisteredEvent, type VerificationKeyRemovedEvent, type VerifyAssetArgs, type VerifyProofArgs, type VkEntry, type ZkNote, type ZkVerifierCall, type ZkVerifierCircuitVersionInfo, type ZkVerifierEvent, type ZkVerifierHistoricalVersion, ZkVerifierModule, type ZkVerifierVersionStats, type ZkVerifierVkHash, accountIdHexToSs58, addressToAccountIdHex, applyNoteStatus, bigintTo32Be, bigintTo32Le, bigintTo32LeArr, blindTag, buildDummyTransferInput, bytesToBigintLE, canonicalAccountId, computeNoteCommitment, computeNullifier, computePathIndices, createNoteDisclosureKey, decodeNoteDisclosureKey, decodePrecompileCalldata, decryptJson, decryptNoteRecord, deriveMasterKeyBytes, deriveOwnerPk, deriveSelfEphSk, deriveSpendingKeyFromSignature, deriveSpendingKeyMessageV2, deriveSpendingKeyTypedData, deriveStealthOwnerPk, deriveStealthSk, deriveVaultBlindKey, deriveVaultKey, deriveViewTag, deriveViewingPublicKey, deriveViewingSecretKey, encryptJson, encryptNote, ensureHexPrefix, evmAddressToAccountId, evmToImplicitSubstrate, evmToMappedAccountHex, evmToSubstrate, formatBalance, formatORB, fromBase64, fromHex, generateFeeClaimProof, generateTransferProof, generateUnshieldProof, getPrecompileLabel, hexToBigint, hexToNumber, implicitSubstrateToEvm, isEvmAddress, isImplicitEvmAccount, isSs58, isSubstrateAddress, isUnifiedAddress, leHexToBigint, mapExtrinsicArgs, mapZkEventData, normalizeEvmAddress, noteBlindTag, randomBlinding, recoverOwnerPkPoint, selectNotes, selfEphWindow, shortHash, substrateSs58ToAccountIdHex, substrateToEvm, toBase64, toHex, toTxResult, treeIdOf, truncateMiddle, tryDecryptNote, tryDecryptNoteVerbose, vaultReplacer, vaultReviver };

package/dist/index.js

@@ -66,6 +66,7 @@ __export(index_exports, {
   blindTag: () => blindTag,
   buildDummyTransferInput: () => buildDummyTransferInput,
   bytesToBigintLE: () => bytesToBigintLE,
+  canonicalAccountId: () => canonicalAccountId,
   computeNoteCommitment: () => computeNoteCommitment,
   computeNullifier: () => computeNullifier,
   computePathIndices: () => computePathIndices,
@@ -106,7 +107,7 @@ __export(index_exports, {
   getPolkadotSigner: () => import_signer.getPolkadotSigner,
   getPolkadotSignerFromPjs: () => import_pjs_signer.getPolkadotSignerFromPjs,
   getPrecompileLabel: () => getPrecompileLabel,
-  getSs58AddressInfo: () => import_polkadot_api4.getSs58AddressInfo,
+  getSs58AddressInfo: () => import_polkadot_api5.getSs58AddressInfo,
   hexToBigint: () => hexToBigint,
   hexToNumber: () => hexToNumber,
   implicitSubstrateToEvm: () => implicitSubstrateToEvm,
@@ -130,6 +131,7 @@ __export(index_exports, {
   toBase64: () => toBase64,
   toHex: () => toHex,
   toTxResult: () => toTxResult,
+  treeIdOf: () => treeIdOf,
   truncateMiddle: () => truncateMiddle,
   tryDecryptNote: () => tryDecryptNote,
   tryDecryptNoteVerbose: () => tryDecryptNoteVerbose,
@@ -4099,6 +4101,7 @@ function tryDecryptNoteVerbose(commitment, viewingSecretKey, spendingKey, ownOwn
       blinding: plaintext.blinding,
       spendingKey: effectiveSpendingKey,
       circuitVersion: plaintext.circuitVersion,
+      ...Number.isSafeInteger(commitment.leafIndex) && commitment.leafIndex >= 0 && commitment.leafIndex < 2 ** 32 ? { leafIndex: commitment.leafIndex } : {},
       spent: false,
       spentAt: null,
       commitment: recomputed,
@@ -4163,6 +4166,12 @@ function decodeNoteDisclosureKey(key) {
 
 // src/shielded-pool/protocol/coinSelection.ts
 var TRANSFER_TREE_DEPTH = 20;
+var LEAVES_PER_TREE = 1 << TRANSFER_TREE_DEPTH;
+function treeIdOf(note) {
+  const idx = note.leafIndex;
+  if (idx === void 0 || !Number.isSafeInteger(idx) || idx < 0 || idx >= 2 ** 32) return 0;
+  return Math.floor(idx / LEAVES_PER_TREE);
+}
 function selectNotes(notes, needed) {
   const unspent = notes.filter((n) => !n.spent && n.value > 0n);
   const sorted = [...unspent].sort((a, b) => a.value < b.value ? -1 : 1);
@@ -4172,11 +4181,20 @@ function selectNotes(notes, needed) {
     for (let j = i + 1; j < sorted.length; j++) {
       const a = sorted[i];
       const b = sorted[j];
-      if (a !== void 0 && b !== void 0 && a.circuitVersion === b.circuitVersion && a.value + b.value >= needed) {
+      if (a !== void 0 && b !== void 0 && a.circuitVersion === b.circuitVersion && treeIdOf(a) === treeIdOf(b) && a.value + b.value >= needed) {
         return [a, b];
       }
     }
   }
+  for (let i = 0; i < sorted.length; i++) {
+    for (let j = i + 1; j < sorted.length; j++) {
+      const a = sorted[i];
+      const b = sorted[j];
+      if (a !== void 0 && b !== void 0 && a.circuitVersion === b.circuitVersion && a.value + b.value >= needed) {
+        return { needsConsolidation: true };
+      }
+    }
+  }
   return null;
 }
 function buildDummyTransferInput(assetId) {
@@ -4205,6 +4223,13 @@ function randomBlinding() {
   return n === 0n ? 1n : n % BN254_R;
 }
 
+// src/privacy-keys/accountIdentity.ts
+var import_polkadot_api4 = require("polkadot-api");
+function canonicalAccountId(address) {
+  const info = (0, import_polkadot_api4.getSs58AddressInfo)(address);
+  return info.isValid ? toHex(info.publicKey) : address.toLowerCase();
+}
+
 // src/privacy-keys/SpendingKeyRequest.ts
 var SPENDING_KEY_VERIFYING_CONTRACT = PRECOMPILE_ADDR.SHIELDED_POOL;
 var SPENDING_KEY_WARNING = "Signing this grants full control of your Orbinum private funds. Only sign on the official Orbinum app.";
@@ -4234,7 +4259,7 @@ function deriveSpendingKeyMessageV2(chainId, address) {
 
 orbinum-spending-key-v2
 ${chainId}
-${address.toLowerCase()}`;
+${canonicalAccountId(address)}`;
 }
 
 // src/privacy-keys/PrivacyKeys.ts
@@ -4255,7 +4280,7 @@ async function deriveMasterKeyBytes(signatureHex, chainId, address) {
   const sigBytes = fromHex(signatureHex);
   assertUsableSignature(sigBytes);
   const info = new TextEncoder().encode(
-    `orbinum-sk-${KEY_VERSION}:${chainId}:${address.toLowerCase()}`
+    `orbinum-sk-${KEY_VERSION}:${chainId}:${canonicalAccountId(address)}`
   );
   return (0, import_hkdf2.hkdf)(import_sha24.sha256, sigBytes, new Uint8Array(0), info, 32);
 }
@@ -5457,7 +5482,7 @@ var import_substrate_bindings3 = require("@polkadot-api/substrate-bindings");
 var import_base = require("@scure/base");
 var import_signer = require("polkadot-api/signer");
 var import_pjs_signer = require("polkadot-api/pjs-signer");
-var import_polkadot_api4 = require("polkadot-api");
+var import_polkadot_api5 = require("polkadot-api");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AccountId,
@@ -5506,6 +5531,7 @@ var import_polkadot_api4 = require("polkadot-api");
   blindTag,
   buildDummyTransferInput,
   bytesToBigintLE,
+  canonicalAccountId,
   computeNoteCommitment,
   computeNullifier,
   computePathIndices,
@@ -5570,6 +5596,7 @@ var import_polkadot_api4 = require("polkadot-api");
   toBase64,
   toHex,
   toTxResult,
+  treeIdOf,
   truncateMiddle,
   tryDecryptNote,
   tryDecryptNoteVerbose,

package/dist/index.mjs

@@ -3963,6 +3963,7 @@ function tryDecryptNoteVerbose(commitment, viewingSecretKey, spendingKey, ownOwn
       blinding: plaintext.blinding,
       spendingKey: effectiveSpendingKey,
       circuitVersion: plaintext.circuitVersion,
+      ...Number.isSafeInteger(commitment.leafIndex) && commitment.leafIndex >= 0 && commitment.leafIndex < 2 ** 32 ? { leafIndex: commitment.leafIndex } : {},
       spent: false,
       spentAt: null,
       commitment: recomputed,
@@ -4027,6 +4028,12 @@ function decodeNoteDisclosureKey(key) {
 
 // src/shielded-pool/protocol/coinSelection.ts
 var TRANSFER_TREE_DEPTH = 20;
+var LEAVES_PER_TREE = 1 << TRANSFER_TREE_DEPTH;
+function treeIdOf(note) {
+  const idx = note.leafIndex;
+  if (idx === void 0 || !Number.isSafeInteger(idx) || idx < 0 || idx >= 2 ** 32) return 0;
+  return Math.floor(idx / LEAVES_PER_TREE);
+}
 function selectNotes(notes, needed) {
   const unspent = notes.filter((n) => !n.spent && n.value > 0n);
   const sorted = [...unspent].sort((a, b) => a.value < b.value ? -1 : 1);
@@ -4036,11 +4043,20 @@ function selectNotes(notes, needed) {
     for (let j = i + 1; j < sorted.length; j++) {
       const a = sorted[i];
       const b = sorted[j];
-      if (a !== void 0 && b !== void 0 && a.circuitVersion === b.circuitVersion && a.value + b.value >= needed) {
+      if (a !== void 0 && b !== void 0 && a.circuitVersion === b.circuitVersion && treeIdOf(a) === treeIdOf(b) && a.value + b.value >= needed) {
         return [a, b];
       }
     }
   }
+  for (let i = 0; i < sorted.length; i++) {
+    for (let j = i + 1; j < sorted.length; j++) {
+      const a = sorted[i];
+      const b = sorted[j];
+      if (a !== void 0 && b !== void 0 && a.circuitVersion === b.circuitVersion && a.value + b.value >= needed) {
+        return { needsConsolidation: true };
+      }
+    }
+  }
   return null;
 }
 function buildDummyTransferInput(assetId) {
@@ -4069,6 +4085,13 @@ function randomBlinding() {
   return n === 0n ? 1n : n % BN254_R;
 }
 
+// src/privacy-keys/accountIdentity.ts
+import { getSs58AddressInfo } from "polkadot-api";
+function canonicalAccountId(address) {
+  const info = getSs58AddressInfo(address);
+  return info.isValid ? toHex(info.publicKey) : address.toLowerCase();
+}
+
 // src/privacy-keys/SpendingKeyRequest.ts
 var SPENDING_KEY_VERIFYING_CONTRACT = PRECOMPILE_ADDR.SHIELDED_POOL;
 var SPENDING_KEY_WARNING = "Signing this grants full control of your Orbinum private funds. Only sign on the official Orbinum app.";
@@ -4098,7 +4121,7 @@ function deriveSpendingKeyMessageV2(chainId, address) {
 
 orbinum-spending-key-v2
 ${chainId}
-${address.toLowerCase()}`;
+${canonicalAccountId(address)}`;
 }
 
 // src/privacy-keys/PrivacyKeys.ts
@@ -4119,7 +4142,7 @@ async function deriveMasterKeyBytes(signatureHex, chainId, address) {
   const sigBytes = fromHex(signatureHex);
   assertUsableSignature(sigBytes);
   const info = new TextEncoder().encode(
-    `orbinum-sk-${KEY_VERSION}:${chainId}:${address.toLowerCase()}`
+    `orbinum-sk-${KEY_VERSION}:${chainId}:${canonicalAccountId(address)}`
   );
   return hkdf2(sha2564, sigBytes, new Uint8Array(0), info, 32);
 }
@@ -5344,7 +5367,7 @@ import {
   connectInjectedExtension,
   getInjectedExtensions
 } from "polkadot-api/pjs-signer";
-import { getSs58AddressInfo } from "polkadot-api";
+import { getSs58AddressInfo as getSs58AddressInfo2 } from "polkadot-api";
 export {
   AccountId2 as AccountId,
   AccountMappingModule,
@@ -5392,6 +5415,7 @@ export {
   blindTag,
   buildDummyTransferInput,
   bytesToBigintLE,
+  canonicalAccountId,
   computeNoteCommitment,
   computeNullifier,
   computePathIndices,
@@ -5432,7 +5456,7 @@ export {
   getPolkadotSigner,
   getPolkadotSignerFromPjs,
   getPrecompileLabel,
-  getSs58AddressInfo,
+  getSs58AddressInfo2 as getSs58AddressInfo,
   hexToBigint,
   hexToNumber,
   implicitSubstrateToEvm,
@@ -5456,6 +5480,7 @@ export {
   toBase64,
   toHex,
   toTxResult,
+  treeIdOf,
   truncateMiddle,
   tryDecryptNote,
   tryDecryptNoteVerbose,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbinum/sdk",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Official TypeScript SDK for Orbinum.",
   "author": "Orbinum",
   "license": "MIT",