phygital-token-sdk 0.9.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -67
- package/dist/generated/instructions/createMint.js +1 -1
- package/dist/generated/instructions/createMint.js.map +1 -1
- package/dist/generated/instructions/executeTransfer.js +1 -1
- package/dist/generated/instructions/executeTransfer.js.map +1 -1
- package/dist/generated/instructions/mintToken.js +1 -1
- package/dist/generated/instructions/mintToken.js.map +1 -1
- package/dist/generated/instructions/removeOwnership.js +1 -1
- package/dist/generated/instructions/removeOwnership.js.map +1 -1
- package/dist/generated/instructions/setLockState.js +1 -1
- package/dist/generated/instructions/setLockState.js.map +1 -1
- package/dist/generated/instructions/verifyAsset.js +1 -1
- package/dist/generated/instructions/verifyAsset.js.map +1 -1
- package/dist/generated/programs/phygitalToken.d.ts +1 -1
- package/dist/generated/programs/phygitalToken.d.ts.map +1 -1
- package/dist/generated/programs/phygitalToken.js +1 -1
- package/dist/generated/programs/phygitalToken.js.map +1 -1
- package/dist/index.d.ts +2 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -3
- package/dist/index.js.map +1 -1
- package/dist/instructions/transfer.d.ts +1 -1
- package/dist/instructions/transfer.d.ts.map +1 -1
- package/dist/instructions/transfer.js +4 -16
- package/dist/instructions/transfer.js.map +1 -1
- package/dist/instructions/verifyAsset.d.ts +1 -1
- package/dist/instructions/verifyAsset.d.ts.map +1 -1
- package/dist/instructions/verifyAsset.js +5 -19
- package/dist/instructions/verifyAsset.js.map +1 -1
- package/dist/utils/assetCredential.d.ts +1 -1
- package/dist/utils/assetCredential.d.ts.map +1 -1
- package/dist/utils/assetCredential.js +2 -2
- package/dist/utils/assetCredential.js.map +1 -1
- package/dist/utils/metadata.d.ts +15 -4
- package/dist/utils/metadata.d.ts.map +1 -1
- package/dist/utils/metadata.js +38 -12
- package/dist/utils/metadata.js.map +1 -1
- package/dist/utils/passkey/internal.d.ts +2 -2
- package/dist/utils/passkey/internal.d.ts.map +1 -1
- package/dist/utils/passkey/internal.js +2 -12
- package/dist/utils/passkey/internal.js.map +1 -1
- package/dist/utils/passkey/nfc/authenticate.d.ts +2 -2
- package/dist/utils/passkey/nfc/authenticate.d.ts.map +1 -1
- package/dist/utils/passkey/nfc/authenticate.js +3 -3
- package/dist/utils/passkey/nfc/authenticate.js.map +1 -1
- package/dist/utils/passkey/nfc/fromWebAuthnJson.d.ts.map +1 -1
- package/dist/utils/passkey/nfc/fromWebAuthnJson.js +1 -2
- package/dist/utils/passkey/nfc/fromWebAuthnJson.js.map +1 -1
- package/dist/utils/passkey/nfc/index.d.ts +1 -1
- package/dist/utils/passkey/nfc/index.d.ts.map +1 -1
- package/dist/utils/passkey/nfc/index.js +1 -1
- package/dist/utils/passkey/nfc/index.js.map +1 -1
- package/dist/utils/passkey/nfc/parseResponses.d.ts +1 -1
- package/dist/utils/passkey/nfc/parseResponses.d.ts.map +1 -1
- package/dist/utils/passkey/nfc/types.d.ts +1 -1
- package/dist/utils/passkey/nfc/types.d.ts.map +1 -1
- package/dist/utils/passkey/nfc/webauthnResponses.d.ts +1 -1
- package/dist/utils/passkey/nfc/webauthnResponses.d.ts.map +1 -1
- package/dist/utils/passkey/nfc/webauthnResponses.js +6 -7
- package/dist/utils/passkey/nfc/webauthnResponses.js.map +1 -1
- package/dist/utils/passkey/secp256r1.d.ts +4 -3
- package/dist/utils/passkey/secp256r1.d.ts.map +1 -1
- package/dist/utils/passkey/secp256r1.js +1 -1
- package/dist/utils/passkey/secp256r1.js.map +1 -1
- package/dist/utils/passkey/webauthn.d.ts +36 -0
- package/dist/utils/passkey/webauthn.d.ts.map +1 -0
- package/dist/utils/passkey/webauthn.js +95 -0
- package/dist/utils/passkey/webauthn.js.map +1 -0
- package/dist/utils/slotHash.d.ts +0 -1
- package/dist/utils/slotHash.d.ts.map +1 -1
- package/dist/utils/slotHash.js +1 -2
- package/dist/utils/slotHash.js.map +1 -1
- package/dist/utils/verify.d.ts +12 -9
- package/dist/utils/verify.d.ts.map +1 -1
- package/dist/utils/verify.js +15 -32
- package/dist/utils/verify.js.map +1 -1
- package/package.json +4 -7
- package/docs/gating/README.md +0 -83
- package/docs/gating/evaluation-and-errors.md +0 -134
- package/docs/gating/filters-and-composition.md +0 -120
- package/docs/gating/overview.md +0 -84
- package/docs/gating/predicates.md +0 -122
- package/docs/gating/recipes.md +0 -199
- package/docs/gating/tiers.md +0 -158
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyAsset.js","sourceRoot":"","sources":["../../src/instructions/verifyAsset.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,
|
|
1
|
+
{"version":3,"file":"verifyAsset.js","sourceRoot":"","sources":["../../src/instructions/verifyAsset.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,wBAAwB,EACxB,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,mDAAmD,EACnD,yBAAyB,GAE1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,yBAAyB,GAE1B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAczE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,KAGtC;IACC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,MAAM,yBAAyB,CAAC;QAChD,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,QAAQ;KACT,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,QAAQ;QACR,UAAU;QACV,SAAS;QACT,OAAO,EAAE,KAAK,CAAC,OAAO;KACvB,CAAC;AACJ,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,OAA2B;IAE3B,OAAO,wBAAwB,CAC7B,yBAAyB,CAAC,uBAAuB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CACtE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAA2B,EAC3B,QAAoC,EACpC,6BAAsD;IAQtD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,0BAA0B,CAChD,QAAQ,CAAC,EAAE,EACX,OAAO,CAAC,GAAG,CACZ,CAAC;IACF,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,cAAc,EAAE,GAC3D,MAAM,mDAAmD,CAAC;QACxD,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,QAAQ;QACR,6BAA6B;KAC9B,CAAC,CAAC;IACL,OAAO;QACL,KAAK;QACL,QAAQ,EAAE,MAAM,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC;QAC7C,eAAe;QACf,kBAAkB;QAClB,cAAc;KACf,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAA2B,EAC3B,QAAoC,EACpC,6BAAsD;IAEtD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,kBAAkB,EAAE,cAAc,EAAE,GACrE,MAAM,oBAAoB,CACxB,OAAO,EACP,QAAQ,EACR,6BAA6B,CAC9B,CAAC;IAEJ,MAAM,sBAAsB,GAAG,yBAAyB,CAAC;QACvD,KAAK,EAAE,QAAQ;QACf,mBAAmB,EAAE;YACnB,uBAAuB,EAAE,CAAC,CAAC;YAC3B,kBAAkB;YAClB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,cAAc;SACf;QACD,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;IAEH,OAAO,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC;AACnD,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Address, type Rpc, type SolanaRpcApi } from "@solana/kit";
|
|
2
|
-
import { type Base64URLString } from "
|
|
2
|
+
import { type Base64URLString } from "./passkey/webauthn.js";
|
|
3
3
|
import { type Asset } from "../generated/index.js";
|
|
4
4
|
export declare function fetchAssetFromCredentialId(credentialId: Base64URLString, rpc: Rpc<SolanaRpcApi>): Promise<{
|
|
5
5
|
publicKey: Base64URLString;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assetCredential.d.ts","sourceRoot":"","sources":["../../src/utils/assetCredential.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,OAAO,EAEZ,KAAK,GAAG,EACR,KAAK,YAAY,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,
|
|
1
|
+
{"version":3,"file":"assetCredential.d.ts","sourceRoot":"","sources":["../../src/utils/assetCredential.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,OAAO,EAEZ,KAAK,GAAG,EACR,KAAK,YAAY,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAGL,KAAK,KAAK,EACX,MAAM,uBAAuB,CAAC;AAc/B,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,eAAe,EAC7B,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,GACrB,OAAO,CAAC;IAAE,SAAS,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC,CA8BvD;AAED,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,GACrB,OAAO,CAAC,KAAK,EAAE,CAAC,CA2BlB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getAddressEncoder, getBase64Decoder, getBase64Encoder, } from "@solana/kit";
|
|
2
|
-
import { bufferToBase64URLString, } from "
|
|
2
|
+
import { bufferToBase64URLString, } from "./passkey/webauthn.js";
|
|
3
3
|
import { getAssetDecoder, PHYGITAL_TOKEN_PROGRAM_ADDRESS, } from "../generated/index.js";
|
|
4
4
|
import { base64URLStringToBuffer } from "./passkey/internal.js";
|
|
5
5
|
const ASSET_ACCOUNT_DATA_SIZE = 179;
|
|
@@ -26,7 +26,7 @@ export async function fetchAssetFromCredentialId(credentialId, rpc) {
|
|
|
26
26
|
}
|
|
27
27
|
const asset = getAssetDecoder().decode(getBase64Encoder().encode(data[0].account.data[0]));
|
|
28
28
|
return {
|
|
29
|
-
publicKey: bufferToBase64URLString(
|
|
29
|
+
publicKey: bufferToBase64URLString(asset.publicKey[0]),
|
|
30
30
|
asset,
|
|
31
31
|
};
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assetCredential.js","sourceRoot":"","sources":["../../src/utils/assetCredential.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,GAKjB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,uBAAuB,GAExB,MAAM,
|
|
1
|
+
{"version":3,"file":"assetCredential.js","sourceRoot":"","sources":["../../src/utils/assetCredential.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,GAKjB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,uBAAuB,GAExB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,eAAe,EACf,8BAA8B,GAE/B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAGhE,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAGpC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAEvC,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAK/B,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,YAA6B,EAC7B,GAAsB;IAEtB,MAAM,IAAI,GAAG,MAAM,GAAG;SACnB,kBAAkB,CAAC,8BAA8B,EAAE;QAClD,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE;YACP,EAAE,QAAQ,EAAE,MAAM,CAAC,uBAAuB,CAAC,EAAE;YAC7C;gBACE,MAAM,EAAE;oBACN,QAAQ,EAAE,QAAiB;oBAC3B,MAAM,EAAE,MAAM,CAAC,0BAA0B,CAAC;oBAC1C,KAAK,EAAE,gBAAgB,EAAE,CAAC,MAAM,CAC9B,uBAAuB,CAAC,YAAY,CAAC,CAChB;iBACxB;aACF;SACF;KACF,CAAC;SACD,IAAI,EAAE,CAAC;IAEV,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC,MAAM,CACpC,gBAAgB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CACnD,CAAC;IACF,OAAO;QACL,SAAS,EAAE,uBAAuB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACtD,KAAK;KACN,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,KAAc,EACd,GAAsB;IAEtB,MAAM,IAAI,GAAG,MAAM,GAAG;SACnB,kBAAkB,CAAC,8BAA8B,EAAE;QAClD,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE;YACP,EAAE,QAAQ,EAAE,MAAM,CAAC,uBAAuB,CAAC,EAAE;YAC7C;gBACE,MAAM,EAAE;oBACN,QAAQ,EAAE,QAAiB;oBAC3B,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC;oBACnC,KAAK,EAAE,gBAAgB,EAAE,CAAC,MAAM,CAC9B,iBAAiB,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CACZ;iBACxB;aACF;SACF;KACF,CAAC;SACD,IAAI,EAAE,CAAC;IAEV,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5B,eAAe,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CACvE,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/dist/utils/metadata.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Address, type Rpc, type SolanaRpcApi } from "@solana/kit";
|
|
2
|
-
import { AssetType } from "../generated/index.js";
|
|
2
|
+
import { AssetType, type Asset } from "../generated/index.js";
|
|
3
3
|
type AssetAttribute = {
|
|
4
4
|
trait_type?: string;
|
|
5
5
|
traitType?: string;
|
|
@@ -9,7 +9,16 @@ export type Shortcut = {
|
|
|
9
9
|
label?: string;
|
|
10
10
|
uri?: string;
|
|
11
11
|
icon?: string;
|
|
12
|
-
type?: string;
|
|
12
|
+
type?: "fungible" | "collectible" | string;
|
|
13
|
+
prefersExternalTarget?: boolean;
|
|
14
|
+
preferredPresentation?: "default" | "immerse" | string;
|
|
15
|
+
limitToCollections?: string[];
|
|
16
|
+
limitToTokenAddresses?: string[];
|
|
17
|
+
platform?: "desktop" | "mobile" | "all" | string;
|
|
18
|
+
};
|
|
19
|
+
export type ShortcutsDocument = {
|
|
20
|
+
version: number;
|
|
21
|
+
shortcuts: Shortcut[];
|
|
13
22
|
};
|
|
14
23
|
export type MediaCategory = "image" | "video" | "audio" | "vr";
|
|
15
24
|
export type TokenMediaFile = {
|
|
@@ -30,7 +39,6 @@ export type TokenJsonMetadata = {
|
|
|
30
39
|
category?: MediaCategory | string;
|
|
31
40
|
files?: TokenMediaFile[];
|
|
32
41
|
};
|
|
33
|
-
shortcuts?: Array<Shortcut>;
|
|
34
42
|
};
|
|
35
43
|
export type ResolvedMedia = {
|
|
36
44
|
image: string | null;
|
|
@@ -39,6 +47,7 @@ export type ResolvedMedia = {
|
|
|
39
47
|
category: MediaCategory | null;
|
|
40
48
|
};
|
|
41
49
|
export declare function resolveMedia(json: TokenJsonMetadata | null): ResolvedMedia;
|
|
50
|
+
export declare function fetchShortcutsFromExternalUrl(externalUrl: string | undefined | null): Promise<Shortcut[]>;
|
|
42
51
|
export type AssetDisplayInfo = {
|
|
43
52
|
assetType: AssetType;
|
|
44
53
|
publicKey: string;
|
|
@@ -56,6 +65,7 @@ export type AssetDisplayInfo = {
|
|
|
56
65
|
description: string | null;
|
|
57
66
|
attributes: AssetAttribute[];
|
|
58
67
|
shortcuts: Shortcut[];
|
|
68
|
+
externalUrl: string | null;
|
|
59
69
|
collectionMint: Address | null;
|
|
60
70
|
collectionName: string | null;
|
|
61
71
|
collectionSymbol: string | null;
|
|
@@ -64,6 +74,7 @@ export type AssetDisplayInfo = {
|
|
|
64
74
|
currentOwner: Address;
|
|
65
75
|
lastTransferSlot: bigint;
|
|
66
76
|
};
|
|
67
|
-
export declare function
|
|
77
|
+
export declare function fetchAssetDisplayInfoFromPublicKey(rpc: Rpc<SolanaRpcApi>, publicKey: string): Promise<AssetDisplayInfo>;
|
|
78
|
+
export declare function fetchAssetDisplayInfo(rpc: Rpc<SolanaRpcApi>, asset: Asset): Promise<AssetDisplayInfo>;
|
|
68
79
|
export {};
|
|
69
80
|
//# sourceMappingURL=metadata.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../src/utils/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,GAAG,EACR,KAAK,YAAY,EAClB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,SAAS,EAAc,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../src/utils/metadata.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/metadata.js
CHANGED
|
@@ -3,7 +3,7 @@ import { fetchMint, isExtension, } from "@solana-program/token-2022";
|
|
|
3
3
|
import { parseSecp256r1Pubkey } from "../instructions/mint.js";
|
|
4
4
|
import { findAssetPda } from "./pdas/asset.js";
|
|
5
5
|
import { AssetType, fetchAsset } from "../generated/index.js";
|
|
6
|
-
import { bufferToBase64URLString } from "
|
|
6
|
+
import { bufferToBase64URLString } from "./passkey/webauthn.js";
|
|
7
7
|
function findMintExtension(extensions, kind) {
|
|
8
8
|
for (const extension of extensions) {
|
|
9
9
|
if (isExtension(kind, extension)) {
|
|
@@ -102,10 +102,33 @@ async function fetchJsonMetadata(uri) {
|
|
|
102
102
|
return null;
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
|
-
export async function
|
|
105
|
+
export async function fetchShortcutsFromExternalUrl(externalUrl) {
|
|
106
|
+
if (!externalUrl?.trim()) {
|
|
107
|
+
return [];
|
|
108
|
+
}
|
|
109
|
+
try {
|
|
110
|
+
const base = externalUrl.replace(/\/$/, "");
|
|
111
|
+
const response = await fetch(`${base}/shortcuts.json`);
|
|
112
|
+
if (!response.ok) {
|
|
113
|
+
return [];
|
|
114
|
+
}
|
|
115
|
+
const doc = (await response.json());
|
|
116
|
+
if (!Array.isArray(doc?.shortcuts)) {
|
|
117
|
+
return [];
|
|
118
|
+
}
|
|
119
|
+
return doc.shortcuts;
|
|
120
|
+
}
|
|
121
|
+
catch {
|
|
122
|
+
return [];
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
export async function fetchAssetDisplayInfoFromPublicKey(rpc, publicKey) {
|
|
106
126
|
const asset = await findAssetPda(parseSecp256r1Pubkey(publicKey));
|
|
107
127
|
const instance = await fetchAsset(rpc, asset);
|
|
108
|
-
|
|
128
|
+
return fetchAssetDisplayInfo(rpc, instance.data);
|
|
129
|
+
}
|
|
130
|
+
export async function fetchAssetDisplayInfo(rpc, asset) {
|
|
131
|
+
const mintAccount = await fetchMint(rpc, asset.mint);
|
|
109
132
|
const designExtensions = unwrapOption(mintAccount.data.extensions) ?? [];
|
|
110
133
|
const designMeta = findMintExtension(designExtensions, "TokenMetadata");
|
|
111
134
|
const groupMember = findMintExtension(designExtensions, "TokenGroupMember");
|
|
@@ -123,13 +146,15 @@ export async function fetchAssetDisplayInfo(rpc, publicKey) {
|
|
|
123
146
|
: Promise.resolve(null),
|
|
124
147
|
]);
|
|
125
148
|
const designMedia = resolveMedia(designJsonMeta);
|
|
149
|
+
const externalUrl = designJsonMeta?.external_url?.trim() || null;
|
|
150
|
+
const shortcuts = await fetchShortcutsFromExternalUrl(externalUrl);
|
|
126
151
|
return {
|
|
127
|
-
assetType:
|
|
128
|
-
publicKey,
|
|
129
|
-
credentialId: bufferToBase64URLString(
|
|
130
|
-
asset: asset,
|
|
131
|
-
isLocked:
|
|
132
|
-
mint:
|
|
152
|
+
assetType: asset.assetType,
|
|
153
|
+
publicKey: bufferToBase64URLString(asset.publicKey[0]),
|
|
154
|
+
credentialId: bufferToBase64URLString(asset.credentialId[0]),
|
|
155
|
+
asset: await findAssetPda(asset.publicKey),
|
|
156
|
+
isLocked: asset.isLocked,
|
|
157
|
+
mint: asset.mint,
|
|
133
158
|
name: designMeta?.name ?? designJsonMeta?.name ?? "Unknown asset",
|
|
134
159
|
symbol: designMeta?.symbol ?? designJsonMeta?.symbol ?? "",
|
|
135
160
|
uri: designMeta?.uri ?? "",
|
|
@@ -139,14 +164,15 @@ export async function fetchAssetDisplayInfo(rpc, publicKey) {
|
|
|
139
164
|
mediaCategory: designMedia.category,
|
|
140
165
|
description: designJsonMeta?.description ?? null,
|
|
141
166
|
attributes: designJsonMeta?.attributes ?? [],
|
|
142
|
-
shortcuts
|
|
167
|
+
shortcuts,
|
|
168
|
+
externalUrl,
|
|
143
169
|
collectionMint,
|
|
144
170
|
collectionName: collectionMeta?.name ?? collectionJsonMeta?.name ?? null,
|
|
145
171
|
collectionSymbol: collectionMeta?.symbol ?? collectionJsonMeta?.symbol ?? null,
|
|
146
172
|
collectionImage: collectionJsonMeta?.image ?? null,
|
|
147
173
|
collectionUri: collectionMeta?.uri ?? null,
|
|
148
|
-
currentOwner:
|
|
149
|
-
lastTransferSlot:
|
|
174
|
+
currentOwner: asset.owner,
|
|
175
|
+
lastTransferSlot: asset.lastTransferSlot,
|
|
150
176
|
};
|
|
151
177
|
}
|
|
152
178
|
//# sourceMappingURL=metadata.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/utils/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,GAIb,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,SAAS,EACT,WAAW,GAEZ,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/utils/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,GAIb,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,SAAS,EACT,WAAW,GAEZ,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAc,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAUhE,SAAS,iBAAiB,CACxB,UAAgC,EAChC,IAAyB;IAEzB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;YACjC,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAkED,MAAM,iBAAiB,GAA2B;IAChD,GAAG,EAAE,WAAW;IAChB,GAAG,EAAE,YAAY;IACjB,IAAI,EAAE,YAAY;IAClB,IAAI,EAAE,YAAY;IAClB,GAAG,EAAE,WAAW;IAChB,GAAG,EAAE,eAAe;IACpB,GAAG,EAAE,WAAW;IAChB,IAAI,EAAE,YAAY;IAClB,GAAG,EAAE,iBAAiB;IACtB,GAAG,EAAE,YAAY;IACjB,GAAG,EAAE,WAAW;IAChB,GAAG,EAAE,WAAW;IAChB,IAAI,EAAE,YAAY;IAClB,GAAG,EAAE,mBAAmB;IACxB,IAAI,EAAE,iBAAiB;CACxB,CAAC;AAGF,SAAS,WAAW,CAAC,GAAW;IAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;IACxD,OAAO,iBAAiB,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;AACxC,CAAC;AAGD,SAAS,eAAe,CACtB,IAA+B;IAE/B,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,OAAO,CAAC;IAC9C,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,OAAO,CAAC;IAC9C,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3C,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,OAAO,CAAC;IAC9C,OAAO,IAAI,CAAC;AACd,CAAC;AAoBD,MAAM,UAAU,YAAY,CAAC,IAA8B;IACzD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,KAAK,EAAE,IAAI;YACX,YAAY,EAAE,IAAI;YAClB,aAAa,EAAE,IAAI;YACnB,QAAQ,EAAE,IAAI;SACf,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC;IAC3C,MAAM,KAAK,GACT,IAAI,CAAC,KAAK;QACV,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,EAAE,GAAG;QACpE,IAAI,CAAC;IAEP,IAAI,YAAY,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC;IAC9C,IAAI,aAAa,GAAkB,IAAI,CAAC;IACxC,IAAI,YAAY,EAAE,CAAC;QACjB,aAAa;YACX,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,YAAY,CAAC,EAAE,IAAI;gBAC/C,WAAW,CAAC,YAAY,CAAC,CAAC;IAC9B,CAAC;SAAM,CAAC;QAGN,MAAM,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAC5B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAC1D,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9B,MAAM,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;YAC9D,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QACH,IAAI,KAAK,EAAE,GAAG,EAAE,CAAC;YACf,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC;YACzB,aAAa,GAAG,KAAK,CAAC,IAAI,IAAI,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC;IAC9C,MAAM,gBAAgB,GACpB,WAAW,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;QACpE,CAAC,CAAE,WAA6B;QAChC,CAAC,CAAC,IAAI,CAAC;IACX,MAAM,QAAQ,GACZ,gBAAgB;QAChB,eAAe,CAAC,aAAa,CAAC;QAC9B,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAE3B,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC;AAC1D,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,GAAW;IAEX,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAsB,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,WAAsC;IAEtC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,iBAAiB,CAAC,CAAC;QACvD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,GAAG,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAsB,CAAC;QACzD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC;YACnC,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,GAAG,CAAC,SAAS,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAqCD,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACtD,GAAsB,EACtB,SAAiB;IAEjB,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC9C,OAAO,qBAAqB,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AACnD,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,GAAsB,EACtB,KAAY;IAEZ,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,gBAAgB,GAAG,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IACzE,MAAM,UAAU,GAAG,iBAAiB,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,iBAAiB,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;IAC5E,MAAM,cAAc,GAAG,WAAW,EAAE,KAAK,IAAI,IAAI,CAAC;IAElD,IAAI,cAAc,GAChB,IAAI,CAAC;IACP,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,qBAAqB,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QACnE,MAAM,oBAAoB,GACxB,YAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC5D,cAAc,GAAG,iBAAiB,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC7D,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;QAC3E,cAAc,EAAE,GAAG;YACjB,CAAC,CAAC,iBAAiB,CAAC,cAAc,CAAC,GAAG,CAAC;YACvC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;KAC1B,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,cAAc,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC;IACjE,MAAM,SAAS,GAAG,MAAM,6BAA6B,CAAC,WAAW,CAAC,CAAC;IAEnE,OAAO;QACL,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,SAAS,EAAE,uBAAuB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACtD,YAAY,EAAE,uBAAuB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC5D,KAAK,EAAE,MAAM,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC;QAC1C,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,UAAU,EAAE,IAAI,IAAI,cAAc,EAAE,IAAI,IAAI,eAAe;QACjE,MAAM,EAAE,UAAU,EAAE,MAAM,IAAI,cAAc,EAAE,MAAM,IAAI,EAAE;QAC1D,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE;QAC1B,KAAK,EAAE,WAAW,CAAC,KAAK;QACxB,YAAY,EAAE,WAAW,CAAC,YAAY;QACtC,aAAa,EAAE,WAAW,CAAC,aAAa;QACxC,aAAa,EAAE,WAAW,CAAC,QAAQ;QACnC,WAAW,EAAE,cAAc,EAAE,WAAW,IAAI,IAAI;QAChD,UAAU,EAAE,cAAc,EAAE,UAAU,IAAI,EAAE;QAC5C,SAAS;QACT,WAAW;QACX,cAAc;QACd,cAAc,EAAE,cAAc,EAAE,IAAI,IAAI,kBAAkB,EAAE,IAAI,IAAI,IAAI;QACxE,gBAAgB,EACd,cAAc,EAAE,MAAM,IAAI,kBAAkB,EAAE,MAAM,IAAI,IAAI;QAC9D,eAAe,EAAE,kBAAkB,EAAE,KAAK,IAAI,IAAI;QAClD,aAAa,EAAE,cAAc,EAAE,GAAG,IAAI,IAAI;QAC1C,YAAY,EAAE,KAAK,CAAC,KAAK;QACzB,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;KACzC,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type
|
|
2
|
-
export
|
|
1
|
+
import { type AuthenticationResponseJSON } from "./webauthn.js";
|
|
2
|
+
export { base64URLStringToBuffer } from "./webauthn.js";
|
|
3
3
|
export declare function normalizeSignatureToLowS(signature: Uint8Array): Uint8Array;
|
|
4
4
|
export declare function convertSignatureDERtoRS(signature: Uint8Array): Uint8Array;
|
|
5
5
|
export declare function getClientDataJsonBytes(authResponse: AuthenticationResponseJSON): Uint8Array;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../../src/utils/passkey/internal.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../../src/utils/passkey/internal.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AA4CxD,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,UAAU,GAAG,UAAU,CAoB1E;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,UAAU,GAAG,UAAU,CA4CzE;AAED,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,0BAA0B,GACvC,UAAU,CAEZ;AAED,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,0BAA0B,GACvC,UAAU,CASZ;AAED,wBAAgB,uBAAuB,CAAC,cAAc,EAAE,MAAM;;;;;EAU7D"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { p256 } from "@noble/curves/nist.js";
|
|
2
2
|
import { sha256 } from "@noble/hashes/sha2.js";
|
|
3
|
+
import { base64URLStringToBuffer, } from "./webauthn.js";
|
|
4
|
+
export { base64URLStringToBuffer } from "./webauthn.js";
|
|
3
5
|
function uint8ArrayToHex(bytes) {
|
|
4
6
|
return Array.from(bytes)
|
|
5
7
|
.map((b) => b.toString(16).padStart(2, "0"))
|
|
@@ -12,18 +14,6 @@ function hexToUint8Array(hex) {
|
|
|
12
14
|
}
|
|
13
15
|
return bytes;
|
|
14
16
|
}
|
|
15
|
-
export function base64URLStringToBuffer(base64URLString) {
|
|
16
|
-
const base64 = base64URLString.replace(/-/g, "+").replace(/_/g, "/");
|
|
17
|
-
const padLength = (4 - (base64.length % 4)) % 4;
|
|
18
|
-
const padded = base64.padEnd(base64.length + padLength, "=");
|
|
19
|
-
const binary = atob(padded);
|
|
20
|
-
const buffer = new ArrayBuffer(binary.length);
|
|
21
|
-
const bytes = new Uint8Array(buffer);
|
|
22
|
-
for (let i = 0; i < binary.length; i += 1) {
|
|
23
|
-
bytes[i] = binary.charCodeAt(i);
|
|
24
|
-
}
|
|
25
|
-
return bytes;
|
|
26
|
-
}
|
|
27
17
|
function extractAdditionalFields(clientData) {
|
|
28
18
|
const knownKeys = new Set(["type", "challenge", "origin", "crossOrigin"]);
|
|
29
19
|
const remaining = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/utils/passkey/internal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/utils/passkey/internal.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AuthenticationResponseJSON } from "
|
|
1
|
+
import type { AuthenticationResponseJSON } from "../webauthn.js";
|
|
2
2
|
import type { PublicKeyCredentialRequestOptionsJSONWithNfc } from "./types.js";
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function authenticateWithApdu(args: PublicKeyCredentialRequestOptionsJSONWithNfc, transceive: (apdu: Uint8Array) => Promise<Uint8Array>): Promise<AuthenticationResponseJSON>;
|
|
4
4
|
//# sourceMappingURL=authenticate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.d.ts","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/authenticate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"authenticate.d.ts","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/authenticate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAWjE,OAAO,KAAK,EAAE,4CAA4C,EAAE,MAAM,YAAY,CAAC;AAgE/E,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,4CAA4C,EAClD,UAAU,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,GACpD,OAAO,CAAC,0BAA0B,CAAC,CAYrC"}
|
|
@@ -4,7 +4,7 @@ import { authenticatorGetAssertionRequestFromPublicKeyCredentialRequestOptionsJS
|
|
|
4
4
|
import { parseApduToAuthenticationResponse } from "./parseResponses.js";
|
|
5
5
|
import { ApduError } from "./errors.js";
|
|
6
6
|
function nfcTransceiveFor(transceive, phase) {
|
|
7
|
-
const label = `
|
|
7
|
+
const label = `authenticateWithApdu (${phase})`;
|
|
8
8
|
return async (apdu) => {
|
|
9
9
|
try {
|
|
10
10
|
const resp = await transceive(apdu);
|
|
@@ -26,7 +26,7 @@ async function runAuthenticateWithNfc(args, transceive) {
|
|
|
26
26
|
const apduResponse = await transceiveNfcCtap2Command(splitExtendedApduForNfcTransmit(buildCborCommandApdu(encodeAuthenticatorGetAssertionRequest(authenticatorGetAssertionRequestFromPublicKeyCredentialRequestOptionsJSON(args)))), nfcTransceiveFor(transceive, "getAssertion"));
|
|
27
27
|
return parseApduToAuthenticationResponse({ apduResponse, request: args });
|
|
28
28
|
}
|
|
29
|
-
export async function
|
|
29
|
+
export async function authenticateWithApdu(args, transceive) {
|
|
30
30
|
try {
|
|
31
31
|
return await runAuthenticateWithNfc(args, transceive);
|
|
32
32
|
}
|
|
@@ -34,7 +34,7 @@ export async function authenticateWithNfc(args, transceive) {
|
|
|
34
34
|
if (e instanceof ApduError) {
|
|
35
35
|
throw e;
|
|
36
36
|
}
|
|
37
|
-
throw new ApduError(`
|
|
37
|
+
throw new ApduError(`authenticateWithApdu: ${e instanceof Error ? e.message : String(e)}`, { cause: e });
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
//# sourceMappingURL=authenticate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/authenticate.ts"],"names":[],"mappings":"AACA,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,+BAA+B,EAC/B,yBAAyB,GAC1B,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,sCAAsC,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,yEAAyE,EAAE,MAAM,uBAAuB,CAAC;AAClH,OAAO,EAAE,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAOxC,SAAS,gBAAgB,CACvB,UAAqD,EACrD,KAAa;IAEb,MAAM,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/authenticate.ts"],"names":[],"mappings":"AACA,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,+BAA+B,EAC/B,yBAAyB,GAC1B,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,sCAAsC,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,yEAAyE,EAAE,MAAM,uBAAuB,CAAC;AAClH,OAAO,EAAE,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAOxC,SAAS,gBAAgB,CACvB,UAAqD,EACrD,KAAa;IAEb,MAAM,KAAK,GAAG,yBAAyB,KAAK,GAAG,CAAC;IAChD,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;YACpC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpB,MAAM,IAAI,SAAS,CACjB,GAAG,KAAK,wCAAwC,IAAI,CAAC,MAAM,WAAW,CACvE,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,SAAS,EAAE,CAAC;gBAC3B,MAAM,CAAC,CAAC;YACV,CAAC;YACD,MAAM,IAAI,SAAS,CACjB,GAAG,KAAK,KAAK,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EACzD,EAAE,KAAK,EAAE,CAAC,EAAE,CACb,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,IAAkD,EAClD,UAAqD;IAErD,MAAM,yBAAyB,CAC7B,2BAA2B,EAAE,EAC7B,gBAAgB,CAAC,UAAU,EAAE,aAAa,CAAC,CAC5C,CAAC;IACF,MAAM,YAAY,GAAG,MAAM,yBAAyB,CAClD,+BAA+B,CAC7B,oBAAoB,CAClB,sCAAsC,CACpC,yEAAyE,CACvE,IAAI,CACL,CACF,CACF,CACF,EACD,gBAAgB,CAAC,UAAU,EAAE,cAAc,CAAC,CAC7C,CAAC;IACF,OAAO,iCAAiC,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AAC5E,CAAC;AAWD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,IAAkD,EAClD,UAAqD;IAErD,IAAI,CAAC;QACH,OAAO,MAAM,sBAAsB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACxD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,SAAS,EAAE,CAAC;YAC3B,MAAM,CAAC,CAAC;QACV,CAAC;QACD,MAAM,IAAI,SAAS,CACjB,yBAAyB,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EACrE,EAAE,KAAK,EAAE,CAAC,EAAE,CACb,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fromWebAuthnJson.d.ts","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/fromWebAuthnJson.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fromWebAuthnJson.d.ts","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/fromWebAuthnJson.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,KAAK,EAAE,4CAA4C,EAAE,MAAM,YAAY,CAAC;AAkC/E,wBAAgB,yEAAyE,CACvF,IAAI,EAAE,4CAA4C,GACjD,gCAAgC,CAuClC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { sha256 } from "@noble/hashes/sha2.js";
|
|
2
|
-
import { utf8ToBytes } from "@noble/hashes/utils.js";
|
|
3
2
|
import { base64URLStringToBuffer } from "../internal.js";
|
|
4
3
|
import { ApduError } from "./errors.js";
|
|
5
4
|
import { buildCollectedClientDataJSON } from "./clientData.js";
|
|
@@ -38,7 +37,7 @@ export function authenticatorGetAssertionRequestFromPublicKeyCredentialRequestOp
|
|
|
38
37
|
crossOrigin,
|
|
39
38
|
topOrigin,
|
|
40
39
|
});
|
|
41
|
-
const clientDataHash = sha256(
|
|
40
|
+
const clientDataHash = sha256(new TextEncoder().encode(clientDataJSON));
|
|
42
41
|
const uv = userVerificationToOptionalUvBool(userVerification);
|
|
43
42
|
const uvOpts = uv === undefined ? undefined : { up: true, uv };
|
|
44
43
|
const parsedExtensions = extensions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fromWebAuthnJson.js","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/fromWebAuthnJson.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"fromWebAuthnJson.js","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/fromWebAuthnJson.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAE/D,SAAS,gCAAgC,CACvC,EAA2C;IAE3C,IAAI,EAAE,KAAK,UAAU,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,EAAE,KAAK,aAAa,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,kBAAkB,CACzB,GAAwC;IAExC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,GAAG,GAA4B,EAAE,CAAC;IACxC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACzC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;YACd,SAAS;QACX,CAAC;QACD,IAAI,CAAC,KAAK,WAAW,EAAE,CAAC;YACtB,SAAS;QACX,CAAC;QACD,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,yEAAyE,CACvF,IAAkD;IAElD,MAAM,EACJ,SAAS,EACT,IAAI,EACJ,gBAAgB,EAChB,gBAAgB,EAChB,UAAU,EACV,WAAW,GAAG,KAAK,EACnB,SAAS,EACT,MAAM,GACP,GAAG,IAAI,CAAC;IAET,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,SAAS,CAAC,oCAAoC,CAAC,CAAC;IAErE,MAAM,cAAc,GAAG,4BAA4B,CAAC,cAAc,EAAE;QAClE,SAAS;QACT,MAAM;QACN,WAAW;QACX,SAAS;KACV,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;IAExE,MAAM,EAAE,GAAG,gCAAgC,CAAC,gBAAgB,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAa,EAAE,EAAE,EAAE,CAAC;IAExE,MAAM,gBAAgB,GAAG,UAAU;QACjC,CAAC,CAAC,kBAAkB,CAAC,UAAiD,CAAC;QACvE,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO;QACL,IAAI;QACJ,cAAc;QACd,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9C,EAAE,EAAE,IAAI,UAAU,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACjD,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,YAAY;SAC7B,CAAC,CAAC;QACH,UAAU,EAAE,gBAAgB;QAC5B,OAAO,EAAE,MAAM;KAChB,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { ApduError } from "./errors.js";
|
|
2
|
-
export {
|
|
2
|
+
export { authenticateWithApdu } from "./authenticate.js";
|
|
3
3
|
export type { PublicKeyCredentialRequestOptionsJSONWithNfc } from "./types.js";
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,YAAY,EAAE,4CAA4C,EAAE,MAAM,YAAY,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AuthenticationResponseJSON } from "
|
|
1
|
+
import type { AuthenticationResponseJSON } from "../webauthn.js";
|
|
2
2
|
import type { PublicKeyCredentialRequestOptionsJSONWithNfc } from "./types.js";
|
|
3
3
|
export declare function parseApduToAuthenticationResponse(input: {
|
|
4
4
|
apduResponse: Uint8Array;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseResponses.d.ts","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/parseResponses.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"parseResponses.d.ts","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/parseResponses.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAIjE,OAAO,KAAK,EAAE,4CAA4C,EAAE,MAAM,YAAY,CAAC;AAE/E,wBAAgB,iCAAiC,CAAC,KAAK,EAAE;IACvD,YAAY,EAAE,UAAU,CAAC;IACzB,OAAO,EAAE,4CAA4C,CAAC;CACvD,GAAG,0BAA0B,CAa7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,gBAAgB,CAAC;AAE5E,KAAK,uBAAuB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,4CAA4C,GACtD,qCAAqC,GAAG,uBAAuB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type AuthenticationResponseJSON } from "
|
|
1
|
+
import { type AuthenticationResponseJSON } from "../webauthn.js";
|
|
2
2
|
import type { AuthenticatorGetAssertionResponse } from "./getAssertion.js";
|
|
3
3
|
export declare function toAuthenticationResponseJSON(input: {
|
|
4
4
|
assertion: AuthenticatorGetAssertionResponse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webauthnResponses.d.ts","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/webauthnResponses.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webauthnResponses.d.ts","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/webauthnResponses.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,mBAAmB,CAAC;AAI3E,wBAAgB,4BAA4B,CAAC,KAAK,EAAE;IAClD,SAAS,EAAE,iCAAiC,CAAC;IAC7C,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;CACxB,GAAG,0BAA0B,CAmC7B"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { bufferToBase64URLString } from "@simplewebauthn/browser";
|
|
1
|
+
import { bufferToBase64URLString, } from "../webauthn.js";
|
|
3
2
|
import { ApduError } from "./errors.js";
|
|
4
3
|
import { parseAuthenticatorDataExtensions } from "./authDataExtensions.js";
|
|
5
4
|
export function toAuthenticationResponseJSON(input) {
|
|
@@ -10,18 +9,18 @@ export function toAuthenticationResponseJSON(input) {
|
|
|
10
9
|
(() => {
|
|
11
10
|
throw new ApduError("Assertion response missing credential id; set credentialId (base64url) on the request object or use a token that returns it in CBOR");
|
|
12
11
|
})();
|
|
13
|
-
const idStr = bufferToBase64URLString(credBytes
|
|
12
|
+
const idStr = bufferToBase64URLString(credBytes);
|
|
14
13
|
return {
|
|
15
14
|
id: idStr,
|
|
16
15
|
rawId: idStr,
|
|
17
16
|
type: "public-key",
|
|
18
17
|
clientExtensionResults,
|
|
19
18
|
response: {
|
|
20
|
-
clientDataJSON: bufferToBase64URLString(
|
|
21
|
-
authenticatorData: bufferToBase64URLString(assertion.authData
|
|
22
|
-
signature: bufferToBase64URLString(assertion.signature
|
|
19
|
+
clientDataJSON: bufferToBase64URLString(new TextEncoder().encode(clientDataJSON)),
|
|
20
|
+
authenticatorData: bufferToBase64URLString(assertion.authData),
|
|
21
|
+
signature: bufferToBase64URLString(assertion.signature),
|
|
23
22
|
userHandle: assertion.user?.id !== undefined
|
|
24
|
-
? bufferToBase64URLString(assertion.user.id
|
|
23
|
+
? bufferToBase64URLString(assertion.user.id)
|
|
25
24
|
: undefined,
|
|
26
25
|
},
|
|
27
26
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webauthnResponses.js","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/webauthnResponses.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"webauthnResponses.js","sourceRoot":"","sources":["../../../../src/utils/passkey/nfc/webauthnResponses.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,GAExB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAE3E,MAAM,UAAU,4BAA4B,CAAC,KAI5C;IACC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAE3E,MAAM,sBAAsB,GAAG,gCAAgC,CAC7D,SAAS,CAAC,QAAQ,CACsB,CAAC;IAE3C,MAAM,SAAS,GACb,SAAS,CAAC,UAAU,EAAE,EAAE;QACxB,eAAe;QACf,CAAC,GAAG,EAAE;YACJ,MAAM,IAAI,SAAS,CACjB,qIAAqI,CACtI,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,KAAK,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAEjD,OAAO;QACL,EAAE,EAAE,KAAK;QACT,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,YAAY;QAClB,sBAAsB;QACtB,QAAQ,EAAE;YACR,cAAc,EAAE,uBAAuB,CACrC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CACzC;YACD,iBAAiB,EAAE,uBAAuB,CAAC,SAAS,CAAC,QAAQ,CAAC;YAC9D,SAAS,EAAE,uBAAuB,CAAC,SAAS,CAAC,SAAS,CAAC;YACvD,UAAU,EACR,SAAS,CAAC,IAAI,EAAE,EAAE,KAAK,SAAS;gBAC9B,CAAC,CAAC,uBAAuB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC5C,CAAC,CAAC,SAAS;SAChB;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import type { AuthenticationResponseJSON } from "
|
|
1
|
+
import type { AuthenticationResponseJSON } from "./webauthn.js";
|
|
2
2
|
import { type Address, type Instruction } from "@solana/kit";
|
|
3
3
|
import { type Secp256r1VerifyEntry } from "../../instructions/internal/secp256r1Verify.js";
|
|
4
4
|
import { SECP256R1_PROGRAM_ADDRESS } from "../consts.js";
|
|
5
|
+
import type { Secp256r1Pubkey } from "../../generated/index.js";
|
|
5
6
|
export type { Secp256r1VerifyEntry };
|
|
6
7
|
export declare function buildVerifyInputFromWebAuthn(input: {
|
|
7
|
-
publicKey:
|
|
8
|
+
publicKey: Secp256r1Pubkey;
|
|
8
9
|
response: AuthenticationResponseJSON;
|
|
9
10
|
}): Secp256r1VerifyEntry;
|
|
10
11
|
export declare function buildTransferChallenge(input: {
|
|
@@ -21,7 +22,7 @@ export type WebAuthnSecp256r1Verification = {
|
|
|
21
22
|
clientDataJson: Uint8Array;
|
|
22
23
|
};
|
|
23
24
|
export declare function buildSecp256r1VerifyInstructionFromWebAuthnResponse(input: {
|
|
24
|
-
publicKey:
|
|
25
|
+
publicKey: Secp256r1Pubkey;
|
|
25
26
|
response: AuthenticationResponseJSON;
|
|
26
27
|
existingSecp256r1VerifyInputs?: Secp256r1VerifyEntry[];
|
|
27
28
|
}): Promise<WebAuthnSecp256r1Verification>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secp256r1.d.ts","sourceRoot":"","sources":["../../../src/utils/passkey/secp256r1.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"secp256r1.d.ts","sourceRoot":"","sources":["../../../src/utils/passkey/secp256r1.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAqB,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,gDAAgD,CAAC;AACxD,OAAO,EACL,yBAAyB,EAG1B,MAAM,cAAc,CAAC;AAQtB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAEhE,YAAY,EAAE,oBAAoB,EAAE,CAAC;AAiBrC,wBAAgB,4BAA4B,CAAC,KAAK,EAAE;IAClD,SAAS,EAAE,eAAe,CAAC;IAC3B,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,oBAAoB,CAWvB;AAED,wBAAsB,sBAAsB,CAAC,KAAK,EAAE;IAClD,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,UAAU,CAAC;CACtB,GAAG,OAAO,CAAC,UAAU,CAAC,CAUtB;AAED,wBAAsB,yBAAyB,CAAC,KAAK,EAAE;IACrD,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,UAAU,CAAC;CACtB,GAAG,OAAO,CAAC,UAAU,CAAC,CAUtB;AAED,MAAM,MAAM,6BAA6B,GAAG;IAC1C,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,WAAW,CAAC,OAAO,yBAAyB,CAAC,CAAC;IAC/D,cAAc,EAAE,UAAU,CAAC;CAC5B,CAAC;AAEF,wBAAsB,mDAAmD,CAAC,KAAK,EAAE;IAC/E,SAAS,EAAE,eAAe,CAAC;IAC3B,QAAQ,EAAE,0BAA0B,CAAC;IACrC,6BAA6B,CAAC,EAAE,oBAAoB,EAAE,CAAC;CACxD,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAazC"}
|
|
@@ -20,7 +20,7 @@ export function buildVerifyInputFromWebAuthn(input) {
|
|
|
20
20
|
const signature = convertSignatureDERtoRS(base64URLStringToBuffer(input.response.response.signature));
|
|
21
21
|
const message = getSecp256r1Message(input.response);
|
|
22
22
|
return {
|
|
23
|
-
publicKey:
|
|
23
|
+
publicKey: input.publicKey[0],
|
|
24
24
|
signature,
|
|
25
25
|
message,
|
|
26
26
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secp256r1.js","sourceRoot":"","sources":["../../../src/utils/passkey/secp256r1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAkC,MAAM,aAAa,CAAC;AAChF,OAAO,EACL,6BAA6B,GAE9B,MAAM,gDAAgD,CAAC;AACxD,OAAO,EACL,yBAAyB,EACzB,qBAAqB,EACrB,yBAAyB,GAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"secp256r1.js","sourceRoot":"","sources":["../../../src/utils/passkey/secp256r1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAkC,MAAM,aAAa,CAAC;AAChF,OAAO,EACL,6BAA6B,GAE9B,MAAM,gDAAgD,CAAC;AACxD,OAAO,EACL,yBAAyB,EACzB,qBAAqB,EACrB,yBAAyB,GAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAK/C,SAAS,WAAW,CAAC,GAAG,KAAmB;IACzC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAChE,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;IAClC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACtB,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;IACxB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,aAAa,CAAC,YAAqB;IAC1C,OAAO,IAAI,UAAU,CAAC,iBAAiB,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,KAG5C;IACC,MAAM,SAAS,GAAG,uBAAuB,CACvC,uBAAuB,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAC3D,CAAC;IACF,MAAM,OAAO,GAAG,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEpD,OAAO;QACL,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7B,SAAS;QACT,OAAO;KACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,KAG5C;IACC,MAAM,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAEvD,OAAO,MAAM,CACX,WAAW,CACT,qBAAqB,EACrB,WAAW,EACX,IAAI,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAC/B,CACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,KAG/C;IACC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAE1C,OAAO,MAAM,CACX,WAAW,CACT,yBAAyB,EACzB,WAAW,EACX,IAAI,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAC/B,CACF,CAAC;AACJ,CAAC;AAQD,MAAM,CAAC,KAAK,UAAU,mDAAmD,CAAC,KAIzE;IACC,MAAM,QAAQ,GAAG,KAAK,CAAC,6BAA6B,CAAC;IACrD,MAAM,MAAM,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IACnD,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAC3B,IAAI,QAAQ,EAAE,MAAM,EAAE,CAAC;QACrB,kBAAkB,GAAG,QAAQ,CAAC,MAAM,CAAC;QACrC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IACD,OAAO;QACL,kBAAkB;QAClB,eAAe,EAAE,6BAA6B,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,CAAC;QACpE,cAAc,EAAE,sBAAsB,CAAC,KAAK,CAAC,QAAQ,CAAC;KACvD,CAAC;AACJ,CAAC"}
|