@loyal-labs/private-transactions 0.2.3 → 0.2.5

package/dist/index.d.ts

@@ -9,6 +9,7 @@
  * import { Keypair, PublicKey } from "@solana/web3.js";
  * import {
  *   ER_VALIDATOR,
+ *   ER_VALIDATOR_MAINNET,
  *   LoyalPrivateTransactionsClient,
  *   MAGIC_CONTEXT_ID,
  *   MAGIC_PROGRAM_ID,
@@ -25,14 +26,14 @@
  * });
  *
  * await client.createPermission({ user: signer.publicKey, tokenMint, payer: signer.publicKey });
- * await client.delegateDeposit({ user: signer.publicKey, tokenMint, payer: signer.publicKey, validator: ER_VALIDATOR });
+ * await client.delegateDeposit({ user: signer.publicKey, tokenMint, payer: signer.publicKey, validator: ER_VALIDATOR_MAINNET });
  * await client.transferToUsernameDeposit({ username: "alice_user", tokenMint, amount: 100_000, user: signer.publicKey, payer: signer.publicKey, sessionToken: null });
  * await client.undelegateDeposit({ user: signer.publicKey, tokenMint, payer: signer.publicKey, sessionToken: null, magicProgram: MAGIC_PROGRAM_ID, magicContext: MAGIC_CONTEXT_ID });
  */
 export { LoyalPrivateTransactionsClient, waitForAccountOwnerChange, } from "./src/LoyalPrivateTransactionsClient";
 export type { WalletSigner, WalletLike, RpcOptions, ClientConfig, DepositData, UsernameDepositData, InitializeDepositParams, ModifyBalanceParams, ModifyBalanceResult, CreatePermissionParams, CreateUsernamePermissionParams, DelegateDepositParams, DelegateUsernameDepositParams, UndelegateDepositParams, UndelegateUsernameDepositParams, TransferDepositParams, TransferToUsernameDepositParams, DelegationRecord, DelegationStatusResult, DelegationStatusResponse, } from "./src/types";
 export { isKeypair, isAnchorProvider, isWalletLike } from "./src/types";
-export { ER_VALIDATOR, PROGRAM_ID, DELEGATION_PROGRAM_ID, PERMISSION_PROGRAM_ID, MAGIC_PROGRAM_ID, MAGIC_CONTEXT_ID, DEPOSIT_SEED, DEPOSIT_SEED_BYTES, USERNAME_DEPOSIT_SEED, USERNAME_DEPOSIT_SEED_BYTES, VAULT_SEED, VAULT_SEED_BYTES, PERMISSION_SEED, PERMISSION_SEED_BYTES, LAMPORTS_PER_SOL, solToLamports, lamportsToSol, } from "./src/constants";
+export { ER_VALIDATOR, ER_VALIDATOR_DEVNET, ER_VALIDATOR_MAINNET, getErValidatorForSolanaEnv, getErValidatorForRpcEndpoint, PROGRAM_ID, DELEGATION_PROGRAM_ID, PERMISSION_PROGRAM_ID, MAGIC_PROGRAM_ID, MAGIC_CONTEXT_ID, DEPOSIT_SEED, DEPOSIT_SEED_BYTES, USERNAME_DEPOSIT_SEED, USERNAME_DEPOSIT_SEED_BYTES, VAULT_SEED, VAULT_SEED_BYTES, PERMISSION_SEED, PERMISSION_SEED_BYTES, LAMPORTS_PER_SOL, solToLamports, lamportsToSol, } from "./src/constants";
 export { findDepositPda, findUsernameDepositPda, findVaultPda, findPermissionPda, findDelegationRecordPda, findDelegationMetadataPda, findBufferPda, } from "./src/pda";
 export declare const IDL: {
     address: string;

package/dist/index.js

@@ -20533,7 +20533,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -20611,7 +20614,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -20892,7 +20898,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -21188,7 +21197,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -21358,7 +21370,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -21668,7 +21683,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -21698,7 +21716,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -21780,7 +21801,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -21898,7 +21922,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -22238,7 +22265,9 @@ var telegram_private_transfer_default = {
     {
       name: "UsernameDeposit",
       docs: [
-        "A deposit account for a telegram username and token mint."
+        "A deposit account for a telegram username and token mint.",
+        "",
+        "Telegram username is always lowercase (a-z, 0-9 and underscores)"
       ],
       type: {
         kind: "struct",
@@ -22279,13 +22308,21 @@ var telegram_private_transfer_default = {
 
 // src/constants.ts
 import { PublicKey, LAMPORTS_PER_SOL } from "@solana/web3.js";
-var ER_VALIDATOR = new PublicKey("FnE6VJT5QNZdedZPnCoLsARgBwoE6DeJNjBs2H1gySXA");
+var ER_VALIDATOR_DEVNET = new PublicKey("FnE6VJT5QNZdedZPnCoLsARgBwoE6DeJNjBs2H1gySXA");
+var ER_VALIDATOR_MAINNET = new PublicKey("MTEWGuqxUpYZGFJQcp8tLN7x5v9BSeoFHYWQQ3n3xzo");
+var ER_VALIDATOR = ER_VALIDATOR_DEVNET;
+function getErValidatorForSolanaEnv(env) {
+  return env === "mainnet" ? ER_VALIDATOR_MAINNET : ER_VALIDATOR_DEVNET;
+}
+function getErValidatorForRpcEndpoint(rpcEndpoint) {
+  return rpcEndpoint.includes("mainnet-tee") ? ER_VALIDATOR_MAINNET : ER_VALIDATOR_DEVNET;
+}
 var PROGRAM_ID = new PublicKey("97FzQdWi26mFNR21AbQNg4KqofiCLqQydQfAvRQMcXhV");
 var DELEGATION_PROGRAM_ID = new PublicKey("DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh");
 var PERMISSION_PROGRAM_ID = new PublicKey("ACLseoPoyC3cBqoUtkbjZ4aDrkurZW86v19pXz2XQnp1");
 var MAGIC_PROGRAM_ID = new PublicKey("Magic11111111111111111111111111111111111111");
 var MAGIC_CONTEXT_ID = new PublicKey("MagicContext1111111111111111111111111111111");
-var DEPOSIT_SEED = "deposit";
+var DEPOSIT_SEED = "deposit_v2";
 var DEPOSIT_SEED_BYTES = Buffer.from(DEPOSIT_SEED);
 var USERNAME_DEPOSIT_SEED = "username_deposit";
 var USERNAME_DEPOSIT_SEED_BYTES = Buffer.from(USERNAME_DEPOSIT_SEED);
@@ -22476,6 +22513,15 @@ class LoyalPrivateTransactionsClient {
     this.ephemeralProgram = ephemeralProgram;
     this.wallet = wallet;
   }
+  getExpectedErValidator() {
+    return getErValidatorForRpcEndpoint(this.ephemeralProgram.provider.connection.rpcEndpoint);
+  }
+  getExpectedValidator() {
+    return this.getExpectedErValidator();
+  }
+  async getAccountDelegationStatus(account) {
+    return this.getDelegationStatus(account);
+  }
   static async fromConfig(config) {
     const {
       signer,
@@ -22712,7 +22758,18 @@ class LoyalPrivateTransactionsClient {
       delegationProgram: DELEGATION_PROGRAM_ID,
       systemProgram: SystemProgram.programId
     };
-    const signature = await this.baseProgram.methods.delegate(user, tokenMint).accountsPartial(accounts).rpc(rpcOptions);
+    const delegationWatcher = waitForAccountOwnerChange(this.baseProgram.provider.connection, depositPda, DELEGATION_PROGRAM_ID);
+    let signature;
+    try {
+      console.log("delegateDeposit Accounts:", prettyStringify(accounts));
+      signature = await this.baseProgram.methods.delegate(user, tokenMint).accountsPartial(accounts).rpc(rpcOptions);
+      console.log("delegateDeposit: waiting for depositPda owner to be DELEGATION_PROGRAM_ID on base connection...");
+      await delegationWatcher.wait();
+      await new Promise((resolve) => setTimeout(resolve, 3000));
+    } catch (e) {
+      await delegationWatcher.cancel();
+      throw e;
+    }
     return signature;
   }
   async delegateUsernameDeposit(params) {
@@ -22740,7 +22797,18 @@ class LoyalPrivateTransactionsClient {
       systemProgram: SystemProgram.programId
     };
     accounts.validator = validator ?? null;
-    const signature = await this.baseProgram.methods.delegateUsernameDeposit(username, tokenMint).accountsPartial(accounts).rpc(rpcOptions);
+    const delegationWatcher = waitForAccountOwnerChange(this.baseProgram.provider.connection, depositPda, DELEGATION_PROGRAM_ID);
+    let signature;
+    try {
+      console.log("delegateUsernameDeposit Accounts:", prettyStringify(accounts));
+      signature = await this.baseProgram.methods.delegateUsernameDeposit(username, tokenMint).accountsPartial(accounts).rpc(rpcOptions);
+      console.log("delegateUsernameDeposit: waiting for depositPda owner to be DELEGATION_PROGRAM_ID on base connection...");
+      await delegationWatcher.wait();
+      await new Promise((resolve) => setTimeout(resolve, 3000));
+    } catch (e) {
+      await delegationWatcher.cancel();
+      throw e;
+    }
     return signature;
   }
   async undelegateDeposit(params) {
@@ -22974,8 +23042,9 @@ class LoyalPrivateTransactionsClient {
       console.error("/getDelegationStatus", JSON.stringify(delegationStatus, null, 2));
       console.error("baseAccountInfo", prettyStringify(baseAccountInfo));
       console.error("ephemeralAccountInfo", prettyStringify(ephemeralAccountInfo));
+      const expectedValidator = this.getExpectedErValidator();
       const authority = delegationStatus.result?.delegationRecord?.authority;
-      if (authority && authority !== ER_VALIDATOR.toString()) {
+      if (authority && authority !== expectedValidator.toString()) {
         console.error(`Account is delegated on wrong validator: ${displayName}${account.toString()} - validator: ${authority}`);
       }
       throw new Error(`Account is delegated to ER: ${displayName}${account.toString()}`);
@@ -22997,7 +23066,7 @@ class LoyalPrivateTransactionsClient {
       console.error("baseAccountInfo", prettyStringify(baseAccountInfo));
       console.error("ephemeralAccountInfo", prettyStringify(ephemeralAccountInfo));
       throw new Error(`Account is not delegated to ER: ${displayName}${account.toString()}`);
-    } else if (!skipValidatorCheck && delegationStatus.result.delegationRecord.authority !== ER_VALIDATOR.toString()) {
+    } else if (!skipValidatorCheck && delegationStatus.result.delegationRecord.authority !== this.getExpectedErValidator().toString()) {
       console.error(`Account is delegated on wrong validator: ${displayName}${account.toString()} - validator: ${delegationStatus.result.delegationRecord.authority}`);
       console.error("/getDelegationStatus:", JSON.stringify(delegationStatus, null, 2));
       console.error("baseAccountInfo", prettyStringify(baseAccountInfo));
@@ -23017,6 +23086,7 @@ class LoyalPrivateTransactionsClient {
       headers: { "Content-Type": "application/json" },
       body
     };
+    const expectedValidator = this.getExpectedErValidator();
     const ephemeralUrl = this.ephemeralProgram.provider.connection.rpcEndpoint;
     const teeBaseUrl = ephemeralUrl.includes("mainnet-tee") ? "https://mainnet-tee.magicblock.app/" : "https://tee.magicblock.app/";
     try {
@@ -23028,7 +23098,7 @@ class LoyalPrivateTransactionsClient {
           result: {
             ...teeData.result,
             delegationRecord: {
-              authority: ER_VALIDATOR.toString()
+              authority: expectedValidator.toString()
             }
           }
         };
@@ -23039,13 +23109,13 @@ class LoyalPrivateTransactionsClient {
     const routerBaseUrl = ephemeralUrl.includes("mainnet-tee") ? "https://router.magicblock.app/" : "https://devnet-router.magicblock.app/";
     const res = await fetch(routerBaseUrl, options);
     const routerData = await res.json();
-    if (routerData.error?.message?.includes(ER_VALIDATOR.toString())) {
+    if (routerData.error?.message?.includes(expectedValidator.toString())) {
       return {
         ...routerData,
         result: {
           isDelegated: true,
           delegationRecord: {
-            authority: ER_VALIDATOR.toString()
+            authority: expectedValidator.toString()
           }
         }
       };
@@ -23062,6 +23132,8 @@ export {
   isWalletLike,
   isKeypair,
   isAnchorProvider,
+  getErValidatorForSolanaEnv,
+  getErValidatorForRpcEndpoint,
   findVaultPda,
   findUsernameDepositPda,
   findPermissionPda,
@@ -23082,6 +23154,8 @@ export {
   LoyalPrivateTransactionsClient,
   LAMPORTS_PER_SOL,
   IDL,
+  ER_VALIDATOR_MAINNET,
+  ER_VALIDATOR_DEVNET,
   ER_VALIDATOR,
   DEPOSIT_SEED_BYTES,
   DEPOSIT_SEED,

package/dist/src/LoyalPrivateTransactionsClient.d.ts

@@ -1,7 +1,7 @@
 import { Connection, PublicKey } from "@solana/web3.js";
 import { Program } from "@coral-xyz/anchor";
 import type { TelegramPrivateTransfer } from "./idl/telegram_private_transfer.ts";
-import type { WalletLike, ClientConfig, DepositData, UsernameDepositData, InitializeDepositParams, ModifyBalanceParams, ModifyBalanceResult, CreatePermissionParams, CreateUsernamePermissionParams, DelegateDepositParams, DelegateUsernameDepositParams, UndelegateDepositParams, UndelegateUsernameDepositParams, TransferDepositParams, TransferToUsernameDepositParams, InitializeUsernameDepositParams, ClaimUsernameDepositToDepositParams } from "./types";
+import type { WalletLike, ClientConfig, DepositData, UsernameDepositData, InitializeDepositParams, ModifyBalanceParams, ModifyBalanceResult, CreatePermissionParams, CreateUsernamePermissionParams, DelegateDepositParams, DelegateUsernameDepositParams, UndelegateDepositParams, UndelegateUsernameDepositParams, TransferDepositParams, TransferToUsernameDepositParams, InitializeUsernameDepositParams, ClaimUsernameDepositToDepositParams, DelegationStatusResponse } from "./types";
 export declare function waitForAccountOwnerChange(connection: Connection, account: PublicKey, expectedOwner: PublicKey, timeoutMs?: number, intervalMs?: number): {
     wait: () => Promise<void>;
     cancel: () => Promise<void>;
@@ -36,6 +36,9 @@ export declare class LoyalPrivateTransactionsClient {
     readonly ephemeralProgram: Program<TelegramPrivateTransfer>;
     readonly wallet: WalletLike;
     private constructor();
+    private getExpectedErValidator;
+    getExpectedValidator(): PublicKey;
+    getAccountDelegationStatus(account: PublicKey): Promise<DelegationStatusResponse>;
     /**
      * Create client connected to an ephemeral rollup endpoint with PER auth token.
      * Verifies TEE RPC integrity and obtains an auth token automatically.

package/dist/src/constants.d.ts

@@ -1,8 +1,15 @@
 import { PublicKey, LAMPORTS_PER_SOL } from "@solana/web3.js";
 /**
- * TEE ER Validator
+ * TEE ER Validators
+ */
+export declare const ER_VALIDATOR_DEVNET: PublicKey;
+export declare const ER_VALIDATOR_MAINNET: PublicKey;
+/**
+ * Backward-compatible alias (defaults to devnet validator).
  */
 export declare const ER_VALIDATOR: PublicKey;
+export declare function getErValidatorForSolanaEnv(env: string): PublicKey;
+export declare function getErValidatorForRpcEndpoint(rpcEndpoint: string): PublicKey;
 /**
  * Telegram Private Transfer program ID
  */
@@ -26,7 +33,7 @@ export declare const MAGIC_CONTEXT_ID: PublicKey;
 /**
  * PDA seed for deposit accounts
  */
-export declare const DEPOSIT_SEED = "deposit";
+export declare const DEPOSIT_SEED = "deposit_v2";
 export declare const DEPOSIT_SEED_BYTES: Buffer<ArrayBuffer>;
 /**
  * PDA seed for username deposit accounts

package/dist/src/idl/telegram_private_transfer.d.ts

@@ -88,7 +88,10 @@ export type TelegramPrivateTransfer = {
                                     111,
                                     115,
                                     105,
-                                    116
+                                    116,
+                                    95,
+                                    118,
+                                    50
                                 ];
                             },
                             {
@@ -166,7 +169,10 @@ export type TelegramPrivateTransfer = {
                                     111,
                                     115,
                                     105,
-                                    116
+                                    116,
+                                    95,
+                                    118,
+                                    50
                                 ];
                             },
                             {
@@ -447,7 +453,10 @@ export type TelegramPrivateTransfer = {
                                     111,
                                     115,
                                     105,
-                                    116
+                                    116,
+                                    95,
+                                    118,
+                                    50
                                 ];
                             },
                             {
@@ -743,7 +752,10 @@ export type TelegramPrivateTransfer = {
                                     111,
                                     115,
                                     105,
-                                    116
+                                    116,
+                                    95,
+                                    118,
+                                    50
                                 ];
                             },
                             {
@@ -913,7 +925,10 @@ export type TelegramPrivateTransfer = {
                                     111,
                                     115,
                                     105,
-                                    116
+                                    116,
+                                    95,
+                                    118,
+                                    50
                                 ];
                             },
                             {
@@ -1223,7 +1238,10 @@ export type TelegramPrivateTransfer = {
                                     111,
                                     115,
                                     105,
-                                    116
+                                    116,
+                                    95,
+                                    118,
+                                    50
                                 ];
                             },
                             {
@@ -1253,7 +1271,10 @@ export type TelegramPrivateTransfer = {
                                     111,
                                     115,
                                     105,
-                                    116
+                                    116,
+                                    95,
+                                    118,
+                                    50
                                 ];
                             },
                             {
@@ -1335,7 +1356,10 @@ export type TelegramPrivateTransfer = {
                                     111,
                                     115,
                                     105,
-                                    116
+                                    116,
+                                    95,
+                                    118,
+                                    50
                                 ];
                             },
                             {
@@ -1453,7 +1477,10 @@ export type TelegramPrivateTransfer = {
                                     111,
                                     115,
                                     105,
-                                    116
+                                    116,
+                                    95,
+                                    118,
+                                    50
                                 ];
                             },
                             {
@@ -1793,7 +1820,9 @@ export type TelegramPrivateTransfer = {
         {
             "name": "usernameDeposit";
             "docs": [
-                "A deposit account for a telegram username and token mint."
+                "A deposit account for a telegram username and token mint.",
+                "",
+                "Telegram username is always lowercase (a-z, 0-9 and underscores)"
             ];
             "type": {
                 "kind": "struct";

package/dist/src/idl.d.ts

@@ -212,7 +212,7 @@ export type TelegramPrivateTransfer = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [100, 101, 112, 111, 115, 105, 116];
+                                value: [100, 101, 112, 111, 115, 105, 116, 95, 118, 50];
                             },
                             {
                                 kind: "account";
@@ -447,7 +447,7 @@ export type TelegramPrivateTransfer = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [100, 101, 112, 111, 115, 105, 116];
+                                value: [100, 101, 112, 111, 115, 105, 116, 95, 118, 50];
                             },
                             {
                                 kind: "arg";
@@ -895,7 +895,7 @@ export type TelegramPrivateTransfer = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [100, 101, 112, 111, 115, 105, 116];
+                                value: [100, 101, 112, 111, 115, 105, 116, 95, 118, 50];
                             },
                             {
                                 kind: "account";
@@ -966,7 +966,7 @@ export type TelegramPrivateTransfer = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [100, 101, 112, 111, 115, 105, 116];
+                                value: [100, 101, 112, 111, 115, 105, 116, 95, 118, 50];
                             },
                             {
                                 kind: "account";
@@ -1246,7 +1246,7 @@ export type TelegramPrivateTransfer = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [100, 101, 112, 111, 115, 105, 116];
+                                value: [100, 101, 112, 111, 115, 105, 116, 95, 118, 50];
                             },
                             {
                                 kind: "account";
@@ -1268,7 +1268,7 @@ export type TelegramPrivateTransfer = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [100, 101, 112, 111, 115, 105, 116];
+                                value: [100, 101, 112, 111, 115, 105, 116, 95, 118, 50];
                             },
                             {
                                 kind: "account";
@@ -1328,7 +1328,7 @@ export type TelegramPrivateTransfer = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [100, 101, 112, 111, 115, 105, 116];
+                                value: [100, 101, 112, 111, 115, 105, 116, 95, 118, 50];
                             },
                             {
                                 kind: "account";
@@ -1426,7 +1426,7 @@ export type TelegramPrivateTransfer = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [100, 101, 112, 111, 115, 105, 116];
+                                value: [100, 101, 112, 111, 115, 105, 116, 95, 118, 50];
                             },
                             {
                                 kind: "account";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loyal-labs/private-transactions",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "SDK for Telegram-based private Solana deposits",
   "type": "module",
   "main": "./dist/index.js",