chore: sync from internal

Author: phantom-commit-bot[bot]

packages/api-key-stamper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/api-key-stamper",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0",
   "description": "API key stamper for Phantom Wallet SDK",
   "repository": {
     "type": "git",

packages/auth2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/auth2",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0",
   "description": "Shared core utilities for the Auth2 OAuth2 PKCE flow",
   "repository": {
     "type": "git",

packages/auth2/src/__tests__/auth2Flow.test.ts

@@ -463,6 +463,14 @@ describe("completeAuth2Exchange()", () => {
     getOrCreateWalletWithTag: jest.fn().mockResolvedValue({ walletId: "wallet-1", tags: [] }),
   };
 
+  /** Access token whose JWT `aud` includes a wallet URN so `Auth2Token.wallet` is set (migration runs only in that case). */
+  const accessTokenWithWalletClaim = makeJwt({
+    sub: "user-1",
+    client_id: "test-client",
+    ext: { a2t: DEFAULT_A2T },
+    aud: ["urn:phantom:wallet:wallet-1:0"],
+  });
+
   beforeEach(() => {
     mockKms.getOrCreatePhantomOrganization.mockResolvedValue({ organizationId: "org-1" });
     mockKms.listPendingMigrations.mockResolvedValue({ pendingMigrations: [] });
@@ -542,7 +550,14 @@ describe("completeAuth2Exchange()", () => {
     expect(mockKms.getOrCreatePhantomOrganization).toHaveBeenCalledWith("encoded-pub-key");
   });
 
-  it("calls kms.listPendingMigrations with organizationId", async () => {
+  it("calls kms.listPendingMigrations with organizationId when the token has a wallet claim", async () => {
+    mockExchangeAuthCode.mockResolvedValueOnce({
+      accessToken: accessTokenWithWalletClaim,
+      idType: "Bearer",
+      expiresInMs: 3_600_000,
+      refreshToken: "refresh-tok",
+    });
+
     await completeAuth2Exchange({
       stamper: makeStamper(),
       kms: mockKms as any,
@@ -638,6 +653,12 @@ describe("completeAuth2Exchange()", () => {
   });
 
   it("calls completeWalletTransfer for each pending migration", async () => {
+    mockExchangeAuthCode.mockResolvedValueOnce({
+      accessToken: accessTokenWithWalletClaim,
+      idType: "Bearer",
+      expiresInMs: 3_600_000,
+      refreshToken: "refresh-tok",
+    });
     mockKms.listPendingMigrations.mockResolvedValueOnce({
       pendingMigrations: [{ migrationId: "migration-1" }, { migrationId: "migration-2" }],
     });
@@ -663,6 +684,12 @@ describe("completeAuth2Exchange()", () => {
   });
 
   it("skips migration entries that have no migrationId", async () => {
+    mockExchangeAuthCode.mockResolvedValueOnce({
+      accessToken: accessTokenWithWalletClaim,
+      idType: "Bearer",
+      expiresInMs: 3_600_000,
+      refreshToken: "refresh-tok",
+    });
     mockKms.listPendingMigrations.mockResolvedValueOnce({
       pendingMigrations: [{ migrationId: "migration-1" }, {}, { migrationId: "migration-3" }],
     });
@@ -688,6 +715,12 @@ describe("completeAuth2Exchange()", () => {
   });
 
   it("does not call completeWalletTransfer when pendingMigrations key is absent", async () => {
+    mockExchangeAuthCode.mockResolvedValueOnce({
+      accessToken: accessTokenWithWalletClaim,
+      idType: "Bearer",
+      expiresInMs: 3_600_000,
+      refreshToken: "refresh-tok",
+    });
     mockKms.listPendingMigrations.mockResolvedValueOnce({});
 
     await completeAuth2Exchange({
@@ -703,6 +736,12 @@ describe("completeAuth2Exchange()", () => {
   });
 
   it("does not call completeWalletTransfer when there are no pending migrations", async () => {
+    mockExchangeAuthCode.mockResolvedValueOnce({
+      accessToken: accessTokenWithWalletClaim,
+      idType: "Bearer",
+      expiresInMs: 3_600_000,
+      refreshToken: "refresh-tok",
+    });
     mockKms.listPendingMigrations.mockResolvedValueOnce({ pendingMigrations: [] });
 
     await completeAuth2Exchange({
@@ -718,6 +757,12 @@ describe("completeAuth2Exchange()", () => {
   });
 
   it("continues and resolves even when a completeWalletTransfer call throws", async () => {
+    mockExchangeAuthCode.mockResolvedValueOnce({
+      accessToken: accessTokenWithWalletClaim,
+      idType: "Bearer",
+      expiresInMs: 3_600_000,
+      refreshToken: "refresh-tok",
+    });
     mockKms.listPendingMigrations.mockResolvedValueOnce({
       pendingMigrations: [{ migrationId: "migration-fail" }, { migrationId: "migration-ok" }],
     });
@@ -875,8 +920,12 @@ describe("_getOrMigrateWallet()", () => {
     expect(mockKms.getOrCreatePhantomOrganization).toHaveBeenCalledWith("encoded-pub-key");
   });
 
-  it("calls listPendingMigrations with organizationId", async () => {
-    await _getOrMigrateWallet({ stamper: makeStamper(), kms: mockKms as any, auth2Token: makeToken() });
+  it("calls listPendingMigrations with organizationId when the token has a wallet claim", async () => {
+    await _getOrMigrateWallet({
+      stamper: makeStamper(),
+      kms: mockKms as any,
+      auth2Token: makeToken({ walletUrn: "urn:phantom:wallet:w:0" }),
+    });
 
     expect(mockKms.listPendingMigrations).toHaveBeenCalledWith("org-1");
   });
@@ -886,7 +935,11 @@ describe("_getOrMigrateWallet()", () => {
       pendingMigrations: [{ migrationId: "m-1" }, { migrationId: "m-2" }],
     });
 
-    await _getOrMigrateWallet({ stamper: makeStamper(), kms: mockKms as any, auth2Token: makeToken() });
+    await _getOrMigrateWallet({
+      stamper: makeStamper(),
+      kms: mockKms as any,
+      auth2Token: makeToken({ walletUrn: "urn:phantom:wallet:wallet-1:0" }),
+    });
 
     expect(mockKms.completeWalletTransfer).toHaveBeenCalledTimes(2);
     expect(mockKms.completeWalletTransfer).toHaveBeenCalledWith({ organizationId: "org-1", migrationId: "m-1" });
@@ -898,7 +951,11 @@ describe("_getOrMigrateWallet()", () => {
       pendingMigrations: [{ migrationId: "m-1" }, {}, { migrationId: "m-3" }],
     });
 
-    await _getOrMigrateWallet({ stamper: makeStamper(), kms: mockKms as any, auth2Token: makeToken() });
+    await _getOrMigrateWallet({
+      stamper: makeStamper(),
+      kms: mockKms as any,
+      auth2Token: makeToken({ walletUrn: "urn:phantom:wallet:wallet-1:0" }),
+    });
 
     expect(mockKms.completeWalletTransfer).toHaveBeenCalledTimes(2);
     expect(mockKms.completeWalletTransfer).not.toHaveBeenCalledWith(
@@ -909,15 +966,23 @@ describe("_getOrMigrateWallet()", () => {
   it("does not call completeWalletTransfer when pendingMigrations key is absent", async () => {
     mockKms.listPendingMigrations.mockResolvedValueOnce({});
 
-    await _getOrMigrateWallet({ stamper: makeStamper(), kms: mockKms as any, auth2Token: makeToken() });
+    await _getOrMigrateWallet({
+      stamper: makeStamper(),
+      kms: mockKms as any,
+      auth2Token: makeToken({ walletUrn: "urn:phantom:wallet:wallet-1:0" }),
+    });
 
     expect(mockKms.completeWalletTransfer).not.toHaveBeenCalled();
   });
 
   it("does not call completeWalletTransfer when pendingMigrations is empty", async () => {
     mockKms.listPendingMigrations.mockResolvedValueOnce({ pendingMigrations: [] });
 
-    await _getOrMigrateWallet({ stamper: makeStamper(), kms: mockKms as any, auth2Token: makeToken() });
+    await _getOrMigrateWallet({
+      stamper: makeStamper(),
+      kms: mockKms as any,
+      auth2Token: makeToken({ walletUrn: "urn:phantom:wallet:wallet-1:0" }),
+    });
 
     expect(mockKms.completeWalletTransfer).not.toHaveBeenCalled();
   });
@@ -931,7 +996,7 @@ describe("_getOrMigrateWallet()", () => {
     const result = await _getOrMigrateWallet({
       stamper: makeStamper(),
       kms: mockKms as any,
-      auth2Token: makeToken(),
+      auth2Token: makeToken({ walletUrn: "urn:phantom:wallet:wallet-1:0" }),
     });
 
     expect(mockKms.completeWalletTransfer).toHaveBeenCalledTimes(2);

packages/auth2/src/auth2Flow.ts

@@ -253,8 +253,7 @@ export async function completeAuth2Exchange<P extends string>(options: {
 /**
  * Retrieves the organization and wallet for the current user, handling migration if needed.
  * - Uses the provided stamper to get the associated public key and organization.
- * - Attempts to complete any pending wallet migrations for the organization.
- * - If the Auth2 token includes a wallet, returns it directly.
+ * - When the token includes a wallet, completes pending wallet migrations for the organization and returns that wallet.
  * - Otherwise, gets or creates an application-specific wallet tagged with the clientId.
  */
 export async function _getOrMigrateWallet({
@@ -274,22 +273,22 @@ export async function _getOrMigrateWallet({
   const publicKey = base64urlEncode(bs58.decode(keyInfo.publicKey));
   const { organizationId } = await kms.getOrCreatePhantomOrganization(publicKey);
 
-  const pendingMigrations = await kms.listPendingMigrations(organizationId);
-
-  if (pendingMigrations.pendingMigrations) {
-    for (const migration of pendingMigrations.pendingMigrations) {
-      if (migration.migrationId) {
-        try {
-          await kms.completeWalletTransfer({ organizationId, migrationId: migration.migrationId });
-        } catch (error) {
-          console.error(`Failed to complete wallet transfer for migration ${migration.migrationId}:`, error);
+  // Wallet was selected during the login flow
+  if (auth2Token.wallet) {
+    const pendingMigrations = await kms.listPendingMigrations(organizationId);
+
+    if (pendingMigrations.pendingMigrations) {
+      for (const migration of pendingMigrations.pendingMigrations) {
+        if (migration.migrationId) {
+          try {
+            await kms.completeWalletTransfer({ organizationId, migrationId: migration.migrationId });
+          } catch (error) {
+            console.error(`Failed to complete wallet transfer for migration ${migration.migrationId}:`, error);
+          }
         }
       }
     }
-  }
 
-  // Wallet was selected during the login flow
-  if (auth2Token.wallet) {
     return {
       organizationId,
       wallet: auth2Token.wallet,

packages/base64url/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/base64url",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0",
   "description": "Isomorphic base64url encoding/decoding utilities",
   "repository": {
     "type": "git",

packages/browser-injected-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/browser-injected-sdk",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/phantom/phantom-connect-sdk",

packages/browser-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/browser-sdk",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0",
   "description": "Browser SDK for Phantom Wallet",
   "repository": {
     "type": "git",

packages/chain-interfaces/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/chain-interfaces",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0",
   "description": "Shared chain interfaces for Phantom SDK",
   "types": "dist/index.d.ts",
   "exports": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/client",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0",
   "description": "HTTP client for Phantom Wallet API",
   "repository": {
     "type": "git",

packages/constants/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/constants",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0",
   "description": "Shared constants for Phantom Wallet SDK",
   "repository": {
     "type": "git",