From e8cbccd30eda81a99419edc07b068951b6675c4e Mon Sep 17 00:00:00 2001 From: Michael Standen Date: Fri, 6 Dec 2024 08:00:38 +1300 Subject: [PATCH] Rename buildEIP6492Signature --- packages/passkeys/src/index.ts | 14 +------------- packages/signhub/src/orchestrator.ts | 4 ++-- packages/signhub/src/signers/signer.ts | 2 +- packages/signhub/tests/orchestrator.spec.ts | 2 +- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/packages/passkeys/src/index.ts b/packages/passkeys/src/index.ts index b87d98b03..41e3dea19 100644 --- a/packages/passkeys/src/index.ts +++ b/packages/passkeys/src/index.ts @@ -258,19 +258,7 @@ export class SequencePasskeySigner implements signers.SapientSigner { return signatureBytes } - async buildValidationSignature(signatureBytes: string): Promise { - console.log('passkey buildValidationSignature', signatureBytes) - try { - if (await this.isDeployed()) { - return undefined - } - } catch (e) { - // Ignore. Assume not deployed - } - return this.buildEIP6492Signature(signatureBytes) - } - - private async buildEIP6492Signature(signature: string): Promise { + async buildEIP6492Signature(signature: string): Promise { const deployTransactions = await this.buildDeployTransaction() if (!deployTransactions || deployTransactions?.transactions.length === 0) { throw new Error('Cannot build EIP-6492 signature without deploy transaction') diff --git a/packages/signhub/src/orchestrator.ts b/packages/signhub/src/orchestrator.ts index 71a7b4e44..451cbd7d2 100644 --- a/packages/signhub/src/orchestrator.ts +++ b/packages/signhub/src/orchestrator.ts @@ -186,9 +186,9 @@ export class Orchestrator { .then(async signature => { const suffix = s.suffix() let validationSignature - if (s.buildValidationSignature) { + if (s.buildEIP6492Signature) { try { - validationSignature = await s.buildValidationSignature(signature) + validationSignature = await s.buildEIP6492Signature(signature) } catch (e) { // Log and ignore console.warn(`signer ${saddr} failed to build validation signature: ${e}`) diff --git a/packages/signhub/src/signers/signer.ts b/packages/signhub/src/signers/signer.ts index e8595a8d4..8dcb935e6 100644 --- a/packages/signhub/src/signers/signer.ts +++ b/packages/signhub/src/signers/signer.ts @@ -28,7 +28,7 @@ export interface SapientSigner { /** * Build a validation signature for an undeployed contract signer. */ - buildValidationSignature?(signatureBytes: ethers.BytesLike): Promise; + buildEIP6492Signature?(signature: ethers.BytesLike): Promise; /** * Notify the signer of a status change. diff --git a/packages/signhub/tests/orchestrator.spec.ts b/packages/signhub/tests/orchestrator.spec.ts index dc2805967..0e9776ed4 100644 --- a/packages/signhub/tests/orchestrator.spec.ts +++ b/packages/signhub/tests/orchestrator.spec.ts @@ -100,7 +100,7 @@ describe('Orchestrator', () => { suffix(): ethers.BytesLike { return new Uint8Array([2]) } - async buildValidationSignature(signature: string) { + async buildEIP6492Signature(signature: string) { return signature + 'validation' } }