@tatchi-xyz/sdk 0.20.0 → 0.21.0

package/dist/cjs/react/context/useTatchiWithSdkFlow.js

@@ -0,0 +1,96 @@
+const require_rolldown_runtime = require('../_virtual/rolldown_runtime.js');
+const require_sdkSentEvents = require('../sdk/src/core/types/sdkSentEvents.js');
+let react = require("react");
+react = require_rolldown_runtime.__toESM(react);
+
+//#region src/react/context/useTatchiWithSdkFlow.ts
+require_sdkSentEvents.init_sdkSentEvents();
+function useTatchiWithSdkFlow(args) {
+	const { tatchi, beginSdkFlow, appendSdkEventMessage, endSdkFlow } = args;
+	return (0, react.useMemo)(() => {
+		const loginAndCreateSessionWithSdkFlow = async (nearAccountId, options) => {
+			const seq = beginSdkFlow("login", nearAccountId);
+			const wrappedOptions = {
+				...options,
+				onEvent: (event) => {
+					appendSdkEventMessage(seq, event.message);
+					if (event.phase === require_sdkSentEvents.LoginPhase.STEP_4_LOGIN_COMPLETE && event.status === require_sdkSentEvents.LoginStatus.SUCCESS) endSdkFlow("login", seq, "success");
+					else if (event.phase === require_sdkSentEvents.LoginPhase.LOGIN_ERROR || event.status === require_sdkSentEvents.LoginStatus.ERROR) {
+						const error = "error" in event ? event.error : event.message;
+						endSdkFlow("login", seq, "error", error || event.message);
+					}
+					options?.onEvent?.(event);
+				},
+				onError: (error) => {
+					appendSdkEventMessage(seq, error.message);
+					endSdkFlow("login", seq, "error", error.message);
+					options?.onError?.(error);
+				}
+			};
+			return await tatchi.loginAndCreateSession(nearAccountId, wrappedOptions);
+		};
+		const registerPasskeyWithSdkFlow = async (nearAccountId, options) => {
+			const seq = beginSdkFlow("register", nearAccountId);
+			const wrappedOptions = {
+				...options,
+				onEvent: (event) => {
+					appendSdkEventMessage(seq, event.message);
+					if (event.phase === require_sdkSentEvents.RegistrationPhase.STEP_8_REGISTRATION_COMPLETE && event.status === require_sdkSentEvents.RegistrationStatus.SUCCESS) endSdkFlow("register", seq, "success");
+					else if (event.phase === require_sdkSentEvents.RegistrationPhase.REGISTRATION_ERROR || event.status === require_sdkSentEvents.RegistrationStatus.ERROR) {
+						const error = "error" in event ? event.error : event.message;
+						endSdkFlow("register", seq, "error", error || event.message);
+					}
+					options?.onEvent?.(event);
+				},
+				onError: (error) => {
+					appendSdkEventMessage(seq, error.message);
+					endSdkFlow("register", seq, "error", error.message);
+					options?.onError?.(error);
+				}
+			};
+			return await tatchi.registerPasskey(nearAccountId, wrappedOptions);
+		};
+		const recoverAccountFlowWithSdkFlow = async (args$1) => {
+			const seq = beginSdkFlow("recover", args$1?.accountId);
+			const options = args$1?.options;
+			const wrappedOptions = {
+				...options,
+				onEvent: (event) => {
+					appendSdkEventMessage(seq, event.message);
+					if (event.phase === require_sdkSentEvents.AccountRecoveryPhase.STEP_5_ACCOUNT_RECOVERY_COMPLETE && event.status === require_sdkSentEvents.AccountRecoveryStatus.SUCCESS) endSdkFlow("recover", seq, "success");
+					else if (event.phase === require_sdkSentEvents.AccountRecoveryPhase.ERROR || event.status === require_sdkSentEvents.AccountRecoveryStatus.ERROR) {
+						const error = "error" in event ? event.error : event.message;
+						endSdkFlow("recover", seq, "error", error || event.message);
+					}
+					options?.onEvent?.(event);
+				},
+				onError: (error) => {
+					appendSdkEventMessage(seq, error.message);
+					endSdkFlow("recover", seq, "error", error.message);
+					options?.onError?.(error);
+				}
+			};
+			return await tatchi.recoverAccountFlow({
+				...args$1,
+				options: wrappedOptions
+			});
+		};
+		return new Proxy(tatchi, { get(target, prop, receiver) {
+			if (prop === "loginAndCreateSession") return loginAndCreateSessionWithSdkFlow;
+			if (prop === "registerPasskey") return registerPasskeyWithSdkFlow;
+			if (prop === "recoverAccountFlow") return recoverAccountFlowWithSdkFlow;
+			const value = Reflect.get(target, prop, receiver);
+			if (typeof value === "function") return value.bind(target);
+			return value;
+		} });
+	}, [
+		appendSdkEventMessage,
+		beginSdkFlow,
+		endSdkFlow,
+		tatchi
+	]);
+}
+
+//#endregion
+exports.useTatchiWithSdkFlow = useTatchiWithSdkFlow;
+//# sourceMappingURL=useTatchiWithSdkFlow.js.map

package/dist/cjs/react/context/useTatchiWithSdkFlow.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useTatchiWithSdkFlow.js","names":["loginAndCreateSessionWithSdkFlow: LoginAndCreateSessionFn","wrappedOptions: LoginHooksOptions","LoginPhase","LoginStatus","registerPasskeyWithSdkFlow: RegisterPasskeyFn","wrappedOptions: RegistrationHooksOptions","RegistrationPhase","RegistrationStatus","recoverAccountFlowWithSdkFlow: RecoverAccountFlowFn","args","options: AccountRecoveryHooksOptions | undefined","wrappedOptions: AccountRecoveryHooksOptions","AccountRecoveryPhase","AccountRecoveryStatus","value: unknown"],"sources":["../../../../src/react/context/useTatchiWithSdkFlow.ts"],"sourcesContent":["import { useMemo } from 'react';\nimport type { TatchiPasskey } from '@/core/TatchiPasskey';\nimport {\n  AccountRecoveryPhase,\n  AccountRecoveryStatus,\n  type AccountRecoveryHooksOptions,\n  type AccountRecoverySSEEvent,\n  LoginPhase,\n  LoginStatus,\n  type LoginHooksOptions,\n  type LoginSSEvent,\n  RegistrationPhase,\n  RegistrationStatus,\n  type RegistrationHooksOptions,\n  type RegistrationSSEEvent,\n} from '@/core/types/sdkSentEvents';\n\nexport function useTatchiWithSdkFlow(args: {\n  tatchi: TatchiPasskey;\n  beginSdkFlow: (kind: 'login' | 'register' | 'recover', accountId?: string) => number;\n  appendSdkEventMessage: (seq: number, message: string) => void;\n  endSdkFlow: (kind: 'login' | 'register' | 'recover', seq: number, status: 'success' | 'error', error?: string) => void;\n}): TatchiPasskey {\n  const { tatchi, beginSdkFlow, appendSdkEventMessage, endSdkFlow } = args;\n\n  return useMemo(() => {\n    /**\n     * We use a `Proxy` to instrument a few core flow entrypoints (login/register/recover)\n     * while preserving the full `TatchiPasskey` API surface.\n     *\n     * This lets *all* callers (not just PasskeyAuthMenu) use `ctx.tatchi.*` directly and\n     * still have `sdkFlow` update as events stream in.\n     */\n    type LoginAndCreateSessionFn = TatchiPasskey['loginAndCreateSession'];\n    type RegisterPasskeyFn = TatchiPasskey['registerPasskey'];\n    type RecoverAccountFlowFn = TatchiPasskey['recoverAccountFlow'];\n\n    const loginAndCreateSessionWithSdkFlow: LoginAndCreateSessionFn = async (\n      nearAccountId,\n      options,\n    ) => {\n      const seq = beginSdkFlow('login', nearAccountId);\n      const wrappedOptions: LoginHooksOptions = {\n        ...options,\n        onEvent: (event: LoginSSEvent) => {\n          appendSdkEventMessage(seq, event.message);\n          if (event.phase === LoginPhase.STEP_4_LOGIN_COMPLETE && event.status === LoginStatus.SUCCESS) {\n            endSdkFlow('login', seq, 'success');\n          } else if (event.phase === LoginPhase.LOGIN_ERROR || event.status === LoginStatus.ERROR) {\n            const error = 'error' in event ? event.error : event.message;\n            endSdkFlow('login', seq, 'error', error || event.message);\n          }\n          options?.onEvent?.(event);\n        },\n        onError: (error: Error) => {\n          appendSdkEventMessage(seq, error.message);\n          endSdkFlow('login', seq, 'error', error.message);\n          options?.onError?.(error);\n        },\n      };\n\n      return await tatchi.loginAndCreateSession(nearAccountId, wrappedOptions);\n    };\n\n    const registerPasskeyWithSdkFlow: RegisterPasskeyFn = async (\n      nearAccountId,\n      options,\n    ) => {\n      const seq = beginSdkFlow('register', nearAccountId);\n      const wrappedOptions: RegistrationHooksOptions = {\n        ...options,\n        onEvent: (event: RegistrationSSEEvent) => {\n          appendSdkEventMessage(seq, event.message);\n          if (\n            event.phase === RegistrationPhase.STEP_8_REGISTRATION_COMPLETE &&\n            event.status === RegistrationStatus.SUCCESS\n          ) {\n            endSdkFlow('register', seq, 'success');\n          } else if (event.phase === RegistrationPhase.REGISTRATION_ERROR || event.status === RegistrationStatus.ERROR) {\n            const error = 'error' in event ? event.error : event.message;\n            endSdkFlow('register', seq, 'error', error || event.message);\n          }\n          options?.onEvent?.(event);\n        },\n        onError: (error: Error) => {\n          appendSdkEventMessage(seq, error.message);\n          endSdkFlow('register', seq, 'error', error.message);\n          options?.onError?.(error);\n        },\n      };\n\n      return await tatchi.registerPasskey(nearAccountId, wrappedOptions);\n    };\n\n    const recoverAccountFlowWithSdkFlow: RecoverAccountFlowFn = async (args) => {\n      const seq = beginSdkFlow('recover', args?.accountId);\n      const options: AccountRecoveryHooksOptions | undefined = args?.options;\n\n      const wrappedOptions: AccountRecoveryHooksOptions = {\n        ...options,\n        onEvent: (event: AccountRecoverySSEEvent) => {\n          appendSdkEventMessage(seq, event.message);\n          if (\n            event.phase === AccountRecoveryPhase.STEP_5_ACCOUNT_RECOVERY_COMPLETE &&\n            event.status === AccountRecoveryStatus.SUCCESS\n          ) {\n            endSdkFlow('recover', seq, 'success');\n          } else if (event.phase === AccountRecoveryPhase.ERROR || event.status === AccountRecoveryStatus.ERROR) {\n            const error = 'error' in event ? event.error : event.message;\n            endSdkFlow('recover', seq, 'error', error || event.message);\n          }\n          options?.onEvent?.(event);\n        },\n        onError: (error: Error) => {\n          appendSdkEventMessage(seq, error.message);\n          endSdkFlow('recover', seq, 'error', error.message);\n          options?.onError?.(error);\n        },\n      };\n\n      return await tatchi.recoverAccountFlow({\n        ...args,\n        options: wrappedOptions,\n      });\n    };\n\n    return new Proxy(tatchi, {\n      get(target, prop, receiver) {\n        if (prop === 'loginAndCreateSession') {\n          return loginAndCreateSessionWithSdkFlow;\n        }\n\n        if (prop === 'registerPasskey') {\n          return registerPasskeyWithSdkFlow;\n        }\n\n        if (prop === 'recoverAccountFlow') {\n          return recoverAccountFlowWithSdkFlow;\n        }\n\n        const value: unknown = Reflect.get(target as object, prop, receiver);\n        // For non-wrapped methods, bind to preserve `this` on the class instance.\n        if (typeof value === 'function') return (value as (...args: unknown[]) => unknown).bind(target);\n        return value;\n      },\n    });\n  }, [appendSdkEventMessage, beginSdkFlow, endSdkFlow, tatchi]);\n}\n\nexport default useTatchiWithSdkFlow;\n"],"mappings":";;;;;;;AAiBA,SAAgB,qBAAqB,MAKnB;CAChB,MAAM,EAAE,QAAQ,cAAc,uBAAuB,eAAe;AAEpE,iCAAqB;EAYnB,MAAMA,mCAA4D,OAChE,eACA,YACG;GACH,MAAM,MAAM,aAAa,SAAS;GAClC,MAAMC,iBAAoC;IACxC,GAAG;IACH,UAAU,UAAwB;AAChC,2BAAsB,KAAK,MAAM;AACjC,SAAI,MAAM,UAAUC,iCAAW,yBAAyB,MAAM,WAAWC,kCAAY,QACnF,YAAW,SAAS,KAAK;cAChB,MAAM,UAAUD,iCAAW,eAAe,MAAM,WAAWC,kCAAY,OAAO;MACvF,MAAM,QAAQ,WAAW,QAAQ,MAAM,QAAQ,MAAM;AACrD,iBAAW,SAAS,KAAK,SAAS,SAAS,MAAM;;AAEnD,cAAS,UAAU;;IAErB,UAAU,UAAiB;AACzB,2BAAsB,KAAK,MAAM;AACjC,gBAAW,SAAS,KAAK,SAAS,MAAM;AACxC,cAAS,UAAU;;;AAIvB,UAAO,MAAM,OAAO,sBAAsB,eAAe;;EAG3D,MAAMC,6BAAgD,OACpD,eACA,YACG;GACH,MAAM,MAAM,aAAa,YAAY;GACrC,MAAMC,iBAA2C;IAC/C,GAAG;IACH,UAAU,UAAgC;AACxC,2BAAsB,KAAK,MAAM;AACjC,SACE,MAAM,UAAUC,wCAAkB,gCAClC,MAAM,WAAWC,yCAAmB,QAEpC,YAAW,YAAY,KAAK;cACnB,MAAM,UAAUD,wCAAkB,sBAAsB,MAAM,WAAWC,yCAAmB,OAAO;MAC5G,MAAM,QAAQ,WAAW,QAAQ,MAAM,QAAQ,MAAM;AACrD,iBAAW,YAAY,KAAK,SAAS,SAAS,MAAM;;AAEtD,cAAS,UAAU;;IAErB,UAAU,UAAiB;AACzB,2BAAsB,KAAK,MAAM;AACjC,gBAAW,YAAY,KAAK,SAAS,MAAM;AAC3C,cAAS,UAAU;;;AAIvB,UAAO,MAAM,OAAO,gBAAgB,eAAe;;EAGrD,MAAMC,gCAAsD,OAAO,WAAS;GAC1E,MAAM,MAAM,aAAa,WAAWC,QAAM;GAC1C,MAAMC,UAAmDD,QAAM;GAE/D,MAAME,iBAA8C;IAClD,GAAG;IACH,UAAU,UAAmC;AAC3C,2BAAsB,KAAK,MAAM;AACjC,SACE,MAAM,UAAUC,2CAAqB,oCACrC,MAAM,WAAWC,4CAAsB,QAEvC,YAAW,WAAW,KAAK;cAClB,MAAM,UAAUD,2CAAqB,SAAS,MAAM,WAAWC,4CAAsB,OAAO;MACrG,MAAM,QAAQ,WAAW,QAAQ,MAAM,QAAQ,MAAM;AACrD,iBAAW,WAAW,KAAK,SAAS,SAAS,MAAM;;AAErD,cAAS,UAAU;;IAErB,UAAU,UAAiB;AACzB,2BAAsB,KAAK,MAAM;AACjC,gBAAW,WAAW,KAAK,SAAS,MAAM;AAC1C,cAAS,UAAU;;;AAIvB,UAAO,MAAM,OAAO,mBAAmB;IACrC,GAAGJ;IACH,SAAS;;;AAIb,SAAO,IAAI,MAAM,QAAQ,EACvB,IAAI,QAAQ,MAAM,UAAU;AAC1B,OAAI,SAAS,wBACX,QAAO;AAGT,OAAI,SAAS,kBACX,QAAO;AAGT,OAAI,SAAS,qBACX,QAAO;GAGT,MAAMK,QAAiB,QAAQ,IAAI,QAAkB,MAAM;AAE3D,OAAI,OAAO,UAAU,WAAY,QAAQ,MAA0C,KAAK;AACxF,UAAO;;IAGV;EAAC;EAAuB;EAAc;EAAY"}

package/dist/cjs/react/sdk/src/core/EmailRecovery/index.js

@@ -102,6 +102,7 @@ var init_EmailRecovery = require_rolldown_runtime.__esm({ "src/core/EmailRecover
 //#endregion
 init_EmailRecovery();
 exports.bytesToHex = bytesToHex;
+exports.canonicalizeEmail = canonicalizeEmail;
 exports.getLocalRecoveryEmails = getLocalRecoveryEmails;
 Object.defineProperty(exports, 'init_EmailRecovery', {
   enumerable: true,

package/dist/cjs/react/sdk/src/core/TatchiPasskey/emailRecovery.js

@@ -6,7 +6,9 @@ const require_vrf_worker = require('../types/vrf-worker.js');
 const require_errors = require('../../utils/errors.js');
 const require_sdkSentEvents = require('../types/sdkSentEvents.js');
 const require_rpc = require('../types/rpc.js');
+const require_rpcCalls = require('../rpcCalls.js');
 const require_getDeviceNumber = require('../WebAuthnManager/SignerWorkerManager/getDeviceNumber.js');
+const require_nearCrypto = require('../nearCrypto.js');
 const require_login = require('./login.js');
 const require_emailRecoveryPendingStore = require('../EmailRecovery/emailRecoveryPendingStore.js');
 const require_index$1 = require('../EmailRecovery/index.js');
@@ -25,16 +27,12 @@ function getEmailRecoveryConfig(configs) {
 	const maxPollingDurationMs = Number(relayerEmailCfg.maxPollingDurationMs);
 	const pendingTtlMs = Number(relayerEmailCfg.pendingTtlMs);
 	const mailtoAddress = String(relayerEmailCfg.mailtoAddress);
-	const dkimVerifierAccountId = String(relayerEmailCfg.dkimVerifierAccountId);
-	const verificationViewMethod = String(relayerEmailCfg.verificationViewMethod);
 	return {
 		minBalanceYocto,
 		pollingIntervalMs,
 		maxPollingDurationMs,
 		pendingTtlMs,
-		mailtoAddress,
-		dkimVerifierAccountId,
-		verificationViewMethod
+		mailtoAddress
 	};
 }
 function generateEmailRecoveryRequestId() {
@@ -59,6 +57,8 @@ var init_emailRecovery = require_rolldown_runtime.__esm({ "src/core/TatchiPasske
 	require_login.init_login();
 	require_index$1.init_EmailRecovery();
 	require_emailRecovery.init_emailRecovery();
+	require_rpcCalls.init_rpcCalls();
+	require_nearCrypto.init_nearCrypto();
 	EmailRecoveryFlow = class {
 		context;
 		options;
@@ -151,10 +151,9 @@ var init_emailRecovery = require_rolldown_runtime.__esm({ "src/core/TatchiPasske
 				await this.fail(1, require_errors.errorMessage(err) || "Failed to fetch account balance for recovery");
 			}
 		}
-		async getCanonicalRecoveryEmailOrFail(recoveryEmail) {
+		getCanonicalRecoveryEmail(recoveryEmail) {
 			const canonicalEmail = String(recoveryEmail || "").trim().toLowerCase();
-			if (!canonicalEmail) await this.fail(1, "Recovery email is required for email-based account recovery");
-			return canonicalEmail;
+			return canonicalEmail || void 0;
 		}
 		async getNextDeviceNumberFromContract(nearAccountId) {
 			try {
@@ -212,7 +211,7 @@ var init_emailRecovery = require_rolldown_runtime.__esm({ "src/core/TatchiPasske
 				message: "New device key created; please send the recovery email from your registered address.",
 				data: {
 					accountId: rec.accountId,
-					recoveryEmail: rec.recoveryEmail,
+					...rec.recoveryEmail ? { recoveryEmail: rec.recoveryEmail } : {},
 					nearPublicKey: rec.nearPublicKey,
 					requestId: rec.requestId,
 					mailtoUrl
@@ -228,44 +227,57 @@ var init_emailRecovery = require_rolldown_runtime.__esm({ "src/core/TatchiPasske
 				data
 			});
 		}
-		async checkViaDkimViewMethod(rec) {
-			const { dkimVerifierAccountId, verificationViewMethod } = this.getConfig();
-			if (!dkimVerifierAccountId) return null;
+		async checkViaEmailRecovererAttempt(rec) {
 			try {
-				const { getEmailRecoveryVerificationResult } = await Promise.resolve().then(() => require("../rpcCalls.js"));
-				const result = await getEmailRecoveryVerificationResult(this.context.nearClient, dkimVerifierAccountId, verificationViewMethod, rec.requestId);
-				if (!result) return {
+				const attempt = await require_rpcCalls.getEmailRecoveryAttempt(this.context.nearClient, rec.accountId, rec.requestId);
+				if (!attempt) return {
 					completed: false,
-					success: false
+					success: false,
+					missing: true
 				};
-				if (!result.verified) {
-					const errorMessage$1 = result.error_message || result.error_code || "Email verification failed on relayer/contract";
-					return {
+				if (attempt.request_id && attempt.request_id !== rec.requestId) return {
+					completed: true,
+					success: false,
+					errorMessage: "Email recovery attempt request_id does not match requested requestId."
+				};
+				if (attempt.new_public_key && attempt.new_public_key !== rec.nearPublicKey) {
+					const expected = require_nearCrypto.ensureEd25519Prefix(rec.nearPublicKey);
+					const actual = require_nearCrypto.ensureEd25519Prefix(attempt.new_public_key);
+					if (actual === expected) {} else return {
 						completed: true,
 						success: false,
-						errorMessage: errorMessage$1,
-						transactionHash: result.transaction_hash
+						errorMessage: `Email recovery new_public_key mismatch for request ${rec.requestId}. Expected ${expected}; got ${actual}. This usually means the recovery email you sent was generated for a different device/attempt.`
 					};
 				}
-				if (result.account_id && result.account_id !== rec.accountId) return {
+				const normalized = attempt.status.toLowerCase();
+				if (normalized === "complete" || normalized === "completed") return {
 					completed: true,
-					success: false,
-					errorMessage: "Email verification account_id does not match requested account.",
-					transactionHash: result.transaction_hash
+					success: true
 				};
-				if (result.new_public_key && result.new_public_key !== rec.nearPublicKey) return {
+				if (normalized.includes("failed")) return {
 					completed: true,
 					success: false,
-					errorMessage: "Email verification new_public_key does not match expected recovery key.",
-					transactionHash: result.transaction_hash
+					errorMessage: attempt.error || `Email recovery failed (${attempt.status || "unknown status"})`
 				};
 				return {
-					completed: true,
-					success: true,
-					transactionHash: result.transaction_hash
+					completed: false,
+					success: false
 				};
 			} catch (err) {
-				console.warn("[EmailRecoveryFlow] get_verification_result view failed; will retry", err);
+				console.warn("[EmailRecoveryFlow] get_recovery_attempt view failed; will retry", err);
+				return null;
+			}
+		}
+		async isRecoveryAccessKeyPresent(rec) {
+			try {
+				await this.context.nearClient.viewAccessKey(rec.accountId, rec.nearPublicKey);
+				return true;
+			} catch (err) {
+				const kind = typeof err?.kind === "string" ? String(err.kind) : "";
+				const short = typeof err?.short === "string" ? String(err.short) : "";
+				const msg = typeof err?.message === "string" ? String(err.message) : "";
+				if (/AccessKeyDoesNotExist/i.test(kind) || /AccessKeyDoesNotExist/i.test(short) || /access key does not exist/i.test(msg) || /access key .*does not exist/i.test(msg)) return false;
+				console.warn("[EmailRecoveryFlow] view_access_key failed while checking recovery key; will retry", err);
 				return null;
 			}
 		}
@@ -374,7 +386,7 @@ var init_emailRecovery = require_rolldown_runtime.__esm({ "src/core/TatchiPasske
 			});
 			const nearAccountId = await this.assertValidAccountIdOrFail(1, accountId);
 			await this.assertSufficientBalance(nearAccountId);
-			const canonicalEmail = await this.getCanonicalRecoveryEmailOrFail(recoveryEmail);
+			const canonicalEmail = this.getCanonicalRecoveryEmail(recoveryEmail);
 			const deviceNumber = await this.getNextDeviceNumberFromContract(nearAccountId);
 			this.phase = require_sdkSentEvents.EmailRecoveryPhase.STEP_2_TOUCH_ID_REGISTRATION;
 			this.emit({
@@ -505,29 +517,39 @@ var init_emailRecovery = require_rolldown_runtime.__esm({ "src/core/TatchiPasske
 			await this.options?.afterCall?.(true, void 0);
 		}
 		async pollUntilAddKey(rec) {
-			const { pollingIntervalMs, maxPollingDurationMs, dkimVerifierAccountId } = this.getConfig();
-			if (!dkimVerifierAccountId) {
-				const err$1 = this.emitError(4, "Email recovery verification contract (dkimVerifierAccountId) is not configured");
-				await this.options?.afterCall?.(false);
-				throw err$1;
-			}
+			const { pollingIntervalMs, maxPollingDurationMs } = this.getConfig();
 			this.phase = require_sdkSentEvents.EmailRecoveryPhase.STEP_4_POLLING_VERIFICATION_RESULT;
 			this.pollingStartedAt = Date.now();
+			let sawAttempt = false;
 			const pollResult = await this.pollUntil({
 				intervalMs: pollingIntervalMs,
 				timeoutMs: maxPollingDurationMs,
 				isCancelled: () => this.cancelled,
 				tick: async ({ elapsedMs, pollCount }) => {
-					const verification = await this.checkViaDkimViewMethod(rec);
-					const completed = verification?.completed === true;
-					const success = verification?.success === true;
+					const verification = await this.checkViaEmailRecovererAttempt(rec);
+					if (verification && !verification.missing) sawAttempt = true;
+					let completed = verification?.completed === true;
+					let success = verification?.success === true;
+					let errorMessage$1 = verification?.errorMessage;
+					let transactionHash;
+					if (verification?.missing) {
+						const hasKey = await this.isRecoveryAccessKeyPresent(rec);
+						if (hasKey === true) {
+							completed = true;
+							success = true;
+						} else if (hasKey === false && sawAttempt) {
+							completed = true;
+							success = false;
+							errorMessage$1 = "Email recovery attempt was cleared on-chain before completion. Please resend the recovery email or restart the flow.";
+						} else if (hasKey === null) return { done: false };
+					}
 					this.emit({
 						step: 4,
 						phase: require_sdkSentEvents.EmailRecoveryPhase.STEP_4_POLLING_VERIFICATION_RESULT,
 						status: require_sdkSentEvents.EmailRecoveryStatus.PROGRESS,
-						message: completed && success ? `Email verified for request ${rec.requestId}; finalizing registration` : `Waiting for email verification for request ${rec.requestId}`,
+						message: completed && success ? `Email recovery completed for request ${rec.requestId}; finalizing registration` : `Waiting for email recovery for request ${rec.requestId}`,
 						data: this.buildPollingEventData(rec, {
-							transactionHash: verification?.transactionHash,
+							transactionHash,
 							elapsedMs,
 							pollCount
 						})
@@ -537,7 +559,7 @@ var init_emailRecovery = require_rolldown_runtime.__esm({ "src/core/TatchiPasske
 						done: true,
 						value: {
 							outcome: "failed",
-							errorMessage: verification?.errorMessage || "Email verification failed"
+							errorMessage: errorMessage$1 || "Email recovery failed"
 						}
 					};
 					return {