@aztec/wallet-sdk 0.0.1-commit.d1f2d6c → 0.0.1-commit.d431d1c

package/dest/providers/extension/extension_wallet.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extension_wallet.d.ts","sourceRoot":"","sources":["../../../src/providers/extension/extension_wallet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,wBAAwB,CAAC;AAOnE,OAAO,EAAE,KAAK,UAAU,EAA8D,MAAM,gBAAgB,CAAC;AAa7G;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC;AAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBAAa,eAAe;IAexB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,SAAS;IAlBnB,sEAAsE;IACtE,OAAO,CAAC,QAAQ,CAAoD;IACpE,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,mBAAmB,CAA4B;IAEvD;;;;;;;OAOG;IACH,OAAO,eAMH;IAEJ,mCAAmC;IACnC,OAAO,CAAC,WAAW,CAAuB;IAE1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IACH,MAAM,CAAC,MAAM,CACX,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,MAAM,GACZ,eAAe,CAWjB;IAED;;;;;;;;;;;;;;OAcG;IACH,SAAS,IAAI,MAAM,CAuBlB;YAUa,uBAAuB;YA0DvB,WAAW;IA2BzB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IA+BxB;;;;;;;;;;;;;;;OAeG;IACH,YAAY,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,IAAI,CAQrD;IAED;;;;OAIG;IACH,cAAc,IAAI,OAAO,CAExB;IAED;;;;;;;;;;;;;OAaG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CA2BhC;CACF"}

package/dest/{extension/provider → providers/extension}/extension_wallet.js

@@ -6,30 +6,30 @@ import { decrypt, encrypt } from '../../crypto.js';
 import { WalletMessageType } from '../../types.js';
 /**
  * A wallet implementation that communicates with browser extension wallets
- * using an encrypted MessageChannel.
+ * using a secure encrypted MessageChannel.
  *
- * This class uses a secure channel established after discovery:
+ * This class uses a pre-established secure channel from the discovery phase:
  *
- * 1. **MessageChannel**: Created during discovery and transferred via window.postMessage.
- *    Note: The port transfer is visible to page scripts, but security comes from encryption.
+ * 1. **MessageChannel**: A private communication channel created during discovery,
+ *    not visible to other scripts on the page (unlike window.postMessage).
  *
- * 2. **ECDH Key Exchange**: The shared secret was derived after discovery using
- *    Elliptic Curve Diffie-Hellman key exchange over the MessagePort.
+ * 2. **ECDH Key Exchange**: The shared secret was derived during discovery using
+ *    Elliptic Curve Diffie-Hellman key exchange.
  *
  * 3. **AES-GCM Encryption**: All messages are encrypted using AES-256-GCM,
- *    providing both confidentiality and authenticity. This is what secures the channel.
+ *    providing both confidentiality and authenticity.
  *
  * @example
  * ```typescript
- * // Discover and establish secure channel to a wallet
- * const discoveredWallets = await ExtensionProvider.discoverWallets(chainInfo, { appId: 'my-dapp' });
- * const connection = await discoveredWallets[0].establishSecureChannel();
+ * // Discovery returns wallets with secure channel components
+ * const wallets = await ExtensionProvider.discoverExtensions(chainInfo);
+ * const { info, port, sharedKey } = wallets[0];
  *
  * // User can verify emoji if desired
- * console.log('Verify:', hashToEmoji(connection.info.verificationHash!));
+ * console.log('Verify:', hashToEmoji(info.verificationHash!));
  *
- * // Create wallet using the connection
- * const wallet = ExtensionWallet.create(connection.info.id, connection.port, connection.sharedKey, chainInfo, 'my-dapp');
+ * // Create wallet using the discovered components
+ * const wallet = await ExtensionWallet.create(info, chainInfo, port, sharedKey, 'my-dapp');
  *
  * // All subsequent calls are encrypted
  * const accounts = await wallet.getAccounts();
@@ -59,47 +59,68 @@ import { WalletMessageType } from '../../types.js';
         this.inFlight = new Map();
         this.disconnected = false;
         this.disconnectCallbacks = [];
+        this.walletProxy = null;
     }
+    /** Cached Wallet proxy instance */ walletProxy;
     /**
-   * Creates a Wallet that communicates with a browser extension
+   * Creates an ExtensionWallet instance that communicates with a browser extension
    * over a secure encrypted MessageChannel.
    *
-   * @param extensionId - The unique identifier of the wallet extension
-   * @param port - The MessagePort for encrypted communication with the wallet
-   * @param sharedKey - The derived AES-256-GCM shared key for encryption
+   * @param walletInfo - The wallet info from ExtensionProvider.discoverExtensions()
    * @param chainInfo - The chain information (chainId and version) for request context
+   * @param port - The MessagePort for private communication with the wallet
+   * @param sharedKey - The derived AES-256-GCM shared key for encryption
    * @param appId - Application identifier used to identify the requesting dApp to the wallet
-   * @returns A Wallet interface where all method calls are encrypted
+   * @returns The ExtensionWallet instance. Use {@link getWallet} to get the Wallet interface.
    *
    * @example
    * ```typescript
-   * const discoveredWallets = await ExtensionProvider.discoverWallets(chainInfo, { appId: 'my-defi-app' });
-   * const connection = await discoveredWallets[0].establishSecureChannel();
-   * const wallet = ExtensionWallet.create(
-   *   connection.info.id,
-   *   connection.port,
-   *   connection.sharedKey,
-   *   chainInfo,
+   * const wallets = await ExtensionProvider.discoverExtensions(chainInfo);
+   * const { info, port, sharedKey } = wallets[0];
+   * const extensionWallet = ExtensionWallet.create(
+   *   info,
+   *   { chainId: Fr(31337), version: Fr(0) },
+   *   port,
+   *   sharedKey,
    *   'my-defi-app'
    * );
    *
+   * // Register disconnect handler
+   * extensionWallet.onDisconnect(() => console.log('Disconnected!'));
+   *
+   * // Get the Wallet interface for dApp usage
+   * const wallet = extensionWallet.getWallet();
    * const accounts = await wallet.getAccounts();
    * ```
-   */ static create(extensionId, port, sharedKey, chainInfo, appId) {
-        const wallet = new ExtensionWallet(chainInfo, appId, extensionId, port, sharedKey);
-        // Set up message handler for encrypted responses and unencrypted control messages
+   */ static create(walletInfo, chainInfo, port, sharedKey, appId) {
+        const wallet = new ExtensionWallet(chainInfo, appId, walletInfo.id, port, sharedKey);
+        // Set up message handler - all messages are now encrypted
         wallet.port.onmessage = (event)=>{
-            const data = event.data;
-            // Check for unencrypted disconnect notification
-            if (data && typeof data === 'object' && 'type' in data && data.type === WalletMessageType.DISCONNECT) {
-                wallet.handleDisconnect();
-                return;
-            }
-            // Otherwise treat as encrypted payload
-            void wallet.handleEncryptedResponse(data);
+            void wallet.handleEncryptedResponse(event.data);
         };
         wallet.port.start();
-        return new Proxy(wallet, {
+        return wallet;
+    }
+    /**
+   * Returns a Wallet interface that proxies all method calls through the secure channel.
+   *
+   * The returned Wallet can be used directly by dApps - all method calls are automatically
+   * encrypted and sent to the wallet extension.
+   *
+   * @returns A Wallet implementation that encrypts all communication
+   *
+   * @example
+   * ```typescript
+   * const extensionWallet = ExtensionWallet.create(info, chainInfo, port, sharedKey, 'my-app');
+   * const wallet = extensionWallet.getWallet();
+   * const accounts = await wallet.getAccounts();
+   * ```
+   */ getWallet() {
+        if (this.walletProxy) {
+            return this.walletProxy;
+        }
+        // Create a Proxy that intercepts wallet method calls and forwards them to the extension
+        this.walletProxy = new Proxy(this, {
             get: (target, prop)=>{
                 if (schemaHasMethod(WalletSchema, prop.toString())) {
                     return async (...args)=>{
@@ -114,6 +135,7 @@ import { WalletMessageType } from '../../types.js';
                 }
             }
         });
+        return this.walletProxy;
     }
     /**
    * Handles an encrypted response received from the wallet extension.
@@ -129,6 +151,12 @@ import { WalletMessageType } from '../../types.js';
         try {
             const response = await decrypt(this.sharedKey, encrypted);
             const { messageId, result, error, walletId: responseWalletId } = response;
+            // Check for disconnect notification from the wallet backend
+            // This is sent as an encrypted error response with a special type
+            if (error && typeof error === 'object' && 'type' in error && error.type === WalletMessageType.SESSION_DISCONNECTED) {
+                this.handleDisconnect();
+                return;
+            }
             if (!messageId || !responseWalletId) {
                 return;
             }
@@ -175,7 +203,8 @@ import { WalletMessageType } from '../../types.js';
             appId: this.appId,
             walletId: this.extensionId
         };
-        const encrypted = await encrypt(this.sharedKey, jsonStringify(message));
+        // Encrypt the message and send over the private MessageChannel
+        const encrypted = await encrypt(this.sharedKey, message);
         this.port.postMessage(encrypted);
         const { promise, resolve, reject } = promiseWithResolvers();
         this.inFlight.set(messageId, {
@@ -194,20 +223,25 @@ import { WalletMessageType } from '../../types.js';
             return;
         }
         this.disconnected = true;
+        // Close the port to prevent any further messages
         if (this.port) {
             this.port.onmessage = null;
             this.port.close();
         }
+        // Reject all pending requests
+        // Note: These rejections should be caught by the callers, but we log them
+        // here to help with debugging if they become unhandled
         const error = new Error('Wallet disconnected');
         for (const { reject } of this.inFlight.values()){
             reject(error);
         }
         this.inFlight.clear();
+        // Notify registered callbacks
         for (const callback of this.disconnectCallbacks){
             try {
                 callback();
             } catch  {
-            // Ignore errors on disconnect callbacks
+            // Ignore errors in callbacks
             }
         }
     }
@@ -251,21 +285,34 @@ import { WalletMessageType } from '../../types.js';
    *
    * @example
    * ```typescript
-   * const extensionWallet = ExtensionWallet.create(extensionId, port, sharedKey, chainInfo, 'my-app');
+   * const wallet = await provider.connect('my-app');
    * // ... use wallet ...
-   * await extensionWallet.disconnect(); // Clean disconnect when done
+   * await wallet.disconnect(); // Clean disconnect when done
    * ```
-   */ // eslint-disable-next-line require-await -- async for interface compatibility
-    async disconnect() {
+   */ async disconnect() {
         if (this.disconnected) {
             return;
         }
-        if (this.port) {
-            // Send unencrypted disconnect - control messages don't need encryption
-            this.port.postMessage({
-                type: WalletMessageType.DISCONNECT
-            });
+        // Send disconnect message to extension before closing
+        if (this.port && this.sharedKey) {
+            try {
+                const message = {
+                    type: WalletMessageType.DISCONNECT,
+                    messageId: globalThis.crypto.randomUUID(),
+                    chainInfo: this.chainInfo,
+                    appId: this.appId,
+                    walletId: this.extensionId,
+                    args: []
+                };
+                const encrypted = await encrypt(this.sharedKey, message);
+                this.port.postMessage(encrypted);
+            } catch  {
+            // Ignore errors sending disconnect message
+            }
         }
         this.handleDisconnect();
+        if (this.port) {
+            this.port.close();
+        }
     }
 }

package/dest/providers/extension/index.d.ts

@@ -0,0 +1,6 @@
+export { ExtensionWallet, type DisconnectCallback } from './extension_wallet.js';
+export { ExtensionProvider, type DiscoveredWallet } from './extension_provider.js';
+export * from '../../crypto.js';
+export { WalletMessageType } from '../../types.js';
+export type { WalletInfo, WalletMessage, WalletResponse, DiscoveryRequest, DiscoveryResponse } from '../../types.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wcm92aWRlcnMvZXh0ZW5zaW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxlQUFlLEVBQUUsS0FBSyxrQkFBa0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2pGLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxLQUFLLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbkYsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNuRCxZQUFZLEVBQUUsVUFBVSxFQUFFLGFBQWEsRUFBRSxjQUFjLEVBQUUsZ0JBQWdCLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQyJ9

package/dest/providers/extension/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/extension/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACnF,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC"}

package/dest/{extension/provider → providers/extension}/index.js

@@ -1,2 +1,4 @@
 export { ExtensionWallet } from './extension_wallet.js';
 export { ExtensionProvider } from './extension_provider.js';
+export * from '../../crypto.js';
+export { WalletMessageType } from '../../types.js';

package/dest/types.d.ts

@@ -9,16 +9,13 @@ export declare enum WalletMessageType {
     DISCOVERY = "aztec-wallet-discovery",
     /** Discovery response from a wallet */
     DISCOVERY_RESPONSE = "aztec-wallet-discovery-response",
-    /** Disconnect message (unencrypted control message, bidirectional) */
-    DISCONNECT = "aztec-wallet-disconnect",
-    /** Key exchange request sent over MessageChannel */
-    KEY_EXCHANGE_REQUEST = "aztec-wallet-key-exchange-request",
-    /** Key exchange response sent over MessageChannel */
-    KEY_EXCHANGE_RESPONSE = "aztec-wallet-key-exchange-response"
+    /** Session disconnected notification (unencrypted control message) */
+    SESSION_DISCONNECTED = "aztec-wallet-session-disconnected",
+    /** Explicit disconnect request from dApp */
+    DISCONNECT = "aztec-wallet-disconnect"
 }
 /**
- * Information about an installed Aztec wallet.
- * Used during discovery phase before key exchange.
+ * Information about an installed Aztec wallet
  */
 export interface WalletInfo {
     /** Unique identifier for the wallet */
@@ -29,16 +26,10 @@ export interface WalletInfo {
     icon?: string;
     /** Wallet version */
     version: string;
-}
-/**
- * Full information about a connected Aztec wallet including crypto material.
- * Available after key exchange completes.
- */
-export interface ConnectedWalletInfo extends WalletInfo {
     /** Wallet's ECDH public key for secure channel establishment */
     publicKey: ExportedPublicKey;
     /**
-     * Verification hash for verification.
+     * Hash of the shared secret for anti-MITM verification.
      * Both dApp and wallet independently compute this from the ECDH shared secret.
      * Use {@link hashToEmoji} to convert to a visual representation for user verification.
      */
@@ -75,49 +66,27 @@ export interface WalletResponse {
     walletId: string;
 }
 /**
- * Discovery message for finding installed wallets (public, unencrypted).
+ * Discovery message for finding installed wallets (public, unencrypted)
  */
 export interface DiscoveryRequest {
     /** Message type for discovery */
     type: WalletMessageType.DISCOVERY;
     /** Request ID */
     requestId: string;
-    /** Application ID making the request */
-    appId: string;
     /** Chain information to check if wallet supports this network */
     chainInfo: ChainInfo;
+    /** dApp's ECDH public key for deriving shared secret */
+    publicKey: ExportedPublicKey;
 }
 /**
- * Discovery response from a wallet (public, unencrypted).
+ * Discovery response from a wallet (public, unencrypted)
  */
 export interface DiscoveryResponse {
     /** Message type for discovery response */
     type: WalletMessageType.DISCOVERY_RESPONSE;
     /** Request ID matching the discovery request */
     requestId: string;
-    /** Basic wallet information */
+    /** Wallet information */
     walletInfo: WalletInfo;
 }
-/**
- * Key exchange request sent over MessageChannel after discovery approval.
- */
-export interface KeyExchangeRequest {
-    /** Message type */
-    type: WalletMessageType.KEY_EXCHANGE_REQUEST;
-    /** Request ID matching the discovery request */
-    requestId: string;
-    /** dApp's ECDH public key for deriving shared secret */
-    publicKey: ExportedPublicKey;
-}
-/**
- * Key exchange response sent over MessageChannel.
- */
-export interface KeyExchangeResponse {
-    /** Message type */
-    type: WalletMessageType.KEY_EXCHANGE_RESPONSE;
-    /** Request ID matching the discovery request */
-    requestId: string;
-    /** Wallet's ECDH public key for deriving shared secret */
-    publicKey: ExportedPublicKey;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVyRDs7O0dBR0c7QUFDSCxvQkFBWSxpQkFBaUI7SUFDM0Isa0RBQWtEO0lBQ2xELFNBQVMsMkJBQTJCO0lBQ3BDLHVDQUF1QztJQUN2QyxrQkFBa0Isb0NBQW9DO0lBQ3RELHNFQUFzRTtJQUN0RSxVQUFVLDRCQUE0QjtJQUN0QyxvREFBb0Q7SUFDcEQsb0JBQW9CLHNDQUFzQztJQUMxRCxxREFBcUQ7SUFDckQscUJBQXFCLHVDQUF1QztDQUM3RDtBQUVEOzs7R0FHRztBQUNILE1BQU0sV0FBVyxVQUFVO0lBQ3pCLHVDQUF1QztJQUN2QyxFQUFFLEVBQUUsTUFBTSxDQUFDO0lBQ1gsaUNBQWlDO0lBQ2pDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYiwrQkFBK0I7SUFDL0IsSUFBSSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2QscUJBQXFCO0lBQ3JCLE9BQU8sRUFBRSxNQUFNLENBQUM7Q0FDakI7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFdBQVcsbUJBQW9CLFNBQVEsVUFBVTtJQUNyRCxnRUFBZ0U7SUFDaEUsU0FBUyxFQUFFLGlCQUFpQixDQUFDO0lBQzdCOzs7O09BSUc7SUFDSCxnQkFBZ0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUMzQjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGFBQWE7SUFDNUIsK0NBQStDO0lBQy9DLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsZ0NBQWdDO0lBQ2hDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYiwrQkFBK0I7SUFDL0IsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDO0lBQ2hCLHdCQUF3QjtJQUN4QixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLHdDQUF3QztJQUN4QyxLQUFLLEVBQUUsTUFBTSxDQUFDO0lBQ2QsNENBQTRDO0lBQzVDLFFBQVEsRUFBRSxNQUFNLENBQUM7Q0FDbEI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxjQUFjO0lBQzdCLHNDQUFzQztJQUN0QyxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLGtDQUFrQztJQUNsQyxNQUFNLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDakIsNkJBQTZCO0lBQzdCLEtBQUssQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUNoQix1Q0FBdUM7SUFDdkMsUUFBUSxFQUFFLE1BQU0sQ0FBQztDQUNsQjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQixpQ0FBaUM7SUFDakMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLFNBQVMsQ0FBQztJQUNsQyxpQkFBaUI7SUFDakIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQix3Q0FBd0M7SUFDeEMsS0FBSyxFQUFFLE1BQU0sQ0FBQztJQUNkLGlFQUFpRTtJQUNqRSxTQUFTLEVBQUUsU0FBUyxDQUFDO0NBQ3RCO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsaUJBQWlCO0lBQ2hDLDBDQUEwQztJQUMxQyxJQUFJLEVBQUUsaUJBQWlCLENBQUMsa0JBQWtCLENBQUM7SUFDM0MsZ0RBQWdEO0lBQ2hELFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsK0JBQStCO0lBQy9CLFVBQVUsRUFBRSxVQUFVLENBQUM7Q0FDeEI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxrQkFBa0I7SUFDakMsbUJBQW1CO0lBQ25CLElBQUksRUFBRSxpQkFBaUIsQ0FBQyxvQkFBb0IsQ0FBQztJQUM3QyxnREFBZ0Q7SUFDaEQsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQix3REFBd0Q7SUFDeEQsU0FBUyxFQUFFLGlCQUFpQixDQUFDO0NBQzlCO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsbUJBQW1CO0lBQ2xDLG1CQUFtQjtJQUNuQixJQUFJLEVBQUUsaUJBQWlCLENBQUMscUJBQXFCLENBQUM7SUFDOUMsZ0RBQWdEO0lBQ2hELFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsMERBQTBEO0lBQzFELFNBQVMsRUFBRSxpQkFBaUIsQ0FBQztDQUM5QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVyRDs7O0dBR0c7QUFDSCxvQkFBWSxpQkFBaUI7SUFDM0Isa0RBQWtEO0lBQ2xELFNBQVMsMkJBQTJCO0lBQ3BDLHVDQUF1QztJQUN2QyxrQkFBa0Isb0NBQW9DO0lBQ3RELHNFQUFzRTtJQUN0RSxvQkFBb0Isc0NBQXNDO0lBQzFELDRDQUE0QztJQUM1QyxVQUFVLDRCQUE0QjtDQUN2QztBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLFVBQVU7SUFDekIsdUNBQXVDO0lBQ3ZDLEVBQUUsRUFBRSxNQUFNLENBQUM7SUFDWCxpQ0FBaUM7SUFDakMsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLCtCQUErQjtJQUMvQixJQUFJLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZCxxQkFBcUI7SUFDckIsT0FBTyxFQUFFLE1BQU0sQ0FBQztJQUNoQixnRUFBZ0U7SUFDaEUsU0FBUyxFQUFFLGlCQUFpQixDQUFDO0lBQzdCOzs7O09BSUc7SUFDSCxnQkFBZ0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUMzQjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGFBQWE7SUFDNUIsK0NBQStDO0lBQy9DLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsZ0NBQWdDO0lBQ2hDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYiwrQkFBK0I7SUFDL0IsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDO0lBQ2hCLHdCQUF3QjtJQUN4QixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLHdDQUF3QztJQUN4QyxLQUFLLEVBQUUsTUFBTSxDQUFDO0lBQ2QsNENBQTRDO0lBQzVDLFFBQVEsRUFBRSxNQUFNLENBQUM7Q0FDbEI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxjQUFjO0lBQzdCLHNDQUFzQztJQUN0QyxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLGtDQUFrQztJQUNsQyxNQUFNLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDakIsNkJBQTZCO0lBQzdCLEtBQUssQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUNoQix1Q0FBdUM7SUFDdkMsUUFBUSxFQUFFLE1BQU0sQ0FBQztDQUNsQjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQixpQ0FBaUM7SUFDakMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLFNBQVMsQ0FBQztJQUNsQyxpQkFBaUI7SUFDakIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixpRUFBaUU7SUFDakUsU0FBUyxFQUFFLFNBQVMsQ0FBQztJQUNyQix3REFBd0Q7SUFDeEQsU0FBUyxFQUFFLGlCQUFpQixDQUFDO0NBQzlCO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsaUJBQWlCO0lBQ2hDLDBDQUEwQztJQUMxQyxJQUFJLEVBQUUsaUJBQWlCLENBQUMsa0JBQWtCLENBQUM7SUFDM0MsZ0RBQWdEO0lBQ2hELFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIseUJBQXlCO0lBQ3pCLFVBQVUsRUFBRSxVQUFVLENBQUM7Q0FDeEIifQ==

package/dest/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD;;;GAGG;AACH,oBAAY,iBAAiB;IAC3B,kDAAkD;IAClD,SAAS,2BAA2B;IACpC,uCAAuC;IACvC,kBAAkB,oCAAoC;IACtD,sEAAsE;IACtE,UAAU,4BAA4B;IACtC,oDAAoD;IACpD,oBAAoB,sCAAsC;IAC1D,qDAAqD;IACrD,qBAAqB,uCAAuC;CAC7D;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,+BAA+B;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qBAAqB;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAoB,SAAQ,UAAU;IACrD,gEAAgE;IAChE,SAAS,EAAE,iBAAiB,CAAC;IAC7B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,+CAA+C;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,+BAA+B;IAC/B,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,wBAAwB;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,wCAAwC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,sCAAsC;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,kCAAkC;IAClC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,6BAA6B;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,uCAAuC;IACvC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,iCAAiC;IACjC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC;IAClC,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,iEAAiE;IACjE,SAAS,EAAE,SAAS,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,0CAA0C;IAC1C,IAAI,EAAE,iBAAiB,CAAC,kBAAkB,CAAC;IAC3C,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,+BAA+B;IAC/B,UAAU,EAAE,UAAU,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,mBAAmB;IACnB,IAAI,EAAE,iBAAiB,CAAC,oBAAoB,CAAC;IAC7C,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,wDAAwD;IACxD,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,mBAAmB;IACnB,IAAI,EAAE,iBAAiB,CAAC,qBAAqB,CAAC;IAC9C,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,SAAS,EAAE,iBAAiB,CAAC;CAC9B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD;;;GAGG;AACH,oBAAY,iBAAiB;IAC3B,kDAAkD;IAClD,SAAS,2BAA2B;IACpC,uCAAuC;IACvC,kBAAkB,oCAAoC;IACtD,sEAAsE;IACtE,oBAAoB,sCAAsC;IAC1D,4CAA4C;IAC5C,UAAU,4BAA4B;CACvC;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,+BAA+B;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qBAAqB;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,gEAAgE;IAChE,SAAS,EAAE,iBAAiB,CAAC;IAC7B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,+CAA+C;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,+BAA+B;IAC/B,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,wBAAwB;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,wCAAwC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,sCAAsC;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,kCAAkC;IAClC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,6BAA6B;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,uCAAuC;IACvC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,iCAAiC;IACjC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC;IAClC,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,SAAS,EAAE,SAAS,CAAC;IACrB,wDAAwD;IACxD,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,0CAA0C;IAC1C,IAAI,EAAE,iBAAiB,CAAC,kBAAkB,CAAC;IAC3C,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,yBAAyB;IACzB,UAAU,EAAE,UAAU,CAAC;CACxB"}

package/dest/types.js

@@ -4,8 +4,7 @@
  */ export var WalletMessageType = /*#__PURE__*/ function(WalletMessageType) {
     /** Discovery request to find installed wallets */ WalletMessageType["DISCOVERY"] = "aztec-wallet-discovery";
     /** Discovery response from a wallet */ WalletMessageType["DISCOVERY_RESPONSE"] = "aztec-wallet-discovery-response";
-    /** Disconnect message (unencrypted control message, bidirectional) */ WalletMessageType["DISCONNECT"] = "aztec-wallet-disconnect";
-    /** Key exchange request sent over MessageChannel */ WalletMessageType["KEY_EXCHANGE_REQUEST"] = "aztec-wallet-key-exchange-request";
-    /** Key exchange response sent over MessageChannel */ WalletMessageType["KEY_EXCHANGE_RESPONSE"] = "aztec-wallet-key-exchange-response";
+    /** Session disconnected notification (unencrypted control message) */ WalletMessageType["SESSION_DISCONNECTED"] = "aztec-wallet-session-disconnected";
+    /** Explicit disconnect request from dApp */ WalletMessageType["DISCONNECT"] = "aztec-wallet-disconnect";
     return WalletMessageType;
 }({});

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@aztec/wallet-sdk",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/wallet-sdk",
-  "version": "0.0.1-commit.d1f2d6c",
+  "version": "0.0.1-commit.d431d1c",
   "type": "module",
   "exports": {
     "./base-wallet": "./dest/base-wallet/index.js",
-    "./extension/handlers": "./dest/extension/handlers/index.js",
-    "./extension/provider": "./dest/extension/provider/index.js",
+    "./providers/extension": "./dest/providers/extension/index.js",
     "./crypto": "./dest/crypto.js",
     "./types": "./dest/types.js",
     "./manager": "./dest/manager/index.js"
@@ -65,15 +64,15 @@
     ]
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.0.1-commit.d1f2d6c",
-    "@aztec/constants": "0.0.1-commit.d1f2d6c",
-    "@aztec/entrypoints": "0.0.1-commit.d1f2d6c",
-    "@aztec/foundation": "0.0.1-commit.d1f2d6c",
-    "@aztec/pxe": "0.0.1-commit.d1f2d6c",
-    "@aztec/stdlib": "0.0.1-commit.d1f2d6c"
+    "@aztec/aztec.js": "0.0.1-commit.d431d1c",
+    "@aztec/constants": "0.0.1-commit.d431d1c",
+    "@aztec/entrypoints": "0.0.1-commit.d431d1c",
+    "@aztec/foundation": "0.0.1-commit.d431d1c",
+    "@aztec/pxe": "0.0.1-commit.d431d1c",
+    "@aztec/stdlib": "0.0.1-commit.d431d1c"
   },
   "devDependencies": {
-    "@aztec/noir-contracts.js": "0.0.1-commit.d1f2d6c",
+    "@aztec/noir-contracts.js": "0.0.1-commit.d431d1c",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

package/src/base-wallet/base_wallet.ts

@@ -1,8 +1,6 @@
 import type { Account } from '@aztec/aztec.js/account';
 import type { CallIntent, IntentInnerHash } from '@aztec/aztec.js/authorization';
-import { type InteractionWaitOptions, NO_WAIT, type SendReturn } from '@aztec/aztec.js/contracts';
 import type { FeePaymentMethod } from '@aztec/aztec.js/fee';
-import { waitForTx } from '@aztec/aztec.js/node';
 import type {
   Aliased,
   BatchResults,
@@ -45,7 +43,9 @@ import { siloNullifier } from '@aztec/stdlib/hash';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import type {
   TxExecutionRequest,
+  TxHash,
   TxProfileResult,
+  TxReceipt,
   TxSimulationResult,
   UtilitySimulationResult,
 } from '@aztec/stdlib/tx';
@@ -282,10 +282,7 @@ export abstract class BaseWallet implements Wallet {
     return this.pxe.profileTx(txRequest, opts.profileMode, opts.skipProofGeneration ?? true);
   }
 
-  public async sendTx<W extends InteractionWaitOptions = undefined>(
-    executionPayload: ExecutionPayload,
-    opts: SendOptions<W>,
-  ): Promise<SendReturn<W>> {
+  async sendTx(executionPayload: ExecutionPayload, opts: SendOptions): Promise<TxHash> {
     const feeOptions = await this.completeFeeOptions(opts.from, executionPayload.feePayer, opts.fee?.gasSettings);
     const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(executionPayload, opts.from, feeOptions);
     const provenTx = await this.pxe.proveTx(txRequest);
@@ -299,15 +296,7 @@ export abstract class BaseWallet implements Wallet {
       throw this.contextualizeError(err, inspect(tx));
     });
     this.log.info(`Sent transaction ${txHash}`);
-
-    // If wait is NO_WAIT, return txHash immediately
-    if (opts.wait === NO_WAIT) {
-      return txHash as SendReturn<W>;
-    }
-
-    // Otherwise, wait for the full receipt (default behavior on wait: undefined)
-    const waitOpts = typeof opts.wait === 'object' ? opts.wait : undefined;
-    return (await waitForTx(this.aztecNode, txHash, waitOpts)) as SendReturn<W>;
+    return txHash;
   }
 
   protected contextualizeError(err: Error, ...context: string[]): Error {
@@ -328,6 +317,10 @@ export abstract class BaseWallet implements Wallet {
     return this.pxe.simulateUtility(call, authwits);
   }
 
+  getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
+    return this.aztecNode.getTxReceipt(txHash);
+  }
+
   async getPrivateEvents<T>(
     eventDef: EventMetadataDefinition,
     eventFilter: PrivateEventFilter,