Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/voltaire-effect/src/crypto/CryptoLive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Bn254Live } from "./Bn254/index.js";
import { ChaCha20Poly1305Live } from "./ChaCha20Poly1305/index.js";
import { Ed25519Live } from "./Ed25519/Ed25519Live.js";
import { EIP712Live } from "./EIP712/index.js";
import { HDWalletLive } from "./HDWallet/HDWalletLive.js";
import { HMACLive } from "./HMAC/index.js";
import { KeccakLive } from "./Keccak256/index.js";
import { KeystoreLive } from "./Keystore/index.js";
Expand All @@ -18,7 +19,7 @@ import { SHA256Live } from "./SHA256/index.js";
/**
* Combined production layer providing all cryptographic services.
* Includes: Keccak256, Secp256k1, SHA256, Blake2, Ripemd160, BLS12-381,
* Ed25519, P256, KZG, BN254, BIP-39, HMAC, EIP-712, ChaCha20Poly1305, and Keystore.
* Ed25519, P256, KZG, BN254, BIP-39, HMAC, EIP-712, ChaCha20Poly1305, Keystore, and HDWallet.
*
* @example
* ```typescript
Expand Down Expand Up @@ -49,4 +50,5 @@ export const CryptoLive = Layer.mergeAll(
EIP712Live,
ChaCha20Poly1305Live,
KeystoreLive,
HDWalletLive,
);
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @since 0.0.1
*/

import { HDWallet } from "@tevm/voltaire/native";
import { HDWallet } from "@tevm/voltaire/HDWallet";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import { wordsToMnemonic } from "../Bip39/utils.js";
Expand Down
4 changes: 2 additions & 2 deletions packages/voltaire-effect/src/crypto/HDWallet/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
*
* @example
* ```typescript
* import { HDWalletService, generateMnemonic, mnemonicToSeed, fromSeed, derive } from 'voltaire-effect/crypto/HDWallet'
* import { HDWalletLive } from 'voltaire-effect/native'
* import { HDWalletService, HDWalletLive, generateMnemonic, mnemonicToSeed, fromSeed, derive } from 'voltaire-effect/crypto/HDWallet'
* import { mnemonicToWords } from 'voltaire-effect/crypto/Bip39'
* import * as Effect from 'effect/Effect'
*
Expand Down Expand Up @@ -56,6 +55,7 @@ export {
InvalidSeedError,
mapToHDWalletError,
} from "./errors.js";
export { HDWalletLive } from "./HDWalletLive.js";
export {
type HDNode,
type HDPath,
Expand Down
8 changes: 0 additions & 8 deletions packages/voltaire-effect/src/native/CryptoLiveNative.ts

This file was deleted.

2 changes: 0 additions & 2 deletions packages/voltaire-effect/src/native/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
*/

export * from "../index.js";
export { CryptoLiveNative } from "./CryptoLiveNative.js";
export { HDWalletLive } from "../crypto/HDWallet/HDWalletLive.js";
export {
HDWalletDerivationError,
MnemonicAccount,
Expand Down
3 changes: 1 addition & 2 deletions packages/voltaire-ts/src/crypto/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ export { ChaCha20Poly1305 } from "./ChaCha20Poly1305/ChaCha20Poly1305.js";
export { Ed25519 } from "./Ed25519/index.js";
export { EIP712 } from "./EIP712/index.js";
export { HMAC } from "./HMAC/index.js";
// HDWallet uses native FFI modules - import from @tevm/voltaire/native instead
// export * as HDWallet from "./HDWallet/index.js";
export * as HDWallet from "./HDWallet/index.js";
export { Keccak256 } from "./Keccak256/index.js";
export type {
Keccak256Hash,
Expand Down
4 changes: 1 addition & 3 deletions packages/voltaire-ts/src/native/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,9 @@ export {
P256,
X25519,
ModExp,
HDWallet,
} from "../crypto/index.js";

// HDWallet uses native FFI - only available in native entry point
export * as HDWallet from "../crypto/HDWallet/index.js";

// Re-export crypto types
export type { Keccak256Hash } from "../crypto/Keccak256/Keccak256HashType.js";
export type {
Expand Down
3 changes: 1 addition & 2 deletions packages/voltaire-ts/src/wasm/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,11 +255,10 @@ export const KZG = KZGJS;
export const ModExp = ModExpJS;

// Additional crypto namespaces present in JS/native
// Note: HDWallet uses native FFI modules - import from @tevm/voltaire/native instead
// Import specific modules to avoid pulling in HDWallet via crypto/index.js
export { AesGcm } from "../crypto/AesGcm/AesGcm.js";
export { ChaCha20Poly1305 } from "../crypto/ChaCha20Poly1305/ChaCha20Poly1305.js";
export { Bip39 } from "../crypto/Bip39/index.js";
export * as HDWallet from "../crypto/HDWallet/index.js";
export * as Keystore from "../crypto/Keystore/index.js";

// ============================================================================
Expand Down
Loading