@phantom/embedded-provider-core 1.0.0-beta.2 → 1.0.0-beta.4

package/README.md

@@ -60,7 +60,6 @@ const config: EmbeddedProviderConfig = {
   appId: "your-app-id",
   embeddedWalletType: "user-wallet", // or 'app-wallet'
   addressTypes: ["solana", "ethereum"],
-  solanaProvider: "web3js",
   authOptions: {
     authUrl: "https://auth.phantom.app",
     redirectUrl: "https://your-app.com/callback",
@@ -276,7 +275,6 @@ interface EmbeddedProviderConfig {
   addressTypes: [AddressType, ...AddressType[]]; // Supported blockchain addresses
 
   // Optional
-  solanaProvider?: "web3js" | "kit"; // Solana library preference
   authOptions?: {
     authUrl?: string; // Custom auth URL
     redirectUrl?: string; // OAuth redirect URL

package/dist/index.d.mts

@@ -1,6 +1,6 @@
-import { StamperWithKeyManagement } from '@phantom/sdk-types';
+import { StamperWithKeyManagement, Transaction, VersionedTransaction } from '@phantom/sdk-types';
+import { ClientSideSdkHeaders, NetworkId } from '@phantom/constants';
 import { AddressType } from '@phantom/client';
-import { NetworkId } from '@phantom/constants';
 import { ParsedSignatureResult, ParsedTransactionResult } from '@phantom/parsers';
 import { ISolanaChain, IEthereumChain, EthTransactionRequest } from '@phantom/chains';
 
@@ -92,6 +92,7 @@ interface PlatformAdapter {
     authProvider: AuthProvider;
     urlParamsAccessor: URLParamsAccessor;
     stamper: StamperWithKeyManagement;
+    analyticsHeaders?: Partial<ClientSideSdkHeaders>;
 }
 interface DebugLogger {
     info(category: string, message: string, data?: any): void;
@@ -134,13 +135,12 @@ interface EmbeddedProviderConfig {
     apiBaseUrl: string;
     appId: string;
     organizationId: string;
-    authOptions?: {
-        authUrl?: string;
-        redirectUrl?: string;
+    authOptions: {
+        authUrl: string;
+        redirectUrl: string;
     };
     embeddedWalletType: "app-wallet" | "user-wallet" | (string & Record<never, never>);
     addressTypes: [AddressType, ...AddressType[]];
-    solanaProvider: "web3js" | "kit" | (string & Record<never, never>);
 }
 
 type EmbeddedProviderEvent = "connect" | "connect_start" | "connect_error" | "disconnect" | "error";
@@ -212,11 +212,14 @@ declare class EmbeddedSolanaChain implements ISolanaChain {
         signature: Uint8Array;
         publicKey: string;
     }>;
-    signTransaction<T>(transaction: T): Promise<T>;
-    signAndSendTransaction<T>(transaction: T): Promise<{
+    signTransaction(transaction: Transaction | VersionedTransaction): Promise<Transaction | VersionedTransaction>;
+    signAndSendTransaction(transaction: Transaction | VersionedTransaction): Promise<{
         signature: string;
     }>;
-    signAllTransactions<T>(transactions: T[]): Promise<T[]>;
+    signAllTransactions(transactions: (Transaction | VersionedTransaction)[]): Promise<(Transaction | VersionedTransaction)[]>;
+    signAndSendAllTransactions(transactions: (Transaction | VersionedTransaction)[]): Promise<{
+        signatures: string[];
+    }>;
     connect(_options?: {
         onlyIfTrusted?: boolean;
     }): Promise<{

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { StamperWithKeyManagement } from '@phantom/sdk-types';
+import { StamperWithKeyManagement, Transaction, VersionedTransaction } from '@phantom/sdk-types';
+import { ClientSideSdkHeaders, NetworkId } from '@phantom/constants';
 import { AddressType } from '@phantom/client';
-import { NetworkId } from '@phantom/constants';
 import { ParsedSignatureResult, ParsedTransactionResult } from '@phantom/parsers';
 import { ISolanaChain, IEthereumChain, EthTransactionRequest } from '@phantom/chains';
 
@@ -92,6 +92,7 @@ interface PlatformAdapter {
     authProvider: AuthProvider;
     urlParamsAccessor: URLParamsAccessor;
     stamper: StamperWithKeyManagement;
+    analyticsHeaders?: Partial<ClientSideSdkHeaders>;
 }
 interface DebugLogger {
     info(category: string, message: string, data?: any): void;
@@ -134,13 +135,12 @@ interface EmbeddedProviderConfig {
     apiBaseUrl: string;
     appId: string;
     organizationId: string;
-    authOptions?: {
-        authUrl?: string;
-        redirectUrl?: string;
+    authOptions: {
+        authUrl: string;
+        redirectUrl: string;
     };
     embeddedWalletType: "app-wallet" | "user-wallet" | (string & Record<never, never>);
     addressTypes: [AddressType, ...AddressType[]];
-    solanaProvider: "web3js" | "kit" | (string & Record<never, never>);
 }
 
 type EmbeddedProviderEvent = "connect" | "connect_start" | "connect_error" | "disconnect" | "error";
@@ -212,11 +212,14 @@ declare class EmbeddedSolanaChain implements ISolanaChain {
         signature: Uint8Array;
         publicKey: string;
     }>;
-    signTransaction<T>(transaction: T): Promise<T>;
-    signAndSendTransaction<T>(transaction: T): Promise<{
+    signTransaction(transaction: Transaction | VersionedTransaction): Promise<Transaction | VersionedTransaction>;
+    signAndSendTransaction(transaction: Transaction | VersionedTransaction): Promise<{
         signature: string;
     }>;
-    signAllTransactions<T>(transactions: T[]): Promise<T[]>;
+    signAllTransactions(transactions: (Transaction | VersionedTransaction)[]): Promise<(Transaction | VersionedTransaction)[]>;
+    signAndSendAllTransactions(transactions: (Transaction | VersionedTransaction)[]): Promise<{
+        signatures: string[];
+    }>;
     connect(_options?: {
         onlyIfTrusted?: boolean;
     }): Promise<{

package/dist/index.js

@@ -43,6 +43,7 @@ module.exports = __toCommonJS(src_exports);
 
 // src/embedded-provider.ts
 var import_client = require("@phantom/client");
+var import_utils = require("@phantom/utils");
 var import_base64url2 = require("@phantom/base64url");
 var import_bs582 = __toESM(require("bs58"));
 var import_parsers2 = require("@phantom/parsers");
@@ -215,8 +216,12 @@ var EmbeddedSolanaChain = class {
       transaction,
       networkId: this.currentNetworkId
     });
-    const signatureResult = (0, import_parsers.parseSolanaTransactionSignature)(result.rawTransaction);
-    return signatureResult.signature;
+    const signedResult = (0, import_parsers.parseSolanaSignedTransaction)(result.rawTransaction);
+    if (signedResult.transaction && !signedResult.fallback) {
+      return signedResult.transaction;
+    } else {
+      throw new Error("Failed to parse signed transaction");
+    }
   }
   async signAndSendTransaction(transaction) {
     this.ensureConnected();
@@ -233,6 +238,10 @@ var EmbeddedSolanaChain = class {
     const results = await Promise.all(transactions.map((tx) => this.signTransaction(tx)));
     return results;
   }
+  async signAndSendAllTransactions(transactions) {
+    const results = await Promise.all(transactions.map((tx) => this.signAndSendTransaction(tx)));
+    return { signatures: results.map((result) => result.signature) };
+  }
   connect(_options) {
     if (!this.provider.isConnected()) {
       throw new Error("Provider not connected. Call provider connect first.");
@@ -504,6 +513,9 @@ var EmbeddedProvider = class {
     this.eventListeners = /* @__PURE__ */ new Map();
     this.logger = logger;
     this.logger.log("EMBEDDED_PROVIDER", "Initializing EmbeddedProvider", { config });
+    if (config.embeddedWalletType === "app-wallet") {
+      throw new Error("app-wallet type is not currently supported. Please use 'user-wallet' instead.");
+    }
     this.config = config;
     this.platform = platform;
     this.storage = platform.storage;
@@ -511,7 +523,6 @@ var EmbeddedProvider = class {
     this.urlParamsAccessor = platform.urlParamsAccessor;
     this.stamper = platform.stamper;
     this.jwtAuth = new JWTAuth();
-    config.solanaProvider;
     this.solana = new EmbeddedSolanaChain(this);
     this.ethereum = new EmbeddedEthereumChain(this);
     this.logger.info("EMBEDDED_PROVIDER", "EmbeddedProvider initialized");
@@ -778,21 +789,24 @@ var EmbeddedProvider = class {
     this.logger.log("EMBEDDED_PROVIDER", "Creating temporary PhantomClient");
     const tempClient = new import_client.PhantomClient(
       {
-        apiBaseUrl: this.config.apiBaseUrl
+        apiBaseUrl: this.config.apiBaseUrl,
+        headers: {
+          ...this.platform.analyticsHeaders || {}
+        }
       },
       this.stamper
     );
     const platformName = this.platform.name || "unknown";
     const shortPubKey = stamperInfo.publicKey.slice(0, 8);
-    const organizationName = `${this.config.organizationId}-${platformName}-${shortPubKey}`;
+    const organizationName = `${this.config.organizationId.substring(0, 8)}-${platformName}-${shortPubKey}`;
     this.logger.log("EMBEDDED_PROVIDER", "Creating organization", {
       organizationName,
       publicKey: stamperInfo.publicKey,
       platform: platformName
     });
     const base64urlPublicKey = (0, import_base64url2.base64urlEncode)(import_bs582.default.decode(stamperInfo.publicKey));
-    const expiresAtMs = Date.now() + AUTHENTICATOR_EXPIRATION_TIME_MS;
-    const username = `user-${shortPubKey}`;
+    const expiresInMs = AUTHENTICATOR_EXPIRATION_TIME_MS;
+    const username = `user-${(0, import_utils.randomUUID)()}`;
     const { organizationId } = await tempClient.createOrganization(organizationName, [
       {
         username,
@@ -804,13 +818,13 @@ var EmbeddedProvider = class {
             publicKey: base64urlPublicKey,
             algorithm: "Ed25519"
             // Commented for now until KMS supports fully expirable organizations
-            // expiresAtMs: expiresAtMs,
+            // expiresInMs: expiresInMs,
           }
         ]
       }
     ]);
     this.logger.info("EMBEDDED_PROVIDER", "Organization created", { organizationId });
-    return { organizationId, stamperInfo, expiresAtMs, username };
+    return { organizationId, stamperInfo, expiresInMs, username };
   }
   async connect(authOptions) {
     try {
@@ -839,8 +853,8 @@ var EmbeddedProvider = class {
       }
       this.validateAuthOptions(authOptions);
       this.logger.info("EMBEDDED_PROVIDER", "No existing connection, creating new auth flow");
-      const { organizationId, stamperInfo, expiresAtMs, username } = await this.createOrganizationAndStamper();
-      const session = await this.handleAuthFlow(organizationId, stamperInfo, authOptions, expiresAtMs, username);
+      const { organizationId, stamperInfo, expiresInMs, username } = await this.createOrganizationAndStamper();
+      const session = await this.handleAuthFlow(organizationId, stamperInfo, authOptions, expiresInMs, username);
       if (!session) {
         return {
           addresses: [],
@@ -1010,13 +1024,13 @@ var EmbeddedProvider = class {
    * It handles app-wallet creation directly or routes to JWT/redirect authentication for user-wallets.
    * Returns null for redirect flows since they don't complete synchronously.
    */
-  async handleAuthFlow(organizationId, stamperInfo, authOptions, expiresAtMs, username) {
+  async handleAuthFlow(organizationId, stamperInfo, authOptions, expiresInMs, username) {
     if (this.config.embeddedWalletType === "user-wallet") {
       this.logger.info("EMBEDDED_PROVIDER", "Creating user-wallet, routing authentication", {
         authProvider: authOptions?.provider || "phantom-connect"
       });
       if (authOptions?.provider === "jwt") {
-        return await this.handleJWTAuth(organizationId, stamperInfo, authOptions, expiresAtMs, username);
+        return await this.handleJWTAuth(organizationId, stamperInfo, authOptions, expiresInMs, username);
       } else {
         this.logger.info("EMBEDDED_PROVIDER", "Starting redirect-based authentication flow", {
           organizationId,
@@ -1032,7 +1046,10 @@ var EmbeddedProvider = class {
       const tempClient = new import_client.PhantomClient(
         {
           apiBaseUrl: this.config.apiBaseUrl,
-          organizationId
+          organizationId,
+          headers: {
+            ...this.platform.analyticsHeaders || {}
+          }
         },
         this.stamper
       );
@@ -1053,7 +1070,7 @@ var EmbeddedProvider = class {
         createdAt: now,
         lastUsed: now,
         authenticatorCreatedAt: now,
-        authenticatorExpiresAt: expiresAtMs,
+        authenticatorExpiresAt: Date.now() + expiresInMs,
         lastRenewalAttempt: void 0,
         username
       };
@@ -1066,7 +1083,7 @@ var EmbeddedProvider = class {
    * We use this method to handle JWT-based authentication for user-wallets.
    * It authenticates using the provided JWT token and creates a completed session.
    */
-  async handleJWTAuth(organizationId, stamperInfo, authOptions, expiresAtMs, username) {
+  async handleJWTAuth(organizationId, stamperInfo, authOptions, expiresInMs, username) {
     this.logger.info("EMBEDDED_PROVIDER", "Using JWT authentication flow");
     if (!authOptions.jwtToken) {
       this.logger.error("EMBEDDED_PROVIDER", "JWT token missing for JWT authentication");
@@ -1096,7 +1113,7 @@ var EmbeddedProvider = class {
       createdAt: now,
       lastUsed: now,
       authenticatorCreatedAt: now,
-      authenticatorExpiresAt: expiresAtMs,
+      authenticatorExpiresAt: Date.now() + expiresInMs,
       lastRenewalAttempt: void 0,
       username
     };
@@ -1112,8 +1129,8 @@ var EmbeddedProvider = class {
   async handleRedirectAuth(organizationId, stamperInfo, authOptions, username) {
     this.logger.info("EMBEDDED_PROVIDER", "Using Phantom Connect authentication flow (redirect-based)", {
       provider: authOptions?.provider,
-      hasRedirectUrl: !!this.config.authOptions?.redirectUrl,
-      authUrl: this.config.authOptions?.authUrl
+      hasRedirectUrl: !!this.config.authOptions.redirectUrl,
+      authUrl: this.config.authOptions.authUrl
     });
     const now = Date.now();
     const sessionId = generateSessionId();
@@ -1134,7 +1151,7 @@ var EmbeddedProvider = class {
       authenticatorCreatedAt: now,
       authenticatorExpiresAt: now + AUTHENTICATOR_EXPIRATION_TIME_MS,
       lastRenewalAttempt: void 0,
-      username: username || `user-${stamperInfo.keyId.substring(0, 8)}`
+      username: username || `user-${(0, import_utils.randomUUID)()}`
     };
     this.logger.log("EMBEDDED_PROVIDER", "Saving temporary session before redirect", {
       sessionId: tempSession.sessionId,
@@ -1147,16 +1164,16 @@ var EmbeddedProvider = class {
       parentOrganizationId: this.config.organizationId,
       appId: this.config.appId,
       provider: authOptions?.provider,
-      authUrl: this.config.authOptions?.authUrl
+      authUrl: this.config.authOptions.authUrl
     });
     const authResult = await this.authProvider.authenticate({
       organizationId,
       appId: this.config.appId,
       parentOrganizationId: this.config.organizationId,
       provider: authOptions?.provider,
-      redirectUrl: this.config.authOptions?.redirectUrl,
+      redirectUrl: this.config.authOptions.redirectUrl,
       customAuthData: authOptions?.customAuthData,
-      authUrl: this.config.authOptions?.authUrl,
+      authUrl: this.config.authOptions.authUrl,
       sessionId
     });
     if (authResult && "walletId" in authResult) {
@@ -1252,7 +1269,7 @@ var EmbeddedProvider = class {
         newPublicKey: newKeyInfo.publicKey
       });
       const base64urlPublicKey = (0, import_base64url2.base64urlEncode)(import_bs582.default.decode(newKeyInfo.publicKey));
-      const expiresAtMs = Date.now() + AUTHENTICATOR_EXPIRATION_TIME_MS;
+      const expiresInMs = AUTHENTICATOR_EXPIRATION_TIME_MS;
       let authenticatorResult;
       try {
         authenticatorResult = await this.client.createAuthenticator({
@@ -1265,7 +1282,7 @@ var EmbeddedProvider = class {
             publicKey: base64urlPublicKey,
             algorithm: "Ed25519"
             // Commented for now until KMS supports fully expiring organizations
-            // expiresAtMs: expiresAtMs,
+            // expiresInMs: expiresInMs,
           },
           replaceExpirable: true
         });
@@ -1285,12 +1302,12 @@ var EmbeddedProvider = class {
       const now = Date.now();
       session.stamperInfo = newKeyInfo;
       session.authenticatorCreatedAt = now;
-      session.authenticatorExpiresAt = expiresAtMs;
+      session.authenticatorExpiresAt = Date.now() + expiresInMs;
       session.lastRenewalAttempt = now;
       await this.storage.saveSession(session);
       this.logger.info("EMBEDDED_PROVIDER", "Authenticator renewal completed successfully", {
         newKeyId: newKeyInfo.keyId,
-        expiresAt: new Date(expiresAtMs).toISOString()
+        expiresAt: new Date(Date.now() + expiresInMs).toISOString()
       });
     } catch (error) {
       await this.stamper.rollbackRotation();
@@ -1313,7 +1330,10 @@ var EmbeddedProvider = class {
     this.client = new import_client.PhantomClient(
       {
         apiBaseUrl: this.config.apiBaseUrl,
-        organizationId: session.organizationId
+        organizationId: session.organizationId,
+        headers: {
+          ...this.platform.analyticsHeaders || {}
+        }
       },
       this.stamper
     );