@tatchi-xyz/sdk 0.20.0 → 0.31.0

package/dist/cjs/core/rpcCalls.js

@@ -1,19 +1,46 @@
-const require_rolldown_runtime = require('../_virtual/rolldown_runtime.js');
+const require_validation = require('../utils/validation.js');
 const require_base64 = require('../utils/base64.js');
-const require_encoders = require('../utils/encoders.js');
 const require_errors = require('../utils/errors.js');
 const require_defaultConfigs = require('./defaultConfigs.js');
+const require_rpc = require('./types/rpc.js');
+const require_vrf_worker = require('./types/vrf-worker.js');
 const require_sdkSentEvents = require('./types/sdkSentEvents.js');
 const require_actions = require('./types/actions.js');
-const require_rpc = require('./types/rpc.js');
 
 //#region src/core/rpcCalls.ts
-async function getEmailRecoveryVerificationResult(nearClient, dkimVerifierAccountId, verificationViewMethod, requestId) {
-	return await nearClient.view({
-		account: dkimVerifierAccountId,
-		method: verificationViewMethod,
+function normalizeByteArray(input) {
+	if (input == null) return input;
+	if (Array.isArray(input)) return input.map((v) => Number(v)).filter((v) => Number.isFinite(v));
+	if (typeof input === "string" && input) try {
+		const bytes = typeof Buffer !== "undefined" ? Buffer.from(input, "base64") : Uint8Array.from(atob(input), (c) => c.charCodeAt(0));
+		const arr = bytes instanceof Uint8Array ? Array.from(bytes) : Array.from(new Uint8Array(bytes));
+		return arr;
+	} catch {
+		return void 0;
+	}
+	return void 0;
+}
+async function getEmailRecoveryAttempt(nearClient, accountId, requestId) {
+	const raw = await nearClient.view({
+		account: accountId,
+		method: "get_recovery_attempt",
 		args: { request_id: requestId }
 	});
+	if (!raw) return null;
+	const statusRaw = raw.status;
+	const status = (() => {
+		if (typeof statusRaw === "string") return statusRaw.trim();
+		if (statusRaw && typeof statusRaw === "object") {
+			const keys = Object.keys(statusRaw);
+			if (keys.length === 1) return String(keys[0] || "").trim();
+		}
+		return "";
+	})();
+	return {
+		...raw,
+		from_address_hash: normalizeByteArray(raw.from_address_hash) ?? raw.from_address_hash,
+		status
+	};
 }
 /**
 * Query the contract to get the account linked to a device public key
@@ -48,12 +75,16 @@ async function getDeviceLinkingAccountContractCall(nearClient, contractId, devic
 * This function signs and broadcasts both transactions required for device linking
 */
 async function executeDeviceLinkingContractCalls({ context, device1AccountId, device2PublicKey, nextNonce, nextNextNonce, nextNextNextNonce, txBlockHash, vrfChallenge, onEvent, confirmationConfigOverride, confirmerText }) {
-	const signedTransactions = await context.webAuthnManager.signTransactionsWithActions({
+	const signTransactions = () => context.webAuthnManager.signTransactionsWithActions({
 		rpcCall: {
 			contractId: context.webAuthnManager.tatchiPasskeyConfigs.contractId,
 			nearRpcUrl: context.webAuthnManager.tatchiPasskeyConfigs.nearRpcUrl,
 			nearAccountId: device1AccountId
 		},
+		signerMode: {
+			mode: "threshold-signer",
+			behavior: "fallback"
+		},
 		confirmationConfigOverride,
 		title: confirmerText?.title,
 		body: confirmerText?.body,
@@ -105,6 +136,25 @@ async function executeDeviceLinkingContractCalls({ context, device1AccountId, de
 			});
 		}
 	});
+	let signedTransactions = [];
+	try {
+		signedTransactions = await signTransactions();
+	} catch (e) {
+		if (!isVrfSessionPasskeyMismatchError(e)) throw e;
+		onEvent?.({
+			step: 3,
+			phase: require_sdkSentEvents.DeviceLinkingPhase.STEP_3_AUTHORIZATION,
+			status: require_sdkSentEvents.DeviceLinkingStatus.PROGRESS,
+			message: "Session mismatch detected; re-authenticating with TouchID..."
+		});
+		await repairVrfSessionForCurrentDevice({
+			context,
+			nearAccountId: device1AccountId,
+			remainingUses: 3,
+			ttlMs: 120 * 1e3
+		});
+		signedTransactions = await signTransactions();
+	}
 	if (!signedTransactions[0].signedTransaction) throw new Error("AddKey transaction signing failed");
 	if (!signedTransactions[1].signedTransaction) throw new Error("Contract mapping transaction signing failed");
 	if (!signedTransactions[2].signedTransaction) throw new Error("DeleteKey transaction signing failed");
@@ -146,6 +196,39 @@ async function executeDeviceLinkingContractCalls({ context, device1AccountId, de
 		signedDeleteKeyTransaction: signedTransactions[2].signedTransaction
 	};
 }
+function isVrfSessionPasskeyMismatchError(err) {
+	const msg = require_errors.errorMessage(err) || String(err || "");
+	return msg.includes("different passkey/VRF session than the current device");
+}
+async function repairVrfSessionForCurrentDevice(args) {
+	const { context, nearAccountId } = args;
+	const lastUser = await context.webAuthnManager.getLastUser();
+	if (!lastUser || lastUser.nearAccountId !== nearAccountId) throw new Error("Cannot repair VRF session: no lastUser for this account. Please log in again.");
+	const deviceNumber = lastUser.deviceNumber;
+	if (!Number.isFinite(deviceNumber) || deviceNumber < 1) throw new Error("Cannot repair VRF session: invalid lastUser.deviceNumber");
+	const authenticators = await context.webAuthnManager.getAuthenticatorsByUser(nearAccountId);
+	const credentialIdsForDevice = authenticators.filter((a) => a.deviceNumber === deviceNumber).map((a) => a.credentialId);
+	const credentialIds = credentialIdsForDevice.length > 0 ? credentialIdsForDevice : authenticators.map((a) => a.credentialId);
+	if (credentialIds.length === 0) throw new Error(`Cannot repair VRF session: no authenticators found for ${nearAccountId}`);
+	const challenge = require_vrf_worker.createRandomVRFChallenge();
+	const credential = await context.webAuthnManager.getAuthenticationCredentialsSerializedDualPrf({
+		nearAccountId,
+		challenge,
+		credentialIds
+	});
+	const unlockResult = await context.webAuthnManager.unlockVRFKeypair({
+		nearAccountId,
+		encryptedVrfKeypair: lastUser.encryptedVrfKeypair,
+		credential
+	});
+	if (!unlockResult.success) throw new Error(unlockResult.error || "Failed to re-unlock VRF keypair for current device");
+	await context.webAuthnManager.mintSigningSessionFromCredential({
+		nearAccountId,
+		credential,
+		ttlMs: args.ttlMs,
+		remainingUses: args.remainingUses
+	});
+}
 /**
 * Get credential IDs associated with an account from the contract
 * Used in account recovery to discover available credentials
@@ -205,6 +288,12 @@ async function syncAuthenticatorsContractCall(nearClient, contractId, accountId)
 				}).filter((x) => typeof x === "string" && x.length > 0);
 				return void 0;
 			})();
+			const nearPublicKey = (() => {
+				const raw = contractAuthenticator.near_public_key;
+				if (typeof raw !== "string") return void 0;
+				const trimmed = raw.trim();
+				return trimmed ? require_validation.ensureEd25519Prefix(trimmed) : void 0;
+			})();
 			return {
 				credentialId,
 				authenticator: {
@@ -216,7 +305,8 @@ async function syncAuthenticatorsContractCall(nearClient, contractId, accountId)
 					registered,
 					deviceNumber: contractAuthenticator.device_number,
 					vrfPublicKeys
-				}
+				},
+				...nearPublicKey ? { nearPublicKey } : {}
 			};
 		});
 		return [];
@@ -225,14 +315,27 @@ async function syncAuthenticatorsContractCall(nearClient, contractId, accountId)
 		return [];
 	}
 }
+const EMPTY_NEAR_CODE_HASH = "11111111111111111111111111111111";
+async function hasDeployedContractCode(nearClient, accountId) {
+	try {
+		const account = await nearClient.viewAccount(accountId);
+		const codeHash = account?.code_hash;
+		const globalContractHash = account?.global_contract_hash;
+		const globalContractAccountId = account?.global_contract_account_id;
+		const hasLocalCode = typeof codeHash === "string" && codeHash !== EMPTY_NEAR_CODE_HASH;
+		const hasGlobalCode = typeof globalContractHash === "string" && globalContractHash.trim().length > 0 || typeof globalContractAccountId === "string" && globalContractAccountId.trim().length > 0;
+		return hasLocalCode || hasGlobalCode;
+	} catch {
+		return false;
+	}
+}
 /**
 * Fetch on-chain recovery email hashes from the per-account contract.
 * Returns [] when no contract is deployed or on failure.
 */
 async function getRecoveryEmailHashesContractCall(nearClient, accountId) {
 	try {
-		const code = await nearClient.viewCode(accountId);
-		const hasContract = !!code && code.byteLength > 0;
+		const hasContract = await hasDeployedContractCode(nearClient, accountId);
 		if (!hasContract) return [];
 		const hashes = await nearClient.view({
 			account: accountId,
@@ -241,7 +344,6 @@ async function getRecoveryEmailHashesContractCall(nearClient, accountId) {
 		});
 		return Array.isArray(hashes) ? hashes : [];
 	} catch (error) {
-		console.error("[rpcCalls] Failed to fetch recovery email hashes", error);
 		return [];
 	}
 }
@@ -250,27 +352,24 @@ async function getRecoveryEmailHashesContractCall(nearClient, accountId) {
 * If the per-account contract is missing, deploy/attach the global recoverer via `init_email_recovery`.
 */
 async function buildSetRecoveryEmailsActions(nearClient, accountId, recoveryEmailHashes, contracts = require_defaultConfigs.DEFAULT_EMAIL_RECOVERY_CONTRACTS) {
-	let hasContract = false;
-	try {
-		const code = await nearClient.viewCode(accountId);
-		hasContract = !!code && code.byteLength > 0;
-	} catch {
-		hasContract = false;
-	}
+	const hasContract = await hasDeployedContractCode(nearClient, accountId);
 	const { emailRecovererGlobalContract, zkEmailVerifierContract, emailDkimVerifierContract } = contracts;
-	return hasContract ? [{
-		type: require_actions.ActionType.UseGlobalContract,
-		accountId: emailRecovererGlobalContract
-	}, {
-		type: require_actions.ActionType.FunctionCall,
-		methodName: "set_recovery_emails",
-		args: { recovery_emails: recoveryEmailHashes },
-		gas: "80000000000000",
-		deposit: "0"
-	}] : [{
+	let shouldInit = !hasContract;
+	if (!shouldInit) try {
+		await nearClient.view({
+			account: accountId,
+			method: "get_recovery_emails",
+			args: {}
+		});
+	} catch (err) {
+		const msg = require_errors.errorMessage(err);
+		if (/Cannot deserialize the contract state/i.test(msg) || /CodeDoesNotExist/i.test(msg) || /MethodNotFound/i.test(msg)) shouldInit = true;
+	}
+	const base = [{
 		type: require_actions.ActionType.UseGlobalContract,
 		accountId: emailRecovererGlobalContract
-	}, {
+	}];
+	return shouldInit ? [...base, {
 		type: require_actions.ActionType.FunctionCall,
 		methodName: "init_email_recovery",
 		args: {
@@ -281,8 +380,58 @@ async function buildSetRecoveryEmailsActions(nearClient, accountId, recoveryEmai
 		},
 		gas: "80000000000000",
 		deposit: "0"
+	}] : [...base, {
+		type: require_actions.ActionType.FunctionCall,
+		methodName: "set_recovery_emails",
+		args: { recovery_emails: recoveryEmailHashes },
+		gas: "80000000000000",
+		deposit: "0"
 	}];
 }
+function sleep(ms) {
+	return new Promise((res) => setTimeout(res, ms));
+}
+function isAccessKeyNotFoundError(err) {
+	const msg = String(require_errors.errorMessage(err) || "").toLowerCase();
+	if (!msg) return false;
+	if (msg.includes("unknown access key") || msg.includes("unknown_access_key") || msg.includes("unknownaccesskey")) return true;
+	if (msg.includes("accesskeydoesnotexist")) return true;
+	if (msg.includes("access key does not exist")) return true;
+	if (msg.includes("access key doesn't exist")) return true;
+	if (msg.includes("access key not found")) return true;
+	if (msg.includes("no such access key")) return true;
+	if (msg.includes("viewing access key") && msg.includes("does not exist") && !msg.includes("account")) return true;
+	return false;
+}
+async function hasAccessKey(nearClient, nearAccountId, publicKey, opts) {
+	const expected = require_validation.ensureEd25519Prefix(publicKey);
+	if (!expected) return false;
+	const attempts = Math.max(1, Math.floor(opts?.attempts ?? 6));
+	const delayMs = Math.max(50, Math.floor(opts?.delayMs ?? 750));
+	for (let i = 0; i < attempts; i++) {
+		try {
+			await nearClient.viewAccessKey(nearAccountId, expected);
+			return true;
+		} catch {}
+		if (i < attempts - 1) await sleep(delayMs);
+	}
+	return false;
+}
+async function waitForAccessKeyAbsent(nearClient, nearAccountId, publicKey, opts) {
+	const expected = require_validation.ensureEd25519Prefix(publicKey);
+	if (!expected) return true;
+	const attempts = Math.max(1, Math.floor(opts?.attempts ?? 6));
+	const delayMs = Math.max(50, Math.floor(opts?.delayMs ?? 650));
+	for (let i = 0; i < attempts; i++) {
+		try {
+			await nearClient.viewAccessKey(nearAccountId, expected);
+		} catch (err) {
+			if (isAccessKeyNotFoundError(err)) return true;
+		}
+		if (i < attempts - 1) await sleep(delayMs);
+	}
+	return false;
+}
 /**
 * View-only registration pre-check.
 *
@@ -292,6 +441,10 @@ async function buildSetRecoveryEmailsActions(nearClient, accountId, recoveryEmai
 */
 async function checkCanRegisterUserContractCall({ nearClient, contractId, vrfChallenge, credential, authenticatorOptions }) {
 	try {
+		const intent_digest_32 = Array.from(require_base64.base64UrlDecode(vrfChallenge.intentDigest || ""));
+		if (intent_digest_32.length !== 32) throw new Error("Missing or invalid vrfChallenge.intentDigest (expected base64url-encoded 32 bytes)");
+		const session_policy_digest_32 = vrfChallenge.sessionPolicyDigest32 ? Array.from(require_base64.base64UrlDecode(vrfChallenge.sessionPolicyDigest32)) : [];
+		if (session_policy_digest_32.length !== 0 && session_policy_digest_32.length !== 32) throw new Error("Invalid vrfChallenge.sessionPolicyDigest32 (expected base64url-encoded 32 bytes)");
 		const vrfData = {
 			vrf_input_data: Array.from(require_base64.base64UrlDecode(vrfChallenge.vrfInput)),
 			vrf_output: Array.from(require_base64.base64UrlDecode(vrfChallenge.vrfOutput)),
@@ -300,7 +453,9 @@ async function checkCanRegisterUserContractCall({ nearClient, contractId, vrfCha
 			user_id: vrfChallenge.userId,
 			rp_id: vrfChallenge.rpId,
 			block_height: Number(vrfChallenge.blockHeight),
-			block_hash: Array.from(require_base64.base64UrlDecode(vrfChallenge.blockHash))
+			block_hash: Array.from(require_base64.base64UrlDecode(vrfChallenge.blockHash)),
+			intent_digest_32,
+			...session_policy_digest_32.length ? { session_policy_digest_32 } : {}
 		};
 		const args = {
 			vrf_data: vrfData,
@@ -335,6 +490,10 @@ async function verifyAuthenticationResponse(relayServerUrl, routePath, sessionKi
 			if (!b64u) return [];
 			return Array.from(require_base64.base64UrlDecode(b64u));
 		};
+		const intent_digest_32 = toBytes(vrfChallenge.intentDigest);
+		if (intent_digest_32.length !== 32) throw new Error("Missing or invalid vrfChallenge.intentDigest (expected base64url-encoded 32 bytes)");
+		const session_policy_digest_32 = toBytes(vrfChallenge.sessionPolicyDigest32);
+		if (session_policy_digest_32.length !== 0 && session_policy_digest_32.length !== 32) throw new Error("Invalid vrfChallenge.sessionPolicyDigest32 (expected base64url-encoded 32 bytes)");
 		const vrf_data = {
 			vrf_input_data: toBytes(vrfChallenge.vrfInput),
 			vrf_output: toBytes(vrfChallenge.vrfOutput),
@@ -343,7 +502,9 @@ async function verifyAuthenticationResponse(relayServerUrl, routePath, sessionKi
 			user_id: vrfChallenge.userId,
 			rp_id: vrfChallenge.rpId,
 			block_height: Number(vrfChallenge.blockHeight || 0),
-			block_hash: toBytes(vrfChallenge.blockHash)
+			block_hash: toBytes(vrfChallenge.blockHash),
+			intent_digest_32,
+			...session_policy_digest_32.length ? { session_policy_digest_32 } : {}
 		};
 		const webauthn_authentication = {
 			...webauthnAuthentication,
@@ -386,30 +547,138 @@ async function verifyAuthenticationResponse(relayServerUrl, routePath, sessionKi
 		};
 	}
 }
-var init_rpcCalls = require_rolldown_runtime.__esm({ "src/core/rpcCalls.ts": (() => {
-	require_sdkSentEvents.init_sdkSentEvents();
-	require_actions.init_actions();
-	require_rpc.init_rpc();
-	require_encoders.init_encoders();
-	require_errors.init_errors();
-	require_defaultConfigs.init_defaultConfigs();
-}) });
+async function thresholdEd25519Keygen(relayServerUrl, vrfChallenge, webauthnAuthentication, args) {
+	try {
+		const base = String(relayServerUrl || "").trim().replace(/\/$/, "");
+		if (!base) throw new Error("Missing relayServerUrl");
+		const clientVerifyingShareB64u = String(args.clientVerifyingShareB64u || "").trim();
+		if (!clientVerifyingShareB64u) throw new Error("Missing clientVerifyingShareB64u");
+		const nearAccountId = String(args.nearAccountId || "").trim();
+		if (!nearAccountId) throw new Error("Missing nearAccountId");
+		const toBytes = (b64u) => {
+			if (!b64u) return [];
+			return Array.from(require_base64.base64UrlDecode(b64u));
+		};
+		const intent_digest_32 = toBytes(vrfChallenge.intentDigest);
+		if (intent_digest_32.length !== 32) throw new Error("Missing or invalid vrfChallenge.intentDigest (expected base64url-encoded 32 bytes)");
+		const vrf_data = {
+			vrf_input_data: toBytes(vrfChallenge.vrfInput),
+			vrf_output: toBytes(vrfChallenge.vrfOutput),
+			vrf_proof: toBytes(vrfChallenge.vrfProof),
+			public_key: toBytes(vrfChallenge.vrfPublicKey),
+			user_id: vrfChallenge.userId,
+			rp_id: vrfChallenge.rpId,
+			block_height: Number(vrfChallenge.blockHeight || 0),
+			block_hash: toBytes(vrfChallenge.blockHash),
+			intent_digest_32
+		};
+		const webauthn_authentication = {
+			...webauthnAuthentication,
+			authenticatorAttachment: webauthnAuthentication.authenticatorAttachment ?? null,
+			response: {
+				...webauthnAuthentication.response,
+				userHandle: webauthnAuthentication.response.userHandle ?? null
+			},
+			clientExtensionResults: null
+		};
+		const url = `${base}/threshold-ed25519/keygen`;
+		const response = await fetch(url, {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			credentials: "include",
+			body: JSON.stringify({
+				clientVerifyingShareB64u,
+				nearAccountId,
+				vrf_data,
+				webauthn_authentication
+			})
+		});
+		if (!response.ok) {
+			const errorText = await response.text();
+			return {
+				ok: false,
+				error: `HTTP ${response.status}: ${errorText}`
+			};
+		}
+		const json = await response.json();
+		return {
+			ok: !!json?.ok,
+			clientParticipantId: json?.clientParticipantId,
+			relayerParticipantId: json?.relayerParticipantId,
+			participantIds: json?.participantIds,
+			relayerKeyId: json?.relayerKeyId,
+			publicKey: json?.publicKey,
+			relayerVerifyingShareB64u: json?.relayerVerifyingShareB64u,
+			code: json?.code,
+			message: json?.message
+		};
+	} catch (error) {
+		return {
+			ok: false,
+			error: error?.message || "Failed to keygen threshold-ed25519"
+		};
+	}
+}
+async function thresholdEd25519KeygenFromRegistrationTx(relayServerUrl, args) {
+	try {
+		const base = String(relayServerUrl || "").trim().replace(/\/$/, "");
+		if (!base) throw new Error("Missing relayServerUrl");
+		const clientVerifyingShareB64u = String(args.clientVerifyingShareB64u || "").trim();
+		if (!clientVerifyingShareB64u) throw new Error("Missing clientVerifyingShareB64u");
+		const nearAccountId = String(args.nearAccountId || "").trim();
+		if (!nearAccountId) throw new Error("Missing nearAccountId");
+		const registrationTxHash = String(args.registrationTxHash || "").trim();
+		if (!registrationTxHash) throw new Error("Missing registrationTxHash");
+		const url = `${base}/threshold-ed25519/keygen`;
+		const response = await fetch(url, {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			credentials: "include",
+			body: JSON.stringify({
+				clientVerifyingShareB64u,
+				nearAccountId,
+				registrationTxHash
+			})
+		});
+		if (!response.ok) {
+			const errorText = await response.text();
+			return {
+				ok: false,
+				error: `HTTP ${response.status}: ${errorText}`
+			};
+		}
+		const json = await response.json();
+		return {
+			ok: !!json?.ok,
+			clientParticipantId: json?.clientParticipantId,
+			relayerParticipantId: json?.relayerParticipantId,
+			participantIds: json?.participantIds,
+			relayerKeyId: json?.relayerKeyId,
+			publicKey: json?.publicKey,
+			relayerVerifyingShareB64u: json?.relayerVerifyingShareB64u,
+			code: json?.code,
+			message: json?.message
+		};
+	} catch (error) {
+		return {
+			ok: false,
+			error: error?.message || "Failed to keygen threshold-ed25519 from registration tx"
+		};
+	}
+}
 
 //#endregion
-init_rpcCalls();
 exports.buildSetRecoveryEmailsActions = buildSetRecoveryEmailsActions;
 exports.checkCanRegisterUserContractCall = checkCanRegisterUserContractCall;
 exports.executeDeviceLinkingContractCalls = executeDeviceLinkingContractCalls;
 exports.getCredentialIdsContractCall = getCredentialIdsContractCall;
 exports.getDeviceLinkingAccountContractCall = getDeviceLinkingAccountContractCall;
-exports.getEmailRecoveryVerificationResult = getEmailRecoveryVerificationResult;
+exports.getEmailRecoveryAttempt = getEmailRecoveryAttempt;
 exports.getRecoveryEmailHashesContractCall = getRecoveryEmailHashesContractCall;
-Object.defineProperty(exports, 'init_rpcCalls', {
-  enumerable: true,
-  get: function () {
-    return init_rpcCalls;
-  }
-});
+exports.hasAccessKey = hasAccessKey;
 exports.syncAuthenticatorsContractCall = syncAuthenticatorsContractCall;
+exports.thresholdEd25519Keygen = thresholdEd25519Keygen;
+exports.thresholdEd25519KeygenFromRegistrationTx = thresholdEd25519KeygenFromRegistrationTx;
 exports.verifyAuthenticationResponse = verifyAuthenticationResponse;
+exports.waitForAccessKeyAbsent = waitForAccessKeyAbsent;
 //# sourceMappingURL=rpcCalls.js.map