@effectstream/wallets 0.100.17 → 0.100.19

package/src/midnight/midnight.ts

@@ -132,11 +132,15 @@ export class MidnightProvider implements IProvider<MidnightApi> {
   static init = async (
     conn: ActiveConnection<MidnightApi>
   ): Promise<MidnightProvider> => {
-    const hexAddress = await MidnightProvider.fetchAddress(conn);
-    // const prefix = pickBech32Prefix(hexAddress);
-    // const words = bech32.toWords(hexStringToUint8Array(hexAddress));
-    // const userAddress = bech32.encode(prefix, words, 200);
-
+    // The IProvider's primary address must be the UNSHIELDED one — that's
+    // the address `addressFromKey(verifyingKey)` resolves to for the
+    // `signData({keyType: "unshielded"})` signatures we produce in
+    // `signMessage`, which is what `CryptoManager.Midnight().verifySignature`
+    // (and therefore the batcher) cross-checks. The shielded and dust
+    // addresses remain reachable via `fetchAddress(conn, { type })` or
+    // directly through `conn.api.getShieldedAddresses()` /
+    // `getDustAddress()`.
+    const hexAddress = await MidnightProvider.fetchAddress(conn, { type: "unshielded" });
     return new MidnightProvider(conn, hexAddress as MidnightAddress);
   };
 
@@ -152,7 +156,12 @@ export class MidnightProvider implements IProvider<MidnightApi> {
       encoding: "text",
       keyType,
     })) as Signature;
-    return signature.signature;
+    // Format: "signature|verifyingKey". Midnight unshielded signatures are
+    // not self-recovering, so `@effectstream/crypto`'s verifier needs the
+    // public key alongside the signature (matches the local-seed wallet
+    // and mirrors Cardano's "sig+key" convention with a different
+    // separator).
+    return `${signature.signature}|${signature.verifyingKey}`;
   };
 
   getAddress(): AddressAndType {
@@ -162,12 +171,49 @@ export class MidnightProvider implements IProvider<MidnightApi> {
     }
   }
 
-  static fetchAddress = async (conn: ActiveConnection<MidnightApi>): Promise<string> => {
-    const addresses = await conn.api.getShieldedAddresses();
-    if (!addresses?.shieldedAddress) {
-      throw new Error("Midnight wallet did not return a shielded address");
+  /**
+   * Fetch a specific address type from a connected Midnight wallet. Defaults
+   * to the **shielded** address to keep existing callers backwards-compatible
+   * with the pre-multi-address behaviour. The IProvider primary address
+   * (`getAddress()`) is the **unshielded** one — that's the address
+   * `addressFromKey(verifyingKey)` resolves to and what
+   * `CryptoManager.Midnight().verifySignature` needs to cross-check.
+   *
+   * @example
+   * ```ts
+   * const shielded = await MidnightProvider.fetchAddress(conn);
+   * const unshielded = await MidnightProvider.fetchAddress(conn, { type: "unshielded" });
+   * const dust = await MidnightProvider.fetchAddress(conn, { type: "dust" });
+   * ```
+   */
+  static fetchAddress = async (
+    conn: ActiveConnection<MidnightApi>,
+    options: { type?: "shielded" | "unshielded" | "dust" } = {},
+  ): Promise<string> => {
+    const type = options.type ?? "shielded";
+    switch (type) {
+      case "shielded": {
+        const res = await conn.api.getShieldedAddresses();
+        if (!res?.shieldedAddress) {
+          throw new Error("Midnight wallet did not return a shielded address");
+        }
+        return res.shieldedAddress;
+      }
+      case "unshielded": {
+        const res = await conn.api.getUnshieldedAddress();
+        if (!res?.unshieldedAddress) {
+          throw new Error("Midnight wallet did not return an unshielded address");
+        }
+        return res.unshieldedAddress;
+      }
+      case "dust": {
+        const res = await conn.api.getDustAddress();
+        if (!res?.dustAddress) {
+          throw new Error("Midnight wallet did not return a dust address");
+        }
+        return res.dustAddress;
+      }
     }
-    return addresses.shieldedAddress;
   };
 }
 

package/src/midnight/wrapper-local.ts

@@ -0,0 +1,30 @@
+import type { Result } from "@effectstream/utils";
+import type { IProvider } from "../IProvider.ts";
+import type { WalletMode, ApiForMode } from "../utils.ts";
+import type { LoginInfoMap } from "../wallet-modes.ts";
+import { MidnightLocalConnector } from "./local.ts";
+import { formatError } from "../helpers/format-error.ts";
+
+export async function midnightLocalLoginWrapper(
+  loginInfo: LoginInfoMap[WalletMode.MidnightLocal],
+): Promise<Result<IProvider<ApiForMode<WalletMode.MidnightLocal>>>> {
+  try {
+    console.log("midnightLocalLoginWrapper: deriving unshielded keystore from seed");
+    const provider = await MidnightLocalConnector.instance().connectFromSeed({
+      seed: loginInfo.seed,
+      networkId: loginInfo.networkId,
+    });
+    return {
+      success: true,
+      result: provider as unknown as IProvider<
+        ApiForMode<WalletMode.MidnightLocal>
+      >,
+    };
+  } catch (err) {
+    console.log("midnightLocalLoginWrapper: error building local Midnight wallet");
+    return {
+      success: false,
+      errorMessage: formatError(err),
+    };
+  }
+}

package/src/mod.ts

@@ -7,4 +7,23 @@ export { WalletMode, WalletNameMap } from "./utils.ts";
 export { walletLogin } from "./wallets.ts";
 export { allInjectedWallets } from "./utils.ts";
 export { getAddressType } from "./wallet-modes.ts";
+export type { LoginInfo, LoginInfoMap } from "./wallet-modes.ts";
+// Local-wallet mode helper (env-driven injected↔local swap).
+export { pickWalletMode } from "./helpers/pick-mode.ts";
+export type {
+  ChainKey,
+  PickWalletModeArgs,
+  LocalOptionsForChain,
+  InjectedOptionsForChain,
+} from "./helpers/pick-mode.ts";
+// Inline data-URI icons for the three local-JS wallet modes (orange/blue/black
+// JS circles), suitable for use as `WalletOption.icon`.
+export {
+  evmViemIcon,
+  cardanoLocalIcon,
+  midnightLocalIcon,
+} from "./helpers/local-icons.ts";
+// Coerces wallet/SDK rejects (including CIP-30-style `{code, info}` objects)
+// to a readable string.
+export { formatError } from "./helpers/format-error.ts";
 export * from "./effectstream.ts";

package/src/utils.ts

@@ -7,18 +7,24 @@ import type {
 
 import { AlgorandConnector } from "./algorand/algorand.ts";
 import { EthersConnector } from "./evm/ethers.ts";
+import { ViemConnector } from "./evm/viem.ts";
 import { EvmInjectedConnector } from "./evm/injected.ts";
 import { CardanoConnector } from "./cardano/cardano.ts";
+import { CardanoLocalConnector } from "./cardano/local.ts";
 import { PolkadotConnector } from "./polkadot/polkadot.ts";
 import { MinaConnector } from "./mina/mina.ts";
 import { AvailConnector } from "./avail/avail.ts";
 import { MidnightConnector } from "./midnight/midnight.ts";
+import { MidnightLocalConnector } from "./midnight/local.ts";
 
 export const enum WalletMode {
   EvmInjected,
   EvmEthers,
+  EvmViem,
   Midnight,
+  MidnightLocal,
   Cardano,
+  CardanoLocal,
   Polkadot,
   Algorand,
   Mina,
@@ -28,8 +34,11 @@ export const enum WalletMode {
 export const WalletNameMap: Record<WalletMode, string> = {
   [WalletMode.EvmInjected]: "EVM",
   [WalletMode.EvmEthers]: "EVM",
+  [WalletMode.EvmViem]: "EVM",
   [WalletMode.Midnight]: "Midnight",
+  [WalletMode.MidnightLocal]: "Midnight",
   [WalletMode.Cardano]: "Cardano",
+  [WalletMode.CardanoLocal]: "Cardano",
   [WalletMode.Polkadot]: 'Polkadot',
   [WalletMode.Algorand]: 'Algorand',
   [WalletMode.Mina]: "Mina",
@@ -39,8 +48,11 @@ export const WalletNameMap: Record<WalletMode, string> = {
 export const WalletModeMap = {
   [WalletMode.EvmInjected]: EvmInjectedConnector.instance(),
   [WalletMode.EvmEthers]: EthersConnector.instance(),
+  [WalletMode.EvmViem]: ViemConnector.instance(),
   [WalletMode.Midnight]: MidnightConnector.instance(),
+  [WalletMode.MidnightLocal]: MidnightLocalConnector.instance(),
   [WalletMode.Cardano]: CardanoConnector.instance(),
+  [WalletMode.CardanoLocal]: CardanoLocalConnector.instance(),
   [WalletMode.Polkadot]: PolkadotConnector.instance(),
   [WalletMode.Algorand]: AlgorandConnector.instance(),
   [WalletMode.Mina]: MinaConnector.instance(),
@@ -87,9 +99,12 @@ export async function allInjectedWallets(config: {
     [WalletMode.Polkadot]: await PolkadotConnector.getWalletOptions(),
     [WalletMode.Mina]: MinaConnector.getWalletOptions(),
     // TODO: Algorand signature support is not implemented yet.
-    // NOTE: Midnight Do not support signature yet.
     [WalletMode.Algorand]: signatureSupport? [] : AlgorandConnector.getWalletOptions(),
-    [WalletMode.Midnight]: signatureSupport? [] : MidnightConnector.getWalletOptions(),
+    // Midnight signing via ConnectedAPI.signData(message, {keyType: "unshielded"})
+    // works as of @effectstream/crypto's MidnightCrypto.verifySignature
+    // implementation, so it now surfaces in the injected-wallet list even when
+    // signature support is requested.
+    [WalletMode.Midnight]: MidnightConnector.getWalletOptions(),
   };
 
   return wallets;

package/src/wallet-modes.ts

@@ -2,8 +2,11 @@ import type { ApiPromise } from "avail-js-sdk";
 import type { Result } from "@effectstream/utils";
 import type { AlgorandApi } from "./algorand/algorand.ts";
 import type { CardanoApi } from "./cardano/cardano.ts";
+import type { CardanoLocalNetwork } from "./cardano/local.ts";
 import type { EthersApi } from "./evm/ethers.ts";
+import type { ViemApi } from "./evm/viem.ts";
 import type { EvmApi } from "./evm/injected.ts";
+import type { Hex } from "viem";
 import type {
   ActiveConnection,
   IInjectedConnector,
@@ -17,7 +20,9 @@ import {
   WalletMode,
 } from "./utils.ts";
 import { AddressType } from "@effectstream/utils";
+import { formatError } from "./helpers/format-error.ts";
 import type { MidnightApi } from "./midnight/midnight.ts";
+import type {} from "./midnight/local.ts";
 import type { Chain } from "viem/chains";
 import { Wallet } from "ethers";
 
@@ -42,7 +47,25 @@ export type LoginInfoMap = {
     connection: ActiveConnection<EthersApi>;
     preferBatchedMode: boolean;
   };
+  [WalletMode.EvmViem]: {
+    /** 0x-prefixed 32-byte hex private key. */
+    privateKey: Hex;
+    /** RPC URL the viem WalletClient should target. */
+    rpcUrl: string;
+    /** Optional viem Chain — pass to enable chain-aware tx fields (chainId etc). */
+    chain?: Chain;
+    /** If true, even EVM inputs are batched (sign + send to batcher). */
+    preferBatchedMode?: boolean;
+  };
   [WalletMode.Cardano]: BaseLoginInfo<CardanoApi>;
+  [WalletMode.CardanoLocal]: {
+    /** BIP-39 mnemonic. Generated when omitted. */
+    seedPhrase?: string;
+    /** Cardano network — sets the bech32 prefix. */
+    network: CardanoLocalNetwork;
+    /** Optional Lucid Provider; only needed for on-chain ops, not pure signing. */
+    provider?: unknown;
+  };
   [WalletMode.Polkadot]: BaseLoginInfo<PolkadotApi>;
   [WalletMode.Algorand]: BaseLoginInfo<AlgorandApi>;
   [WalletMode.Mina]: BaseLoginInfo<MinaApi>;
@@ -54,6 +77,12 @@ export type LoginInfoMap = {
   [WalletMode.Midnight]: BaseLoginInfo<MidnightApi> & {
     networkId?: string;
   };
+  [WalletMode.MidnightLocal]: {
+    /** 64-char hex seed. Generated when omitted. */
+    seed?: string;
+    /** Midnight network id ("undeployed" | "testnet" | …) — sets the bech32 prefix. */
+    networkId: string;
+  };
 };
 
 type ToUnion<T> = {
@@ -93,7 +122,7 @@ export async function connectInjected<Api>(
 
     return {
       success: false,
-      errorMessage: err instanceof Error ? err.message : String(err),
+      errorMessage: formatError(err),
     };
   }
 }
@@ -103,8 +132,10 @@ export function getAddressType(mode: WalletMode): AddressType {
 
     case WalletMode.EvmInjected:
     case WalletMode.EvmEthers:
+    case WalletMode.EvmViem:
       return AddressType.EVM;
     case WalletMode.Cardano:
+    case WalletMode.CardanoLocal:
       return AddressType.CARDANO;
     case WalletMode.Polkadot:
       return AddressType.POLKADOT;
@@ -113,6 +144,7 @@ export function getAddressType(mode: WalletMode): AddressType {
     case WalletMode.Mina:
       return AddressType.MINA;
     case WalletMode.Midnight:
+    case WalletMode.MidnightLocal:
       return AddressType.MIDNIGHT;
     case WalletMode.AvailJs:
       return AddressType.AVAIL;

package/src/wallets.ts

@@ -1,9 +1,11 @@
 import type { IProvider } from "./IProvider.ts";
 import { algorandLoginWrapper } from "./algorand/wrapper.ts";
 import { cardanoLoginWrapper } from "./cardano/wrapper.ts";
+import { cardanoLocalLoginWrapper } from "./cardano/wrapper-local.ts";
 import { evmLoginWrapper } from "./evm/wrapper-injected.ts";
 import { polkadotLoginWrapper } from "./polkadot/wrapper.ts";
 import { ethersLoginWrapper } from "./evm/wrapper-ethers.ts";
+import { viemLoginWrapper } from "./evm/wrapper-viem.ts";
 import { minaLoginWrapper } from "./mina/wrapper.ts";
 import { availJsLoginWrapper } from "./avail/wrapper.ts";
 import { WalletMode } from "./utils.ts";
@@ -12,6 +14,7 @@ import type { Wallet } from "./types.ts";
 import type { LoginInfo } from "./wallet-modes.ts";
 // import { assertNever } from "assert-never";
 import { midnightLoginWrapper } from "./midnight/wrapper.ts";
+import { midnightLocalLoginWrapper } from "./midnight/wrapper-local.ts";
 
 export async function walletLogin(
   loginInfo: LoginInfo
@@ -38,9 +41,15 @@ async function login(loginInfo: LoginInfo): Promise<Result<IProvider<unknown>>>
     case WalletMode.EvmEthers: {
       return await ethersLoginWrapper(loginInfo);
     }
+    case WalletMode.EvmViem: {
+      return await viemLoginWrapper(loginInfo);
+    }
     case WalletMode.Cardano: {
       return await cardanoLoginWrapper(loginInfo);
     }
+    case WalletMode.CardanoLocal: {
+      return await cardanoLocalLoginWrapper(loginInfo);
+    }
     case WalletMode.Polkadot: {
       return await polkadotLoginWrapper(loginInfo);
     }
@@ -56,6 +65,9 @@ async function login(loginInfo: LoginInfo): Promise<Result<IProvider<unknown>>>
     case WalletMode.Midnight: {
       return await midnightLoginWrapper(loginInfo);
     }
+    case WalletMode.MidnightLocal: {
+      return await midnightLocalLoginWrapper(loginInfo);
+    }
     default:
       throw new Error(`Unsupported wallet mode: ${(loginInfo as any).mode}`);
   }