@1upmonster/duel 0.2.1 → 0.2.3
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 +120 -59
- package/dist/admin.d.ts +8 -1
- package/dist/admin.js +52 -9
- package/dist/generated/duel/errors/duel.d.ts +1 -3
- package/dist/generated/duel/errors/duel.js +2 -4
- package/dist/generated/duel/instructions/index.d.ts +2 -0
- package/dist/generated/duel/instructions/index.js +3 -1
- package/dist/generated/duel/instructions/joinQueue.d.ts +1 -1
- package/dist/generated/duel/instructions/joinQueue.js +3 -3
- package/dist/generated/duel/instructions/setupQueuePermission.d.ts +51 -0
- package/dist/generated/duel/instructions/setupQueuePermission.js +63 -0
- package/dist/generated/duel/instructions/setupTicketPermission.d.ts +54 -0
- package/dist/generated/duel/instructions/setupTicketPermission.js +63 -0
- package/dist/generated/duel/programs/duel.d.ts +11 -3
- package/dist/generated/duel/programs/duel.js +19 -3
- package/dist/player.d.ts +8 -1
- package/dist/player.js +56 -5
- package/dist/tee.d.ts +4 -3
- package/dist/tee.js +17 -23
- package/dist/transaction.d.ts +2 -0
- package/dist/transaction.js +30 -19
- package/dist/utils.d.ts +10 -0
- package/dist/utils.js +28 -1
- package/package.json +1 -1
- package/src/admin.ts +67 -7
- package/src/duel.json +57 -5
- package/src/generated/duel/errors/duel.ts +2 -4
- package/src/generated/duel/instructions/index.ts +3 -1
- package/src/generated/duel/instructions/joinQueue.ts +3 -3
- package/src/generated/duel/instructions/setupQueuePermission.ts +112 -0
- package/src/generated/duel/instructions/setupTicketPermission.ts +115 -0
- package/src/generated/duel/programs/duel.ts +12 -4
- package/src/player.ts +72 -1
- package/src/tee.ts +18 -22
- package/src/transaction.ts +33 -18
- package/src/utils.ts +34 -0
- package/src/encryption.ts +0 -154
- package/src/idl/private_matchmaking.json +0 -1027
- package/src/idl/private_matchmaking.ts +0 -1033
package/dist/player.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export declare class MatchmakingPlayer {
|
|
|
8
8
|
getTicket(ticketPda: Address): Promise<import("@solana/accounts").MaybeAccount<import("./generated/duel/index.js").MatchTicket, string>>;
|
|
9
9
|
createTicket(tenant: Address): Promise<string>;
|
|
10
10
|
delegateTicket(player: Address, tenant: Address, validator?: Address): Promise<string>;
|
|
11
|
-
joinQueue(queue: Address, tenant: Address, playerData: Address): Promise<string>;
|
|
11
|
+
joinQueue(queue: Address, tenant: Address, playerData: Address, callbackProgram?: Address): Promise<string>;
|
|
12
12
|
cancelTicket(tenant: Address): Promise<string>;
|
|
13
13
|
closeTicket(tenant: Address): Promise<string>;
|
|
14
14
|
/**
|
|
@@ -19,6 +19,13 @@ export declare class MatchmakingPlayer {
|
|
|
19
19
|
opponent: Address;
|
|
20
20
|
matchId: bigint;
|
|
21
21
|
} | null>;
|
|
22
|
+
/**
|
|
23
|
+
* High-level: full matchmaking TEE entry flow.
|
|
24
|
+
* Creates ticket on L1, sets up permission PDA (so only player + queue authority can read it),
|
|
25
|
+
* delegates the permission PDA and ticket to TEE, then joins the queue.
|
|
26
|
+
* Use individual methods (createTicket, delegateTicket, joinQueue) as escape hatches if needed.
|
|
27
|
+
*/
|
|
28
|
+
enterQueue(tenant: Address, queue: Address, playerData: Address, teeRpc: Rpc<SolanaRpcApi>, teeUrlWithToken: string, validator?: Address, callbackProgram?: Address): Promise<Address>;
|
|
22
29
|
/** Create a new MatchmakingPlayer pointing at a TEE RPC endpoint. */
|
|
23
30
|
withRpc(teeUrl: string): MatchmakingPlayer;
|
|
24
31
|
}
|
package/dist/player.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { createSolanaRpc, } from "@solana/kit";
|
|
2
|
-
import { getCreateTicketInstructionAsync, getDelegateTicketInstructionAsync, getJoinQueueInstructionAsync, getCancelTicketInstructionAsync, getCloseTicketInstructionAsync, fetchMaybeMatchTicket, accountType, } from "./generated/duel/index.js";
|
|
1
|
+
import { createSolanaRpc, AccountRole, } from "@solana/kit";
|
|
2
|
+
import { getCreateTicketInstructionAsync, getDelegateTicketInstructionAsync, getSetupTicketPermissionInstructionAsync, getJoinQueueInstructionAsync, getCancelTicketInstructionAsync, getCloseTicketInstructionAsync, fetchMaybeMatchTicket, accountType, } from "./generated/duel/index.js";
|
|
3
3
|
import { sendInstruction } from "./transaction.js";
|
|
4
4
|
import * as utils from "./utils.js";
|
|
5
5
|
const DUEL_PROGRAM_ID = "EdZzUwKd1X2ZWjxLPpz1cpEzMF7RUZC43Pq64v1VcK5X";
|
|
@@ -32,14 +32,18 @@ export class MatchmakingPlayer {
|
|
|
32
32
|
}, { programAddress: this.programId });
|
|
33
33
|
return sendInstruction(this.rpc, ix, this.signer);
|
|
34
34
|
}
|
|
35
|
-
async joinQueue(queue, tenant, playerData) {
|
|
35
|
+
async joinQueue(queue, tenant, playerData, callbackProgram) {
|
|
36
36
|
const ix = await getJoinQueueInstructionAsync({
|
|
37
37
|
queue,
|
|
38
38
|
tenant,
|
|
39
39
|
playerData,
|
|
40
40
|
signer: this.signer,
|
|
41
41
|
}, { programAddress: this.programId });
|
|
42
|
-
|
|
42
|
+
const ixFinal = callbackProgram
|
|
43
|
+
? { ...ix, accounts: [...ix.accounts, { address: callbackProgram, role: 0 }] }
|
|
44
|
+
: ix;
|
|
45
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
46
|
+
return sendInstruction(this.rpc, ixFinal, this.signer);
|
|
43
47
|
}
|
|
44
48
|
async cancelTicket(tenant) {
|
|
45
49
|
const ix = await getCancelTicketInstructionAsync({
|
|
@@ -79,9 +83,56 @@ export class MatchmakingPlayer {
|
|
|
79
83
|
}
|
|
80
84
|
return null;
|
|
81
85
|
}
|
|
86
|
+
/**
|
|
87
|
+
* High-level: full matchmaking TEE entry flow.
|
|
88
|
+
* Creates ticket on L1, sets up permission PDA (so only player + queue authority can read it),
|
|
89
|
+
* delegates the permission PDA and ticket to TEE, then joins the queue.
|
|
90
|
+
* Use individual methods (createTicket, delegateTicket, joinQueue) as escape hatches if needed.
|
|
91
|
+
*/
|
|
92
|
+
async enterQueue(tenant, queue, playerData, teeRpc, teeUrlWithToken, validator, callbackProgram) {
|
|
93
|
+
const player = this.signer.address;
|
|
94
|
+
const ticketPda = await this.getTicketPda(player, tenant);
|
|
95
|
+
// 1. Create ticket on L1
|
|
96
|
+
await this.createTicket(tenant);
|
|
97
|
+
// 2. Create Permission PDA for the ticket (CPI from duel program with invoke_signed)
|
|
98
|
+
const permissionPda = await utils.derivePermissionPda(ticketPda);
|
|
99
|
+
const setupIx = await getSetupTicketPermissionInstructionAsync({
|
|
100
|
+
player: this.signer,
|
|
101
|
+
tenant,
|
|
102
|
+
permission: permissionPda,
|
|
103
|
+
permissionProgram: utils.PERMISSION_PROGRAM,
|
|
104
|
+
}, { programAddress: this.programId });
|
|
105
|
+
await sendInstruction(this.rpc, setupIx, this.signer);
|
|
106
|
+
// 3. Delegate Permission PDA to TEE (called on permission program, player signs)
|
|
107
|
+
const { delegationBuffer, delegationRecord, delegationMetadata } = await utils.derivePermissionDelegationPdas(permissionPda);
|
|
108
|
+
const delegatePermIx = {
|
|
109
|
+
programAddress: utils.PERMISSION_PROGRAM,
|
|
110
|
+
data: new Uint8Array([3, 0, 0, 0, 0, 0, 0, 0]),
|
|
111
|
+
accounts: [
|
|
112
|
+
{ address: this.signer.address, role: AccountRole.WRITABLE_SIGNER },
|
|
113
|
+
{ address: this.signer.address, role: AccountRole.READONLY_SIGNER },
|
|
114
|
+
{ address: ticketPda, role: AccountRole.READONLY },
|
|
115
|
+
{ address: permissionPda, role: AccountRole.WRITABLE },
|
|
116
|
+
{ address: "11111111111111111111111111111111", role: AccountRole.READONLY },
|
|
117
|
+
{ address: utils.PERMISSION_PROGRAM, role: AccountRole.READONLY },
|
|
118
|
+
{ address: delegationBuffer, role: AccountRole.WRITABLE },
|
|
119
|
+
{ address: delegationRecord, role: AccountRole.WRITABLE },
|
|
120
|
+
{ address: delegationMetadata, role: AccountRole.WRITABLE },
|
|
121
|
+
{ address: utils.DELEGATION_PROGRAM, role: AccountRole.READONLY },
|
|
122
|
+
...(validator ? [{ address: validator, role: AccountRole.READONLY }] : []),
|
|
123
|
+
],
|
|
124
|
+
};
|
|
125
|
+
await sendInstruction(this.rpc, delegatePermIx, this.signer);
|
|
126
|
+
// 4. Delegate ticket to TEE
|
|
127
|
+
await this.delegateTicket(player, tenant, validator);
|
|
128
|
+
// 5. Join the queue on TEE
|
|
129
|
+
const teeClient = new MatchmakingPlayer(teeRpc, this.signer, this.programId);
|
|
130
|
+
await teeClient.joinQueue(queue, tenant, playerData, callbackProgram);
|
|
131
|
+
return ticketPda;
|
|
132
|
+
}
|
|
82
133
|
/** Create a new MatchmakingPlayer pointing at a TEE RPC endpoint. */
|
|
83
134
|
withRpc(teeUrl) {
|
|
84
135
|
return new MatchmakingPlayer(createSolanaRpc(teeUrl), this.signer, this.programId);
|
|
85
136
|
}
|
|
86
137
|
}
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"player.js","sourceRoot":"","sources":["../src/player.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createSolanaRpc,\n  type Address,\n  type TransactionSigner,\n  type Rpc,\n  type SolanaRpcApi,\n} from \"@solana/kit\";\nimport {\n  getCreateTicketInstructionAsync,\n  getDelegateTicketInstructionAsync,\n  getJoinQueueInstructionAsync,\n  getCancelTicketInstructionAsync,\n  getCloseTicketInstructionAsync,\n  fetchMaybeMatchTicket,\n  accountType,\n} from \"./generated/duel/index.js\";\nimport { sendInstruction } from \"./transaction.js\";\nimport * as utils from \"./utils.js\";\n\nconst DUEL_PROGRAM_ID = \"EdZzUwKd1X2ZWjxLPpz1cpEzMF7RUZC43Pq64v1VcK5X\" as Address;\n\nexport class MatchmakingPlayer {\n  public rpc: Rpc<SolanaRpcApi>;\n  public signer: TransactionSigner;\n  public programId: Address;\n\n  constructor(\n    rpc: Rpc<SolanaRpcApi>,\n    signer: TransactionSigner,\n    programId: Address = DUEL_PROGRAM_ID,\n  ) {\n    this.rpc = rpc;\n    this.signer = signer;\n    this.programId = programId;\n  }\n\n  async getTicketPda(player: Address, tenant: Address): Promise<Address> {\n    return utils.deriveTicketPda(this.programId, player, tenant);\n  }\n\n  async getTicket(ticketPda: Address) {\n    return fetchMaybeMatchTicket(this.rpc, ticketPda);\n  }\n\n  async createTicket(tenant: Address): Promise<string> {\n    const ix = await getCreateTicketInstructionAsync({\n      player: this.signer,\n      tenant,\n    }, { programAddress: this.programId });\n    return sendInstruction(this.rpc, ix, this.signer);\n  }\n\n  async delegateTicket(\n    player: Address,\n    tenant: Address,\n    validator?: Address,\n  ): Promise<string> {\n    const ticketPda = await this.getTicketPda(player, tenant);\n    const ix = await getDelegateTicketInstructionAsync({\n      pda: ticketPda,\n      payer: this.signer,\n      validator,\n      accountType: accountType(\"Ticket\", { player, tenant }),\n    }, { programAddress: this.programId });\n    return sendInstruction(this.rpc, ix, this.signer);\n  }\n\n  async joinQueue(\n    queue: Address,\n    tenant: Address,\n    playerData: Address,\n  ): Promise<string> {\n    const ix = await getJoinQueueInstructionAsync({\n      queue,\n      tenant,\n      playerData,\n      signer: this.signer,\n    }, { programAddress: this.programId });\n    return sendInstruction(this.rpc, ix, this.signer);\n  }\n\n  async cancelTicket(tenant: Address): Promise<string> {\n    const ix = await getCancelTicketInstructionAsync({\n      player: this.signer,\n      tenant,\n    }, { programAddress: this.programId });\n    return sendInstruction(this.rpc, ix, this.signer);\n  }\n\n  async closeTicket(tenant: Address): Promise<string> {\n    const ix = await getCloseTicketInstructionAsync({\n      player: this.signer,\n      tenant,\n    }, { programAddress: this.programId });\n    return sendInstruction(this.rpc, ix, this.signer);\n  }\n\n  /**\n   * Poll L1 for ticket status.\n   * Returns match info when status becomes Matched.\n   */\n  async pollForMatch(\n    ticketPda: Address,\n    maxAttempts = 60,\n    pollInterval = 2000,\n    signal?: AbortSignal,\n  ): Promise<{ opponent: Address; matchId: bigint } | null> {\n    for (let i = 0; i < maxAttempts; i++) {\n      if (signal?.aborted) return null;\n      await new Promise((r) => setTimeout(r, pollInterval));\n      try {\n        const maybeTicket = await fetchMaybeMatchTicket(this.rpc, ticketPda);\n        if (!maybeTicket.exists) continue;\n        const status = maybeTicket.data.status;\n        if (status.__kind === \"Matched\") {\n          return { opponent: status.opponent, matchId: status.matchId };\n        }\n      } catch {\n        // Ignore decode errors during transition\n      }\n    }\n    return null;\n  }\n\n  /** Create a new MatchmakingPlayer pointing at a TEE RPC endpoint. */\n  withRpc(teeUrl: string): MatchmakingPlayer {\n    return new MatchmakingPlayer(createSolanaRpc(teeUrl), this.signer, this.programId);\n  }\n}\n"]}
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"player.js","sourceRoot":"","sources":["../src/player.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createSolanaRpc,\n  AccountRole,\n  type Address,\n  type TransactionSigner,\n  type Rpc,\n  type SolanaRpcApi,\n  type Instruction,\n} from \"@solana/kit\";\nimport {\n  getCreateTicketInstructionAsync,\n  getDelegateTicketInstructionAsync,\n  getSetupTicketPermissionInstructionAsync,\n  getJoinQueueInstructionAsync,\n  getCancelTicketInstructionAsync,\n  getCloseTicketInstructionAsync,\n  fetchMaybeMatchTicket,\n  accountType,\n} from \"./generated/duel/index.js\";\nimport { sendInstruction } from \"./transaction.js\";\nimport * as utils from \"./utils.js\";\n\nconst DUEL_PROGRAM_ID = \"EdZzUwKd1X2ZWjxLPpz1cpEzMF7RUZC43Pq64v1VcK5X\" as Address;\n\nexport class MatchmakingPlayer {\n  public rpc: Rpc<SolanaRpcApi>;\n  public signer: TransactionSigner;\n  public programId: Address;\n\n  constructor(\n    rpc: Rpc<SolanaRpcApi>,\n    signer: TransactionSigner,\n    programId: Address = DUEL_PROGRAM_ID,\n  ) {\n    this.rpc = rpc;\n    this.signer = signer;\n    this.programId = programId;\n  }\n\n  async getTicketPda(player: Address, tenant: Address): Promise<Address> {\n    return utils.deriveTicketPda(this.programId, player, tenant);\n  }\n\n  async getTicket(ticketPda: Address) {\n    return fetchMaybeMatchTicket(this.rpc, ticketPda);\n  }\n\n  async createTicket(tenant: Address): Promise<string> {\n    const ix = await getCreateTicketInstructionAsync({\n      player: this.signer,\n      tenant,\n    }, { programAddress: this.programId });\n    return sendInstruction(this.rpc, ix, this.signer);\n  }\n\n  async delegateTicket(\n    player: Address,\n    tenant: Address,\n    validator?: Address,\n  ): Promise<string> {\n    const ticketPda = await this.getTicketPda(player, tenant);\n    const ix = await getDelegateTicketInstructionAsync({\n      pda: ticketPda,\n      payer: this.signer,\n      validator,\n      accountType: accountType(\"Ticket\", { player, tenant }),\n    }, { programAddress: this.programId });\n    return sendInstruction(this.rpc, ix, this.signer);\n  }\n\n  async joinQueue(\n    queue: Address,\n    tenant: Address,\n    playerData: Address,\n    callbackProgram?: Address,\n  ): Promise<string> {\n    const ix = await getJoinQueueInstructionAsync({\n      queue,\n      tenant,\n      playerData,\n      signer: this.signer,\n    }, { programAddress: this.programId });\n    const ixFinal = callbackProgram\n      ? { ...ix, accounts: [...ix.accounts, { address: callbackProgram, role: 0 as const }] }\n      : ix;\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return sendInstruction(this.rpc, ixFinal as any, this.signer);\n  }\n\n  async cancelTicket(tenant: Address): Promise<string> {\n    const ix = await getCancelTicketInstructionAsync({\n      player: this.signer,\n      tenant,\n    }, { programAddress: this.programId });\n    return sendInstruction(this.rpc, ix, this.signer);\n  }\n\n  async closeTicket(tenant: Address): Promise<string> {\n    const ix = await getCloseTicketInstructionAsync({\n      player: this.signer,\n      tenant,\n    }, { programAddress: this.programId });\n    return sendInstruction(this.rpc, ix, this.signer);\n  }\n\n  /**\n   * Poll L1 for ticket status.\n   * Returns match info when status becomes Matched.\n   */\n  async pollForMatch(\n    ticketPda: Address,\n    maxAttempts = 60,\n    pollInterval = 2000,\n    signal?: AbortSignal,\n  ): Promise<{ opponent: Address; matchId: bigint } | null> {\n    for (let i = 0; i < maxAttempts; i++) {\n      if (signal?.aborted) return null;\n      await new Promise((r) => setTimeout(r, pollInterval));\n      try {\n        const maybeTicket = await fetchMaybeMatchTicket(this.rpc, ticketPda);\n        if (!maybeTicket.exists) continue;\n        const status = maybeTicket.data.status;\n        if (status.__kind === \"Matched\") {\n          return { opponent: status.opponent, matchId: status.matchId };\n        }\n      } catch {\n        // Ignore decode errors during transition\n      }\n    }\n    return null;\n  }\n\n  /**\n   * High-level: full matchmaking TEE entry flow.\n   * Creates ticket on L1, sets up permission PDA (so only player + queue authority can read it),\n   * delegates the permission PDA and ticket to TEE, then joins the queue.\n   * Use individual methods (createTicket, delegateTicket, joinQueue) as escape hatches if needed.\n   */\n  async enterQueue(\n    tenant: Address,\n    queue: Address,\n    playerData: Address,\n    teeRpc: Rpc<SolanaRpcApi>,\n    teeUrlWithToken: string,\n    validator?: Address,\n    callbackProgram?: Address,\n  ): Promise<Address> {\n    const player = this.signer.address as Address;\n    const ticketPda = await this.getTicketPda(player, tenant);\n\n    // 1. Create ticket on L1\n    await this.createTicket(tenant);\n\n    // 2. Create Permission PDA for the ticket (CPI from duel program with invoke_signed)\n    const permissionPda = await utils.derivePermissionPda(ticketPda);\n    const setupIx = await getSetupTicketPermissionInstructionAsync({\n      player: this.signer,\n      tenant,\n      permission: permissionPda,\n      permissionProgram: utils.PERMISSION_PROGRAM,\n    }, { programAddress: this.programId });\n    await sendInstruction(this.rpc, setupIx, this.signer);\n\n    // 3. Delegate Permission PDA to TEE (called on permission program, player signs)\n    const { delegationBuffer, delegationRecord, delegationMetadata } =\n      await utils.derivePermissionDelegationPdas(permissionPda);\n    const delegatePermIx: Instruction = {\n      programAddress: utils.PERMISSION_PROGRAM,\n      data: new Uint8Array([3, 0, 0, 0, 0, 0, 0, 0]),\n      accounts: [\n        { address: this.signer.address, role: AccountRole.WRITABLE_SIGNER },\n        { address: this.signer.address, role: AccountRole.READONLY_SIGNER },\n        { address: ticketPda, role: AccountRole.READONLY },\n        { address: permissionPda, role: AccountRole.WRITABLE },\n        { address: \"11111111111111111111111111111111\" as Address, role: AccountRole.READONLY },\n        { address: utils.PERMISSION_PROGRAM, role: AccountRole.READONLY },\n        { address: delegationBuffer, role: AccountRole.WRITABLE },\n        { address: delegationRecord, role: AccountRole.WRITABLE },\n        { address: delegationMetadata, role: AccountRole.WRITABLE },\n        { address: utils.DELEGATION_PROGRAM, role: AccountRole.READONLY },\n        ...(validator ? [{ address: validator, role: AccountRole.READONLY }] : []),\n      ],\n    };\n    await sendInstruction(this.rpc, delegatePermIx, this.signer);\n\n    // 4. Delegate ticket to TEE\n    await this.delegateTicket(player, tenant, validator);\n\n    // 5. Join the queue on TEE\n    const teeClient = new MatchmakingPlayer(teeRpc, this.signer, this.programId);\n    await teeClient.joinQueue(queue, tenant, playerData, callbackProgram);\n\n    return ticketPda;\n  }\n\n  /** Create a new MatchmakingPlayer pointing at a TEE RPC endpoint. */\n  withRpc(teeUrl: string): MatchmakingPlayer {\n    return new MatchmakingPlayer(createSolanaRpc(teeUrl), this.signer, this.programId);\n  }\n}\n"]}
|
package/dist/tee.d.ts
CHANGED
|
@@ -8,7 +8,8 @@ export declare function getAuthToken(rpcUrl: string, signer: MessagePartialSigne
|
|
|
8
8
|
expiresAt: number;
|
|
9
9
|
}>;
|
|
10
10
|
/**
|
|
11
|
-
* Poll the TEE
|
|
12
|
-
*
|
|
11
|
+
* Poll the TEE until the Permission PDA for the given account is active (authorizedUsers non-empty).
|
|
12
|
+
* This confirms the TEE has picked up the delegated Permission PDA and is enforcing access control.
|
|
13
|
+
* Returns true if active before timeout, false otherwise.
|
|
13
14
|
*/
|
|
14
|
-
export declare function
|
|
15
|
+
export declare function waitForPermission(teeUrlWithToken: string, accountAddress: Address, timeoutMs?: number): Promise<boolean>;
|
package/dist/tee.js
CHANGED
|
@@ -29,34 +29,28 @@ export async function getAuthToken(rpcUrl, signer) {
|
|
|
29
29
|
return { token: authJson.token, expiresAt };
|
|
30
30
|
}
|
|
31
31
|
/**
|
|
32
|
-
* Poll the TEE
|
|
33
|
-
*
|
|
32
|
+
* Poll the TEE until the Permission PDA for the given account is active (authorizedUsers non-empty).
|
|
33
|
+
* This confirms the TEE has picked up the delegated Permission PDA and is enforcing access control.
|
|
34
|
+
* Returns true if active before timeout, false otherwise.
|
|
34
35
|
*/
|
|
35
|
-
export async function
|
|
36
|
-
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
else {
|
|
43
|
-
permissionUrl = `${baseUrl}/permission?pubkey=${pda}`;
|
|
44
|
-
}
|
|
45
|
-
const start = Date.now();
|
|
46
|
-
while (Date.now() - start < timeoutMs) {
|
|
36
|
+
export async function waitForPermission(teeUrlWithToken, accountAddress, timeoutMs = 10000) {
|
|
37
|
+
const [baseUrl, token] = teeUrlWithToken.replace("/?", "?").split("?");
|
|
38
|
+
const permUrl = token
|
|
39
|
+
? `${baseUrl}/permission?${token}&pubkey=${accountAddress}`
|
|
40
|
+
: `${baseUrl}/permission?pubkey=${accountAddress}`;
|
|
41
|
+
const deadline = Date.now() + timeoutMs;
|
|
42
|
+
while (Date.now() < deadline) {
|
|
47
43
|
try {
|
|
48
|
-
const res = await fetch(
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
return true;
|
|
53
|
-
}
|
|
44
|
+
const res = await fetch(permUrl);
|
|
45
|
+
const json = (await res.json());
|
|
46
|
+
if (json.authorizedUsers && json.authorizedUsers.length > 0)
|
|
47
|
+
return true;
|
|
54
48
|
}
|
|
55
49
|
catch {
|
|
56
|
-
// ignore transient errors
|
|
50
|
+
// ignore transient errors
|
|
57
51
|
}
|
|
58
|
-
await new Promise((r) => setTimeout(r,
|
|
52
|
+
await new Promise((r) => setTimeout(r, 500));
|
|
59
53
|
}
|
|
60
54
|
return false;
|
|
61
55
|
}
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3RlZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsZ0JBQWdCLEVBQ2hCLHFCQUFxQixHQUd0QixNQUFNLGFBQWEsQ0FBQztBQUlyQjs7R0FFRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsWUFBWSxDQUNoQyxNQUFjLEVBQ2QsTUFBNEI7SUFFNUIsTUFBTSxZQUFZLEdBQUcsTUFBTSxLQUFLLENBQzlCLEdBQUcsTUFBTSwwQkFBMEIsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUNwRCxDQUFDO0lBQ0YsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNyQixNQUFNLElBQUksS0FBSyxDQUFDLHlCQUF5QixZQUFZLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQztJQUN0RSxDQUFDO0lBQ0QsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLENBQUMsTUFBTSxZQUFZLENBQUMsSUFBSSxFQUFFLENBQTBCLENBQUM7SUFFM0UsTUFBTSxjQUFjLEdBQUcsSUFBSSxXQUFXLEVBQUUsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDM0QsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLE1BQU0sTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDLHFCQUFxQixDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNyRixNQUFNLFNBQVMsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLE9BQWtCLENBQUMsQ0FBQztJQUNyRCxNQUFNLGVBQWUsR0FBRyxnQkFBZ0IsRUFBRSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUU3RCxNQUFNLFFBQVEsR0FBRyxNQUFNLEtBQUssQ0FBQyxHQUFHLE1BQU0sYUFBYSxFQUFFO1FBQ25ELE1BQU0sRUFBRSxNQUFNO1FBQ2QsT0FBTyxFQUFFLEVBQUUsY0FBYyxFQUFFLGtCQUFrQixFQUFFO1FBQy9DLElBQUksRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDO1lBQ25CLE1BQU0sRUFBRSxNQUFNLENBQUMsT0FBTztZQUN0QixTQUFTO1lBQ1QsU0FBUyxFQUFFLGVBQWU7U0FDM0IsQ0FBQztLQUNILENBQUMsQ0FBQztJQUNILE1BQU0sUUFBUSxHQUFHLENBQUMsTUFBTSxRQUFRLENBQUMsSUFBSSxFQUFFLENBQTBELENBQUM7SUFDbEcsSUFBSSxRQUFRLENBQUMsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDO1FBQzVCLE1BQU0sSUFBSSxLQUFLLENBQUMsMkJBQTJCLFFBQVEsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFDRCxNQUFNLFNBQVMsR0FBRyxRQUFRLENBQUMsU0FBUyxJQUFJLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxDQUFDO0lBQzlFLE9BQU8sRUFBRSxLQUFLLEVBQUUsUUFBUSxDQUFDLEtBQUssRUFBRSxTQUFTLEVBQUUsQ0FBQztBQUM5QyxDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsaUJBQWlCLENBQ3JDLGVBQXVCLEVBQ3ZCLGNBQXVCLEVBQ3ZCLFNBQVMsR0FBRyxLQUFLO0lBRWpCLE1BQU0sQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLEdBQUcsZUFBZSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3ZFLE1BQU0sT0FBTyxHQUFHLEtBQUs7UUFDbkIsQ0FBQyxDQUFDLEdBQUcsT0FBTyxlQUFlLEtBQUssV0FBVyxjQUFjLEVBQUU7UUFDM0QsQ0FBQyxDQUFDLEdBQUcsT0FBTyxzQkFBc0IsY0FBYyxFQUFFLENBQUM7SUFFckQsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLFNBQVMsQ0FBQztJQUN4QyxPQUFPLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxRQUFRLEVBQUUsQ0FBQztRQUM3QixJQUFJLENBQUM7WUFDSCxNQUFNLEdBQUcsR0FBRyxNQUFNLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUNqQyxNQUFNLElBQUksR0FBRyxDQUFDLE1BQU0sR0FBRyxDQUFDLElBQUksRUFBRSxDQUEyQyxDQUFDO1lBQzFFLElBQUksSUFBSSxDQUFDLGVBQWUsSUFBSSxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sR0FBRyxDQUFDO2dCQUFFLE9BQU8sSUFBSSxDQUFDO1FBQzNFLENBQUM7UUFBQyxNQUFNLENBQUM7WUFDUCwwQkFBMEI7UUFDNUIsQ0FBQztRQUNELE1BQU0sSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQztJQUMvQyxDQUFDO0lBQ0QsT0FBTyxLQUFLLENBQUM7QUFDZixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgZ2V0QmFzZTU4RGVjb2RlcixcbiAgY3JlYXRlU2lnbmFibGVNZXNzYWdlLFxuICB0eXBlIEFkZHJlc3MsXG4gIHR5cGUgTWVzc2FnZVBhcnRpYWxTaWduZXIsXG59IGZyb20gXCJAc29sYW5hL2tpdFwiO1xuXG5leHBvcnQgdHlwZSB7IE1lc3NhZ2VQYXJ0aWFsU2lnbmVyIGFzIE1lc3NhZ2VTaWduZXIgfTtcblxuLyoqXG4gKiBBdXRoZW50aWNhdGUgd2l0aCB0aGUgTWFnaWNCbG9jayBURUUgdmlhIGNoYWxsZW5nZS1zaWduIGZsb3cuXG4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBnZXRBdXRoVG9rZW4oXG4gIHJwY1VybDogc3RyaW5nLFxuICBzaWduZXI6IE1lc3NhZ2VQYXJ0aWFsU2lnbmVyLFxuKTogUHJvbWlzZTx7IHRva2VuOiBzdHJpbmc7IGV4cGlyZXNBdDogbnVtYmVyIH0+IHtcbiAgY29uc3QgY2hhbGxlbmdlUmVzID0gYXdhaXQgZmV0Y2goXG4gICAgYCR7cnBjVXJsfS9hdXRoL2NoYWxsZW5nZT9wdWJrZXk9JHtzaWduZXIuYWRkcmVzc31gXG4gICk7XG4gIGlmICghY2hhbGxlbmdlUmVzLm9rKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKGBURUUgY2hhbGxlbmdlIGZhaWxlZDogJHtjaGFsbGVuZ2VSZXMuc3RhdHVzVGV4dH1gKTtcbiAgfVxuICBjb25zdCB7IGNoYWxsZW5nZSB9ID0gKGF3YWl0IGNoYWxsZW5nZVJlcy5qc29uKCkpIGFzIHsgY2hhbGxlbmdlOiBzdHJpbmcgfTtcblxuICBjb25zdCBjaGFsbGVuZ2VCeXRlcyA9IG5ldyBUZXh0RW5jb2RlcigpLmVuY29kZShjaGFsbGVuZ2UpO1xuICBjb25zdCBbc2lnRGljdF0gPSBhd2FpdCBzaWduZXIuc2lnbk1lc3NhZ2VzKFtjcmVhdGVTaWduYWJsZU1lc3NhZ2UoY2hhbGxlbmdlQnl0ZXMpXSk7XG4gIGNvbnN0IHNpZ25hdHVyZSA9IHNpZ0RpY3Rbc2lnbmVyLmFkZHJlc3MgYXMgQWRkcmVzc107XG4gIGNvbnN0IHNpZ25hdHVyZVN0cmluZyA9IGdldEJhc2U1OERlY29kZXIoKS5kZWNvZGUoc2lnbmF0dXJlKTtcblxuICBjb25zdCB0b2tlblJlcyA9IGF3YWl0IGZldGNoKGAke3JwY1VybH0vYXV0aC9sb2dpbmAsIHtcbiAgICBtZXRob2Q6IFwiUE9TVFwiLFxuICAgIGhlYWRlcnM6IHsgXCJDb250ZW50LVR5cGVcIjogXCJhcHBsaWNhdGlvbi9qc29uXCIgfSxcbiAgICBib2R5OiBKU09OLnN0cmluZ2lmeSh7XG4gICAgICBwdWJrZXk6IHNpZ25lci5hZGRyZXNzLFxuICAgICAgY2hhbGxlbmdlLFxuICAgICAgc2lnbmF0dXJlOiBzaWduYXR1cmVTdHJpbmcsXG4gICAgfSksXG4gIH0pO1xuICBjb25zdCBhdXRoSnNvbiA9IChhd2FpdCB0b2tlblJlcy5qc29uKCkpIGFzIHsgdG9rZW46IHN0cmluZzsgZXhwaXJlc0F0PzogbnVtYmVyOyBlcnJvcj86IHN0cmluZyB9O1xuICBpZiAodG9rZW5SZXMuc3RhdHVzICE9PSAyMDApIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoYEZhaWxlZCB0byBhdXRoZW50aWNhdGU6ICR7YXV0aEpzb24uZXJyb3J9YCk7XG4gIH1cbiAgY29uc3QgZXhwaXJlc0F0ID0gYXV0aEpzb24uZXhwaXJlc0F0ID8/IERhdGUubm93KCkgKyAxMDAwICogNjAgKiA2MCAqIDI0ICogMzA7XG4gIHJldHVybiB7IHRva2VuOiBhdXRoSnNvbi50b2tlbiwgZXhwaXJlc0F0IH07XG59XG5cbi8qKlxuICogUG9sbCB0aGUgVEVFIHVudGlsIHRoZSBQZXJtaXNzaW9uIFBEQSBmb3IgdGhlIGdpdmVuIGFjY291bnQgaXMgYWN0aXZlIChhdXRob3JpemVkVXNlcnMgbm9uLWVtcHR5KS5cbiAqIFRoaXMgY29uZmlybXMgdGhlIFRFRSBoYXMgcGlja2VkIHVwIHRoZSBkZWxlZ2F0ZWQgUGVybWlzc2lvbiBQREEgYW5kIGlzIGVuZm9yY2luZyBhY2Nlc3MgY29udHJvbC5cbiAqIFJldHVybnMgdHJ1ZSBpZiBhY3RpdmUgYmVmb3JlIHRpbWVvdXQsIGZhbHNlIG90aGVyd2lzZS5cbiAqL1xuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIHdhaXRGb3JQZXJtaXNzaW9uKFxuICB0ZWVVcmxXaXRoVG9rZW46IHN0cmluZyxcbiAgYWNjb3VudEFkZHJlc3M6IEFkZHJlc3MsXG4gIHRpbWVvdXRNcyA9IDEwMDAwLFxuKTogUHJvbWlzZTxib29sZWFuPiB7XG4gIGNvbnN0IFtiYXNlVXJsLCB0b2tlbl0gPSB0ZWVVcmxXaXRoVG9rZW4ucmVwbGFjZShcIi8/XCIsIFwiP1wiKS5zcGxpdChcIj9cIik7XG4gIGNvbnN0IHBlcm1VcmwgPSB0b2tlblxuICAgID8gYCR7YmFzZVVybH0vcGVybWlzc2lvbj8ke3Rva2VufSZwdWJrZXk9JHthY2NvdW50QWRkcmVzc31gXG4gICAgOiBgJHtiYXNlVXJsfS9wZXJtaXNzaW9uP3B1YmtleT0ke2FjY291bnRBZGRyZXNzfWA7XG5cbiAgY29uc3QgZGVhZGxpbmUgPSBEYXRlLm5vdygpICsgdGltZW91dE1zO1xuICB3aGlsZSAoRGF0ZS5ub3coKSA8IGRlYWRsaW5lKSB7XG4gICAgdHJ5IHtcbiAgICAgIGNvbnN0IHJlcyA9IGF3YWl0IGZldGNoKHBlcm1VcmwpO1xuICAgICAgY29uc3QganNvbiA9IChhd2FpdCByZXMuanNvbigpKSBhcyB7IGF1dGhvcml6ZWRVc2Vycz86IHVua25vd25bXSB8IG51bGwgfTtcbiAgICAgIGlmIChqc29uLmF1dGhvcml6ZWRVc2VycyAmJiBqc29uLmF1dGhvcml6ZWRVc2Vycy5sZW5ndGggPiAwKSByZXR1cm4gdHJ1ZTtcbiAgICB9IGNhdGNoIHtcbiAgICAgIC8vIGlnbm9yZSB0cmFuc2llbnQgZXJyb3JzXG4gICAgfVxuICAgIGF3YWl0IG5ldyBQcm9taXNlKChyKSA9PiBzZXRUaW1lb3V0KHIsIDUwMCkpO1xuICB9XG4gIHJldHVybiBmYWxzZTtcbn1cblxuIl19
|
package/dist/transaction.d.ts
CHANGED
|
@@ -2,10 +2,12 @@ import { type Instruction, type SolanaRpcApi, type Rpc, type TransactionSigner }
|
|
|
2
2
|
type SolanaRpc = Rpc<SolanaRpcApi>;
|
|
3
3
|
/**
|
|
4
4
|
* Build, sign with a Kit keypair signer, and send a single instruction.
|
|
5
|
+
* Throws if the transaction is rejected or times out.
|
|
5
6
|
*/
|
|
6
7
|
export declare function sendInstruction(rpc: SolanaRpc, instruction: Instruction, signer: TransactionSigner): Promise<string>;
|
|
7
8
|
/**
|
|
8
9
|
* Build, sign, and send multiple instructions in a single transaction.
|
|
10
|
+
* Throws if the transaction is rejected or times out.
|
|
9
11
|
*/
|
|
10
12
|
export declare function sendInstructions(rpc: SolanaRpc, instructions: Instruction[], signer: TransactionSigner): Promise<string>;
|
|
11
13
|
export {};
|
package/dist/transaction.js
CHANGED
|
@@ -1,6 +1,30 @@
|
|
|
1
1
|
import { createTransactionMessage, setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, appendTransactionMessageInstruction, appendTransactionMessageInstructions, signTransactionMessageWithSigners, getBase64EncodedWireTransaction, pipe, } from "@solana/kit";
|
|
2
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
3
|
+
const bigIntReplacer = (_, v) => typeof v === 'bigint' ? v.toString() : v;
|
|
4
|
+
/**
|
|
5
|
+
* Poll for transaction confirmation and throw if it failed.
|
|
6
|
+
* This ensures callers always know immediately when a transaction is rejected.
|
|
7
|
+
*/
|
|
8
|
+
async function confirmTransaction(rpc, sig) {
|
|
9
|
+
for (let i = 0; i < 8; i++) {
|
|
10
|
+
await new Promise(r => setTimeout(r, 1000));
|
|
11
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
12
|
+
const statuses = await rpc.getSignatureStatuses([sig], { searchTransactionHistory: false }).send().catch(() => null);
|
|
13
|
+
const status = statuses?.value?.[0];
|
|
14
|
+
if (status) {
|
|
15
|
+
if (status.err) {
|
|
16
|
+
throw new Error(`[TX] ${sig.slice(0, 16)}... FAILED: ${JSON.stringify(status.err, bigIntReplacer)}`);
|
|
17
|
+
}
|
|
18
|
+
console.log(`[TX] ${sig.slice(0, 16)}... ${status.confirmationStatus}`);
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
// No status after 8s — treat as timeout rather than silently succeeding
|
|
23
|
+
throw new Error(`[TX] ${sig.slice(0, 16)}... confirmation timeout (no status after 8s)`);
|
|
24
|
+
}
|
|
2
25
|
/**
|
|
3
26
|
* Build, sign with a Kit keypair signer, and send a single instruction.
|
|
27
|
+
* Throws if the transaction is rejected or times out.
|
|
4
28
|
*/
|
|
5
29
|
export async function sendInstruction(rpc, instruction, signer) {
|
|
6
30
|
const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
|
|
@@ -13,27 +37,12 @@ export async function sendInstruction(rpc, instruction, signer) {
|
|
|
13
37
|
encoding: "base64",
|
|
14
38
|
skipPreflight: true,
|
|
15
39
|
}).send();
|
|
16
|
-
|
|
17
|
-
for (let i = 0; i < 8; i++) {
|
|
18
|
-
await new Promise(r => setTimeout(r, 1000));
|
|
19
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
20
|
-
const statuses = await rpc.getSignatureStatuses([sig], { searchTransactionHistory: false }).send().catch(() => null);
|
|
21
|
-
const status = statuses?.value?.[0];
|
|
22
|
-
if (status) {
|
|
23
|
-
if (status.err) {
|
|
24
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
25
|
-
console.error(`[TX] ${sig.slice(0, 16)}... FAILED:`, JSON.stringify(status.err, (_, v) => typeof v === 'bigint' ? v.toString() : v));
|
|
26
|
-
}
|
|
27
|
-
else if (status.confirmationStatus) {
|
|
28
|
-
console.log(`[TX] ${sig.slice(0, 16)}... ${status.confirmationStatus}`);
|
|
29
|
-
}
|
|
30
|
-
break;
|
|
31
|
-
}
|
|
32
|
-
}
|
|
40
|
+
await confirmTransaction(rpc, sig);
|
|
33
41
|
return sig;
|
|
34
42
|
}
|
|
35
43
|
/**
|
|
36
44
|
* Build, sign, and send multiple instructions in a single transaction.
|
|
45
|
+
* Throws if the transaction is rejected or times out.
|
|
37
46
|
*/
|
|
38
47
|
export async function sendInstructions(rpc, instructions, signer) {
|
|
39
48
|
const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
|
|
@@ -42,9 +51,11 @@ export async function sendInstructions(rpc, instructions, signer) {
|
|
|
42
51
|
const signedTx = await signTransactionMessageWithSigners(tx);
|
|
43
52
|
const encoded = getBase64EncodedWireTransaction(signedTx);
|
|
44
53
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
45
|
-
|
|
54
|
+
const sig = await rpc.sendTransaction(encoded, {
|
|
46
55
|
encoding: "base64",
|
|
47
56
|
skipPreflight: true,
|
|
48
57
|
}).send();
|
|
58
|
+
await confirmTransaction(rpc, sig);
|
|
59
|
+
return sig;
|
|
49
60
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../src/transaction.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createTransactionMessage,\n  setTransactionMessageFeePayerSigner,\n  setTransactionMessageLifetimeUsingBlockhash,\n  appendTransactionMessageInstruction,\n  appendTransactionMessageInstructions,\n  signTransactionMessageWithSigners,\n  getBase64EncodedWireTransaction,\n  pipe,\n  type Instruction,\n  type SolanaRpcApi,\n  type Rpc,\n  type TransactionSigner,\n} from \"@solana/kit\";\n\ntype SolanaRpc = Rpc<SolanaRpcApi>;\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst bigIntReplacer = (_: string, v: unknown) => typeof v === 'bigint' ? v.toString() : v;\n\n/**\n * Poll for transaction confirmation and throw if it failed.\n * This ensures callers always know immediately when a transaction is rejected.\n */\nasync function confirmTransaction(rpc: SolanaRpc, sig: string): Promise<void> {\n  for (let i = 0; i < 8; i++) {\n    await new Promise(r => setTimeout(r, 1000));\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const statuses = await (rpc as any).getSignatureStatuses([sig], { searchTransactionHistory: false }).send().catch(() => null);\n    const status = statuses?.value?.[0];\n    if (status) {\n      if (status.err) {\n        throw new Error(`[TX] ${sig.slice(0, 16)}... FAILED: ${JSON.stringify(status.err, bigIntReplacer)}`);\n      }\n      console.log(`[TX] ${sig.slice(0, 16)}... ${status.confirmationStatus}`);\n      return;\n    }\n  }\n  // No status after 8s — treat as timeout rather than silently succeeding\n  throw new Error(`[TX] ${sig.slice(0, 16)}... confirmation timeout (no status after 8s)`);\n}\n\n/**\n * Build, sign with a Kit keypair signer, and send a single instruction.\n * Throws if the transaction is rejected or times out.\n */\nexport async function sendInstruction(\n  rpc: SolanaRpc,\n  instruction: Instruction,\n  signer: TransactionSigner,\n): Promise<string> {\n  const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const tx: any = pipe(\n    createTransactionMessage({ version: 0 as const }),\n    (m) => setTransactionMessageFeePayerSigner(signer, m),\n    (m) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, m),\n    (m) => appendTransactionMessageInstruction(instruction, m),\n  );\n\n  const signedTx = await signTransactionMessageWithSigners(tx);\n  const encoded = getBase64EncodedWireTransaction(signedTx);\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const sig = await (rpc.sendTransaction(encoded as any, {\n    encoding: \"base64\",\n    skipPreflight: true,\n  }).send() as Promise<string>);\n\n  await confirmTransaction(rpc, sig);\n  return sig;\n}\n\n/**\n * Build, sign, and send multiple instructions in a single transaction.\n * Throws if the transaction is rejected or times out.\n */\nexport async function sendInstructions(\n  rpc: SolanaRpc,\n  instructions: Instruction[],\n  signer: TransactionSigner,\n): Promise<string> {\n  const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const tx: any = pipe(\n    createTransactionMessage({ version: 0 as const }),\n    (m) => setTransactionMessageFeePayerSigner(signer, m),\n    (m) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, m),\n    (m) => appendTransactionMessageInstructions(instructions, m),\n  );\n\n  const signedTx = await signTransactionMessageWithSigners(tx);\n  const encoded = getBase64EncodedWireTransaction(signedTx);\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const sig = await (rpc.sendTransaction(encoded as any, {\n    encoding: \"base64\",\n    skipPreflight: true,\n  }).send() as Promise<string>);\n\n  await confirmTransaction(rpc, sig);\n  return sig;\n}\n"]}
|
package/dist/utils.d.ts
CHANGED
|
@@ -1,4 +1,14 @@
|
|
|
1
1
|
import { type Address } from "@solana/kit";
|
|
2
|
+
export declare const PERMISSION_PROGRAM: Address;
|
|
3
|
+
export declare const DELEGATION_PROGRAM: Address;
|
|
4
|
+
/** Derives the Permission PDA for a given permissioned account. */
|
|
5
|
+
export declare function derivePermissionPda(accountAddress: Address): Promise<Address>;
|
|
6
|
+
/** Derives the DELeGG delegation PDAs for the Permission PDA (used in DelegatePermission ix). */
|
|
7
|
+
export declare function derivePermissionDelegationPdas(permissionPda: Address): Promise<{
|
|
8
|
+
delegationBuffer: Address;
|
|
9
|
+
delegationRecord: Address;
|
|
10
|
+
delegationMetadata: Address;
|
|
11
|
+
}>;
|
|
2
12
|
export declare const QUEUE_SEED = "queue";
|
|
3
13
|
export declare const TENANT_SEED = "tenant";
|
|
4
14
|
export declare const TICKET_SEED = "ticket";
|
package/dist/utils.js
CHANGED
|
@@ -1,6 +1,33 @@
|
|
|
1
1
|
import { getProgramDerivedAddress, getAddressEncoder, getUtf8Encoder, } from "@solana/kit";
|
|
2
2
|
const addressEncoder = getAddressEncoder();
|
|
3
3
|
const utf8Encoder = getUtf8Encoder();
|
|
4
|
+
export const PERMISSION_PROGRAM = "ACLseoPoyC3cBqoUtkbjZ4aDrkurZW86v19pXz2XQnp1";
|
|
5
|
+
export const DELEGATION_PROGRAM = "DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh";
|
|
6
|
+
/** Derives the Permission PDA for a given permissioned account. */
|
|
7
|
+
export async function derivePermissionPda(accountAddress) {
|
|
8
|
+
const [pda] = await getProgramDerivedAddress({
|
|
9
|
+
programAddress: PERMISSION_PROGRAM,
|
|
10
|
+
seeds: [utf8Encoder.encode("permission:"), addressEncoder.encode(accountAddress)],
|
|
11
|
+
});
|
|
12
|
+
return pda;
|
|
13
|
+
}
|
|
14
|
+
/** Derives the DELeGG delegation PDAs for the Permission PDA (used in DelegatePermission ix). */
|
|
15
|
+
export async function derivePermissionDelegationPdas(permissionPda) {
|
|
16
|
+
const [delegationRecord] = await getProgramDerivedAddress({
|
|
17
|
+
programAddress: DELEGATION_PROGRAM,
|
|
18
|
+
seeds: [utf8Encoder.encode("delegation"), addressEncoder.encode(permissionPda)],
|
|
19
|
+
});
|
|
20
|
+
const [delegationMetadata] = await getProgramDerivedAddress({
|
|
21
|
+
programAddress: DELEGATION_PROGRAM,
|
|
22
|
+
seeds: [utf8Encoder.encode("delegation-metadata"), addressEncoder.encode(permissionPda)],
|
|
23
|
+
});
|
|
24
|
+
// Buffer PDA is under the ownerProgram (PERMISSION_PROGRAM for the Permission PDA)
|
|
25
|
+
const [delegationBuffer] = await getProgramDerivedAddress({
|
|
26
|
+
programAddress: PERMISSION_PROGRAM,
|
|
27
|
+
seeds: [utf8Encoder.encode("buffer"), addressEncoder.encode(permissionPda)],
|
|
28
|
+
});
|
|
29
|
+
return { delegationBuffer, delegationRecord, delegationMetadata };
|
|
30
|
+
}
|
|
4
31
|
export const QUEUE_SEED = "queue";
|
|
5
32
|
export const TENANT_SEED = "tenant";
|
|
6
33
|
export const TICKET_SEED = "ticket";
|
|
@@ -29,4 +56,4 @@ export async function deriveTicketPda(programId, player, tenant) {
|
|
|
29
56
|
});
|
|
30
57
|
return pda;
|
|
31
58
|
}
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLHdCQUF3QixFQUN4QixpQkFBaUIsRUFDakIsY0FBYyxHQUVmLE1BQU0sYUFBYSxDQUFDO0FBRXJCLE1BQU0sY0FBYyxHQUFHLGlCQUFpQixFQUFFLENBQUM7QUFDM0MsTUFBTSxXQUFXLEdBQUcsY0FBYyxFQUFFLENBQUM7QUFFckMsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsOENBQXlELENBQUM7QUFDNUYsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsOENBQXlELENBQUM7QUFFNUYsbUVBQW1FO0FBQ25FLE1BQU0sQ0FBQyxLQUFLLFVBQVUsbUJBQW1CLENBQUMsY0FBdUI7SUFDL0QsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLE1BQU0sd0JBQXdCLENBQUM7UUFDM0MsY0FBYyxFQUFFLGtCQUFrQjtRQUNsQyxLQUFLLEVBQUUsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxFQUFFLGNBQWMsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUM7S0FDbEYsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQsaUdBQWlHO0FBQ2pHLE1BQU0sQ0FBQyxLQUFLLFVBQVUsOEJBQThCLENBQUMsYUFBc0I7SUFLekUsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsTUFBTSx3QkFBd0IsQ0FBQztRQUN4RCxjQUFjLEVBQUUsa0JBQWtCO1FBQ2xDLEtBQUssRUFBRSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLEVBQUUsY0FBYyxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztLQUNoRixDQUFDLENBQUM7SUFDSCxNQUFNLENBQUMsa0JBQWtCLENBQUMsR0FBRyxNQUFNLHdCQUF3QixDQUFDO1FBQzFELGNBQWMsRUFBRSxrQkFBa0I7UUFDbEMsS0FBSyxFQUFFLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxFQUFFLGNBQWMsQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7S0FDekYsQ0FBQyxDQUFDO0lBQ0gsbUZBQW1GO0lBQ25GLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLE1BQU0sd0JBQXdCLENBQUM7UUFDeEQsY0FBYyxFQUFFLGtCQUFrQjtRQUNsQyxLQUFLLEVBQUUsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxFQUFFLGNBQWMsQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7S0FDNUUsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxFQUFFLGdCQUFnQixFQUFFLGdCQUFnQixFQUFFLGtCQUFrQixFQUFFLENBQUM7QUFDcEUsQ0FBQztBQUVELE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUM7QUFDbEMsTUFBTSxDQUFDLE1BQU0sV0FBVyxHQUFHLFFBQVEsQ0FBQztBQUNwQyxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsUUFBUSxDQUFDO0FBRXBDLE1BQU0sQ0FBQyxLQUFLLFVBQVUsY0FBYyxDQUFDLFNBQWtCLEVBQUUsU0FBa0I7SUFDekUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLE1BQU0sd0JBQXdCLENBQUM7UUFDM0MsY0FBYyxFQUFFLFNBQVM7UUFDekIsS0FBSyxFQUFFLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBRSxjQUFjLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0tBQzFFLENBQUMsQ0FBQztJQUNILE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQztBQUVELE1BQU0sQ0FBQyxLQUFLLFVBQVUsZUFBZSxDQUFDLFNBQWtCLEVBQUUsU0FBa0I7SUFDMUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLE1BQU0sd0JBQXdCLENBQUM7UUFDM0MsY0FBYyxFQUFFLFNBQVM7UUFDekIsS0FBSyxFQUFFLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsRUFBRSxjQUFjLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0tBQzNFLENBQUMsQ0FBQztJQUNILE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQztBQUVELE1BQU0sQ0FBQyxLQUFLLFVBQVUsZUFBZSxDQUNuQyxTQUFrQixFQUNsQixNQUFlLEVBQ2YsTUFBZTtJQUVmLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxNQUFNLHdCQUF3QixDQUFDO1FBQzNDLGNBQWMsRUFBRSxTQUFTO1FBQ3pCLEtBQUssRUFBRTtZQUNMLFdBQVcsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDO1lBQy9CLGNBQWMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDO1lBQzdCLGNBQWMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDO1NBQzlCO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgZ2V0UHJvZ3JhbURlcml2ZWRBZGRyZXNzLFxuICBnZXRBZGRyZXNzRW5jb2RlcixcbiAgZ2V0VXRmOEVuY29kZXIsXG4gIHR5cGUgQWRkcmVzcyxcbn0gZnJvbSBcIkBzb2xhbmEva2l0XCI7XG5cbmNvbnN0IGFkZHJlc3NFbmNvZGVyID0gZ2V0QWRkcmVzc0VuY29kZXIoKTtcbmNvbnN0IHV0ZjhFbmNvZGVyID0gZ2V0VXRmOEVuY29kZXIoKTtcblxuZXhwb3J0IGNvbnN0IFBFUk1JU1NJT05fUFJPR1JBTSA9IFwiQUNMc2VvUG95QzNjQnFvVXRrYmpaNGFEcmt1clpXODZ2MTlwWHoyWFFucDFcIiBhcyBBZGRyZXNzO1xuZXhwb3J0IGNvbnN0IERFTEVHQVRJT05fUFJPR1JBTSA9IFwiREVMZUdHdlhwV1YyZnFKVWhxY0Y1WlNZTVM0SlRManRlYUFNQVJSU2FlU2hcIiBhcyBBZGRyZXNzO1xuXG4vKiogRGVyaXZlcyB0aGUgUGVybWlzc2lvbiBQREEgZm9yIGEgZ2l2ZW4gcGVybWlzc2lvbmVkIGFjY291bnQuICovXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gZGVyaXZlUGVybWlzc2lvblBkYShhY2NvdW50QWRkcmVzczogQWRkcmVzcyk6IFByb21pc2U8QWRkcmVzcz4ge1xuICBjb25zdCBbcGRhXSA9IGF3YWl0IGdldFByb2dyYW1EZXJpdmVkQWRkcmVzcyh7XG4gICAgcHJvZ3JhbUFkZHJlc3M6IFBFUk1JU1NJT05fUFJPR1JBTSxcbiAgICBzZWVkczogW3V0ZjhFbmNvZGVyLmVuY29kZShcInBlcm1pc3Npb246XCIpLCBhZGRyZXNzRW5jb2Rlci5lbmNvZGUoYWNjb3VudEFkZHJlc3MpXSxcbiAgfSk7XG4gIHJldHVybiBwZGE7XG59XG5cbi8qKiBEZXJpdmVzIHRoZSBERUxlR0cgZGVsZWdhdGlvbiBQREFzIGZvciB0aGUgUGVybWlzc2lvbiBQREEgKHVzZWQgaW4gRGVsZWdhdGVQZXJtaXNzaW9uIGl4KS4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBkZXJpdmVQZXJtaXNzaW9uRGVsZWdhdGlvblBkYXMocGVybWlzc2lvblBkYTogQWRkcmVzcyk6IFByb21pc2U8e1xuICBkZWxlZ2F0aW9uQnVmZmVyOiBBZGRyZXNzO1xuICBkZWxlZ2F0aW9uUmVjb3JkOiBBZGRyZXNzO1xuICBkZWxlZ2F0aW9uTWV0YWRhdGE6IEFkZHJlc3M7XG59PiB7XG4gIGNvbnN0IFtkZWxlZ2F0aW9uUmVjb3JkXSA9IGF3YWl0IGdldFByb2dyYW1EZXJpdmVkQWRkcmVzcyh7XG4gICAgcHJvZ3JhbUFkZHJlc3M6IERFTEVHQVRJT05fUFJPR1JBTSxcbiAgICBzZWVkczogW3V0ZjhFbmNvZGVyLmVuY29kZShcImRlbGVnYXRpb25cIiksIGFkZHJlc3NFbmNvZGVyLmVuY29kZShwZXJtaXNzaW9uUGRhKV0sXG4gIH0pO1xuICBjb25zdCBbZGVsZWdhdGlvbk1ldGFkYXRhXSA9IGF3YWl0IGdldFByb2dyYW1EZXJpdmVkQWRkcmVzcyh7XG4gICAgcHJvZ3JhbUFkZHJlc3M6IERFTEVHQVRJT05fUFJPR1JBTSxcbiAgICBzZWVkczogW3V0ZjhFbmNvZGVyLmVuY29kZShcImRlbGVnYXRpb24tbWV0YWRhdGFcIiksIGFkZHJlc3NFbmNvZGVyLmVuY29kZShwZXJtaXNzaW9uUGRhKV0sXG4gIH0pO1xuICAvLyBCdWZmZXIgUERBIGlzIHVuZGVyIHRoZSBvd25lclByb2dyYW0gKFBFUk1JU1NJT05fUFJPR1JBTSBmb3IgdGhlIFBlcm1pc3Npb24gUERBKVxuICBjb25zdCBbZGVsZWdhdGlvbkJ1ZmZlcl0gPSBhd2FpdCBnZXRQcm9ncmFtRGVyaXZlZEFkZHJlc3Moe1xuICAgIHByb2dyYW1BZGRyZXNzOiBQRVJNSVNTSU9OX1BST0dSQU0sXG4gICAgc2VlZHM6IFt1dGY4RW5jb2Rlci5lbmNvZGUoXCJidWZmZXJcIiksIGFkZHJlc3NFbmNvZGVyLmVuY29kZShwZXJtaXNzaW9uUGRhKV0sXG4gIH0pO1xuICByZXR1cm4geyBkZWxlZ2F0aW9uQnVmZmVyLCBkZWxlZ2F0aW9uUmVjb3JkLCBkZWxlZ2F0aW9uTWV0YWRhdGEgfTtcbn1cblxuZXhwb3J0IGNvbnN0IFFVRVVFX1NFRUQgPSBcInF1ZXVlXCI7XG5leHBvcnQgY29uc3QgVEVOQU5UX1NFRUQgPSBcInRlbmFudFwiO1xuZXhwb3J0IGNvbnN0IFRJQ0tFVF9TRUVEID0gXCJ0aWNrZXRcIjtcblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGRlcml2ZVF1ZXVlUGRhKHByb2dyYW1JZDogQWRkcmVzcywgYXV0aG9yaXR5OiBBZGRyZXNzKTogUHJvbWlzZTxBZGRyZXNzPiB7XG4gIGNvbnN0IFtwZGFdID0gYXdhaXQgZ2V0UHJvZ3JhbURlcml2ZWRBZGRyZXNzKHtcbiAgICBwcm9ncmFtQWRkcmVzczogcHJvZ3JhbUlkLFxuICAgIHNlZWRzOiBbdXRmOEVuY29kZXIuZW5jb2RlKFFVRVVFX1NFRUQpLCBhZGRyZXNzRW5jb2Rlci5lbmNvZGUoYXV0aG9yaXR5KV0sXG4gIH0pO1xuICByZXR1cm4gcGRhO1xufVxuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gZGVyaXZlVGVuYW50UGRhKHByb2dyYW1JZDogQWRkcmVzcywgYXV0aG9yaXR5OiBBZGRyZXNzKTogUHJvbWlzZTxBZGRyZXNzPiB7XG4gIGNvbnN0IFtwZGFdID0gYXdhaXQgZ2V0UHJvZ3JhbURlcml2ZWRBZGRyZXNzKHtcbiAgICBwcm9ncmFtQWRkcmVzczogcHJvZ3JhbUlkLFxuICAgIHNlZWRzOiBbdXRmOEVuY29kZXIuZW5jb2RlKFRFTkFOVF9TRUVEKSwgYWRkcmVzc0VuY29kZXIuZW5jb2RlKGF1dGhvcml0eSldLFxuICB9KTtcbiAgcmV0dXJuIHBkYTtcbn1cblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGRlcml2ZVRpY2tldFBkYShcbiAgcHJvZ3JhbUlkOiBBZGRyZXNzLFxuICBwbGF5ZXI6IEFkZHJlc3MsXG4gIHRlbmFudDogQWRkcmVzc1xuKTogUHJvbWlzZTxBZGRyZXNzPiB7XG4gIGNvbnN0IFtwZGFdID0gYXdhaXQgZ2V0UHJvZ3JhbURlcml2ZWRBZGRyZXNzKHtcbiAgICBwcm9ncmFtQWRkcmVzczogcHJvZ3JhbUlkLFxuICAgIHNlZWRzOiBbXG4gICAgICB1dGY4RW5jb2Rlci5lbmNvZGUoVElDS0VUX1NFRUQpLFxuICAgICAgYWRkcmVzc0VuY29kZXIuZW5jb2RlKHBsYXllciksXG4gICAgICBhZGRyZXNzRW5jb2Rlci5lbmNvZGUodGVuYW50KSxcbiAgICBdLFxuICB9KTtcbiAgcmV0dXJuIHBkYTtcbn1cbiJdfQ==
|
package/package.json
CHANGED
package/src/admin.ts
CHANGED
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
import {
|
|
2
2
|
createSolanaRpc,
|
|
3
|
+
AccountRole,
|
|
3
4
|
type Address,
|
|
4
5
|
type TransactionSigner,
|
|
5
6
|
type Rpc,
|
|
6
7
|
type SolanaRpcApi,
|
|
8
|
+
type Instruction,
|
|
7
9
|
} from "@solana/kit";
|
|
8
10
|
import {
|
|
9
11
|
getInitializeTenantInstructionAsync,
|
|
10
12
|
getInitializeQueueInstructionAsync,
|
|
11
13
|
getDelegateQueueInstructionAsync,
|
|
14
|
+
getSetupQueuePermissionInstructionAsync,
|
|
12
15
|
getFlushMatchesInstruction,
|
|
13
16
|
getCommitTicketsInstruction,
|
|
14
17
|
fetchQueue,
|
|
@@ -114,6 +117,39 @@ export class MatchmakingAdmin {
|
|
|
114
117
|
validator?: Address,
|
|
115
118
|
): Promise<string> {
|
|
116
119
|
const queuePda = await this.getQueuePda(authority);
|
|
120
|
+
|
|
121
|
+
// 1. Create Permission PDA for the queue (CPI from duel program with invoke_signed)
|
|
122
|
+
const permissionPda = await utils.derivePermissionPda(queuePda);
|
|
123
|
+
const setupIx = await getSetupQueuePermissionInstructionAsync({
|
|
124
|
+
authority: this.signer,
|
|
125
|
+
permission: permissionPda,
|
|
126
|
+
permissionProgram: utils.PERMISSION_PROGRAM,
|
|
127
|
+
}, { programAddress: this.programId });
|
|
128
|
+
await sendInstruction(this.rpc, setupIx, this.signer);
|
|
129
|
+
|
|
130
|
+
// 2. Delegate Permission PDA to TEE (called on permission program, authority signs)
|
|
131
|
+
const { delegationBuffer, delegationRecord, delegationMetadata } =
|
|
132
|
+
await utils.derivePermissionDelegationPdas(permissionPda);
|
|
133
|
+
const delegatePermIx: Instruction = {
|
|
134
|
+
programAddress: utils.PERMISSION_PROGRAM,
|
|
135
|
+
data: new Uint8Array([3, 0, 0, 0, 0, 0, 0, 0]), // discriminator = 3 (DelegatePermission)
|
|
136
|
+
accounts: [
|
|
137
|
+
{ address: this.signer.address, role: AccountRole.WRITABLE_SIGNER }, // payer
|
|
138
|
+
{ address: this.signer.address, role: AccountRole.READONLY_SIGNER }, // authority
|
|
139
|
+
{ address: queuePda, role: AccountRole.READONLY }, // permissionedAccount (not signer)
|
|
140
|
+
{ address: permissionPda, role: AccountRole.WRITABLE }, // permission PDA
|
|
141
|
+
{ address: "11111111111111111111111111111111" as Address, role: AccountRole.READONLY }, // system_program
|
|
142
|
+
{ address: utils.PERMISSION_PROGRAM, role: AccountRole.READONLY }, // owner_program
|
|
143
|
+
{ address: delegationBuffer, role: AccountRole.WRITABLE },
|
|
144
|
+
{ address: delegationRecord, role: AccountRole.WRITABLE },
|
|
145
|
+
{ address: delegationMetadata, role: AccountRole.WRITABLE },
|
|
146
|
+
{ address: utils.DELEGATION_PROGRAM, role: AccountRole.READONLY },
|
|
147
|
+
...(validator ? [{ address: validator, role: AccountRole.READONLY }] : []),
|
|
148
|
+
],
|
|
149
|
+
};
|
|
150
|
+
await sendInstruction(this.rpc, delegatePermIx, this.signer);
|
|
151
|
+
|
|
152
|
+
// 3. Delegate queue PDA to TEE (existing DELeGG flow)
|
|
117
153
|
const ix = await getDelegateQueueInstructionAsync({
|
|
118
154
|
pda: queuePda,
|
|
119
155
|
payer: this.signer,
|
|
@@ -127,7 +163,6 @@ export class MatchmakingAdmin {
|
|
|
127
163
|
queue: Address,
|
|
128
164
|
tenant: Address,
|
|
129
165
|
ticketPdas: Address[],
|
|
130
|
-
callbackProgram?: Address,
|
|
131
166
|
): Promise<string> {
|
|
132
167
|
const ix = getFlushMatchesInstruction({
|
|
133
168
|
queue,
|
|
@@ -135,14 +170,12 @@ export class MatchmakingAdmin {
|
|
|
135
170
|
signer: this.signer,
|
|
136
171
|
}, { programAddress: this.programId });
|
|
137
172
|
|
|
138
|
-
const remainingAccounts = [
|
|
139
|
-
...ticketPdas.map((address) => ({ address, role: 1 as const })),
|
|
140
|
-
...(callbackProgram ? [{ address: callbackProgram, role: 0 as const }] : []),
|
|
141
|
-
];
|
|
142
|
-
|
|
143
173
|
const ixWithRemaining = {
|
|
144
174
|
...ix,
|
|
145
|
-
accounts: [
|
|
175
|
+
accounts: [
|
|
176
|
+
...ix.accounts,
|
|
177
|
+
...ticketPdas.map((address) => ({ address, role: 1 as const })),
|
|
178
|
+
],
|
|
146
179
|
};
|
|
147
180
|
|
|
148
181
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -170,6 +203,33 @@ export class MatchmakingAdmin {
|
|
|
170
203
|
return sendInstruction(this.rpc, ixWithRemaining as any, this.signer);
|
|
171
204
|
}
|
|
172
205
|
|
|
206
|
+
/**
|
|
207
|
+
* High-level: full match resolution flow (runs on TEE).
|
|
208
|
+
* Reads the queue's pending matches, flushes them (updating opponent tickets),
|
|
209
|
+
* waits for TEE settlement, then commits all tickets back to L1.
|
|
210
|
+
* Use individual methods (flushMatches, commitTickets) as escape hatches if needed.
|
|
211
|
+
*/
|
|
212
|
+
async resolveMatches(
|
|
213
|
+
queue: Address,
|
|
214
|
+
tenant: Address,
|
|
215
|
+
ticketPdas: Address[],
|
|
216
|
+
settlementDelayMs = 3000,
|
|
217
|
+
): Promise<void> {
|
|
218
|
+
const queueData = await this.getQueue(queue);
|
|
219
|
+
const pendingTicketPdas = await Promise.all(
|
|
220
|
+
queueData.data.pendingMatches.map((pm) =>
|
|
221
|
+
utils.deriveTicketPda(this.programId, pm.player, tenant),
|
|
222
|
+
),
|
|
223
|
+
);
|
|
224
|
+
|
|
225
|
+
if (pendingTicketPdas.length > 0) {
|
|
226
|
+
await this.flushMatches(queue, tenant, pendingTicketPdas);
|
|
227
|
+
await new Promise((r) => setTimeout(r, settlementDelayMs));
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
await this.commitTickets(tenant, ticketPdas);
|
|
231
|
+
}
|
|
232
|
+
|
|
173
233
|
/** Create a new MatchmakingAdmin pointing at a TEE RPC endpoint. */
|
|
174
234
|
withRpc(teeUrl: string): MatchmakingAdmin {
|
|
175
235
|
return new MatchmakingAdmin(createSolanaRpc(teeUrl), this.signer, this.programId);
|