@effectstream/wallets 0.103.1 → 0.103.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectstream/wallets",
-  "version": "0.103.1",
+  "version": "0.103.2",
   "license": "(MIT OR Apache-2.0)",
   "homepage": "https://effectstream.github.io/docs/",
   "repository": {
@@ -20,7 +20,7 @@
     "./solana-local": "./src/solana/local.ts"
   },
   "peerDependencies": {
-    "@effectstream/midnight-contracts": "0.103.1",
+    "@effectstream/midnight-contracts": "0.103.2",
     "@lucid-evolution/lucid": "^0.4.29",
     "@lucid-evolution/provider": "^0.1.90",
     "@lucid-evolution/utils": "^0.1.66",
@@ -52,7 +52,7 @@
     }
   },
   "devDependencies": {
-    "@effectstream/midnight-contracts": "0.103.1",
+    "@effectstream/midnight-contracts": "0.103.2",
     "@lucid-evolution/lucid": "^0.4.30",
     "@lucid-evolution/provider": "^0.1.91",
     "@lucid-evolution/utils": "^0.1.66",
@@ -61,10 +61,10 @@
     "@midnightntwrk/wallet-sdk-unshielded-wallet": "3.1.0"
   },
   "dependencies": {
-    "@effectstream/concise": "0.103.1",
-    "@effectstream/crypto": "0.103.1",
-    "@effectstream/event-client": "0.103.1",
-    "@effectstream/utils": "0.103.1",
+    "@effectstream/concise": "0.103.2",
+    "@effectstream/crypto": "0.103.2",
+    "@effectstream/event-client": "0.103.2",
+    "@effectstream/utils": "0.103.2",
     "@aurowallet/mina-provider": "^1.0.12",
     "@metamask/providers": "^22.1.0",
     "@midnight-ntwrk/dapp-connector-api": "4.0.1",

package/src/IProvider.ts

@@ -1,4 +1,4 @@
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 
 
 export type WalletOption = {

package/src/algorand/algorand.ts

@@ -1,5 +1,5 @@
 import { PeraWalletConnect } from "@perawallet/connect";
-import { AddressType, uint8ArrayToHexString } from "@effectstream/utils";
+import { AddressType, uint8ArrayToHexString } from "@effectstream/utils/types";
 import {
   type IConnector,
   type IInjectedConnector,

package/src/algorand/wrapper.ts

@@ -1,4 +1,4 @@
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { IProvider } from "../IProvider.ts";
 import type { WalletMode, ApiForMode } from "../utils.ts";
 import { type LoginInfoMap, connectInjected } from "../wallet-modes.ts";

package/src/avail/avail.ts

@@ -1,7 +1,7 @@
 import { Buffer } from "node:buffer";
 import { utf8ToHex } from 'web3-utils';
 import type { ApiPromise } from "avail-js-sdk";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import type { IProvider, ActiveConnection, AddressAndType, UserSignature } from "../IProvider.ts";
 type PolkadotAddress = string;
 import { u8aToHex } from "@polkadot/util";

package/src/avail/wrapper.ts

@@ -1,4 +1,4 @@
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { IProvider } from "../IProvider.ts";
 import type { WalletMode, ApiForMode } from "../utils.ts";
 import type { LoginInfoMap } from "../wallet-modes.ts";

package/src/cardano/cardano.ts

@@ -1,5 +1,5 @@
 import { bech32 } from "bech32";
-import { hexStringToUint8Array, AddressType } from "@effectstream/utils";
+import { hexStringToUint8Array, AddressType } from "@effectstream/utils/types";
 import { 
   type IConnector, 
   type IInjectedConnector, 

package/src/cardano/local.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 import { CryptoManager } from "@effectstream/crypto";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import { CardanoLocalConnector } from "./local.ts";
 
 describe("CardanoLocalProvider", () => {

package/src/cardano/local.ts

@@ -1,4 +1,4 @@
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import { utf8ToHex } from "web3-utils";
 import type {
   ActiveConnection,

package/src/cardano/wrapper-local.ts

@@ -1,4 +1,4 @@
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { IProvider } from "../IProvider.ts";
 import type { WalletMode, ApiForMode } from "../utils.ts";
 import type { LoginInfoMap } from "../wallet-modes.ts";

package/src/cardano/wrapper.ts

@@ -1,4 +1,4 @@
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { IProvider } from "../IProvider.ts";
 import type { WalletMode, ApiForMode } from "../utils.ts";
 import { type LoginInfoMap, connectInjected } from "../wallet-modes.ts";

package/src/effectstream.ts

@@ -1,4 +1,4 @@
-import { AddressType, type EvmAddress } from "@effectstream/utils";
+import { AddressType, type EvmAddress } from "@effectstream/utils/types";
 import type { Wallet } from "./types.ts";
 import type { IProvider } from "./IProvider.ts";
 import { type Chain, numberToHex } from "viem";

package/src/evm/ethers.ts

@@ -6,7 +6,7 @@ import type {
 } from "ethers";
 
 import { Buffer } from "node:buffer";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import type {
   ActiveConnection,
   AddressAndType,

package/src/evm/injected.ts

@@ -1,5 +1,5 @@
 import type { MetaMaskInpageProvider } from "@metamask/providers";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import {
   type ActiveConnection,
   type AddressAndType,

package/src/evm/viem.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 import { CryptoManager } from "@effectstream/crypto";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import { ViemConnector } from "./viem.ts";
 
 const TEST_KEY =

package/src/evm/viem.ts

@@ -8,7 +8,7 @@ import {
   type WalletClient,
 } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import type {
   ActiveConnection,
   AddressAndType,

package/src/evm/wrapper-ethers.ts

@@ -1,4 +1,4 @@
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { IProvider } from "../IProvider.ts";
 import type { WalletMode, ApiForMode } from "../utils.ts";
 import type { LoginInfoMap } from "../wallet-modes.ts";

package/src/evm/wrapper-injected.ts

@@ -1,4 +1,4 @@
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { IProvider } from "../IProvider.ts";
 import type { ApiForMode, WalletMode } from "../utils.ts";
 import { connectInjected, type LoginInfoMap } from "../wallet-modes.ts";

package/src/evm/wrapper-viem.ts

@@ -1,4 +1,4 @@
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { IProvider } from "../IProvider.ts";
 import type { WalletMode, ApiForMode } from "../utils.ts";
 import type { LoginInfoMap } from "../wallet-modes.ts";

package/src/midnight/local.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, mock, test } from "bun:test";
 import { Buffer } from "node:buffer";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import { verifySignature } from "@midnight-ntwrk/ledger-v8";
 import { CryptoManager } from "@effectstream/crypto";
 import { MidnightLocalConnector, type MidnightLocalApi } from "./local.ts";
@@ -117,10 +117,17 @@ describe("MidnightLocalProvider", () => {
     expect(api.walletFacade).toBe(fakeFacade);
     expect(api.dustAddress).toBe(`dust-for-${DETERMINISTIC_SEED.slice(0, 8)}`);
     expect(api.shieldedAddress).toBe("deadbeef-coin-pub-key");
+    // The encryption key is surfaced alongside the coin key: anything building
+    // a shielded output for this wallet needs both, and re-deriving it meant
+    // reaching back into @effectstream/midnight-contracts.
+    expect(api.shieldedEncryptionPublicKey).toBe("deadbeef-enc-pub-key");
 
-    // getShieldedAddresses no longer throws in facade mode.
+    // getShieldedAddresses no longer throws in facade mode, and mirrors the
+    // dapp-connector-api's shape (same field names; hex rather than bech32m).
     await expect(api.getShieldedAddresses()).resolves.toEqual({
       shieldedAddress: "deadbeef-coin-pub-key",
+      shieldedCoinPublicKey: "deadbeef-coin-pub-key",
+      shieldedEncryptionPublicKey: "deadbeef-enc-pub-key",
     });
 
     expect(provider.getConnection().metadata.displayName).toBe(

package/src/midnight/local.ts

@@ -1,5 +1,5 @@
 import { Buffer } from "node:buffer";
-import { AddressType, type MidnightAddress } from "@effectstream/utils";
+import { AddressType, type MidnightAddress } from "@effectstream/utils/types";
 import type {
   ActiveConnection,
   AddressAndType,
@@ -63,7 +63,26 @@ export type MidnightLocalApi = {
     data: string,
     options: { encoding: "text" | "hex"; keyType: "unshielded" },
   ) => Promise<{ data: string; signature: string; verifyingKey: string }>;
-  getShieldedAddresses: () => Promise<{ shieldedAddress: string }>;
+  /**
+   * Shielded keys, in the same SHAPE as the dapp-connector-api's
+   * `getShieldedAddresses()` so a consumer can branch on encoding rather than
+   * on structure.
+   *
+   * Encoding still differs by design: these are HEX
+   * (`ShieldedAddress.{coin,encryption}PublicKeyString()` return
+   * `.data.toString('hex')`), whereas Lace returns bech32m. Do not run these
+   * through `parseCoinPublicKeyToHex` / `parseEncPublicKeyToHex`.
+   *
+   * Both keys matter for contract calls that pay the caller: the coin public
+   * key is the output recipient, and the ciphertext is keyed off the
+   * encryption public key. Supplying only one means the wallet never finds the
+   * coin it was just sent.
+   */
+  getShieldedAddresses: () => Promise<{
+    shieldedAddress: string;
+    shieldedCoinPublicKey: string;
+    shieldedEncryptionPublicKey: string;
+  }>;
   /** The derived seed, exposed so tests can persist/reuse the wallet. */
   seed: string;
   /** Public verifying key for the unshielded signing role (hex). */
@@ -83,6 +102,13 @@ export type MidnightLocalApi = {
   dustAddress?: string;
   /** Hex-encoded shielded coin public key. Populated only in facade mode. */
   shieldedAddress?: string;
+  /**
+   * Hex-encoded shielded ENCRYPTION public key. Populated only in facade mode.
+   * Needed alongside `shieldedAddress` by anything that builds a shielded
+   * output for this wallet (e.g. a contract mint) — without it the ciphertext
+   * is keyed to the wrong recipient and the coin is never discovered.
+   */
+  shieldedEncryptionPublicKey?: string;
   /**
    * Escape hatch: the entire `WalletResult` returned by
    * `@effectstream/midnight-contracts.buildWalletFacade`. Exposes the raw
@@ -199,9 +225,17 @@ export class MidnightLocalConnector {
     // of `@effectstream/wallets`.
     const contractsMod = await import(
       "@effectstream/midnight-contracts/wallet-info"
-    ).catch(() => {
+    ).catch((cause: unknown) => {
+      // Preserve the underlying reason. A missing peer dep is only ONE way this
+      // import fails — it also rejects when the module resolves but cannot load,
+      // e.g. in a browser bundle where `./wallet-info` drags in node:fs. Naming
+      // only the peer-dep case sends people to reinstall a package they already
+      // have.
       throw new Error(
-        "@effectstream/midnight-contracts is required when `networkUrls` is passed to MidnightLocal.connectFromSeed. Install it as a peer dependency.",
+        "Could not load @effectstream/midnight-contracts/wallet-info, needed when `networkUrls` is passed to MidnightLocal.connectFromSeed. " +
+          "Either it is not installed (add it as a peer dependency), or it failed to load in this runtime — see `cause`. " +
+          `Underlying error: ${cause instanceof Error ? cause.message : String(cause)}`,
+        { cause },
       );
     });
     const { hdMod, keystoreMod } = await loadKeystoreDeps();
@@ -237,6 +271,13 @@ export class MidnightLocalConnector {
       walletResult.wallet.shielded,
     );
     const shieldedAddress = initialShielded.address.coinPublicKeyString();
+    // The encryption key sits right next to the coin key on the same address
+    // object. It used to be dropped here, which forced every consumer that
+    // builds a shielded output for this wallet (a contract mint, say) to
+    // re-derive it by calling getInitialShieldedState again from
+    // @effectstream/midnight-contracts.
+    const shieldedEncryptionPublicKey =
+      initialShielded.address.encryptionPublicKeyString();
 
     const api: MidnightLocalApi = {
       signData: async (data, options) => {
@@ -251,13 +292,21 @@ export class MidnightLocalConnector {
           verifyingKey,
         };
       },
-      getShieldedAddresses: async () => ({ shieldedAddress }),
+      // `shieldedAddress` is repeated as `shieldedCoinPublicKey` so the shape
+      // matches the dapp-connector-api's — locally the "address" IS the coin
+      // public key, so they are the same value under both names.
+      getShieldedAddresses: async () => ({
+        shieldedAddress,
+        shieldedCoinPublicKey: shieldedAddress,
+        shieldedEncryptionPublicKey,
+      }),
       seed,
       verifyingKey,
       unshieldedAddress: walletResult.unshieldedAddress,
       walletFacade: walletResult.wallet,
       dustAddress: walletResult.dustAddress,
       shieldedAddress,
+      shieldedEncryptionPublicKey,
       walletResult,
     };
 

package/src/midnight/midnight.ts

@@ -1,4 +1,4 @@
-import { AddressType, type MidnightAddress } from "@effectstream/utils";
+import { AddressType, type MidnightAddress } from "@effectstream/utils/types";
 import type {
   ConnectedAPI,
   InitialAPI,

package/src/midnight/wrapper-local.ts

@@ -1,4 +1,4 @@
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { IProvider } from "../IProvider.ts";
 import type { WalletMode, ApiForMode } from "../utils.ts";
 import type { LoginInfoMap } from "../wallet-modes.ts";

package/src/midnight/wrapper.ts

@@ -1,4 +1,4 @@
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { IProvider } from "../IProvider.ts";
 import type { WalletMode, ApiForMode } from "../utils.ts";
 import { type LoginInfoMap, connectInjected } from "../wallet-modes.ts";

package/src/mina/mina.ts

@@ -1,5 +1,5 @@
 import * as AuroMinaApi from "@aurowallet/mina-provider";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import {
   type IConnector,
   type IInjectedConnector,

package/src/mina/wrapper.ts

@@ -1,4 +1,4 @@
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { IProvider } from "../IProvider.ts";
 import type { WalletMode, ApiForMode } from "../utils.ts";
 import { type LoginInfoMap, connectInjected } from "../wallet-modes.ts";

package/src/mod.ts

@@ -1,6 +1,6 @@
 export type { IProvider, AddressAndType, UserSignature, WalletOption } from "./IProvider.ts";
 export type { Wallet } from "./types.ts";
-export type { AddressType, WalletAddress } from "@effectstream/utils";
+export type { AddressType, WalletAddress } from "@effectstream/utils/types";
 export { accountPayload_, accountMessages } from "@effectstream/concise";
 export { WalletMode, WalletNameMap } from "./utils.ts";
 // Main entry point

package/src/polkadot/polkadot.ts

@@ -2,7 +2,7 @@ import type {
   InjectedExtension,
   InjectedWindowProvider,
 } from "@polkadot/extension-inject/types";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import {
   type IConnector,
   type IInjectedConnector,

package/src/polkadot/wrapper.ts

@@ -6,7 +6,7 @@
 // import { connectInjected } from './wallet-modes.js';
 // import type { Result } from '@effectstream/utils';
 
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { IProvider } from "../IProvider.ts";
 import type { WalletMode, ApiForMode } from "../utils.ts";
 import { type LoginInfoMap, connectInjected } from "../wallet-modes.ts";

package/src/solana/local.test.ts

@@ -1,7 +1,7 @@
 import { test, expect } from "bun:test";
 import { SolanaLocalConnector } from "./local.ts";
 import { CryptoManager } from "@effectstream/crypto";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 
 const verifier = () => CryptoManager.getCryptoManager(AddressType.SOLANA);
 

package/src/solana/local.ts

@@ -1,4 +1,4 @@
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import { ed25519 } from "@noble/curves/ed25519";
 import bs58 from "bs58";
 import { Buffer } from "node:buffer";

package/src/solana/solana.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import {
   Keypair,
   PublicKey,

package/src/solana/solana.ts

@@ -1,4 +1,4 @@
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import {
   type IConnector,
   type IInjectedConnector,

package/src/solana/wrapper.ts

@@ -1,4 +1,4 @@
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { IProvider } from "../IProvider.ts";
 import type { WalletMode, ApiForMode } from "../utils.ts";
 import { type LoginInfoMap, connectInjected } from "../wallet-modes.ts";

package/src/types.ts

@@ -1,5 +1,5 @@
 export type Hash = string;
-import type { WalletAddress } from "@effectstream/utils";
+import type { WalletAddress } from "@effectstream/utils/types";
 import type { IProvider, UserSignature, WalletOption } from "./IProvider.ts";
 
 export type SignFunction = (message: string) => Promise<UserSignature>;

package/src/utils.test.ts

@@ -3,7 +3,7 @@ import {
   connectInjectedWallet,
 } from "./utils.ts";
 import type { IInjectedConnector, IProvider } from "./IProvider.ts";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 
 const MOCK_ADDRESS = "0xmock";
 const MOCK_METADATA = { name: "MockWallet", displayName: "Mock Wallet", icon: "", version: "1.0" };

package/src/wallet-modes.ts

@@ -1,5 +1,5 @@
 import type { ApiPromise } from "avail-js-sdk";
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { AlgorandApi } from "./algorand/algorand.ts";
 import type { CardanoApi } from "./cardano/cardano.ts";
 import type { CardanoLocalNetwork } from "./cardano/local.ts";
@@ -19,7 +19,7 @@ import {
   type InjectionPreference,
   WalletMode,
 } from "./utils.ts";
-import { AddressType } from "@effectstream/utils";
+import { AddressType } from "@effectstream/utils/types";
 import { formatError } from "./helpers/format-error.ts";
 import type { MidnightApi } from "./midnight/midnight.ts";
 import type {} from "./midnight/local.ts";

package/src/wallets.ts

@@ -9,7 +9,7 @@ import { viemLoginWrapper } from "./evm/wrapper-viem.ts";
 import { minaLoginWrapper } from "./mina/wrapper.ts";
 import { availJsLoginWrapper } from "./avail/wrapper.ts";
 import { WalletMode } from "./utils.ts";
-import type { Result } from "@effectstream/utils";
+import type { Result } from "@effectstream/utils/types";
 import type { Wallet } from "./types.ts";
 import type { LoginInfo } from "./wallet-modes.ts";
 // import { assertNever } from "assert-never";