phygital-token-sdk 0.22.0 → 0.23.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 +1 -2
- 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/initialize.d.ts +1 -3
- package/dist/instructions/initialize.d.ts.map +1 -1
- package/dist/instructions/initialize.js +1 -22
- package/dist/instructions/initialize.js.map +1 -1
- package/dist/instructions/setMint.d.ts.map +1 -1
- package/dist/instructions/setMint.js.map +1 -1
- package/dist/utils/consts.d.ts.map +1 -1
- package/dist/utils/consts.js.map +1 -1
- package/dist/utils/parseSecp256r1Pubkey.d.ts +5 -0
- package/dist/utils/parseSecp256r1Pubkey.d.ts.map +1 -0
- package/dist/utils/parseSecp256r1Pubkey.js +23 -0
- package/dist/utils/parseSecp256r1Pubkey.js.map +1 -0
- package/dist/utils/pdas/token.d.ts +2 -1
- package/dist/utils/pdas/token.d.ts.map +1 -1
- package/dist/utils/pdas/token.js +5 -1
- package/dist/utils/pdas/token.js.map +1 -1
- package/package.json +2 -4
- package/dist/instructions/squadsInitialize.d.ts +0 -23
- package/dist/instructions/squadsInitialize.d.ts.map +0 -1
- package/dist/instructions/squadsInitialize.js +0 -132
- package/dist/instructions/squadsInitialize.js.map +0 -1
- package/dist/instructions/squadsSetMint.d.ts +0 -21
- package/dist/instructions/squadsSetMint.d.ts.map +0 -1
- package/dist/instructions/squadsSetMint.js +0 -127
- package/dist/instructions/squadsSetMint.js.map +0 -1
- package/dist/utils/web3Bridge.d.ts +0 -8
- package/dist/utils/web3Bridge.d.ts.map +0 -1
- package/dist/utils/web3Bridge.js +0 -46
- package/dist/utils/web3Bridge.js.map +0 -1
package/README.md
CHANGED
|
@@ -17,7 +17,6 @@ import { createSolanaRpc } from "@solana/kit";
|
|
|
17
17
|
import {
|
|
18
18
|
startAuthentication,
|
|
19
19
|
verifyResponse,
|
|
20
|
-
parseSecp256r1Pubkey,
|
|
21
20
|
findTokenPda,
|
|
22
21
|
fetchPhygitalToken,
|
|
23
22
|
} from "phygital-token-sdk";
|
|
@@ -37,7 +36,7 @@ const { isVerified, secp256r1PublicKey } = verifyResponse({
|
|
|
37
36
|
if (isVerified) {
|
|
38
37
|
const token = await fetchPhygitalToken(
|
|
39
38
|
rpc,
|
|
40
|
-
await findTokenPda(
|
|
39
|
+
await findTokenPda(secp256r1PublicKey),
|
|
41
40
|
);
|
|
42
41
|
// Continue with token.data.owner
|
|
43
42
|
}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
export { beginTransfer, completeTransfer, authenticatePasskeyForTransfer, type TransferSession, } from "./instructions/transfer.js";
|
|
2
2
|
export { beginVerify, completeVerify, authenticatePasskeyForVerify, buildVerifyArgs, type VerifySession, } from "./instructions/verify.js";
|
|
3
|
-
export { buildInitializeInstruction,
|
|
3
|
+
export { buildInitializeInstruction, type InitializeParams, } from "./instructions/initialize.js";
|
|
4
|
+
export { parseSecp256r1Pubkey, parseIdentifier, } from "./utils/parseSecp256r1Pubkey.js";
|
|
4
5
|
export { buildSetMintInstruction, type SetMintParams, } from "./instructions/setMint.js";
|
|
5
|
-
export { buildSquadsInitializeInstructions, type BuildSquadsInitializeInput, type BuildSquadsInitializeResult, } from "./instructions/squadsInitialize.js";
|
|
6
|
-
export { buildSquadsSetMintInstructions, type BuildSquadsSetMintInput, type BuildSquadsSetMintResult, } from "./instructions/squadsSetMint.js";
|
|
7
6
|
export { fetchTokenByIdentifier, fetchAllTokensFromOwner, } from "./utils/metadata.js";
|
|
8
7
|
export { startAuthentication, verifyResponse, type VerifyResponseResult, type VerifyResponseOptions, } from "./utils/verify.js";
|
|
9
8
|
export { findTokenPda } from "./utils/pdas/index.js";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,8BAA8B,EAC9B,KAAK,eAAe,GACrB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,WAAW,EACX,cAAc,EACd,4BAA4B,EAC5B,eAAe,EACf,KAAK,aAAa,GACnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,0BAA0B,EAC1B,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,8BAA8B,EAC9B,KAAK,eAAe,GACrB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,WAAW,EACX,cAAc,EACd,4BAA4B,EAC5B,eAAe,EACf,KAAK,aAAa,GACnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,0BAA0B,EAC1B,KAAK,gBAAgB,GACtB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,oBAAoB,EACpB,eAAe,GAChB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EACL,uBAAuB,EACvB,KAAK,aAAa,GACnB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,GAC3B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,cAAc,sBAAsB,CAAC;AAErC,OAAO,EACL,6BAA6B,EAC7B,KAAK,oBAAoB,EACzB,KAAK,0BAA0B,GAChC,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EACL,mDAAmD,EACnD,sBAAsB,EACtB,oBAAoB,EACpB,+BAA+B,EAC/B,4BAA4B,EAC5B,KAAK,6BAA6B,GACnC,MAAM,8BAA8B,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
export { beginTransfer, completeTransfer, authenticatePasskeyForTransfer, } from "./instructions/transfer.js";
|
|
2
2
|
export { beginVerify, completeVerify, authenticatePasskeyForVerify, buildVerifyArgs, } from "./instructions/verify.js";
|
|
3
|
-
export { buildInitializeInstruction,
|
|
3
|
+
export { buildInitializeInstruction, } from "./instructions/initialize.js";
|
|
4
|
+
export { parseSecp256r1Pubkey, parseIdentifier, } from "./utils/parseSecp256r1Pubkey.js";
|
|
4
5
|
export { buildSetMintInstruction, } from "./instructions/setMint.js";
|
|
5
|
-
export { buildSquadsInitializeInstructions, } from "./instructions/squadsInitialize.js";
|
|
6
|
-
export { buildSquadsSetMintInstructions, } from "./instructions/squadsSetMint.js";
|
|
7
6
|
export { fetchTokenByIdentifier, fetchAllTokensFromOwner, } from "./utils/metadata.js";
|
|
8
7
|
export { startAuthentication, verifyResponse, } from "./utils/verify.js";
|
|
9
8
|
export { findTokenPda } from "./utils/pdas/index.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,8BAA8B,GAE/B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,WAAW,EACX,cAAc,EACd,4BAA4B,EAC5B,eAAe,GAEhB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,0BAA0B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,8BAA8B,GAE/B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,WAAW,EACX,cAAc,EACd,4BAA4B,EAC5B,eAAe,GAEhB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,0BAA0B,GAE3B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,oBAAoB,EACpB,eAAe,GAChB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EACL,uBAAuB,GAExB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,mBAAmB,EACnB,cAAc,GAGf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,cAAc,sBAAsB,CAAC;AAErC,OAAO,EACL,6BAA6B,GAG9B,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EACL,mDAAmD,EACnD,sBAAsB,EACtB,oBAAoB,EACpB,+BAA+B,EAC/B,4BAA4B,GAE7B,MAAM,8BAA8B,CAAC"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { type Address, type Instruction, type TransactionSigner } from "@solana/kit";
|
|
2
2
|
import type { PhygitalTokenType } from "../generated/types/phygitalTokenType.js";
|
|
3
3
|
import type { Secp256r1Pubkey } from "../generated/types/secp256r1Pubkey.js";
|
|
4
|
-
|
|
5
|
-
export declare function parseSecp256r1Pubkey(input: Base64URLString): Secp256r1Pubkey;
|
|
6
|
-
export declare const parseIdentifier: typeof parseSecp256r1Pubkey;
|
|
4
|
+
export { parseIdentifier, parseSecp256r1Pubkey, } from "../utils/parseSecp256r1Pubkey.js";
|
|
7
5
|
export type InitializeParams = {
|
|
8
6
|
authority: TransactionSigner;
|
|
9
7
|
identifier: Secp256r1Pubkey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initialize.d.ts","sourceRoot":"","sources":["../../src/instructions/initialize.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAG7E,OAAO,
|
|
1
|
+
{"version":3,"file":"initialize.d.ts","sourceRoot":"","sources":["../../src/instructions/initialize.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAG7E,OAAO,EACL,eAAe,EACf,oBAAoB,GACrB,MAAM,kCAAkC,CAAC;AAE1C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,iBAAiB,CAAC;IAE7B,UAAU,EAAE,eAAe,CAAC;IAE5B,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,iBAAiB,CAAC;CAC9B,CAAC;AAWF,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC;IAAE,WAAW,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAUvD"}
|
|
@@ -1,28 +1,7 @@
|
|
|
1
1
|
import {} from "@solana/kit";
|
|
2
2
|
import { getInitializeInstruction } from "../generated/instructions/initialize.js";
|
|
3
|
-
import { base64URLStringToBuffer } from "../utils/passkey/internal.js";
|
|
4
3
|
import { findTokenPda } from "../utils/pdas/token.js";
|
|
5
|
-
export
|
|
6
|
-
const trimmed = input.trim();
|
|
7
|
-
if (!trimmed) {
|
|
8
|
-
throw new Error("secp256r1 value is required.");
|
|
9
|
-
}
|
|
10
|
-
let bytes;
|
|
11
|
-
try {
|
|
12
|
-
bytes = new Uint8Array(base64URLStringToBuffer(trimmed));
|
|
13
|
-
}
|
|
14
|
-
catch {
|
|
15
|
-
throw new Error("Value must be valid base64url.");
|
|
16
|
-
}
|
|
17
|
-
if (bytes.length !== 33) {
|
|
18
|
-
throw new Error("Value must decode to 33 bytes.");
|
|
19
|
-
}
|
|
20
|
-
if (bytes[0] !== 0x02 && bytes[0] !== 0x03) {
|
|
21
|
-
throw new Error("Value must be compressed (starts with 0x02 or 0x03).");
|
|
22
|
-
}
|
|
23
|
-
return [bytes];
|
|
24
|
-
}
|
|
25
|
-
export const parseIdentifier = parseSecp256r1Pubkey;
|
|
4
|
+
export { parseIdentifier, parseSecp256r1Pubkey, } from "../utils/parseSecp256r1Pubkey.js";
|
|
26
5
|
export async function buildInitializeInstruction(input) {
|
|
27
6
|
const token = await findTokenPda(input.secp256r1Pubkey);
|
|
28
7
|
const instruction = getInitializeInstruction({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../src/instructions/initialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAIN,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AAGnF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../src/instructions/initialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAIN,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AAGnF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EACL,eAAe,EACf,oBAAoB,GACrB,MAAM,kCAAkC,CAAC;AAoB1C,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,KAAuB;IAEvB,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,wBAAwB,CAAC;QAC3C,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,KAAK;QACL,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,eAAe,EAAE,KAAK,CAAC,eAAe;QACtC,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC;IACH,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;AAChC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setMint.d.ts","sourceRoot":"","sources":["../../src/instructions/setMint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrF,MAAM,MAAM,aAAa,GAAG;IAE1B,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;
|
|
1
|
+
{"version":3,"file":"setMint.d.ts","sourceRoot":"","sources":["../../src/instructions/setMint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrF,MAAM,MAAM,aAAa,GAAG;IAE1B,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAOF,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW,CAMzE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setMint.js","sourceRoot":"","sources":["../../src/instructions/setMint.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0D,MAAM,aAAa,CAAC;AACrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"setMint.js","sourceRoot":"","sources":["../../src/instructions/setMint.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0D,MAAM,aAAa,CAAC;AACrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAc7E,MAAM,UAAU,uBAAuB,CAAC,KAAoB;IAC1D,OAAO,qBAAqB,CAAC;QAC3B,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,IAAI,EAAE,KAAK,CAAC,IAAI;KACjB,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/utils/consts.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yBAAyB,8EAErC,CAAC;
|
|
1
|
+
{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/utils/consts.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yBAAyB,8EAErC,CAAC;AAOF,eAAO,MAAM,uBAAuB,+EAEnC,CAAC;AAMF,eAAO,MAAM,KAAK,+EAEjB,CAAC;AAEF,eAAO,MAAM,0BAA0B,8EAEtC,CAAC;AAEF,eAAO,MAAM,qBAAqB,yBAAuC,CAAC"}
|
package/dist/utils/consts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/utils/consts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,CAAC,MAAM,yBAAyB,GAAG,OAAO,CAC9C,6CAA6C,CAC9C,CAAC;
|
|
1
|
+
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/utils/consts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,CAAC,MAAM,yBAAyB,GAAG,OAAO,CAC9C,6CAA6C,CAC9C,CAAC;AAOF,MAAM,CAAC,MAAM,uBAAuB,GAAG,OAAO,CAC5C,8CAA8C,CAC/C,CAAC;AAMF,MAAM,CAAC,MAAM,KAAK,GAAG,OAAO,CAC1B,8CAA8C,CAC/C,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,OAAO,CAC/C,6CAA6C,CAC9C,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { Secp256r1Pubkey } from "../generated/types/secp256r1Pubkey.js";
|
|
2
|
+
import type { Base64URLString } from "./passkey/webauthn.js";
|
|
3
|
+
export declare function parseSecp256r1Pubkey(input: Base64URLString): Secp256r1Pubkey;
|
|
4
|
+
export declare const parseIdentifier: typeof parseSecp256r1Pubkey;
|
|
5
|
+
//# sourceMappingURL=parseSecp256r1Pubkey.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parseSecp256r1Pubkey.d.ts","sourceRoot":"","sources":["../../src/utils/parseSecp256r1Pubkey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAM7D,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,eAAe,GAAG,eAAe,CAsB5E;AAGD,eAAO,MAAM,eAAe,6BAAuB,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { base64URLStringToBuffer } from "./passkey/internal.js";
|
|
2
|
+
export function parseSecp256r1Pubkey(input) {
|
|
3
|
+
const trimmed = input.trim();
|
|
4
|
+
if (!trimmed) {
|
|
5
|
+
throw new Error("secp256r1 value is required.");
|
|
6
|
+
}
|
|
7
|
+
let bytes;
|
|
8
|
+
try {
|
|
9
|
+
bytes = new Uint8Array(base64URLStringToBuffer(trimmed));
|
|
10
|
+
}
|
|
11
|
+
catch {
|
|
12
|
+
throw new Error("Value must be valid base64url.");
|
|
13
|
+
}
|
|
14
|
+
if (bytes.length !== 33) {
|
|
15
|
+
throw new Error("Value must decode to 33 bytes.");
|
|
16
|
+
}
|
|
17
|
+
if (bytes[0] !== 0x02 && bytes[0] !== 0x03) {
|
|
18
|
+
throw new Error("Value must be compressed (starts with 0x02 or 0x03).");
|
|
19
|
+
}
|
|
20
|
+
return [bytes];
|
|
21
|
+
}
|
|
22
|
+
export const parseIdentifier = parseSecp256r1Pubkey;
|
|
23
|
+
//# sourceMappingURL=parseSecp256r1Pubkey.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parseSecp256r1Pubkey.js","sourceRoot":"","sources":["../../src/utils/parseSecp256r1Pubkey.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAOhE,MAAM,UAAU,oBAAoB,CAAC,KAAsB;IACzD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,KAAiB,CAAC;IACtB,IAAI,CAAC;QACH,KAAK,GAAG,IAAI,UAAU,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,CAAC;AACjB,CAAC;AAGD,MAAM,CAAC,MAAM,eAAe,GAAG,oBAAoB,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type Address } from "@solana/kit";
|
|
2
2
|
import { type Secp256r1Pubkey } from "../../generated/index.js";
|
|
3
|
-
|
|
3
|
+
import type { Base64URLString } from "../passkey/webauthn.js";
|
|
4
|
+
export declare function findTokenPda(secp256r1Pubkey: Secp256r1Pubkey | Base64URLString): Promise<Address>;
|
|
4
5
|
//# sourceMappingURL=token.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../src/utils/pdas/token.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAGb,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,eAAe,EAErB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../src/utils/pdas/token.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAGb,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,eAAe,EAErB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAU9D,wBAAsB,YAAY,CAChC,eAAe,EAAE,eAAe,GAAG,eAAe,GACjD,OAAO,CAAC,OAAO,CAAC,CAelB"}
|
package/dist/utils/pdas/token.js
CHANGED
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import { getProgramDerivedAddress, getBytesEncoder, } from "@solana/kit";
|
|
2
2
|
import { PHYGITAL_TOKEN_PROGRAM_ADDRESS, } from "../../generated/index.js";
|
|
3
|
+
import { parseSecp256r1Pubkey } from "../parseSecp256r1Pubkey.js";
|
|
3
4
|
const TOKEN_SEED = new TextEncoder().encode("token");
|
|
4
5
|
export async function findTokenPda(secp256r1Pubkey) {
|
|
6
|
+
const pubkey = typeof secp256r1Pubkey === "string"
|
|
7
|
+
? parseSecp256r1Pubkey(secp256r1Pubkey)
|
|
8
|
+
: secp256r1Pubkey;
|
|
5
9
|
const [token] = await getProgramDerivedAddress({
|
|
6
10
|
programAddress: PHYGITAL_TOKEN_PROGRAM_ADDRESS,
|
|
7
11
|
seeds: [
|
|
8
12
|
getBytesEncoder().encode(TOKEN_SEED),
|
|
9
|
-
getBytesEncoder().encode(
|
|
13
|
+
getBytesEncoder().encode(pubkey[0].slice(1)),
|
|
10
14
|
],
|
|
11
15
|
});
|
|
12
16
|
return token;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/utils/pdas/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,wBAAwB,EACxB,eAAe,GAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,8BAA8B,GAC/B,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/utils/pdas/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,wBAAwB,EACxB,eAAe,GAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,8BAA8B,GAC/B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAGlE,MAAM,UAAU,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAQrD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,eAAkD;IAElD,MAAM,MAAM,GACV,OAAO,eAAe,KAAK,QAAQ;QACjC,CAAC,CAAC,oBAAoB,CAAC,eAAe,CAAC;QACvC,CAAC,CAAC,eAAe,CAAC;IAEtB,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,wBAAwB,CAAC;QAC7C,cAAc,EAAE,8BAA8B;QAC9C,KAAK,EAAE;YACL,eAAe,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC;YACpC,eAAe,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC7C;KACF,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "phygital-token-sdk",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.23.0",
|
|
4
4
|
"description": "TypeScript client for the Phygital Token Solana program (generated via Codama)",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"type": "module",
|
|
@@ -29,9 +29,7 @@
|
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@noble/curves": "^2.0.1",
|
|
32
|
-
"@noble/hashes": "^2.0.1"
|
|
33
|
-
"@solana/web3.js": "^1.98.4",
|
|
34
|
-
"@sqds/multisig": "2.1.4"
|
|
32
|
+
"@noble/hashes": "^2.0.1"
|
|
35
33
|
},
|
|
36
34
|
"scripts": {
|
|
37
35
|
"build": "tsc -p tsconfig.json",
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
import { type Address, type Instruction } from "@solana/kit";
|
|
2
|
-
import { Connection } from "@solana/web3.js";
|
|
3
|
-
import type { PhygitalTokenType } from "../generated/types/phygitalTokenType.js";
|
|
4
|
-
import type { Secp256r1Pubkey } from "../generated/types/secp256r1Pubkey.js";
|
|
5
|
-
export type BuildSquadsInitializeInput = {
|
|
6
|
-
connection: Connection | string;
|
|
7
|
-
multisigPda?: Address | string;
|
|
8
|
-
member: Address | string;
|
|
9
|
-
initializeInputs: {
|
|
10
|
-
identifier: Secp256r1Pubkey;
|
|
11
|
-
secp256r1Pubkey: Secp256r1Pubkey;
|
|
12
|
-
tokenType: PhygitalTokenType;
|
|
13
|
-
}[];
|
|
14
|
-
vaultIndex?: number;
|
|
15
|
-
};
|
|
16
|
-
export type BuildSquadsInitializeResult = {
|
|
17
|
-
multisigPda: Address;
|
|
18
|
-
vaultPda: Address;
|
|
19
|
-
transactionIndex: bigint;
|
|
20
|
-
instructions: Instruction[];
|
|
21
|
-
};
|
|
22
|
-
export declare function buildSquadsInitializeInstructions(input: BuildSquadsInitializeInput): Promise<BuildSquadsInitializeResult>;
|
|
23
|
-
//# sourceMappingURL=squadsInitialize.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"squadsInitialize.d.ts","sourceRoot":"","sources":["../../src/instructions/squadsInitialize.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EACL,UAAU,EAIX,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAW7E,MAAM,MAAM,0BAA0B,GAAG;IAEvC,UAAU,EAAE,UAAU,GAAG,MAAM,CAAC;IAKhC,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE/B,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;IACzB,gBAAgB,EAAE;QAChB,UAAU,EAAE,eAAe,CAAC;QAC5B,eAAe,EAAE,eAAe,CAAC;QACjC,SAAS,EAAE,iBAAiB,CAAC;KAC9B,EAAE,CAAC;IAEJ,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IAMzB,YAAY,EAAE,WAAW,EAAE,CAAC;CAC7B,CAAC;AASF,wBAAsB,iCAAiC,CACrD,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,2BAA2B,CAAC,CA8FtC"}
|
|
@@ -1,132 +0,0 @@
|
|
|
1
|
-
import * as multisig from "@sqds/multisig";
|
|
2
|
-
import {} from "@solana/kit";
|
|
3
|
-
import { Connection, PublicKey, TransactionMessage, } from "@solana/web3.js";
|
|
4
|
-
import { getInitializeInstruction } from "../generated/instructions/initialize.js";
|
|
5
|
-
import { ADMIN, INITIALIZE_MULTISIG_PDA } from "../utils/consts.js";
|
|
6
|
-
import { findTokenPda } from "../utils/pdas/token.js";
|
|
7
|
-
import { kitInstructionToWeb3, resolveConnection, toAddress, toPublicKey, web3InstructionToKit, } from "../utils/web3Bridge.js";
|
|
8
|
-
export async function buildSquadsInitializeInstructions(input) {
|
|
9
|
-
const connection = resolveConnection(input.connection);
|
|
10
|
-
const multisigPda = toPublicKey(input.multisigPda ?? INITIALIZE_MULTISIG_PDA);
|
|
11
|
-
const member = toPublicKey(input.member);
|
|
12
|
-
const vaultIndex = input.vaultIndex ?? 0;
|
|
13
|
-
const [vaultPda] = multisig.getVaultPda({
|
|
14
|
-
multisigPda,
|
|
15
|
-
index: vaultIndex,
|
|
16
|
-
});
|
|
17
|
-
if (vaultPda.toBase58() !== ADMIN) {
|
|
18
|
-
throw new Error(`Squads vault ${vaultPda.toBase58()} (index ${vaultIndex}) does not match ADMIN ${ADMIN}.`);
|
|
19
|
-
}
|
|
20
|
-
const multisigInfo = await multisig.accounts.Multisig.fromAccountAddress(connection, multisigPda);
|
|
21
|
-
if (multisigInfo.rentCollector == null) {
|
|
22
|
-
throw new Error("Multisig has no rentCollector set; configure one before closing vault transactions.");
|
|
23
|
-
}
|
|
24
|
-
const transactionIndex = BigInt(multisig.utils.toBigInt(multisigInfo.transactionIndex)) + 1n;
|
|
25
|
-
const initializeIxs = await Promise.all(input.initializeInputs.map(async (item) => buildVaultInitializeInstruction({
|
|
26
|
-
vaultPda,
|
|
27
|
-
token: await findTokenPda(item.secp256r1Pubkey),
|
|
28
|
-
identifier: item.identifier,
|
|
29
|
-
secp256r1Pubkey: item.secp256r1Pubkey,
|
|
30
|
-
tokenType: item.tokenType,
|
|
31
|
-
})));
|
|
32
|
-
const { blockhash } = await connection.getLatestBlockhash();
|
|
33
|
-
const transactionMessage = new TransactionMessage({
|
|
34
|
-
payerKey: vaultPda,
|
|
35
|
-
recentBlockhash: blockhash,
|
|
36
|
-
instructions: initializeIxs,
|
|
37
|
-
});
|
|
38
|
-
const createIx = multisig.instructions.vaultTransactionCreate({
|
|
39
|
-
multisigPda,
|
|
40
|
-
transactionIndex,
|
|
41
|
-
creator: member,
|
|
42
|
-
vaultIndex,
|
|
43
|
-
ephemeralSigners: 0,
|
|
44
|
-
transactionMessage,
|
|
45
|
-
});
|
|
46
|
-
const proposalIx = multisig.instructions.proposalCreate({
|
|
47
|
-
multisigPda,
|
|
48
|
-
creator: member,
|
|
49
|
-
transactionIndex,
|
|
50
|
-
});
|
|
51
|
-
const approveIx = multisig.instructions.proposalApprove({
|
|
52
|
-
multisigPda,
|
|
53
|
-
member,
|
|
54
|
-
transactionIndex,
|
|
55
|
-
});
|
|
56
|
-
const executeIx = await buildVaultTransactionExecuteInstruction({
|
|
57
|
-
connection,
|
|
58
|
-
multisigPda,
|
|
59
|
-
vaultPda,
|
|
60
|
-
member,
|
|
61
|
-
transactionIndex,
|
|
62
|
-
transactionMessage,
|
|
63
|
-
});
|
|
64
|
-
const closeIx = multisig.instructions.vaultTransactionAccountsClose({
|
|
65
|
-
multisigPda,
|
|
66
|
-
rentCollector: multisigInfo.rentCollector,
|
|
67
|
-
transactionIndex,
|
|
68
|
-
});
|
|
69
|
-
return {
|
|
70
|
-
multisigPda: toAddress(multisigPda),
|
|
71
|
-
vaultPda: toAddress(vaultPda),
|
|
72
|
-
transactionIndex,
|
|
73
|
-
instructions: [createIx, proposalIx, approveIx, executeIx, closeIx].map(web3InstructionToKit),
|
|
74
|
-
};
|
|
75
|
-
}
|
|
76
|
-
async function buildVaultTransactionExecuteInstruction(input) {
|
|
77
|
-
const [transactionPda] = multisig.getTransactionPda({
|
|
78
|
-
multisigPda: input.multisigPda,
|
|
79
|
-
index: input.transactionIndex,
|
|
80
|
-
});
|
|
81
|
-
const [proposalPda] = multisig.getProposalPda({
|
|
82
|
-
multisigPda: input.multisigPda,
|
|
83
|
-
transactionIndex: input.transactionIndex,
|
|
84
|
-
});
|
|
85
|
-
const compiled = input.transactionMessage.compileToV0Message();
|
|
86
|
-
const vaultMessage = {
|
|
87
|
-
numSigners: compiled.header.numRequiredSignatures,
|
|
88
|
-
numWritableSigners: compiled.header.numRequiredSignatures -
|
|
89
|
-
compiled.header.numReadonlySignedAccounts,
|
|
90
|
-
numWritableNonSigners: compiled.staticAccountKeys.length -
|
|
91
|
-
compiled.header.numRequiredSignatures -
|
|
92
|
-
compiled.header.numReadonlyUnsignedAccounts,
|
|
93
|
-
accountKeys: compiled.staticAccountKeys,
|
|
94
|
-
instructions: compiled.compiledInstructions.map((ci) => ({
|
|
95
|
-
programIdIndex: ci.programIdIndex,
|
|
96
|
-
accountIndexes: Uint8Array.from(ci.accountKeyIndexes),
|
|
97
|
-
data: Uint8Array.from(ci.data),
|
|
98
|
-
})),
|
|
99
|
-
addressTableLookups: [],
|
|
100
|
-
};
|
|
101
|
-
const { accountMetas } = await multisig.utils.accountsForTransactionExecute({
|
|
102
|
-
connection: input.connection,
|
|
103
|
-
message: vaultMessage,
|
|
104
|
-
ephemeralSignerBumps: [],
|
|
105
|
-
vaultPda: input.vaultPda,
|
|
106
|
-
transactionPda,
|
|
107
|
-
});
|
|
108
|
-
return multisig.generated.createVaultTransactionExecuteInstruction({
|
|
109
|
-
multisig: input.multisigPda,
|
|
110
|
-
member: input.member,
|
|
111
|
-
proposal: proposalPda,
|
|
112
|
-
transaction: transactionPda,
|
|
113
|
-
anchorRemainingAccounts: accountMetas,
|
|
114
|
-
});
|
|
115
|
-
}
|
|
116
|
-
function buildVaultInitializeInstruction(input) {
|
|
117
|
-
const kitIx = getInitializeInstruction({
|
|
118
|
-
token: input.token,
|
|
119
|
-
identifier: input.identifier,
|
|
120
|
-
secp256r1Pubkey: input.secp256r1Pubkey,
|
|
121
|
-
tokenType: input.tokenType,
|
|
122
|
-
});
|
|
123
|
-
const web3Ix = kitInstructionToWeb3(kitIx);
|
|
124
|
-
const authorityMeta = web3Ix.keys[0];
|
|
125
|
-
if (!authorityMeta || !authorityMeta.pubkey.equals(input.vaultPda)) {
|
|
126
|
-
throw new Error("initialize authority account does not match Squads vault PDA");
|
|
127
|
-
}
|
|
128
|
-
authorityMeta.isSigner = true;
|
|
129
|
-
authorityMeta.isWritable = true;
|
|
130
|
-
return web3Ix;
|
|
131
|
-
}
|
|
132
|
-
//# sourceMappingURL=squadsInitialize.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"squadsInitialize.js","sourceRoot":"","sources":["../../src/instructions/squadsInitialize.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
import { type Address, type Instruction } from "@solana/kit";
|
|
2
|
-
import { Connection } from "@solana/web3.js";
|
|
3
|
-
import type { Secp256r1Pubkey } from "../generated/types/secp256r1Pubkey.js";
|
|
4
|
-
export type BuildSquadsSetMintInput = {
|
|
5
|
-
connection: Connection | string;
|
|
6
|
-
multisigPda?: Address | string;
|
|
7
|
-
member: Address | string;
|
|
8
|
-
setMintInputs: {
|
|
9
|
-
secp256r1Pubkey: Secp256r1Pubkey;
|
|
10
|
-
mint: Address;
|
|
11
|
-
}[];
|
|
12
|
-
vaultIndex?: number;
|
|
13
|
-
};
|
|
14
|
-
export type BuildSquadsSetMintResult = {
|
|
15
|
-
multisigPda: Address;
|
|
16
|
-
vaultPda: Address;
|
|
17
|
-
transactionIndex: bigint;
|
|
18
|
-
instructions: Instruction[];
|
|
19
|
-
};
|
|
20
|
-
export declare function buildSquadsSetMintInstructions(input: BuildSquadsSetMintInput): Promise<BuildSquadsSetMintResult>;
|
|
21
|
-
//# sourceMappingURL=squadsSetMint.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"squadsSetMint.d.ts","sourceRoot":"","sources":["../../src/instructions/squadsSetMint.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EACL,UAAU,EAIX,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAW7E,MAAM,MAAM,uBAAuB,GAAG;IAEpC,UAAU,EAAE,UAAU,GAAG,MAAM,CAAC;IAKhC,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE/B,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;IACzB,aAAa,EAAE;QACb,eAAe,EAAE,eAAe,CAAC;QACjC,IAAI,EAAE,OAAO,CAAC;KACf,EAAE,CAAC;IAEJ,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IAMzB,YAAY,EAAE,WAAW,EAAE,CAAC;CAC7B,CAAC;AASF,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,uBAAuB,GAC7B,OAAO,CAAC,wBAAwB,CAAC,CA4FnC"}
|
|
@@ -1,127 +0,0 @@
|
|
|
1
|
-
import * as multisig from "@sqds/multisig";
|
|
2
|
-
import {} from "@solana/kit";
|
|
3
|
-
import { Connection, PublicKey, TransactionMessage, } from "@solana/web3.js";
|
|
4
|
-
import { getSetMintInstruction } from "../generated/instructions/setMint.js";
|
|
5
|
-
import { ADMIN, INITIALIZE_MULTISIG_PDA } from "../utils/consts.js";
|
|
6
|
-
import { findTokenPda } from "../utils/pdas/token.js";
|
|
7
|
-
import { kitInstructionToWeb3, resolveConnection, toAddress, toPublicKey, web3InstructionToKit, } from "../utils/web3Bridge.js";
|
|
8
|
-
export async function buildSquadsSetMintInstructions(input) {
|
|
9
|
-
const connection = resolveConnection(input.connection);
|
|
10
|
-
const multisigPda = toPublicKey(input.multisigPda ?? INITIALIZE_MULTISIG_PDA);
|
|
11
|
-
const member = toPublicKey(input.member);
|
|
12
|
-
const vaultIndex = input.vaultIndex ?? 0;
|
|
13
|
-
const [vaultPda] = multisig.getVaultPda({
|
|
14
|
-
multisigPda,
|
|
15
|
-
index: vaultIndex,
|
|
16
|
-
});
|
|
17
|
-
if (vaultPda.toBase58() !== ADMIN) {
|
|
18
|
-
throw new Error(`Squads vault ${vaultPda.toBase58()} (index ${vaultIndex}) does not match ADMIN ${ADMIN}.`);
|
|
19
|
-
}
|
|
20
|
-
const multisigInfo = await multisig.accounts.Multisig.fromAccountAddress(connection, multisigPda);
|
|
21
|
-
if (multisigInfo.rentCollector == null) {
|
|
22
|
-
throw new Error("Multisig has no rentCollector set; configure one before closing vault transactions.");
|
|
23
|
-
}
|
|
24
|
-
const transactionIndex = BigInt(multisig.utils.toBigInt(multisigInfo.transactionIndex)) + 1n;
|
|
25
|
-
const setMintIxs = await Promise.all(input.setMintInputs.map(async (item) => buildVaultSetMintInstruction({
|
|
26
|
-
vaultPda,
|
|
27
|
-
token: await findTokenPda(item.secp256r1Pubkey),
|
|
28
|
-
mint: item.mint,
|
|
29
|
-
})));
|
|
30
|
-
const { blockhash } = await connection.getLatestBlockhash();
|
|
31
|
-
const transactionMessage = new TransactionMessage({
|
|
32
|
-
payerKey: vaultPda,
|
|
33
|
-
recentBlockhash: blockhash,
|
|
34
|
-
instructions: setMintIxs,
|
|
35
|
-
});
|
|
36
|
-
const createIx = multisig.instructions.vaultTransactionCreate({
|
|
37
|
-
multisigPda,
|
|
38
|
-
transactionIndex,
|
|
39
|
-
creator: member,
|
|
40
|
-
vaultIndex,
|
|
41
|
-
ephemeralSigners: 0,
|
|
42
|
-
transactionMessage,
|
|
43
|
-
});
|
|
44
|
-
const proposalIx = multisig.instructions.proposalCreate({
|
|
45
|
-
multisigPda,
|
|
46
|
-
creator: member,
|
|
47
|
-
transactionIndex,
|
|
48
|
-
});
|
|
49
|
-
const approveIx = multisig.instructions.proposalApprove({
|
|
50
|
-
multisigPda,
|
|
51
|
-
member,
|
|
52
|
-
transactionIndex,
|
|
53
|
-
});
|
|
54
|
-
const executeIx = await buildVaultTransactionExecuteInstruction({
|
|
55
|
-
connection,
|
|
56
|
-
multisigPda,
|
|
57
|
-
vaultPda,
|
|
58
|
-
member,
|
|
59
|
-
transactionIndex,
|
|
60
|
-
transactionMessage,
|
|
61
|
-
});
|
|
62
|
-
const closeIx = multisig.instructions.vaultTransactionAccountsClose({
|
|
63
|
-
multisigPda,
|
|
64
|
-
rentCollector: multisigInfo.rentCollector,
|
|
65
|
-
transactionIndex,
|
|
66
|
-
});
|
|
67
|
-
return {
|
|
68
|
-
multisigPda: toAddress(multisigPda),
|
|
69
|
-
vaultPda: toAddress(vaultPda),
|
|
70
|
-
transactionIndex,
|
|
71
|
-
instructions: [createIx, proposalIx, approveIx, executeIx, closeIx].map(web3InstructionToKit),
|
|
72
|
-
};
|
|
73
|
-
}
|
|
74
|
-
async function buildVaultTransactionExecuteInstruction(input) {
|
|
75
|
-
const [transactionPda] = multisig.getTransactionPda({
|
|
76
|
-
multisigPda: input.multisigPda,
|
|
77
|
-
index: input.transactionIndex,
|
|
78
|
-
});
|
|
79
|
-
const [proposalPda] = multisig.getProposalPda({
|
|
80
|
-
multisigPda: input.multisigPda,
|
|
81
|
-
transactionIndex: input.transactionIndex,
|
|
82
|
-
});
|
|
83
|
-
const compiled = input.transactionMessage.compileToV0Message();
|
|
84
|
-
const vaultMessage = {
|
|
85
|
-
numSigners: compiled.header.numRequiredSignatures,
|
|
86
|
-
numWritableSigners: compiled.header.numRequiredSignatures -
|
|
87
|
-
compiled.header.numReadonlySignedAccounts,
|
|
88
|
-
numWritableNonSigners: compiled.staticAccountKeys.length -
|
|
89
|
-
compiled.header.numRequiredSignatures -
|
|
90
|
-
compiled.header.numReadonlyUnsignedAccounts,
|
|
91
|
-
accountKeys: compiled.staticAccountKeys,
|
|
92
|
-
instructions: compiled.compiledInstructions.map((ci) => ({
|
|
93
|
-
programIdIndex: ci.programIdIndex,
|
|
94
|
-
accountIndexes: Uint8Array.from(ci.accountKeyIndexes),
|
|
95
|
-
data: Uint8Array.from(ci.data),
|
|
96
|
-
})),
|
|
97
|
-
addressTableLookups: [],
|
|
98
|
-
};
|
|
99
|
-
const { accountMetas } = await multisig.utils.accountsForTransactionExecute({
|
|
100
|
-
connection: input.connection,
|
|
101
|
-
message: vaultMessage,
|
|
102
|
-
ephemeralSignerBumps: [],
|
|
103
|
-
vaultPda: input.vaultPda,
|
|
104
|
-
transactionPda,
|
|
105
|
-
});
|
|
106
|
-
return multisig.generated.createVaultTransactionExecuteInstruction({
|
|
107
|
-
multisig: input.multisigPda,
|
|
108
|
-
member: input.member,
|
|
109
|
-
proposal: proposalPda,
|
|
110
|
-
transaction: transactionPda,
|
|
111
|
-
anchorRemainingAccounts: accountMetas,
|
|
112
|
-
});
|
|
113
|
-
}
|
|
114
|
-
function buildVaultSetMintInstruction(input) {
|
|
115
|
-
const kitIx = getSetMintInstruction({
|
|
116
|
-
token: input.token,
|
|
117
|
-
mint: input.mint,
|
|
118
|
-
});
|
|
119
|
-
const web3Ix = kitInstructionToWeb3(kitIx);
|
|
120
|
-
const authorityMeta = web3Ix.keys[0];
|
|
121
|
-
if (!authorityMeta || !authorityMeta.pubkey.equals(input.vaultPda)) {
|
|
122
|
-
throw new Error("set_mint authority account does not match Squads vault PDA");
|
|
123
|
-
}
|
|
124
|
-
authorityMeta.isSigner = true;
|
|
125
|
-
return web3Ix;
|
|
126
|
-
}
|
|
127
|
-
//# sourceMappingURL=squadsSetMint.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"squadsSetMint.js","sourceRoot":"","sources":["../../src/instructions/squadsSetMint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import { type Address, type Instruction } from "@solana/kit";
|
|
2
|
-
import { Connection, PublicKey, TransactionInstruction } from "@solana/web3.js";
|
|
3
|
-
export declare function resolveConnection(connection: Connection | string): Connection;
|
|
4
|
-
export declare function toPublicKey(value: Address | string | PublicKey): PublicKey;
|
|
5
|
-
export declare function toAddress(value: PublicKey | string): Address;
|
|
6
|
-
export declare function kitInstructionToWeb3(instruction: Instruction): TransactionInstruction;
|
|
7
|
-
export declare function web3InstructionToKit(instruction: TransactionInstruction): Instruction;
|
|
8
|
-
//# sourceMappingURL=web3Bridge.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"web3Bridge.d.ts","sourceRoot":"","sources":["../../src/utils/web3Bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,OAAO,EACZ,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,UAAU,EACV,SAAS,EACT,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAGzB,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,GAAG,UAAU,CAK7E;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAG1E;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAE5D;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,WAAW,GACvB,sBAAsB,CAcxB;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,sBAAsB,GAClC,WAAW,CAeb"}
|
package/dist/utils/web3Bridge.js
DELETED
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
import { AccountRole, address, } from "@solana/kit";
|
|
2
|
-
import { Connection, PublicKey, TransactionInstruction, } from "@solana/web3.js";
|
|
3
|
-
export function resolveConnection(connection) {
|
|
4
|
-
if (typeof connection === "string") {
|
|
5
|
-
return new Connection(connection, "confirmed");
|
|
6
|
-
}
|
|
7
|
-
return connection;
|
|
8
|
-
}
|
|
9
|
-
export function toPublicKey(value) {
|
|
10
|
-
if (value instanceof PublicKey)
|
|
11
|
-
return value;
|
|
12
|
-
return new PublicKey(String(value));
|
|
13
|
-
}
|
|
14
|
-
export function toAddress(value) {
|
|
15
|
-
return address(value.toString());
|
|
16
|
-
}
|
|
17
|
-
export function kitInstructionToWeb3(instruction) {
|
|
18
|
-
return new TransactionInstruction({
|
|
19
|
-
programId: toPublicKey(instruction.programAddress),
|
|
20
|
-
keys: (instruction.accounts ?? []).map((account) => ({
|
|
21
|
-
pubkey: toPublicKey(account.address),
|
|
22
|
-
isSigner: account.role === AccountRole.READONLY_SIGNER ||
|
|
23
|
-
account.role === AccountRole.WRITABLE_SIGNER,
|
|
24
|
-
isWritable: account.role === AccountRole.WRITABLE ||
|
|
25
|
-
account.role === AccountRole.WRITABLE_SIGNER,
|
|
26
|
-
})),
|
|
27
|
-
data: Buffer.from(instruction.data ?? new Uint8Array()),
|
|
28
|
-
});
|
|
29
|
-
}
|
|
30
|
-
export function web3InstructionToKit(instruction) {
|
|
31
|
-
return {
|
|
32
|
-
programAddress: toAddress(instruction.programId),
|
|
33
|
-
accounts: instruction.keys.map((key) => ({
|
|
34
|
-
address: toAddress(key.pubkey),
|
|
35
|
-
role: key.isSigner
|
|
36
|
-
? key.isWritable
|
|
37
|
-
? AccountRole.WRITABLE_SIGNER
|
|
38
|
-
: AccountRole.READONLY_SIGNER
|
|
39
|
-
: key.isWritable
|
|
40
|
-
? AccountRole.WRITABLE
|
|
41
|
-
: AccountRole.READONLY,
|
|
42
|
-
})),
|
|
43
|
-
data: new Uint8Array(instruction.data),
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
|
-
//# sourceMappingURL=web3Bridge.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"web3Bridge.js","sourceRoot":"","sources":["../../src/utils/web3Bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,OAAO,GAIR,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,UAAU,EACV,SAAS,EACT,sBAAsB,GACvB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,UAAU,iBAAiB,CAAC,UAA+B;IAC/D,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,IAAI,UAAU,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAmC;IAC7D,IAAI,KAAK,YAAY,SAAS;QAAE,OAAO,KAAK,CAAC;IAC7C,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,KAAyB;IACjD,OAAO,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,WAAwB;IAExB,OAAO,IAAI,sBAAsB,CAAC;QAChC,SAAS,EAAE,WAAW,CAAC,WAAW,CAAC,cAAc,CAAC;QAClD,IAAI,EAAE,CAAC,WAAW,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACnD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;YACpC,QAAQ,EACN,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,eAAe;gBAC5C,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,eAAe;YAC9C,UAAU,EACR,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,QAAQ;gBACrC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,eAAe;SAC/C,CAAC,CAAC;QACH,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,UAAU,EAAE,CAAC;KACxD,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,WAAmC;IAEnC,OAAO;QACL,cAAc,EAAE,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC;QAChD,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACvC,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,GAAG,CAAC,QAAQ;gBAChB,CAAC,CAAC,GAAG,CAAC,UAAU;oBACd,CAAC,CAAC,WAAW,CAAC,eAAe;oBAC7B,CAAC,CAAC,WAAW,CAAC,eAAe;gBAC/B,CAAC,CAAC,GAAG,CAAC,UAAU;oBACd,CAAC,CAAC,WAAW,CAAC,QAAQ;oBACtB,CAAC,CAAC,WAAW,CAAC,QAAQ;SAC3B,CAAC,CAAC;QACH,IAAI,EAAE,IAAI,UAAU,CAAC,WAAW,CAAC,IAAI,CAAuB;KAC7D,CAAC;AACJ,CAAC"}
|