@solana/keys 2.0.0-experimental.71b920d → 2.0.0-experimental.71dcc4e

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Solana Labs, Inc
+Copyright (c) 2023 Solana Labs, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -18,13 +18,11 @@ This package contains utilities for validating, generating, and manipulating add
 
 ## Types
 
-### `Base58EncodedAddress`
+### `Signature`
 
-This type represents a string that validates as a Solana address or public key. Functions that require well-formed addresses should specify their inputs in terms of this type.
+This type represents a 64-byte Ed25519 signature of some data with a private key, as a base58-encoded string.
 
-Whenever you need to validate an arbitrary string as a base58-encoded address, use the `assertIsBase58EncodedAddress()` function in this package.
-
-### `Ed25519Signature`
+### `SignatureBytes`
 
 This type represents a 64-byte Ed25519 signature of some data with a private key.
 
@@ -32,27 +30,27 @@ Whenever you need to verify that a particular signature is, in fact, the one tha
 
 ## Functions
 
-### `assertIsBase58EncodedAddress()`
-
-Client applications primarily deal with addresses and public keys in the form of base58-encoded strings. Addresses and public keys returned from the RPC API conform to the type `Base58EncodedAddress`. You can use a value of that type wherever a base58-encoded address or key is expected.
+### `assertIsSignature()`
 
-From time to time you might acquire a string, that you expect to validate as an address, from an untrusted network API or user input. To assert that such an arbitrary string is a base58-encoded address, use the `assertIsBase58EncodedAddress` function.
+From time to time you might acquire a string that you expect to be a base58-encoded signature (eg. of a transaction) from an untrusted network API or user input. To assert that such an arbitrary string is in fact an Ed25519 signature, use the `assertIsSignature` function.
 
 ```ts
-import { assertIsBase58EncodedAddress } from '@solana/keys';
+import { assertIsSignature } from '@solana/keys';
 
-// Imagine a function that fetches an account's balance when a user submits a form.
+// Imagine a function that asserts whether a user-supplied signature is valid or not.
 function handleSubmit() {
     // We know only that what the user typed conforms to the `string` type.
-    const address: string = accountAddressInput.value;
+    const signature: string = signatureInput.value;
     try {
         // If this type assertion function doesn't throw, then
-        // Typescript will upcast `address` to `Base58EncodedAddress`.
-        assertIsBase58EncodedAddress(address);
-        // At this point, `address` is a `Base58EncodedAddress` that can be used with the RPC.
-        const balanceInLamports = await rpc.getBalance(address).send();
+        // Typescript will upcast `signature` to `Signature`.
+        assertIsSignature(signature);
+        // At this point, `signature` is a `Signature` that can be used with the RPC.
+        const {
+            value: [status],
+        } = await rpc.getSignatureStatuses([signature]).send();
     } catch (e) {
-        // `address` turned out not to be a base58-encoded address
+        // `signature` turned out not to be a base58-encoded signature
     }
 }
 ```
@@ -67,14 +65,23 @@ import { generateKeyPair } from '@solana/keys';
 const { privateKey, publicKey } = await generateKeyPair();
 ```
 
-### `getBase58EncodedAddressFromPublicKey()`
+### `isSignature()`
 
-Given a public `CryptoKey`, this method will return its associated `Base58EncodedAddress`.
+This is a type guard that accepts a string as input. It will both return `true` if the string conforms to the `Signature` type and will refine the type for use in your program.
 
 ```ts
-import { getBase58EncodedAddressFromPublicKey } from '@solana/keys';
-
-const address = await getBase58EncodedAddressFromPublicKey(publicKey);
+import { isSignature } from '@solana/keys';
+
+if (isSignature(signature)) {
+    // At this point, `signature` has been refined to a
+    // `Signature` that can be used with the RPC.
+    const {
+        value: [status],
+    } = await rpc.getSignatureStatuses([signature]).send();
+    setSignatureStatus(status);
+} else {
+    setError(`${signature} is not a transaction signature`);
+}
 ```
 
 ### `signBytes()`
@@ -88,9 +95,22 @@ const data = new Uint8Array([1, 2, 3]);
 const signature = await signBytes(privateKey, data);
 ```
 
+### `signature()`
+
+This helper combines _asserting_ that a string is an Ed25519 signature with _coercing_ it to the `Signature` type. It's best used with untrusted input.
+
+```ts
+import { signature } from '@solana/keys';
+
+const signature = signature(userSuppliedSignature);
+const {
+    value: [status],
+} = await rpc.getSignatureStatuses([signature]).send();
+```
+
 ### `verifySignature()`
 
-Given a public `CryptoKey`, an `Ed25519Signature`, and a `Uint8Array` of bytes, this method will return `true` if the signature was produced by signing the bytes using the private key associated with the public key, and `false` otherwise.
+Given a public `CryptoKey`, some `SignatureBytes`, and a `Uint8Array` of data, this method will return `true` if the signature was produced by signing the data using the private key associated with the public key, and `false` otherwise.
 
 ```ts
 import { verifySignature } from '@solana/keys';

package/dist/index.browser.cjs

@@ -1,110 +1,11 @@
 'use strict';
 
-var umiSerializers = require('@metaplex-foundation/umi-serializers');
-
-// ../build-scripts/env-shim.ts
-var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
-function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
-  try {
-    if (
-      // Lowest address (32 bytes of zeroes)
-      putativeBase58EncodedAddress.length < 32 || // Highest address (32 bytes of 255)
-      putativeBase58EncodedAddress.length > 44
-    ) {
-      throw new Error("Expected input string to decode to a byte array of length 32.");
-    }
-    const bytes = umiSerializers.base58.serialize(putativeBase58EncodedAddress);
-    const numBytes = bytes.byteLength;
-    if (numBytes !== 32) {
-      throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
-    }
-  } catch (e) {
-    throw new Error(`\`${putativeBase58EncodedAddress}\` is not a base-58 encoded address`, {
-      cause: e
-    });
-  }
-}
-function getBase58EncodedAddressCodec(config) {
-  return umiSerializers.string({
-    description: config?.description ?? (__DEV__ ? "A 32-byte account address" : ""),
-    encoding: umiSerializers.base58,
-    size: 32
-  });
-}
-function getBase58EncodedAddressComparator() {
-  return new Intl.Collator("en", {
-    caseFirst: "lower",
-    ignorePunctuation: false,
-    localeMatcher: "best fit",
-    numeric: false,
-    sensitivity: "variant",
-    usage: "sort"
-  }).compare;
-}
-
-// src/guard.ts
-function assertIsSecureContext() {
-  if (!globalThis.isSecureContext) {
-    throw new Error(
-      "Cryptographic operations are only allowed in secure browser contexts. Read more here: https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts"
-    );
-  }
-}
-var cachedEd25519Decision;
-async function isEd25519CurveSupported(subtle) {
-  if (cachedEd25519Decision === void 0) {
-    cachedEd25519Decision = new Promise((resolve) => {
-      subtle.generateKey(
-        "Ed25519",
-        /* extractable */
-        false,
-        ["sign", "verify"]
-      ).catch(() => {
-        resolve(cachedEd25519Decision = false);
-      }).then(() => {
-        resolve(cachedEd25519Decision = true);
-      });
-    });
-  }
-  if (typeof cachedEd25519Decision === "boolean") {
-    return cachedEd25519Decision;
-  } else {
-    return await cachedEd25519Decision;
-  }
-}
-async function assertKeyGenerationIsAvailable() {
-  assertIsSecureContext();
-  if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.generateKey !== "function") {
-    throw new Error("No key generation implementation could be found");
-  }
-  if (!await isEd25519CurveSupported(globalThis.crypto.subtle)) {
-    throw new Error(
-      "This runtime does not support the generation of Ed25519 key pairs.\n\nInstall and import `@solana/webcrypto-ed25519-polyfill` before generating keys in environments that do not support Ed25519.\n\nFor a list of runtimes that currently support Ed25519 operations, visit https://github.com/WICG/webcrypto-secure-curves/issues/20"
-    );
-  }
-}
-async function assertKeyExporterIsAvailable() {
-  assertIsSecureContext();
-  if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.exportKey !== "function") {
-    throw new Error("No key export implementation could be found");
-  }
-}
-async function assertSigningCapabilityIsAvailable() {
-  assertIsSecureContext();
-  if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.sign !== "function") {
-    throw new Error("No signing implementation could be found");
-  }
-}
-async function assertVerificationCapabilityIsAvailable() {
-  assertIsSecureContext();
-  if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.verify !== "function") {
-    throw new Error("No signature verification implementation could be found");
-  }
-}
+var assertions = require('@solana/assertions');
+var codecsStrings = require('@solana/codecs-strings');
 
 // src/key-pair.ts
 async function generateKeyPair() {
-  await assertKeyGenerationIsAvailable();
+  await assertions.assertKeyGenerationIsAvailable();
   const keyPair = await crypto.subtle.generateKey(
     /* algorithm */
     "Ed25519",
@@ -118,34 +19,120 @@ async function generateKeyPair() {
   return keyPair;
 }
 
-// src/pubkey.ts
-async function getBase58EncodedAddressFromPublicKey(publicKey) {
-  await assertKeyExporterIsAvailable();
-  if (publicKey.type !== "public" || publicKey.algorithm.name !== "Ed25519") {
-    throw new Error("The `CryptoKey` must be an `Ed25519` public key");
+// src/private-key.ts
+function addPkcs8Header(bytes) {
+  return new Uint8Array([
+    /**
+     * PKCS#8 header
+     */
+    48,
+    // ASN.1 sequence tag
+    46,
+    // Length of sequence (46 more bytes)
+    2,
+    // ASN.1 integer tag
+    1,
+    // Length of integer
+    0,
+    // Version number
+    48,
+    // ASN.1 sequence tag
+    5,
+    // Length of sequence
+    6,
+    // ASN.1 object identifier tag
+    3,
+    // Length of object identifier
+    // Edwards curve algorithms identifier https://oid-rep.orange-labs.fr/get/1.3.101.112
+    43,
+    // iso(1) / identified-organization(3) (The first node is multiplied by the decimal 40 and the result is added to the value of the second node)
+    101,
+    // thawte(101)
+    // Ed25519 identifier
+    112,
+    // id-Ed25519(112)
+    /**
+     * Private key payload
+     */
+    4,
+    // ASN.1 octet string tag
+    34,
+    // String length (34 more bytes)
+    // Private key bytes as octet string
+    4,
+    // ASN.1 octet string tag
+    32,
+    // String length (32 bytes)
+    ...bytes
+  ]);
+}
+async function createPrivateKeyFromBytes(bytes, extractable) {
+  if (bytes.byteLength !== 32) {
+    throw new Error("Private key bytes must be of length 32");
   }
-  const publicKeyBytes = await crypto.subtle.exportKey("raw", publicKey);
-  const [base58EncodedAddress] = getBase58EncodedAddressCodec().deserialize(new Uint8Array(publicKeyBytes));
-  return base58EncodedAddress;
+  const privateKeyBytesPkcs8 = addPkcs8Header(bytes);
+  return await crypto.subtle.importKey("pkcs8", privateKeyBytesPkcs8, "Ed25519", extractable ?? false, ["sign"]);
+}
+var base58Encoder;
+function assertIsSignature(putativeSignature) {
+  if (!base58Encoder)
+    base58Encoder = codecsStrings.getBase58Encoder();
+  try {
+    if (
+      // Lowest value (64 bytes of zeroes)
+      putativeSignature.length < 64 || // Highest value (64 bytes of 255)
+      putativeSignature.length > 88
+    ) {
+      throw new Error("Expected input string to decode to a byte array of length 64.");
+    }
+    const bytes = base58Encoder.encode(putativeSignature);
+    const numBytes = bytes.byteLength;
+    if (numBytes !== 64) {
+      throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
+    }
+  } catch (e) {
+    throw new Error(`\`${putativeSignature}\` is not a signature`, {
+      cause: e
+    });
+  }
+}
+function isSignature(putativeSignature) {
+  if (!base58Encoder)
+    base58Encoder = codecsStrings.getBase58Encoder();
+  if (
+    // Lowest value (64 bytes of zeroes)
+    putativeSignature.length < 64 || // Highest value (64 bytes of 255)
+    putativeSignature.length > 88
+  ) {
+    return false;
+  }
+  const bytes = base58Encoder.encode(putativeSignature);
+  const numBytes = bytes.byteLength;
+  if (numBytes !== 64) {
+    return false;
+  }
+  return true;
 }
-
-// src/signatures.ts
 async function signBytes(key, data) {
-  await assertSigningCapabilityIsAvailable();
+  await assertions.assertSigningCapabilityIsAvailable();
   const signedData = await crypto.subtle.sign("Ed25519", key, data);
   return new Uint8Array(signedData);
 }
-async function verifySignature(key, signature, data) {
-  await assertVerificationCapabilityIsAvailable();
-  return await crypto.subtle.verify("Ed25519", key, signature, data);
+function signature(putativeSignature) {
+  assertIsSignature(putativeSignature);
+  return putativeSignature;
+}
+async function verifySignature(key, signature2, data) {
+  await assertions.assertVerificationCapabilityIsAvailable();
+  return await crypto.subtle.verify("Ed25519", key, signature2, data);
 }
 
-exports.assertIsBase58EncodedAddress = assertIsBase58EncodedAddress;
+exports.assertIsSignature = assertIsSignature;
+exports.createPrivateKeyFromBytes = createPrivateKeyFromBytes;
 exports.generateKeyPair = generateKeyPair;
-exports.getBase58EncodedAddressCodec = getBase58EncodedAddressCodec;
-exports.getBase58EncodedAddressComparator = getBase58EncodedAddressComparator;
-exports.getBase58EncodedAddressFromPublicKey = getBase58EncodedAddressFromPublicKey;
+exports.isSignature = isSignature;
 exports.signBytes = signBytes;
+exports.signature = signature;
 exports.verifySignature = verifySignature;
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.browser.cjs.map

package/dist/index.browser.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../build-scripts/env-shim.ts","../src/base58.ts","../src/guard.ts","../src/key-pair.ts","../src/pubkey.ts","../src/signatures.ts"],"names":[],"mappings":"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","sourcesContent":["// Clever obfuscation to prevent the build system from inlining the value of `NODE_ENV`\nexport const __DEV__ = /* @__PURE__ */ (() => (process as any)['en' + 'v'].NODE_ENV === 'development')();\n","import { base58, Serializer, string } from '@metaplex-foundation/umi-serializers';\n\nexport type Base58EncodedAddress<TAddress extends string = string> = TAddress & {\n    readonly __base58EncodedAddress: unique symbol;\n};\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = base58.serialize(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n\nexport function getBase58EncodedAddressCodec(\n    config?: Readonly<{\n        description: string;\n    }>\n): Serializer<Base58EncodedAddress> {\n    return string({\n        description: config?.description ?? (__DEV__ ? 'A 32-byte account address' : ''),\n        encoding: base58,\n        size: 32,\n    }) as unknown as Serializer<Base58EncodedAddress>;\n}\n\nexport function getBase58EncodedAddressComparator(): (x: string, y: string) => number {\n    return new Intl.Collator('en', {\n        caseFirst: 'lower',\n        ignorePunctuation: false,\n        localeMatcher: 'best fit',\n        numeric: false,\n        sensitivity: 'variant',\n        usage: 'sort',\n    }).compare;\n}\n","function assertIsSecureContext() {\n    if (__BROWSER__ && !globalThis.isSecureContext) {\n        // TODO: Coded error.\n        throw new Error(\n            'Cryptographic operations are only allowed in secure browser contexts. Read more ' +\n                'here: https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts'\n        );\n    }\n}\n\nlet cachedEd25519Decision: PromiseLike<boolean> | boolean | undefined;\nasync function isEd25519CurveSupported(subtle: SubtleCrypto): Promise<boolean> {\n    if (cachedEd25519Decision === undefined) {\n        cachedEd25519Decision = new Promise(resolve => {\n            subtle\n                .generateKey('Ed25519', /* extractable */ false, ['sign', 'verify'])\n                .catch(() => {\n                    resolve((cachedEd25519Decision = false));\n                })\n                .then(() => {\n                    resolve((cachedEd25519Decision = true));\n                });\n        });\n    }\n    if (typeof cachedEd25519Decision === 'boolean') {\n        return cachedEd25519Decision;\n    } else {\n        return await cachedEd25519Decision;\n    }\n}\n\nexport async function assertKeyGenerationIsAvailable() {\n    assertIsSecureContext();\n    if (typeof globalThis.crypto === 'undefined' || typeof globalThis.crypto.subtle?.generateKey !== 'function') {\n        // TODO: Coded error.\n        throw new Error('No key generation implementation could be found');\n    }\n    if (!(await isEd25519CurveSupported(globalThis.crypto.subtle))) {\n        // TODO: Coded error.\n        throw new Error(\n            'This runtime does not support the generation of Ed25519 key pairs.\\n\\nInstall and ' +\n                'import `@solana/webcrypto-ed25519-polyfill` before generating keys in ' +\n                'environments that do not support Ed25519.\\n\\nFor a list of runtimes that ' +\n                'currently support Ed25519 operations, visit ' +\n                'https://github.com/WICG/webcrypto-secure-curves/issues/20'\n        );\n    }\n}\n\nexport async function assertKeyExporterIsAvailable() {\n    assertIsSecureContext();\n    if (typeof globalThis.crypto === 'undefined' || typeof globalThis.crypto.subtle?.exportKey !== 'function') {\n        // TODO: Coded error.\n        throw new Error('No key export implementation could be found');\n    }\n}\n\nexport async function assertSigningCapabilityIsAvailable() {\n    assertIsSecureContext();\n    if (typeof globalThis.crypto === 'undefined' || typeof globalThis.crypto.subtle?.sign !== 'function') {\n        // TODO: Coded error.\n        throw new Error('No signing implementation could be found');\n    }\n}\n\nexport async function assertVerificationCapabilityIsAvailable() {\n    assertIsSecureContext();\n    if (typeof globalThis.crypto === 'undefined' || typeof globalThis.crypto.subtle?.verify !== 'function') {\n        // TODO: Coded error.\n        throw new Error('No signature verification implementation could be found');\n    }\n}\n","import { assertKeyGenerationIsAvailable } from './guard';\n\nexport async function generateKeyPair(): Promise<CryptoKeyPair> {\n    await assertKeyGenerationIsAvailable();\n    const keyPair = await crypto.subtle.generateKey(\n        /* algorithm */ 'Ed25519', // Native implementation status: https://github.com/WICG/webcrypto-secure-curves/issues/20\n        /* extractable */ false, // Prevents the bytes of the private key from being visible to JS.\n        /* allowed uses */ ['sign', 'verify']\n    );\n    return keyPair as CryptoKeyPair;\n}\n","import { Base58EncodedAddress, getBase58EncodedAddressCodec } from './base58';\nimport { assertKeyExporterIsAvailable } from './guard';\n\nexport async function getBase58EncodedAddressFromPublicKey(publicKey: CryptoKey): Promise<Base58EncodedAddress> {\n    await assertKeyExporterIsAvailable();\n    if (publicKey.type !== 'public' || publicKey.algorithm.name !== 'Ed25519') {\n        // TODO: Coded error.\n        throw new Error('The `CryptoKey` must be an `Ed25519` public key');\n    }\n    const publicKeyBytes = await crypto.subtle.exportKey('raw', publicKey);\n    const [base58EncodedAddress] = getBase58EncodedAddressCodec().deserialize(new Uint8Array(publicKeyBytes));\n    return base58EncodedAddress;\n}\n","import { assertSigningCapabilityIsAvailable, assertVerificationCapabilityIsAvailable } from './guard';\n\nexport type Ed25519Signature = Uint8Array & { readonly __ed25519Signature: unique symbol };\n\nexport async function signBytes(key: CryptoKey, data: Uint8Array): Promise<Ed25519Signature> {\n    await assertSigningCapabilityIsAvailable();\n    const signedData = await crypto.subtle.sign('Ed25519', key, data);\n    return new Uint8Array(signedData) as Ed25519Signature;\n}\n\nexport async function verifySignature(key: CryptoKey, signature: Ed25519Signature, data: Uint8Array): Promise<boolean> {\n    await assertVerificationCapabilityIsAvailable();\n    return await crypto.subtle.verify('Ed25519', key, signature, data);\n}\n"]}
+{"version":3,"sources":["../src/key-pair.ts","../src/private-key.ts","../src/signatures.ts"],"names":["signature"],"mappings":";AAAA,SAAS,sCAAsC;AAE/C,eAAsB,kBAA0C;AAC5D,QAAM,+BAA+B;AACrC,QAAM,UAAU,MAAM,OAAO,OAAO;AAAA;AAAA,IAChB;AAAA;AAAA;AAAA,IACE;AAAA;AAAA;AAAA,IACC,CAAC,QAAQ,QAAQ;AAAA,EACxC;AACA,SAAO;AACX;;;ACVA,SAAS,eAAe,OAA+B;AAEnD,SAAO,IAAI,WAAW;AAAA;AAAA;AAAA;AAAA,IAIlB;AAAA;AAAA,IACA;AAAA;AAAA,IAEI;AAAA;AAAA,IACA;AAAA;AAAA,IACI;AAAA;AAAA,IAEJ;AAAA;AAAA,IACA;AAAA;AAAA,IACI;AAAA;AAAA,IACA;AAAA;AAAA;AAAA,IAEQ;AAAA;AAAA,IACA;AAAA;AAAA;AAAA,IAEA;AAAA;AAAA;AAAA;AAAA;AAAA,IAKhB;AAAA;AAAA,IACA;AAAA;AAAA;AAAA,IAGI;AAAA;AAAA,IACA;AAAA;AAAA,IAEJ,GAAG;AAAA,EACP,CAAC;AACL;AAEA,eAAsB,0BAA0B,OAAmB,aAA2C;AAC1G,MAAI,MAAM,eAAe,IAAI;AAEzB,UAAM,IAAI,MAAM,wCAAwC;AAAA,EAC5D;AACA,QAAM,uBAAuB,eAAe,KAAK;AACjD,SAAO,MAAM,OAAO,OAAO,UAAU,SAAS,sBAAsB,WAAW,eAAe,OAAO,CAAC,MAAM,CAAC;AACjH;;;AC5CA,SAAS,oCAAoC,+CAA+C;AAE5F,SAAS,wBAAwB;AAKjC,IAAI;AAEG,SAAS,kBAAkB,mBAAmE;AACjG,MAAI,CAAC;AAAe,oBAAgB,iBAAiB;AAErD,MAAI;AAEA;AAAA;AAAA,MAEI,kBAAkB,SAAS;AAAA,MAE3B,kBAAkB,SAAS;AAAA,MAC7B;AACE,YAAM,IAAI,MAAM,+DAA+D;AAAA,IACnF;AAEA,UAAM,QAAQ,cAAc,OAAO,iBAAiB;AACpD,UAAM,WAAW,MAAM;AACvB,QAAI,aAAa,IAAI;AACjB,YAAM,IAAI,MAAM,gFAAgF,QAAQ,EAAE;AAAA,IAC9G;AAAA,EACJ,SAAS,GAAG;AACR,UAAM,IAAI,MAAM,KAAK,iBAAiB,yBAAyB;AAAA,MAC3D,OAAO;AAAA,IACX,CAAC;AAAA,EACL;AACJ;AAEO,SAAS,YAAY,mBAA2D;AACnF,MAAI,CAAC;AAAe,oBAAgB,iBAAiB;AAGrD;AAAA;AAAA,IAEI,kBAAkB,SAAS;AAAA,IAE3B,kBAAkB,SAAS;AAAA,IAC7B;AACE,WAAO;AAAA,EACX;AAEA,QAAM,QAAQ,cAAc,OAAO,iBAAiB;AACpD,QAAM,WAAW,MAAM;AACvB,MAAI,aAAa,IAAI;AACjB,WAAO;AAAA,EACX;AACA,SAAO;AACX;AAEA,eAAsB,UAAU,KAAgB,MAA2C;AACvF,QAAM,mCAAmC;AACzC,QAAM,aAAa,MAAM,OAAO,OAAO,KAAK,WAAW,KAAK,IAAI;AAChE,SAAO,IAAI,WAAW,UAAU;AACpC;AAEO,SAAS,UAAU,mBAAsC;AAC5D,oBAAkB,iBAAiB;AACnC,SAAO;AACX;AAEA,eAAsB,gBAAgB,KAAgBA,YAA2B,MAAoC;AACjH,QAAM,wCAAwC;AAC9C,SAAO,MAAM,OAAO,OAAO,OAAO,WAAW,KAAKA,YAAW,IAAI;AACrE","sourcesContent":["import { assertKeyGenerationIsAvailable } from '@solana/assertions';\n\nexport async function generateKeyPair(): Promise<CryptoKeyPair> {\n    await assertKeyGenerationIsAvailable();\n    const keyPair = await crypto.subtle.generateKey(\n        /* algorithm */ 'Ed25519', // Native implementation status: https://github.com/WICG/webcrypto-secure-curves/issues/20\n        /* extractable */ false, // Prevents the bytes of the private key from being visible to JS.\n        /* allowed uses */ ['sign', 'verify'],\n    );\n    return keyPair as CryptoKeyPair;\n}\n","function addPkcs8Header(bytes: Uint8Array): Uint8Array {\n    // prettier-ignore\n    return new Uint8Array([\n        /**\n         * PKCS#8 header\n         */\n        0x30, // ASN.1 sequence tag\n        0x2e, // Length of sequence (46 more bytes)\n\n            0x02, // ASN.1 integer tag\n            0x01, // Length of integer\n                0x00, // Version number\n\n            0x30, // ASN.1 sequence tag\n            0x05, // Length of sequence\n                0x06, // ASN.1 object identifier tag\n                0x03, // Length of object identifier\n                    // Edwards curve algorithms identifier https://oid-rep.orange-labs.fr/get/1.3.101.112\n                        0x2b, // iso(1) / identified-organization(3) (The first node is multiplied by the decimal 40 and the result is added to the value of the second node)\n                        0x65, // thawte(101)\n                    // Ed25519 identifier\n                        0x70, // id-Ed25519(112)\n\n        /**\n         * Private key payload\n         */\n        0x04, // ASN.1 octet string tag\n        0x22, // String length (34 more bytes)\n\n            // Private key bytes as octet string\n            0x04, // ASN.1 octet string tag\n            0x20, // String length (32 bytes)\n\n        ...bytes\n    ]);\n}\n\nexport async function createPrivateKeyFromBytes(bytes: Uint8Array, extractable?: boolean): Promise<CryptoKey> {\n    if (bytes.byteLength !== 32) {\n        // TODO: Coded error.\n        throw new Error('Private key bytes must be of length 32');\n    }\n    const privateKeyBytesPkcs8 = addPkcs8Header(bytes);\n    return await crypto.subtle.importKey('pkcs8', privateKeyBytesPkcs8, 'Ed25519', extractable ?? false, ['sign']);\n}\n","import { assertSigningCapabilityIsAvailable, assertVerificationCapabilityIsAvailable } from '@solana/assertions';\nimport { Encoder } from '@solana/codecs-core';\nimport { getBase58Encoder } from '@solana/codecs-strings';\n\nexport type Signature = string & { readonly __brand: unique symbol };\nexport type SignatureBytes = Uint8Array & { readonly __brand: unique symbol };\n\nlet base58Encoder: Encoder<string> | undefined;\n\nexport function assertIsSignature(putativeSignature: string): asserts putativeSignature is Signature {\n    if (!base58Encoder) base58Encoder = getBase58Encoder();\n\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest value (64 bytes of zeroes)\n            putativeSignature.length < 64 ||\n            // Highest value (64 bytes of 255)\n            putativeSignature.length > 88\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 64.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = base58Encoder.encode(putativeSignature);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 64) {\n            throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeSignature}\\` is not a signature`, {\n            cause: e,\n        });\n    }\n}\n\nexport function isSignature(putativeSignature: string): putativeSignature is Signature {\n    if (!base58Encoder) base58Encoder = getBase58Encoder();\n\n    // Fast-path; see if the input string is of an acceptable length.\n    if (\n        // Lowest value (64 bytes of zeroes)\n        putativeSignature.length < 64 ||\n        // Highest value (64 bytes of 255)\n        putativeSignature.length > 88\n    ) {\n        return false;\n    }\n    // Slow-path; actually attempt to decode the input string.\n    const bytes = base58Encoder.encode(putativeSignature);\n    const numBytes = bytes.byteLength;\n    if (numBytes !== 64) {\n        return false;\n    }\n    return true;\n}\n\nexport async function signBytes(key: CryptoKey, data: Uint8Array): Promise<SignatureBytes> {\n    await assertSigningCapabilityIsAvailable();\n    const signedData = await crypto.subtle.sign('Ed25519', key, data);\n    return new Uint8Array(signedData) as SignatureBytes;\n}\n\nexport function signature(putativeSignature: string): Signature {\n    assertIsSignature(putativeSignature);\n    return putativeSignature;\n}\n\nexport async function verifySignature(key: CryptoKey, signature: SignatureBytes, data: Uint8Array): Promise<boolean> {\n    await assertVerificationCapabilityIsAvailable();\n    return await crypto.subtle.verify('Ed25519', key, signature, data);\n}\n"]}

package/dist/index.browser.js

@@ -1,104 +1,5 @@
-import { base58, string } from '@metaplex-foundation/umi-serializers';
-
-// ../build-scripts/env-shim.ts
-var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
-function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
-  try {
-    if (
-      // Lowest address (32 bytes of zeroes)
-      putativeBase58EncodedAddress.length < 32 || // Highest address (32 bytes of 255)
-      putativeBase58EncodedAddress.length > 44
-    ) {
-      throw new Error("Expected input string to decode to a byte array of length 32.");
-    }
-    const bytes = base58.serialize(putativeBase58EncodedAddress);
-    const numBytes = bytes.byteLength;
-    if (numBytes !== 32) {
-      throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
-    }
-  } catch (e) {
-    throw new Error(`\`${putativeBase58EncodedAddress}\` is not a base-58 encoded address`, {
-      cause: e
-    });
-  }
-}
-function getBase58EncodedAddressCodec(config) {
-  return string({
-    description: config?.description ?? (__DEV__ ? "A 32-byte account address" : ""),
-    encoding: base58,
-    size: 32
-  });
-}
-function getBase58EncodedAddressComparator() {
-  return new Intl.Collator("en", {
-    caseFirst: "lower",
-    ignorePunctuation: false,
-    localeMatcher: "best fit",
-    numeric: false,
-    sensitivity: "variant",
-    usage: "sort"
-  }).compare;
-}
-
-// src/guard.ts
-function assertIsSecureContext() {
-  if (!globalThis.isSecureContext) {
-    throw new Error(
-      "Cryptographic operations are only allowed in secure browser contexts. Read more here: https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts"
-    );
-  }
-}
-var cachedEd25519Decision;
-async function isEd25519CurveSupported(subtle) {
-  if (cachedEd25519Decision === void 0) {
-    cachedEd25519Decision = new Promise((resolve) => {
-      subtle.generateKey(
-        "Ed25519",
-        /* extractable */
-        false,
-        ["sign", "verify"]
-      ).catch(() => {
-        resolve(cachedEd25519Decision = false);
-      }).then(() => {
-        resolve(cachedEd25519Decision = true);
-      });
-    });
-  }
-  if (typeof cachedEd25519Decision === "boolean") {
-    return cachedEd25519Decision;
-  } else {
-    return await cachedEd25519Decision;
-  }
-}
-async function assertKeyGenerationIsAvailable() {
-  assertIsSecureContext();
-  if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.generateKey !== "function") {
-    throw new Error("No key generation implementation could be found");
-  }
-  if (!await isEd25519CurveSupported(globalThis.crypto.subtle)) {
-    throw new Error(
-      "This runtime does not support the generation of Ed25519 key pairs.\n\nInstall and import `@solana/webcrypto-ed25519-polyfill` before generating keys in environments that do not support Ed25519.\n\nFor a list of runtimes that currently support Ed25519 operations, visit https://github.com/WICG/webcrypto-secure-curves/issues/20"
-    );
-  }
-}
-async function assertKeyExporterIsAvailable() {
-  assertIsSecureContext();
-  if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.exportKey !== "function") {
-    throw new Error("No key export implementation could be found");
-  }
-}
-async function assertSigningCapabilityIsAvailable() {
-  assertIsSecureContext();
-  if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.sign !== "function") {
-    throw new Error("No signing implementation could be found");
-  }
-}
-async function assertVerificationCapabilityIsAvailable() {
-  assertIsSecureContext();
-  if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.verify !== "function") {
-    throw new Error("No signature verification implementation could be found");
-  }
-}
+import { assertKeyGenerationIsAvailable, assertSigningCapabilityIsAvailable, assertVerificationCapabilityIsAvailable } from '@solana/assertions';
+import { getBase58Encoder } from '@solana/codecs-strings';
 
 // src/key-pair.ts
 async function generateKeyPair() {
@@ -116,28 +17,114 @@ async function generateKeyPair() {
   return keyPair;
 }
 
-// src/pubkey.ts
-async function getBase58EncodedAddressFromPublicKey(publicKey) {
-  await assertKeyExporterIsAvailable();
-  if (publicKey.type !== "public" || publicKey.algorithm.name !== "Ed25519") {
-    throw new Error("The `CryptoKey` must be an `Ed25519` public key");
+// src/private-key.ts
+function addPkcs8Header(bytes) {
+  return new Uint8Array([
+    /**
+     * PKCS#8 header
+     */
+    48,
+    // ASN.1 sequence tag
+    46,
+    // Length of sequence (46 more bytes)
+    2,
+    // ASN.1 integer tag
+    1,
+    // Length of integer
+    0,
+    // Version number
+    48,
+    // ASN.1 sequence tag
+    5,
+    // Length of sequence
+    6,
+    // ASN.1 object identifier tag
+    3,
+    // Length of object identifier
+    // Edwards curve algorithms identifier https://oid-rep.orange-labs.fr/get/1.3.101.112
+    43,
+    // iso(1) / identified-organization(3) (The first node is multiplied by the decimal 40 and the result is added to the value of the second node)
+    101,
+    // thawte(101)
+    // Ed25519 identifier
+    112,
+    // id-Ed25519(112)
+    /**
+     * Private key payload
+     */
+    4,
+    // ASN.1 octet string tag
+    34,
+    // String length (34 more bytes)
+    // Private key bytes as octet string
+    4,
+    // ASN.1 octet string tag
+    32,
+    // String length (32 bytes)
+    ...bytes
+  ]);
+}
+async function createPrivateKeyFromBytes(bytes, extractable) {
+  if (bytes.byteLength !== 32) {
+    throw new Error("Private key bytes must be of length 32");
   }
-  const publicKeyBytes = await crypto.subtle.exportKey("raw", publicKey);
-  const [base58EncodedAddress] = getBase58EncodedAddressCodec().deserialize(new Uint8Array(publicKeyBytes));
-  return base58EncodedAddress;
+  const privateKeyBytesPkcs8 = addPkcs8Header(bytes);
+  return await crypto.subtle.importKey("pkcs8", privateKeyBytesPkcs8, "Ed25519", extractable ?? false, ["sign"]);
+}
+var base58Encoder;
+function assertIsSignature(putativeSignature) {
+  if (!base58Encoder)
+    base58Encoder = getBase58Encoder();
+  try {
+    if (
+      // Lowest value (64 bytes of zeroes)
+      putativeSignature.length < 64 || // Highest value (64 bytes of 255)
+      putativeSignature.length > 88
+    ) {
+      throw new Error("Expected input string to decode to a byte array of length 64.");
+    }
+    const bytes = base58Encoder.encode(putativeSignature);
+    const numBytes = bytes.byteLength;
+    if (numBytes !== 64) {
+      throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
+    }
+  } catch (e) {
+    throw new Error(`\`${putativeSignature}\` is not a signature`, {
+      cause: e
+    });
+  }
+}
+function isSignature(putativeSignature) {
+  if (!base58Encoder)
+    base58Encoder = getBase58Encoder();
+  if (
+    // Lowest value (64 bytes of zeroes)
+    putativeSignature.length < 64 || // Highest value (64 bytes of 255)
+    putativeSignature.length > 88
+  ) {
+    return false;
+  }
+  const bytes = base58Encoder.encode(putativeSignature);
+  const numBytes = bytes.byteLength;
+  if (numBytes !== 64) {
+    return false;
+  }
+  return true;
 }
-
-// src/signatures.ts
 async function signBytes(key, data) {
   await assertSigningCapabilityIsAvailable();
   const signedData = await crypto.subtle.sign("Ed25519", key, data);
   return new Uint8Array(signedData);
 }
-async function verifySignature(key, signature, data) {
+function signature(putativeSignature) {
+  assertIsSignature(putativeSignature);
+  return putativeSignature;
+}
+async function verifySignature(key, signature2, data) {
   await assertVerificationCapabilityIsAvailable();
-  return await crypto.subtle.verify("Ed25519", key, signature, data);
+  return await crypto.subtle.verify("Ed25519", key, signature2, data);
 }
 
-export { assertIsBase58EncodedAddress, generateKeyPair, getBase58EncodedAddressCodec, getBase58EncodedAddressComparator, getBase58EncodedAddressFromPublicKey, signBytes, verifySignature };
+export { assertIsSignature, createPrivateKeyFromBytes, generateKeyPair, isSignature, signBytes, signature, verifySignature };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.browser.js.map