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

package/dist/index.d.mts

@@ -2,7 +2,7 @@ import { StamperWithKeyManagement, Transaction, VersionedTransaction } from '@ph
 import { ClientSideSdkHeaders, NetworkId } from '@phantom/constants';
 import { AddressType } from '@phantom/client';
 import { ParsedSignatureResult, ParsedTransactionResult } from '@phantom/parsers';
-import { ISolanaChain, IEthereumChain, EthTransactionRequest } from '@phantom/chains';
+import { ISolanaChain, IEthereumChain, EthTransactionRequest } from '@phantom/chain-interfaces';
 
 interface Keypair {
     publicKey: string;
@@ -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";
@@ -164,6 +161,10 @@ declare class EmbeddedProvider {
     on(event: EmbeddedProviderEvent, callback: EventCallback): void;
     off(event: EmbeddedProviderEvent, callback: EventCallback): void;
     private emit;
+    /**
+     * Get the appropriate address for a given network ID from available addresses
+     */
+    private getAddressForNetwork;
     private getAndFilterWalletAddresses;
     private validateAndCleanSession;
     private tryExistingConnection;

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { StamperWithKeyManagement, Transaction, VersionedTransaction } from '@ph
 import { ClientSideSdkHeaders, NetworkId } from '@phantom/constants';
 import { AddressType } from '@phantom/client';
 import { ParsedSignatureResult, ParsedTransactionResult } from '@phantom/parsers';
-import { ISolanaChain, IEthereumChain, EthTransactionRequest } from '@phantom/chains';
+import { ISolanaChain, IEthereumChain, EthTransactionRequest } from '@phantom/chain-interfaces';
 
 interface Keypair {
     publicKey: string;
@@ -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";
@@ -164,6 +161,10 @@ declare class EmbeddedProvider {
     on(event: EmbeddedProviderEvent, callback: EventCallback): void;
     off(event: EmbeddedProviderEvent, callback: EventCallback): void;
     private emit;
+    /**
+     * Get the appropriate address for a given network ID from available addresses
+     */
+    private getAddressForNetwork;
     private getAndFilterWalletAddresses;
     private validateAndCleanSession;
     private tryExistingConnection;

package/dist/index.js

@@ -71,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
         })
       });
@@ -217,8 +216,8 @@ var EmbeddedSolanaChain = class {
       networkId: this.currentNetworkId
     });
     const signedResult = (0, import_parsers.parseSolanaSignedTransaction)(result.rawTransaction);
-    if (signedResult.transaction && !signedResult.fallback) {
-      return signedResult.transaction;
+    if (signedResult) {
+      return signedResult;
     } else {
       throw new Error("Failed to parse signed transaction");
     }
@@ -557,6 +556,35 @@ var EmbeddedProvider = class {
       });
     }
   }
+  /**
+   * Get the appropriate address for a given network ID from available addresses
+   */
+  getAddressForNetwork(networkId) {
+    const network = networkId.split(":")[0].toLowerCase();
+    let targetAddressType;
+    switch (network) {
+      case "solana":
+        targetAddressType = import_client.AddressType.solana;
+        break;
+      case "eip155":
+        targetAddressType = import_client.AddressType.ethereum;
+        break;
+      case "bitcoin":
+      case "btc":
+        targetAddressType = import_client.AddressType.bitcoinSegwit;
+        break;
+      case "sui":
+        targetAddressType = import_client.AddressType.sui;
+        break;
+      default:
+        targetAddressType = import_client.AddressType.ethereum;
+        break;
+    }
+    const matchingAddress = this.addresses.find(
+      (addr) => addr.addressType.toLowerCase() === targetAddressType.toLowerCase()
+    );
+    return matchingAddress?.address;
+  }
   async getAndFilterWalletAddresses(walletId) {
     const session = await this.storage.getSession();
     const derivationIndex = session?.accountDerivationIndex ?? 0;
@@ -798,7 +826,7 @@ var EmbeddedProvider = class {
     );
     const platformName = this.platform.name || "unknown";
     const shortPubKey = stamperInfo.publicKey.slice(0, 8);
-    const organizationName = `${this.config.organizationId.substring(0, 8)}-${platformName}-${shortPubKey}`;
+    const organizationName = `${this.config.appId.substring(0, 8)}-${platformName}-${shortPubKey}`;
     this.logger.log("EMBEDDED_PROVIDER", "Creating organization", {
       organizationName,
       publicKey: stamperInfo.publicKey,
@@ -973,7 +1001,8 @@ var EmbeddedProvider = class {
       walletId: this.walletId,
       transaction: parsedTransaction.base64url,
       networkId: params.networkId,
-      derivationIndex
+      derivationIndex,
+      account: this.getAddressForNetwork(params.networkId)
     });
     this.logger.info("EMBEDDED_PROVIDER", "Transaction signed successfully", {
       walletId: this.walletId,
@@ -1003,7 +1032,8 @@ var EmbeddedProvider = class {
       walletId: this.walletId,
       transaction: parsedTransaction.base64url,
       networkId: params.networkId,
-      derivationIndex
+      derivationIndex,
+      account: this.getAddressForNetwork(params.networkId)
     });
     this.logger.info("EMBEDDED_PROVIDER", "Transaction signed and sent successfully", {
       walletId: this.walletId,
@@ -1034,7 +1064,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);
@@ -1093,7 +1122,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
     });
@@ -1161,7 +1189,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
@@ -1169,7 +1196,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,