@loyal-labs/private-transactions 0.2.2 → 0.2.4

package/dist/index.js

@@ -18133,7 +18133,7 @@ https://github.com/browserify/crypto-browserify`);
   crypto_default = crypto;
 });
 
-// node_modules/tweetnacl/nacl-fast.js
+// ../../node_modules/tweetnacl/nacl-fast.js
 var require_nacl_fast = __commonJS((exports, module) => {
   (function(nacl) {
     var gf = function(init) {
@@ -20459,199 +20459,10 @@ var telegram_private_transfer_default = {
   },
   instructions: [
     {
-      name: "claim_username_deposit",
+      name: "claim_username_deposit_to_deposit",
       docs: [
-        "Claims tokens from a username-based deposit using a verified Telegram session."
+        "Claim tokens and transfer from username deposit to deposit"
       ],
-      discriminator: [
-        73,
-        62,
-        148,
-        70,
-        186,
-        247,
-        37,
-        80
-      ],
-      accounts: [
-        {
-          name: "recipient_token_account",
-          writable: true
-        },
-        {
-          name: "vault",
-          writable: true,
-          pda: {
-            seeds: [
-              {
-                kind: "const",
-                value: [
-                  118,
-                  97,
-                  117,
-                  108,
-                  116
-                ]
-              },
-              {
-                kind: "account",
-                path: "token_mint"
-              }
-            ]
-          }
-        },
-        {
-          name: "vault_token_account",
-          writable: true,
-          pda: {
-            seeds: [
-              {
-                kind: "account",
-                path: "vault"
-              },
-              {
-                kind: "const",
-                value: [
-                  6,
-                  221,
-                  246,
-                  225,
-                  215,
-                  101,
-                  161,
-                  147,
-                  217,
-                  203,
-                  225,
-                  70,
-                  206,
-                  235,
-                  121,
-                  172,
-                  28,
-                  180,
-                  133,
-                  237,
-                  95,
-                  91,
-                  55,
-                  145,
-                  58,
-                  140,
-                  245,
-                  133,
-                  126,
-                  255,
-                  0,
-                  169
-                ]
-              },
-              {
-                kind: "account",
-                path: "token_mint"
-              }
-            ],
-            program: {
-              kind: "const",
-              value: [
-                140,
-                151,
-                37,
-                143,
-                78,
-                36,
-                137,
-                241,
-                187,
-                61,
-                16,
-                41,
-                20,
-                142,
-                13,
-                131,
-                11,
-                90,
-                19,
-                153,
-                218,
-                255,
-                16,
-                132,
-                4,
-                142,
-                123,
-                216,
-                219,
-                233,
-                248,
-                89
-              ]
-            }
-          }
-        },
-        {
-          name: "deposit",
-          writable: true,
-          pda: {
-            seeds: [
-              {
-                kind: "const",
-                value: [
-                  117,
-                  115,
-                  101,
-                  114,
-                  110,
-                  97,
-                  109,
-                  101,
-                  95,
-                  100,
-                  101,
-                  112,
-                  111,
-                  115,
-                  105,
-                  116
-                ]
-              },
-              {
-                kind: "account",
-                path: "deposit.username",
-                account: "UsernameDeposit"
-              },
-              {
-                kind: "account",
-                path: "deposit.token_mint",
-                account: "UsernameDeposit"
-              }
-            ]
-          }
-        },
-        {
-          name: "token_mint",
-          relations: [
-            "deposit"
-          ]
-        },
-        {
-          name: "session"
-        },
-        {
-          name: "token_program",
-          address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
-        }
-      ],
-      args: [
-        {
-          name: "amount",
-          type: "u64"
-        }
-      ]
-    },
-    {
-      name: "claim_username_deposit_to_deposit",
       discriminator: [
         147,
         77,
@@ -20722,7 +20533,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -20800,7 +20614,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -21081,7 +20898,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -21336,214 +21156,6 @@ var telegram_private_transfer_default = {
         }
       ]
     },
-    {
-      name: "deposit_for_username",
-      docs: [
-        "Deposits tokens into a username-based deposit.",
-        "",
-        "Anyone can deposit tokens for a Telegram username."
-      ],
-      discriminator: [
-        85,
-        11,
-        120,
-        21,
-        51,
-        229,
-        125,
-        220
-      ],
-      accounts: [
-        {
-          name: "payer",
-          writable: true,
-          signer: true
-        },
-        {
-          name: "depositor",
-          writable: true,
-          signer: true
-        },
-        {
-          name: "deposit",
-          writable: true,
-          pda: {
-            seeds: [
-              {
-                kind: "const",
-                value: [
-                  117,
-                  115,
-                  101,
-                  114,
-                  110,
-                  97,
-                  109,
-                  101,
-                  95,
-                  100,
-                  101,
-                  112,
-                  111,
-                  115,
-                  105,
-                  116
-                ]
-              },
-              {
-                kind: "arg",
-                path: "username"
-              },
-              {
-                kind: "account",
-                path: "token_mint"
-              }
-            ]
-          }
-        },
-        {
-          name: "vault",
-          writable: true,
-          pda: {
-            seeds: [
-              {
-                kind: "const",
-                value: [
-                  118,
-                  97,
-                  117,
-                  108,
-                  116
-                ]
-              },
-              {
-                kind: "account",
-                path: "token_mint"
-              }
-            ]
-          }
-        },
-        {
-          name: "vault_token_account",
-          writable: true,
-          pda: {
-            seeds: [
-              {
-                kind: "account",
-                path: "vault"
-              },
-              {
-                kind: "const",
-                value: [
-                  6,
-                  221,
-                  246,
-                  225,
-                  215,
-                  101,
-                  161,
-                  147,
-                  217,
-                  203,
-                  225,
-                  70,
-                  206,
-                  235,
-                  121,
-                  172,
-                  28,
-                  180,
-                  133,
-                  237,
-                  95,
-                  91,
-                  55,
-                  145,
-                  58,
-                  140,
-                  245,
-                  133,
-                  126,
-                  255,
-                  0,
-                  169
-                ]
-              },
-              {
-                kind: "account",
-                path: "token_mint"
-              }
-            ],
-            program: {
-              kind: "const",
-              value: [
-                140,
-                151,
-                37,
-                143,
-                78,
-                36,
-                137,
-                241,
-                187,
-                61,
-                16,
-                41,
-                20,
-                142,
-                13,
-                131,
-                11,
-                90,
-                19,
-                153,
-                218,
-                255,
-                16,
-                132,
-                4,
-                142,
-                123,
-                216,
-                219,
-                233,
-                248,
-                89
-              ]
-            }
-          }
-        },
-        {
-          name: "depositor_token_account",
-          writable: true
-        },
-        {
-          name: "token_mint"
-        },
-        {
-          name: "token_program",
-          address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
-        },
-        {
-          name: "associated_token_program",
-          address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
-        },
-        {
-          name: "system_program",
-          address: "11111111111111111111111111111111"
-        }
-      ],
-      args: [
-        {
-          name: "username",
-          type: "string"
-        },
-        {
-          name: "amount",
-          type: "u64"
-        }
-      ]
-    },
     {
       name: "initialize_deposit",
       docs: [
@@ -21585,7 +21197,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -21755,7 +21370,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -22065,7 +21683,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -22095,7 +21716,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -22177,7 +21801,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -22295,7 +21922,10 @@ var telegram_private_transfer_default = {
                   111,
                   115,
                   105,
-                  116
+                  116,
+                  95,
+                  118,
+                  50
                 ]
               },
               {
@@ -22676,13 +22306,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);
@@ -22800,9 +22438,6 @@ function prettyStringify(obj) {
     return `[${items.join(", ")}]`;
   });
 }
-function createProgram(provider) {
-  return new Program(telegram_private_transfer_default, provider);
-}
 function programFromRpc(signer, commitment, rpcEndpoint, wsEndpoint) {
   const adapter = InternalWalletAdapter.from(signer);
   const baseConnection = new Connection(rpcEndpoint, {
@@ -22812,7 +22447,7 @@ function programFromRpc(signer, commitment, rpcEndpoint, wsEndpoint) {
   const baseProvider = new AnchorProvider(baseConnection, adapter, {
     commitment
   });
-  return createProgram(baseProvider);
+  return new Program(telegram_private_transfer_default, baseProvider);
 }
 function deriveMessageSigner(signer) {
   if (isKeypair(signer)) {
@@ -22876,6 +22511,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,
@@ -22979,60 +22623,6 @@ class LoyalPrivateTransactionsClient {
     }
     return { signature, deposit };
   }
-  async depositForUsername(params) {
-    const {
-      username,
-      tokenMint,
-      amount,
-      depositor,
-      payer,
-      depositorTokenAccount,
-      rpcOptions
-    } = params;
-    this.validateUsername(username);
-    const [depositPda] = findUsernameDepositPda(username, tokenMint);
-    await this.ensureDelegated(depositPda, "depositForUsername-depositPda");
-    const [vaultPda] = findVaultPda(tokenMint);
-    const vaultTokenAccount = getAssociatedTokenAddressSync(tokenMint, vaultPda, true, TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID);
-    const signature = await this.ephemeralProgram.methods.depositForUsername(username, new BN(amount.toString())).accountsPartial({
-      payer,
-      depositor,
-      deposit: depositPda,
-      vault: vaultPda,
-      vaultTokenAccount,
-      depositorTokenAccount,
-      tokenMint,
-      tokenProgram: TOKEN_PROGRAM_ID,
-      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-      systemProgram: SystemProgram.programId
-    }).rpc(rpcOptions);
-    return signature;
-  }
-  async claimUsernameDeposit(params) {
-    const {
-      username,
-      tokenMint,
-      amount,
-      recipientTokenAccount,
-      session,
-      rpcOptions
-    } = params;
-    this.validateUsername(username);
-    const [depositPda] = findUsernameDepositPda(username, tokenMint);
-    await this.ensureDelegated(depositPda, "claimUsernameDeposit-depositPda");
-    const [vaultPda] = findVaultPda(tokenMint);
-    const vaultTokenAccount = getAssociatedTokenAddressSync(tokenMint, vaultPda, true, TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID);
-    const signature = await this.ephemeralProgram.methods.claimUsernameDeposit(new BN(amount.toString())).accountsPartial({
-      recipientTokenAccount,
-      vault: vaultPda,
-      vaultTokenAccount,
-      deposit: depositPda,
-      tokenMint,
-      session,
-      tokenProgram: TOKEN_PROGRAM_ID
-    }).rpc(rpcOptions);
-    return signature;
-  }
   async claimUsernameDepositToDeposit(params) {
     const { username, tokenMint, amount, recipient, session, rpcOptions } = params;
     this.validateUsername(username);
@@ -23428,8 +23018,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()}`);
@@ -23451,7 +23042,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));
@@ -23471,8 +23062,11 @@ 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 {
-      const teeRes = await fetch("https://tee.magicblock.app/", options);
+      const teeRes = await fetch(teeBaseUrl, options);
       const teeData = await teeRes.json();
       if (teeData.result?.isDelegated) {
         return {
@@ -23480,23 +23074,24 @@ class LoyalPrivateTransactionsClient {
           result: {
             ...teeData.result,
             delegationRecord: {
-              authority: ER_VALIDATOR.toString()
+              authority: expectedValidator.toString()
             }
           }
         };
       }
     } catch (e) {
-      console.error("[getDelegationStatus] TEE fetch failed, falling back to devnet-router:", e);
+      console.error("[getDelegationStatus] TEE fetch failed, falling back to devnet-router: Options:", options, "Error:", e);
     }
-    const res = await fetch("https://devnet-router.magicblock.app/getDelegationStatus", options);
+    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()
           }
         }
       };
@@ -23513,6 +23108,8 @@ export {
   isWalletLike,
   isKeypair,
   isAnchorProvider,
+  getErValidatorForSolanaEnv,
+  getErValidatorForRpcEndpoint,
   findVaultPda,
   findUsernameDepositPda,
   findPermissionPda,
@@ -23533,6 +23130,8 @@ export {
   LoyalPrivateTransactionsClient,
   LAMPORTS_PER_SOL,
   IDL,
+  ER_VALIDATOR_MAINNET,
+  ER_VALIDATOR_DEVNET,
   ER_VALIDATOR,
   DEPOSIT_SEED_BYTES,
   DEPOSIT_SEED,