@phantom/embedded-provider-core 1.0.0-beta.3 → 1.0.0-beta.5

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-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 { ParsedSignatureResult, ParsedTransactionResult } from '@phantom/parsers';
@@ -66,7 +66,6 @@ interface AuthResult {
 }
 interface PhantomConnectOptions {
     organizationId: string;
-    parentOrganizationId: string;
     appId: string;
     provider?: "google" | "apple";
     redirectUrl?: string;
@@ -77,7 +76,6 @@ interface PhantomConnectOptions {
 interface JWTAuthOptions {
     appId: string;
     organizationId: string;
-    parentOrganizationId: string;
     jwtToken: string;
     customAuthData?: Record<string, any>;
 }
@@ -134,13 +132,12 @@ interface AuthOptions {
 interface EmbeddedProviderConfig {
     apiBaseUrl: string;
     appId: string;
-    organizationId: string;
     authOptions: {
         authUrl: string;
         redirectUrl: string;
     };
     embeddedWalletType: "app-wallet" | "user-wallet" | (string & Record<never, never>);
-    addressTypes: [AddressType, ...AddressType[]];
+    addressTypes: AddressType[];
 }
 
 type EmbeddedProviderEvent = "connect" | "connect_start" | "connect_error" | "disconnect" | "error";
@@ -212,12 +209,12 @@ 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[]>;
-    signAndSendAllTransactions<T>(transactions: T[]): Promise<{
+    signAllTransactions(transactions: (Transaction | VersionedTransaction)[]): Promise<(Transaction | VersionedTransaction)[]>;
+    signAndSendAllTransactions(transactions: (Transaction | VersionedTransaction)[]): Promise<{
         signatures: string[];
     }>;
     connect(_options?: {

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-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 { ParsedSignatureResult, ParsedTransactionResult } from '@phantom/parsers';
@@ -66,7 +66,6 @@ interface AuthResult {
 }
 interface PhantomConnectOptions {
     organizationId: string;
-    parentOrganizationId: string;
     appId: string;
     provider?: "google" | "apple";
     redirectUrl?: string;
@@ -77,7 +76,6 @@ interface PhantomConnectOptions {
 interface JWTAuthOptions {
     appId: string;
     organizationId: string;
-    parentOrganizationId: string;
     jwtToken: string;
     customAuthData?: Record<string, any>;
 }
@@ -134,13 +132,12 @@ interface AuthOptions {
 interface EmbeddedProviderConfig {
     apiBaseUrl: string;
     appId: string;
-    organizationId: string;
     authOptions: {
         authUrl: string;
         redirectUrl: string;
     };
     embeddedWalletType: "app-wallet" | "user-wallet" | (string & Record<never, never>);
-    addressTypes: [AddressType, ...AddressType[]];
+    addressTypes: AddressType[];
 }
 
 type EmbeddedProviderEvent = "connect" | "connect_start" | "connect_error" | "disconnect" | "error";
@@ -212,12 +209,12 @@ 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[]>;
-    signAndSendAllTransactions<T>(transactions: T[]): Promise<{
+    signAllTransactions(transactions: (Transaction | VersionedTransaction)[]): Promise<(Transaction | VersionedTransaction)[]>;
+    signAndSendAllTransactions(transactions: (Transaction | VersionedTransaction)[]): Promise<{
         signatures: string[];
     }>;
     connect(_options?: {

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");
@@ -70,8 +71,7 @@ var JWTAuth = class {
           "X-PHANTOM-APPID": options.appId
         },
         body: JSON.stringify({
-          organizationId: options.organizationId,
-          parentOrganizationId: options.parentOrganizationId,
+          appId: options.appId,
           customAuthData: options.customAuthData
         })
       });
@@ -215,8 +215,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();
@@ -793,7 +797,7 @@ var EmbeddedProvider = class {
     );
     const platformName = this.platform.name || "unknown";
     const shortPubKey = stamperInfo.publicKey.slice(0, 8);
-    const organizationName = `${this.config.organizationId}-${platformName}-${shortPubKey}`;
+    const organizationName = `${this.config.appId.substring(0, 8)}-${platformName}-${shortPubKey}`;
     this.logger.log("EMBEDDED_PROVIDER", "Creating organization", {
       organizationName,
       publicKey: stamperInfo.publicKey,
@@ -801,7 +805,7 @@ var EmbeddedProvider = class {
     });
     const base64urlPublicKey = (0, import_base64url2.base64urlEncode)(import_bs582.default.decode(stamperInfo.publicKey));
     const expiresInMs = AUTHENTICATOR_EXPIRATION_TIME_MS;
-    const username = `user-${shortPubKey}`;
+    const username = `user-${(0, import_utils.randomUUID)()}`;
     const { organizationId } = await tempClient.createOrganization(organizationName, [
       {
         username,
@@ -1029,7 +1033,6 @@ var EmbeddedProvider = class {
       } else {
         this.logger.info("EMBEDDED_PROVIDER", "Starting redirect-based authentication flow", {
           organizationId,
-          parentOrganizationId: this.config.organizationId,
           provider: authOptions?.provider
         });
         return await this.handleRedirectAuth(organizationId, stamperInfo, authOptions, username);
@@ -1088,7 +1091,6 @@ var EmbeddedProvider = class {
     const authResult = await this.jwtAuth.authenticate({
       organizationId,
       appId: this.config.appId,
-      parentOrganizationId: this.config.organizationId,
       jwtToken: authOptions.jwtToken,
       customAuthData: authOptions.customAuthData
     });
@@ -1146,7 +1148,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,
@@ -1156,7 +1158,6 @@ var EmbeddedProvider = class {
     await this.storage.saveSession(tempSession);
     this.logger.info("EMBEDDED_PROVIDER", "Starting Phantom Connect redirect", {
       organizationId,
-      parentOrganizationId: this.config.organizationId,
       appId: this.config.appId,
       provider: authOptions?.provider,
       authUrl: this.config.authOptions.authUrl
@@ -1164,7 +1165,6 @@ var EmbeddedProvider = class {
     const authResult = await this.authProvider.authenticate({
       organizationId,
       appId: this.config.appId,
-      parentOrganizationId: this.config.organizationId,
       provider: authOptions?.provider,
       redirectUrl: this.config.authOptions.redirectUrl,
       customAuthData: authOptions?.customAuthData,