@orbinum/sdk 0.19.0 → 0.20.1

package/dist/index.d.mts

@@ -2449,16 +2449,42 @@ declare function deriveSpendingKeyTypedData(chainId: number, address: string): S
  * only the HKDF domain separation in `PrivacyKeys` still applies.
  */
 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.
+ */
 /**
- * @deprecated INSECURE — v1 derivation. Signs a fixed public string via
- * `personal_sign`, so any dapp can request it and, because the signature is
- * deterministic, reconstruct the user's spending key, viewing key and vault key.
+ * Reduces an address to the form used for derivation.
  *
- * Retained ONLY so existing v1 notes can be swept into a v2 identity. Never call
- * it on a connect/login path. Use {@link deriveSpendingKeyTypedData} (EVM) or
- * {@link deriveSpendingKeyMessageV2} (Substrate) instead.
+ * 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 deriveSpendingKeyMessage(chainId: number, address: string): string;
+declare function canonicalAccountId(address: string): string;
 
 /**
  * PrivacyKeys
@@ -2491,8 +2517,6 @@ declare function deriveSpendingKeyMessage(chainId: number, address: string): str
  * Num2Bits(253), asserting spending_key < 2^253. BABYJUB_SUBORDER < 2^252
  * satisfies it; BN254_R ≈ 2^254.8 does not — ~34% of values would fail at runtime.
  */
-/** Identity version. `v1` is the legacy personal_sign scheme, kept for sweeping only. */
-type KeyVersion = 'v1' | 'v2';
 /**
  * Shortest signature any supported signer produces: sr25519 VRF output is 32
  * bytes, ed25519 is 64, ECDSA `personal_sign` is 65. Anything shorter is not a
@@ -2502,7 +2526,7 @@ declare const MIN_SIGNATURE_BYTES = 32;
 /**
  * Derives the 32-byte master key bytes from a wallet signature.
  *
- * masterBytes = HKDF-SHA256(ikm=sigBytes, salt=empty, info="orbinum-sk-{version}:{chainId}:{address}")
+ * masterBytes = HKDF-SHA256(ikm=sigBytes, salt=empty, info="orbinum-sk-v2:{chainId}:{address}")
  *
  * These bytes are the stable root for ALL derived keys:
  *   - spendingKey (circuit scalar) = BigInt(masterBytes) % BABYJUB_SUBORDER
@@ -2513,18 +2537,14 @@ declare const MIN_SIGNATURE_BYTES = 32;
  * vault key are STABLE across any future change to the modulus — they never
  * depend on which prime field the circuit uses.
  *
- * The version is folded into the HKDF `info`, so v1 and v2 stay disjoint even if
- * the underlying signature bytes were somehow identical.
- *
- * @param version Defaults to 'v2'. Pass 'v1' only from the legacy sweep flow.
  * @throws If the signature is not valid hex, or carries less entropy than the
  *         shortest real signing scheme (see {@link MIN_SIGNATURE_BYTES}).
  */
-declare function deriveMasterKeyBytes(signatureHex: string, chainId: number, address: string, version?: KeyVersion): Promise<Uint8Array>;
+declare function deriveMasterKeyBytes(signatureHex: string, chainId: number, address: string): Promise<Uint8Array>;
 /**
  * Derives an Orbinum spending key from a wallet signature.
  *
- * Uses HKDF-SHA256(ikm=sigBytes, salt=empty, info="orbinum-sk-{version}:{chainId}:{address}")
+ * Uses HKDF-SHA256(ikm=sigBytes, salt=empty, info="orbinum-sk-v2:{chainId}:{address}")
  * and reduces the resulting 32-byte value modulo BABYJUB_SUBORDER.
  *
  * IMPORTANT: viewingSecretKey and vaultKey must be derived from masterBytes (via
@@ -2534,12 +2554,11 @@ declare function deriveMasterKeyBytes(signatureHex: string, chainId: number, add
  * @param signatureHex  0x-prefixed or bare hex of the wallet signature.
  * @param chainId       Chain ID used when building the signing message.
  * @param address       Signer address (EVM or SS58) used in the signing message.
- * @param version       Defaults to 'v2'. Pass 'v1' only from the legacy sweep flow.
  * @returns bigint in [1, BABYJUB_SUBORDER)
  * @throws If the signature is not valid hex or is shorter than
  *         {@link MIN_SIGNATURE_BYTES} — see `deriveMasterKeyBytes`.
  */
-declare function deriveSpendingKeyFromSignature(signatureHex: string, chainId: number, address: string, version?: KeyVersion): Promise<bigint>;
+declare function deriveSpendingKeyFromSignature(signatureHex: string, chainId: number, address: string): Promise<bigint>;
 /**
  * Derive a 32-byte viewing secret key (ivsk) from the spending key.
  *   ivsk = HKDF-SHA256(ikm=bigintTo32Le(spendingKey), info="orbinum-ivk-v1")
@@ -4434,4 +4453,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 KeyVersion, 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, deriveSpendingKeyMessage, 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, truncateMiddle, tryDecryptNote, tryDecryptNoteVerbose, vaultReplacer, vaultReviver };

package/dist/index.d.ts

@@ -2449,16 +2449,42 @@ declare function deriveSpendingKeyTypedData(chainId: number, address: string): S
  * only the HKDF domain separation in `PrivacyKeys` still applies.
  */
 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.
+ */
 /**
- * @deprecated INSECURE — v1 derivation. Signs a fixed public string via
- * `personal_sign`, so any dapp can request it and, because the signature is
- * deterministic, reconstruct the user's spending key, viewing key and vault key.
+ * Reduces an address to the form used for derivation.
  *
- * Retained ONLY so existing v1 notes can be swept into a v2 identity. Never call
- * it on a connect/login path. Use {@link deriveSpendingKeyTypedData} (EVM) or
- * {@link deriveSpendingKeyMessageV2} (Substrate) instead.
+ * 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 deriveSpendingKeyMessage(chainId: number, address: string): string;
+declare function canonicalAccountId(address: string): string;
 
 /**
  * PrivacyKeys
@@ -2491,8 +2517,6 @@ declare function deriveSpendingKeyMessage(chainId: number, address: string): str
  * Num2Bits(253), asserting spending_key < 2^253. BABYJUB_SUBORDER < 2^252
  * satisfies it; BN254_R ≈ 2^254.8 does not — ~34% of values would fail at runtime.
  */
-/** Identity version. `v1` is the legacy personal_sign scheme, kept for sweeping only. */
-type KeyVersion = 'v1' | 'v2';
 /**
  * Shortest signature any supported signer produces: sr25519 VRF output is 32
  * bytes, ed25519 is 64, ECDSA `personal_sign` is 65. Anything shorter is not a
@@ -2502,7 +2526,7 @@ declare const MIN_SIGNATURE_BYTES = 32;
 /**
  * Derives the 32-byte master key bytes from a wallet signature.
  *
- * masterBytes = HKDF-SHA256(ikm=sigBytes, salt=empty, info="orbinum-sk-{version}:{chainId}:{address}")
+ * masterBytes = HKDF-SHA256(ikm=sigBytes, salt=empty, info="orbinum-sk-v2:{chainId}:{address}")
  *
  * These bytes are the stable root for ALL derived keys:
  *   - spendingKey (circuit scalar) = BigInt(masterBytes) % BABYJUB_SUBORDER
@@ -2513,18 +2537,14 @@ declare const MIN_SIGNATURE_BYTES = 32;
  * vault key are STABLE across any future change to the modulus — they never
  * depend on which prime field the circuit uses.
  *
- * The version is folded into the HKDF `info`, so v1 and v2 stay disjoint even if
- * the underlying signature bytes were somehow identical.
- *
- * @param version Defaults to 'v2'. Pass 'v1' only from the legacy sweep flow.
  * @throws If the signature is not valid hex, or carries less entropy than the
  *         shortest real signing scheme (see {@link MIN_SIGNATURE_BYTES}).
  */
-declare function deriveMasterKeyBytes(signatureHex: string, chainId: number, address: string, version?: KeyVersion): Promise<Uint8Array>;
+declare function deriveMasterKeyBytes(signatureHex: string, chainId: number, address: string): Promise<Uint8Array>;
 /**
  * Derives an Orbinum spending key from a wallet signature.
  *
- * Uses HKDF-SHA256(ikm=sigBytes, salt=empty, info="orbinum-sk-{version}:{chainId}:{address}")
+ * Uses HKDF-SHA256(ikm=sigBytes, salt=empty, info="orbinum-sk-v2:{chainId}:{address}")
  * and reduces the resulting 32-byte value modulo BABYJUB_SUBORDER.
  *
  * IMPORTANT: viewingSecretKey and vaultKey must be derived from masterBytes (via
@@ -2534,12 +2554,11 @@ declare function deriveMasterKeyBytes(signatureHex: string, chainId: number, add
  * @param signatureHex  0x-prefixed or bare hex of the wallet signature.
  * @param chainId       Chain ID used when building the signing message.
  * @param address       Signer address (EVM or SS58) used in the signing message.
- * @param version       Defaults to 'v2'. Pass 'v1' only from the legacy sweep flow.
  * @returns bigint in [1, BABYJUB_SUBORDER)
  * @throws If the signature is not valid hex or is shorter than
  *         {@link MIN_SIGNATURE_BYTES} — see `deriveMasterKeyBytes`.
  */
-declare function deriveSpendingKeyFromSignature(signatureHex: string, chainId: number, address: string, version?: KeyVersion): Promise<bigint>;
+declare function deriveSpendingKeyFromSignature(signatureHex: string, chainId: number, address: string): Promise<bigint>;
 /**
  * Derive a 32-byte viewing secret key (ivsk) from the spending key.
  *   ivsk = HKDF-SHA256(ikm=bigintTo32Le(spendingKey), info="orbinum-ivk-v1")
@@ -4434,4 +4453,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 KeyVersion, 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, deriveSpendingKeyMessage, 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, 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,
@@ -79,7 +80,6 @@ __export(index_exports, {
   deriveOwnerPk: () => deriveOwnerPk,
   deriveSelfEphSk: () => deriveSelfEphSk,
   deriveSpendingKeyFromSignature: () => deriveSpendingKeyFromSignature,
-  deriveSpendingKeyMessage: () => deriveSpendingKeyMessage,
   deriveSpendingKeyMessageV2: () => deriveSpendingKeyMessageV2,
   deriveSpendingKeyTypedData: () => deriveSpendingKeyTypedData,
   deriveStealthOwnerPk: () => deriveStealthOwnerPk,
@@ -107,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,
@@ -4206,6 +4206,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.";
@@ -4235,12 +4242,7 @@ function deriveSpendingKeyMessageV2(chainId, address) {
 
 orbinum-spending-key-v2
 ${chainId}
-${address.toLowerCase()}`;
-}
-function deriveSpendingKeyMessage(chainId, address) {
-  return `orbinum-spending-key-v1
-${chainId}
-${address.toLowerCase()}`;
+${canonicalAccountId(address)}`;
 }
 
 // src/privacy-keys/PrivacyKeys.ts
@@ -4248,6 +4250,7 @@ var import_hkdf2 = require("@noble/hashes/hkdf.js");
 var import_sha24 = require("@noble/hashes/sha2.js");
 var import_baby_jubjub6 = require("@zk-kit/baby-jubjub");
 var IVK_DOMAIN = new TextEncoder().encode("orbinum-ivk-v1");
+var KEY_VERSION = "v2";
 var MIN_SIGNATURE_BYTES = 32;
 function assertUsableSignature(sigBytes) {
   if (sigBytes.length < MIN_SIGNATURE_BYTES) {
@@ -4256,16 +4259,16 @@ function assertUsableSignature(sigBytes) {
     );
   }
 }
-async function deriveMasterKeyBytes(signatureHex, chainId, address, version = "v2") {
+async function deriveMasterKeyBytes(signatureHex, chainId, address) {
   const sigBytes = fromHex(signatureHex);
   assertUsableSignature(sigBytes);
   const info = new TextEncoder().encode(
-    `orbinum-sk-${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);
 }
-async function deriveSpendingKeyFromSignature(signatureHex, chainId, address, version = "v2") {
-  const masterBytes = await deriveMasterKeyBytes(signatureHex, chainId, address, version);
+async function deriveSpendingKeyFromSignature(signatureHex, chainId, address) {
+  const masterBytes = await deriveMasterKeyBytes(signatureHex, chainId, address);
   const skBigint = BigInt(toHex(masterBytes)) % BABYJUB_SUBORDER;
   return skBigint === 0n ? 1n : skBigint;
 }
@@ -5462,7 +5465,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,
@@ -5511,6 +5514,7 @@ var import_polkadot_api4 = require("polkadot-api");
   blindTag,
   buildDummyTransferInput,
   bytesToBigintLE,
+  canonicalAccountId,
   computeNoteCommitment,
   computeNullifier,
   computePathIndices,
@@ -5524,7 +5528,6 @@ var import_polkadot_api4 = require("polkadot-api");
   deriveOwnerPk,
   deriveSelfEphSk,
   deriveSpendingKeyFromSignature,
-  deriveSpendingKeyMessage,
   deriveSpendingKeyMessageV2,
   deriveSpendingKeyTypedData,
   deriveStealthOwnerPk,

package/dist/index.mjs

@@ -4069,6 +4069,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,12 +4105,7 @@ function deriveSpendingKeyMessageV2(chainId, address) {
 
 orbinum-spending-key-v2
 ${chainId}
-${address.toLowerCase()}`;
-}
-function deriveSpendingKeyMessage(chainId, address) {
-  return `orbinum-spending-key-v1
-${chainId}
-${address.toLowerCase()}`;
+${canonicalAccountId(address)}`;
 }
 
 // src/privacy-keys/PrivacyKeys.ts
@@ -4111,6 +4113,7 @@ import { hkdf as hkdf2 } from "@noble/hashes/hkdf.js";
 import { sha256 as sha2564 } from "@noble/hashes/sha2.js";
 import { mulPointEscalar as mulPointEscalar4, Base8 as Base82, packPoint as packPoint3 } from "@zk-kit/baby-jubjub";
 var IVK_DOMAIN = new TextEncoder().encode("orbinum-ivk-v1");
+var KEY_VERSION = "v2";
 var MIN_SIGNATURE_BYTES = 32;
 function assertUsableSignature(sigBytes) {
   if (sigBytes.length < MIN_SIGNATURE_BYTES) {
@@ -4119,16 +4122,16 @@ function assertUsableSignature(sigBytes) {
     );
   }
 }
-async function deriveMasterKeyBytes(signatureHex, chainId, address, version = "v2") {
+async function deriveMasterKeyBytes(signatureHex, chainId, address) {
   const sigBytes = fromHex(signatureHex);
   assertUsableSignature(sigBytes);
   const info = new TextEncoder().encode(
-    `orbinum-sk-${version}:${chainId}:${address.toLowerCase()}`
+    `orbinum-sk-${KEY_VERSION}:${chainId}:${canonicalAccountId(address)}`
   );
   return hkdf2(sha2564, sigBytes, new Uint8Array(0), info, 32);
 }
-async function deriveSpendingKeyFromSignature(signatureHex, chainId, address, version = "v2") {
-  const masterBytes = await deriveMasterKeyBytes(signatureHex, chainId, address, version);
+async function deriveSpendingKeyFromSignature(signatureHex, chainId, address) {
+  const masterBytes = await deriveMasterKeyBytes(signatureHex, chainId, address);
   const skBigint = BigInt(toHex(masterBytes)) % BABYJUB_SUBORDER;
   return skBigint === 0n ? 1n : skBigint;
 }
@@ -5348,7 +5351,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,
@@ -5396,6 +5399,7 @@ export {
   blindTag,
   buildDummyTransferInput,
   bytesToBigintLE,
+  canonicalAccountId,
   computeNoteCommitment,
   computeNullifier,
   computePathIndices,
@@ -5409,7 +5413,6 @@ export {
   deriveOwnerPk,
   deriveSelfEphSk,
   deriveSpendingKeyFromSignature,
-  deriveSpendingKeyMessage,
   deriveSpendingKeyMessageV2,
   deriveSpendingKeyTypedData,
   deriveStealthOwnerPk,
@@ -5437,7 +5440,7 @@ export {
   getPolkadotSigner,
   getPolkadotSignerFromPjs,
   getPrecompileLabel,
-  getSs58AddressInfo,
+  getSs58AddressInfo2 as getSs58AddressInfo,
   hexToBigint,
   hexToNumber,
   implicitSubstrateToEvm,

package/package.json

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