@mysten/signers 0.1.13 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mysten/signers",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "A collection of KMS signers for various cloud providers",
   "license": "Apache-2.0",
   "author": "Mysten Labs <build@mystenlabs.com>",

package/src/webcrypto/index.ts

@@ -4,6 +4,7 @@
 import type { SignatureScheme } from '@mysten/sui/cryptography';
 import { Signer } from '@mysten/sui/cryptography';
 import { Secp256r1PublicKey } from '@mysten/sui/keypairs/secp256r1';
+import { secp256r1 } from '@noble/curves/p256';
 
 // Convert from uncompressed (65 bytes) to compressed (33 bytes) format
 function getCompressedPublicKey(publicKey: Uint8Array) {
@@ -20,6 +21,11 @@ function getCompressedPublicKey(publicKey: Uint8Array) {
 	return compressed;
 }
 
+export interface ExportedWebCryptoKeypair {
+	privateKey: CryptoKey;
+	publicKey: Uint8Array;
+}
+
 export class WebCryptoSigner extends Signer {
 	privateKey: CryptoKey;
 
@@ -37,7 +43,17 @@ export class WebCryptoSigner extends Signer {
 
 		const publicKey = await globalThis.crypto.subtle.exportKey('raw', keypair.publicKey);
 
-		return new WebCryptoSigner(keypair.privateKey, new Uint8Array(publicKey));
+		return new WebCryptoSigner(
+			keypair.privateKey,
+			getCompressedPublicKey(new Uint8Array(publicKey)),
+		);
+	}
+
+	/**
+	 * Imports a keypair using the value returned by `export()`.
+	 */
+	static import(data: ExportedWebCryptoKeypair) {
+		return new WebCryptoSigner(data.privateKey, data.publicKey);
 	}
 
 	getKeyScheme(): SignatureScheme {
@@ -47,7 +63,28 @@ export class WebCryptoSigner extends Signer {
 	constructor(privateKey: CryptoKey, publicKey: Uint8Array) {
 		super();
 		this.privateKey = privateKey;
-		this.#publicKey = new Secp256r1PublicKey(getCompressedPublicKey(publicKey));
+		this.#publicKey = new Secp256r1PublicKey(publicKey);
+	}
+
+	/**
+	 * Exports the keypair so that it can be stored in IndexedDB.
+	 */
+	export(): ExportedWebCryptoKeypair {
+		const exportedKeypair = {
+			privateKey: this.privateKey,
+			publicKey: this.#publicKey.toRawBytes(),
+		};
+
+		Object.defineProperty(exportedKeypair, 'toJSON', {
+			enumerable: false,
+			value: () => {
+				throw new Error(
+					'The exported keypair must not be serialized. It must be stored in IndexedDB directly.',
+				);
+			},
+		});
+
+		return exportedKeypair;
 	}
 
 	getPublicKey() {
@@ -55,7 +92,7 @@ export class WebCryptoSigner extends Signer {
 	}
 
 	async sign(bytes: Uint8Array): Promise<Uint8Array> {
-		const signature = await globalThis.crypto.subtle.sign(
+		const rawSignature = await globalThis.crypto.subtle.sign(
 			{
 				name: 'ECDSA',
 				hash: 'SHA-256',
@@ -64,6 +101,8 @@ export class WebCryptoSigner extends Signer {
 			bytes,
 		);
 
-		return new Uint8Array(signature);
+		const signature = secp256r1.Signature.fromCompact(new Uint8Array(rawSignature));
+
+		return signature.normalizeS().toCompactRawBytes();
 	}
 }