From 3db842c332dec6f9f9089812643200618e00bbc0 Mon Sep 17 00:00:00 2001 From: Jingles Date: Wed, 14 Jan 2026 14:06:35 +0800 Subject: [PATCH 1/5] remove btc from react and provider, move them to bitcoin package --- .claude/plans/refactor-bitcoin.md | 27 ++++++++++++++++ package.json | 2 +- packages/bitcoin/package.json | 3 ++ packages/bitcoin/src/index.ts | 1 + packages/bitcoin/src/multi-chain/index.ts | 4 +++ .../src/multi-chain/maestro-unified.ts | 16 +++++----- packages/bitcoin/tsup.config.ts | 1 + packages/mesh-provider/package.json | 1 - packages/mesh-provider/src/index.ts | 1 - .../mesh-provider/src/multi-chain/index.ts | 4 --- packages/mesh-react/package.json | 1 - .../src/cardano-wallet/screen-main.tsx | 16 +--------- .../src/common/icons/icon-bitcoin.tsx | 24 -------------- .../mesh-react/src/contexts/WalletContext.ts | 31 +------------------ packages/mesh-react/src/hooks/useWallet.ts | 2 -- .../midnight-contracts-wizard/package.json | 4 +-- packages/midnight-setup/package.json | 4 +-- 17 files changed, 51 insertions(+), 91 deletions(-) create mode 100644 .claude/plans/refactor-bitcoin.md create mode 100644 packages/bitcoin/src/multi-chain/index.ts rename packages/{mesh-provider => bitcoin}/src/multi-chain/maestro-unified.ts (97%) delete mode 100644 packages/mesh-provider/src/multi-chain/index.ts delete mode 100644 packages/mesh-react/src/common/icons/icon-bitcoin.tsx diff --git a/.claude/plans/refactor-bitcoin.md b/.claude/plans/refactor-bitcoin.md new file mode 100644 index 000000000..10fb3205f --- /dev/null +++ b/.claude/plans/refactor-bitcoin.md @@ -0,0 +1,27 @@ +# Migrate MaestroMultiChainProvider from mesh-provider to bitcoin package + +## Requirements +- Move `MaestroMultiChainProvider` from `packages/mesh-provider/src/multi-chain/` to `packages/bitcoin/src/multi-chain/` +- Add dependencies to bitcoin package: `@meshsdk/provider`, `@meshsdk/common`, `axios` +- Update imports in migrated file: use package imports for Cardano (`@meshsdk/provider`), local imports for Bitcoin (`../providers`, `../types`) +- Export `MaestroMultiChainProvider` and `MaestroConfig` from main `@meshsdk/bitcoin` entry point +- Delete `packages/mesh-provider/src/multi-chain/` directory +- Remove multi-chain export from `packages/mesh-provider/src/index.ts` +- Update all codebase imports of `MaestroMultiChainProvider` from `@meshsdk/provider` to `@meshsdk/bitcoin` + +## Verification +```bash +cd /Users/jingles/Documents/GitHub/mesh && npm install && npm run build +``` + +## Success Criteria +- `npm run build` passes from monorepo root (no import errors in mesh-react) +- `MaestroMultiChainProvider` exports from `@meshsdk/bitcoin` +- No `@meshsdk/bitcoin` dependency in `packages/mesh-provider/package.json` +- No `multi-chain` directory in `packages/mesh-provider/src/` +- No imports of `MaestroMultiChainProvider` from `@meshsdk/provider` remain in codebase + +## Ralph Command +``` +/ralph-loop "Read /Users/jingles/Documents/GitHub/mesh/.claude/plans/refactor-bitcoin.md and implement requirements" --max-iterations 25 --completion-promise "npm run build passes from monorepo root" +``` diff --git a/package.json b/package.json index 808d385bc..f4280fba5 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "build:mesh": "turbo run build:mesh", "build:scripts": "turbo run build:scripts", "clean": "turbo run clean && rm -rf .turbo && rm -rf dist && rm -rf node_modules && rm package-lock.json", - "dev": "turbo dev --concurrency 15", + "dev": "turbo dev --concurrency 20", "format": "turbo run format --continue -- --cache --cache-location node_modules/.cache/.prettiercache", "format:fix": "turbo run format --continue -- --write --cache --cache-location node_modules/.cache/.prettiercache", "lint": "turbo lint", diff --git a/packages/bitcoin/package.json b/packages/bitcoin/package.json index e55253d84..8d8f65ca7 100644 --- a/packages/bitcoin/package.json +++ b/packages/bitcoin/package.json @@ -25,6 +25,9 @@ }, "dependencies": { "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3", + "@meshsdk/common": "*", + "@meshsdk/provider": "*", + "axios": "^1.7.9", "bip174": "^3.0.0", "bip32": "^4.0.0", "bip39": "^3.1.0", diff --git a/packages/bitcoin/src/index.ts b/packages/bitcoin/src/index.ts index ea54f31a8..f635d74f8 100644 --- a/packages/bitcoin/src/index.ts +++ b/packages/bitcoin/src/index.ts @@ -1,5 +1,6 @@ export * from "./core"; export * from "./interfaces"; +export * from "./multi-chain"; export * from "./providers"; export * from "./utils"; export * from "./types"; diff --git a/packages/bitcoin/src/multi-chain/index.ts b/packages/bitcoin/src/multi-chain/index.ts new file mode 100644 index 000000000..73e198d3d --- /dev/null +++ b/packages/bitcoin/src/multi-chain/index.ts @@ -0,0 +1,4 @@ +export { + MaestroMultiChainProvider, + type MaestroMultiChainConfig +} from "./maestro-unified"; diff --git a/packages/mesh-provider/src/multi-chain/maestro-unified.ts b/packages/bitcoin/src/multi-chain/maestro-unified.ts similarity index 97% rename from packages/mesh-provider/src/multi-chain/maestro-unified.ts rename to packages/bitcoin/src/multi-chain/maestro-unified.ts index c5adf2638..1770dbc54 100644 --- a/packages/mesh-provider/src/multi-chain/maestro-unified.ts +++ b/packages/bitcoin/src/multi-chain/maestro-unified.ts @@ -1,15 +1,15 @@ -import { MaestroProvider as CardanoMaestroProvider, type MaestroSupportedNetworks as CardanoMaestroNetworks } from "../maestro"; -import { - MaestroProvider as BitcoinMaestroProvider, +import { MaestroProvider as CardanoMaestroProvider, type MaestroSupportedNetworks as CardanoMaestroNetworks } from "@meshsdk/provider"; +import type { TransactionInfo as CardanoTransactionInfo, UTxO as CardanoUTxO, IFetcherOptions } from "@meshsdk/common"; +import { MaestroProvider as BitcoinMaestroProvider } from "../providers"; +import type { MaestroSupportedNetworks as BitcoinMaestroNetworks, TransactionsInfo as BitcoinTransactionInfo, UTxO as BitcoinUTxO, AddressInfo as BitcoinAddressInfo, TransactionsStatus as BitcoinTransactionStatus -} from "@meshsdk/bitcoin"; -import type { TransactionInfo as CardanoTransactionInfo, UTxO as CardanoUTxO, IFetcherOptions } from "@meshsdk/common"; +} from "../types"; -export type MaestroConfig = +export type MaestroMultiChainConfig = | { chain: "cardano"; apiKey: string; network: CardanoMaestroNetworks; turboSubmit?: boolean } | { chain: "bitcoin"; apiKey: string; network: BitcoinMaestroNetworks }; @@ -48,7 +48,7 @@ export class MaestroMultiChainProvider { * Create a Maestro provider for the specified chain. * @param config - Chain-specific configuration object. */ - constructor(config: MaestroConfig) { + constructor(config: MaestroMultiChainConfig) { this._chain = config.chain; if (config.chain === "cardano") { @@ -279,4 +279,4 @@ export class MaestroMultiChainProvider { throw new Error(`Unsupported chain: ${this._chain}`); } -} \ No newline at end of file +} diff --git a/packages/bitcoin/tsup.config.ts b/packages/bitcoin/tsup.config.ts index 13e90e597..c1c5649f4 100644 --- a/packages/bitcoin/tsup.config.ts +++ b/packages/bitcoin/tsup.config.ts @@ -7,6 +7,7 @@ export default defineConfig({ splitting: false, sourcemap: true, clean: true, + target: "esnext", external: [ "bip32", "ecpair", diff --git a/packages/mesh-provider/package.json b/packages/mesh-provider/package.json index 314d02cff..a3e1e6f95 100644 --- a/packages/mesh-provider/package.json +++ b/packages/mesh-provider/package.json @@ -35,7 +35,6 @@ "typescript": "^5.3.3" }, "dependencies": { - "@meshsdk/bitcoin": "1.9.0-beta.95", "@meshsdk/common": "1.9.0-beta.95", "@meshsdk/core-cst": "1.9.0-beta.95", "@utxorpc/sdk": "^0.6.7", diff --git a/packages/mesh-provider/src/index.ts b/packages/mesh-provider/src/index.ts index 3206e16ab..a376989dc 100644 --- a/packages/mesh-provider/src/index.ts +++ b/packages/mesh-provider/src/index.ts @@ -7,4 +7,3 @@ export * from "./utxo-rpc"; export * from "./yaci"; export * from "./offline"; export * from "./kupo"; -export * from "./multi-chain"; diff --git a/packages/mesh-provider/src/multi-chain/index.ts b/packages/mesh-provider/src/multi-chain/index.ts deleted file mode 100644 index 13d9f71be..000000000 --- a/packages/mesh-provider/src/multi-chain/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { - MaestroMultiChainProvider, - type MaestroConfig -} from "./maestro-unified"; \ No newline at end of file diff --git a/packages/mesh-react/package.json b/packages/mesh-react/package.json index a4df70d42..7e44062a9 100644 --- a/packages/mesh-react/package.json +++ b/packages/mesh-react/package.json @@ -30,7 +30,6 @@ }, "dependencies": { "@cardananium/cardano-peer-connect": "^1.2.19", - "@meshsdk/bitcoin": "1.9.0-beta.95", "@meshsdk/common": "1.9.0-beta.95", "@meshsdk/transaction": "1.9.0-beta.95", "@meshsdk/wallet": "1.9.0-beta.95", diff --git a/packages/mesh-react/src/cardano-wallet/screen-main.tsx b/packages/mesh-react/src/cardano-wallet/screen-main.tsx index a5ee7f13a..4dd0e25fc 100644 --- a/packages/mesh-react/src/cardano-wallet/screen-main.tsx +++ b/packages/mesh-react/src/cardano-wallet/screen-main.tsx @@ -1,7 +1,5 @@ -import { BrowserWallet } from "@meshsdk/bitcoin"; import { EnableWeb3WalletOptions } from "@meshsdk/web3-sdk"; -import IconBitcoin from "../common/icons/icon-bitcoin"; import IconBookDashed from "../common/icons/icon-book-dashed"; import IconDownload from "../common/icons/icon-download"; import IconFingerprint from "../common/icons/icon-fingerprint"; @@ -34,7 +32,7 @@ export default function ScreenMain({ web3Services?: EnableWeb3WalletOptions; }) { const wallets = useWalletList({ injectFn }); - const { connect, setBitcoinWallet } = useWallet(); + const { connect } = useWallet(); return ( @@ -99,18 +97,6 @@ export default function ScreenMain({ }} /> )} - - { - const wallet = await BrowserWallet.enable( - "Mesh SDK want to connect", - ); - setBitcoinWallet(wallet, "Bitcoin"); - setOpen(false); - }} - /> ); diff --git a/packages/mesh-react/src/common/icons/icon-bitcoin.tsx b/packages/mesh-react/src/common/icons/icon-bitcoin.tsx deleted file mode 100644 index 04509f246..000000000 --- a/packages/mesh-react/src/common/icons/icon-bitcoin.tsx +++ /dev/null @@ -1,24 +0,0 @@ -export default function IconBitcoin() { - return ( - - - - ); -} diff --git a/packages/mesh-react/src/contexts/WalletContext.ts b/packages/mesh-react/src/contexts/WalletContext.ts index 9c76811ea..d91fd5dbb 100644 --- a/packages/mesh-react/src/contexts/WalletContext.ts +++ b/packages/mesh-react/src/contexts/WalletContext.ts @@ -1,6 +1,5 @@ import { createContext, useCallback, useEffect, useState } from "react"; -import { IBitcoinWallet } from "@meshsdk/bitcoin"; import { IWallet } from "@meshsdk/common"; import { BrowserWallet } from "@meshsdk/wallet"; import { @@ -12,7 +11,6 @@ import { interface WalletContext { hasConnectedWallet: boolean; connectedWalletInstance: IWallet; - connectedBitcoinWallet: IBitcoinWallet; connectedWalletName: string | undefined; connectingWallet: boolean; connectWallet: (walletName: string, persist?: boolean) => Promise; @@ -24,10 +22,6 @@ interface WalletContext { [key: string]: any; }, ) => void; - setBitcoinWallet: ( - walletInstance: IBitcoinWallet, - walletName: string, - ) => void; setPersist: (persist: boolean) => void; setWeb3Services: (web3Services: EnableWeb3WalletOptions | undefined) => void; web3UserData: UserSocialData | undefined; @@ -67,8 +61,6 @@ export const useWalletStore = () => { const [web3UserData, setWeb3UserData] = useState( undefined, ); - const [connectedBitcoinWallet, setConnectedBitcoinWallet] = - useState({} as IBitcoinWallet); const connectWallet = useCallback( async (walletName: string, persist?: boolean) => { setConnectingWallet(true); @@ -131,15 +123,6 @@ export const useWalletStore = () => { [], ); - const setBitcoinWallet = useCallback( - async (walletInstance: IBitcoinWallet, walletName: string) => { - setConnectedBitcoinWallet(walletInstance); - setConnectedWalletName(walletName); - setState(WalletState.CONNECTED); - }, - [], - ); - const setPersist = useCallback((persist: boolean) => { setPersistSession(persist); }, []); @@ -156,17 +139,9 @@ export const useWalletStore = () => { address = await connectedWalletInstance.getChangeAddress(); setAddress(address); } - - if ( - Object.keys(connectedBitcoinWallet).length > 0 && - address.length === 0 - ) { - let address = await connectedBitcoinWallet.getChangeAddress(); - setAddress(address); - } } load(); - }, [connectedWalletInstance, connectedBitcoinWallet]); + }, [connectedWalletInstance]); // if persist useEffect(() => { @@ -200,13 +175,11 @@ export const useWalletStore = () => { return { hasConnectedWallet: INITIAL_STATE.walletName !== connectedWalletName, connectedWalletInstance, - connectedBitcoinWallet, connectedWalletName, connectingWallet, connectWallet, disconnect, setWallet, - setBitcoinWallet, setPersist, setWeb3Services, web3UserData, @@ -220,13 +193,11 @@ export const useWalletStore = () => { export const WalletContext = createContext({ hasConnectedWallet: false, connectedWalletInstance: INITIAL_STATE.walletInstance, - connectedBitcoinWallet: {} as IBitcoinWallet, connectedWalletName: INITIAL_STATE.walletName, connectingWallet: false, connectWallet: async () => {}, disconnect: () => {}, setWallet: async () => {}, - setBitcoinWallet: async () => {}, setPersist: () => {}, setWeb3Services: () => {}, web3UserData: undefined, diff --git a/packages/mesh-react/src/hooks/useWallet.ts b/packages/mesh-react/src/hooks/useWallet.ts index 769d07f5b..86151bb13 100644 --- a/packages/mesh-react/src/hooks/useWallet.ts +++ b/packages/mesh-react/src/hooks/useWallet.ts @@ -11,7 +11,6 @@ export const useWallet = () => { connectWallet, disconnect, setWallet, - setBitcoinWallet, setPersist, setWeb3Services, web3UserData, @@ -35,7 +34,6 @@ export const useWallet = () => { connect: connectWallet, disconnect, setWallet, - setBitcoinWallet, setPersist, setWeb3Services, web3UserData, diff --git a/packages/midnight-contracts-wizard/package.json b/packages/midnight-contracts-wizard/package.json index 9e469cb9f..af4b12916 100644 --- a/packages/midnight-contracts-wizard/package.json +++ b/packages/midnight-contracts-wizard/package.json @@ -7,10 +7,10 @@ "midnight-contracts-wizard": "./dist/index.js" }, "scripts": { - "build": "tsc", + "build:midnight": "tsc", "clean": "rm -rf dist", "format": "prettier --write \"src/**/*.{ts,js,json}\"", - "dev": "tsc --watch", + "dev:midnight": "tsc --watch", "lint": "eslint", "pack": "npm pack", "test": "jest", diff --git a/packages/midnight-setup/package.json b/packages/midnight-setup/package.json index 563864404..5dafea784 100644 --- a/packages/midnight-setup/package.json +++ b/packages/midnight-setup/package.json @@ -18,9 +18,9 @@ "dist/**" ], "scripts": { - "build:mesh": "tsup src/index.ts --format esm,cjs --dts", + "build:midnight": "tsup src/index.ts --format esm,cjs --dts", "clean": "rm -rf .turbo && rm -rf dist && rm -rf node_modules", - "dev": "tsup src/index.ts --format esm,cjs --watch --dts", + "dev:midnight": "tsup src/index.ts --format esm,cjs --watch --dts", "format": "prettier --check . --ignore-path ../../.gitignore", "lint": "eslint", "pack": "npm pack --pack-destination=./dist", From 489b45ee7b50705d56e2e18dd6c6ec67f5488ff1 Mon Sep 17 00:00:00 2001 From: Jingles Date: Wed, 14 Jan 2026 15:06:09 +0800 Subject: [PATCH 2/5] fix build error --- packages/mesh-core-cst/src/utils/builder.ts | 4 ++-- packages/mesh-core-cst/src/utils/script-data-hash.ts | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/mesh-core-cst/src/utils/builder.ts b/packages/mesh-core-cst/src/utils/builder.ts index f2ced239b..a31570f5c 100644 --- a/packages/mesh-core-cst/src/utils/builder.ts +++ b/packages/mesh-core-cst/src/utils/builder.ts @@ -1,5 +1,5 @@ import { pbkdf2Sync } from "crypto"; -import { blake2b, ready } from "@cardano-sdk/crypto"; +import * as Crypto from "@cardano-sdk/crypto"; import { HexBlob } from "@cardano-sdk/util"; import hash from "hash.js"; @@ -168,7 +168,7 @@ export const buildDRepID = ( addressType: AddressType = AddressType.EnterpriseKey, ): DRepID => { const dRepKeyBytes = Buffer.from(dRepKey, "hex"); - const dRepIdHex = blake2b.hash(HexBlob.fromBytes(dRepKeyBytes), 28); + const dRepIdHex = Crypto.blake2b(28).update(dRepKeyBytes).digest("hex"); const paymentAddress = EnterpriseAddress.packParts({ networkId, paymentPart: { diff --git a/packages/mesh-core-cst/src/utils/script-data-hash.ts b/packages/mesh-core-cst/src/utils/script-data-hash.ts index 4fe83a28f..459fee10c 100644 --- a/packages/mesh-core-cst/src/utils/script-data-hash.ts +++ b/packages/mesh-core-cst/src/utils/script-data-hash.ts @@ -55,5 +55,8 @@ export const hashScriptData = ( ); } - return Hash32ByteBase16.fromHexBlob(Crypto.blake2b.hash(writer.encode(), 32)); + const hashHex = Crypto.blake2b(32) + .update(Buffer.from(writer.encode())) + .digest("hex"); + return Hash32ByteBase16.fromHexBlob(HexBlob(hashHex)); }; From a204944f7e793034466a4df353b551ac3e554b1d Mon Sep 17 00:00:00 2001 From: Jingles Date: Wed, 14 Jan 2026 16:16:21 +0800 Subject: [PATCH 3/5] clean up --- .claude/plans/refactor-bitcoin.md | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .claude/plans/refactor-bitcoin.md diff --git a/.claude/plans/refactor-bitcoin.md b/.claude/plans/refactor-bitcoin.md deleted file mode 100644 index 10fb3205f..000000000 --- a/.claude/plans/refactor-bitcoin.md +++ /dev/null @@ -1,27 +0,0 @@ -# Migrate MaestroMultiChainProvider from mesh-provider to bitcoin package - -## Requirements -- Move `MaestroMultiChainProvider` from `packages/mesh-provider/src/multi-chain/` to `packages/bitcoin/src/multi-chain/` -- Add dependencies to bitcoin package: `@meshsdk/provider`, `@meshsdk/common`, `axios` -- Update imports in migrated file: use package imports for Cardano (`@meshsdk/provider`), local imports for Bitcoin (`../providers`, `../types`) -- Export `MaestroMultiChainProvider` and `MaestroConfig` from main `@meshsdk/bitcoin` entry point -- Delete `packages/mesh-provider/src/multi-chain/` directory -- Remove multi-chain export from `packages/mesh-provider/src/index.ts` -- Update all codebase imports of `MaestroMultiChainProvider` from `@meshsdk/provider` to `@meshsdk/bitcoin` - -## Verification -```bash -cd /Users/jingles/Documents/GitHub/mesh && npm install && npm run build -``` - -## Success Criteria -- `npm run build` passes from monorepo root (no import errors in mesh-react) -- `MaestroMultiChainProvider` exports from `@meshsdk/bitcoin` -- No `@meshsdk/bitcoin` dependency in `packages/mesh-provider/package.json` -- No `multi-chain` directory in `packages/mesh-provider/src/` -- No imports of `MaestroMultiChainProvider` from `@meshsdk/provider` remain in codebase - -## Ralph Command -``` -/ralph-loop "Read /Users/jingles/Documents/GitHub/mesh/.claude/plans/refactor-bitcoin.md and implement requirements" --max-iterations 25 --completion-promise "npm run build passes from monorepo root" -``` From 2819ae4706048ee0b01ee4cceccd850086fab2c2 Mon Sep 17 00:00:00 2001 From: Jingles Date: Wed, 14 Jan 2026 16:23:35 +0800 Subject: [PATCH 4/5] 1.9.0-beta.96 --- packages/bitcoin/package.json | 6 +++--- packages/mesh-common/package.json | 2 +- packages/mesh-contract/package.json | 6 +++--- packages/mesh-core-csl/package.json | 6 +++--- packages/mesh-core-cst/package.json | 4 ++-- packages/mesh-core/package.json | 12 ++++++------ packages/mesh-hydra/package.json | 8 ++++---- packages/mesh-provider/package.json | 6 +++--- packages/mesh-react/package.json | 8 ++++---- packages/mesh-react/src/cardano-wallet/index.tsx | 2 +- packages/mesh-svelte/package.json | 4 ++-- packages/mesh-transaction/package.json | 6 +++--- packages/mesh-wallet/package.json | 8 ++++---- packages/midnight-contracts-wizard/package.json | 2 +- packages/midnight-setup/package.json | 2 +- scripts/mesh-cli/package.json | 2 +- 16 files changed, 42 insertions(+), 42 deletions(-) diff --git a/packages/bitcoin/package.json b/packages/bitcoin/package.json index 8d8f65ca7..a00aec1db 100644 --- a/packages/bitcoin/package.json +++ b/packages/bitcoin/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/bitcoin", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "Mesh Bitcoin package", "main": "./dist/index.cjs", "browser": "./dist/index.js", @@ -25,8 +25,8 @@ }, "dependencies": { "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3", - "@meshsdk/common": "*", - "@meshsdk/provider": "*", + "@meshsdk/common": "1.9.0-beta.96", + "@meshsdk/provider": "1.9.0-beta.96", "axios": "^1.7.9", "bip174": "^3.0.0", "bip32": "^4.0.0", diff --git a/packages/mesh-common/package.json b/packages/mesh-common/package.json index 26c8f0655..9f4fec399 100644 --- a/packages/mesh-common/package.json +++ b/packages/mesh-common/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/common", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "Contains constants, types and interfaces used across the SDK and different serialization libraries", "main": "./dist/index.cjs", "browser": "./dist/index.js", diff --git a/packages/mesh-contract/package.json b/packages/mesh-contract/package.json index 1368f3179..17a45b895 100644 --- a/packages/mesh-contract/package.json +++ b/packages/mesh-contract/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/contract", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "List of open-source smart contracts, complete with documentation, live demos, and end-to-end source code. https://meshjs.dev/smart-contracts", "main": "./dist/index.cjs", "browser": "./dist/index.js", @@ -34,8 +34,8 @@ "typescript": "^5.3.3" }, "dependencies": { - "@meshsdk/common": "1.9.0-beta.95", - "@meshsdk/core": "1.9.0-beta.95", + "@meshsdk/common": "1.9.0-beta.96", + "@meshsdk/core": "1.9.0-beta.96", "libsodium-wrappers-sumo": "0.7.15" }, "prettier": "@meshsdk/configs/prettier", diff --git a/packages/mesh-core-csl/package.json b/packages/mesh-core-csl/package.json index 4fd9dc66b..881ccdae3 100644 --- a/packages/mesh-core-csl/package.json +++ b/packages/mesh-core-csl/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/core-csl", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "Types and utilities functions between Mesh and cardano-serialization-lib", "main": "./dist/index.cjs", "module": "./dist/index.js", @@ -31,7 +31,7 @@ }, "devDependencies": { "@meshsdk/configs": "*", - "@meshsdk/provider": "1.9.0-beta.95", + "@meshsdk/provider": "1.9.0-beta.96", "@types/json-bigint": "^1.0.4", "eslint": "^8.57.0", "ts-jest": "^29.1.4", @@ -39,7 +39,7 @@ "typescript": "^5.3.3" }, "dependencies": { - "@meshsdk/common": "1.9.0-beta.95", + "@meshsdk/common": "1.9.0-beta.96", "@sidan-lab/whisky-js-browser": "^1.0.11", "@sidan-lab/whisky-js-nodejs": "^1.0.11", "@types/base32-encoding": "^1.0.2", diff --git a/packages/mesh-core-cst/package.json b/packages/mesh-core-cst/package.json index ff6466d4d..07f693b90 100644 --- a/packages/mesh-core-cst/package.json +++ b/packages/mesh-core-cst/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/core-cst", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "Types and utilities functions between Mesh and cardano-js-sdk", "main": "./dist/index.cjs", "browser": "./dist/index.js", @@ -44,7 +44,7 @@ "@harmoniclabs/plutus-data": "1.2.6", "@harmoniclabs/uplc": "1.4.1", "@harmoniclabs/pair": "^1.0.0", - "@meshsdk/common": "1.9.0-beta.95", + "@meshsdk/common": "1.9.0-beta.96", "@types/base32-encoding": "^1.0.2", "base32-encoding": "^1.0.0", "bech32": "^2.0.0", diff --git a/packages/mesh-core/package.json b/packages/mesh-core/package.json index 8c72920a0..80f4469dd 100644 --- a/packages/mesh-core/package.json +++ b/packages/mesh-core/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/core", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "Mesh SDK Core - https://meshjs.dev/", "main": "./dist/index.cjs", "browser": "./dist/index.js", @@ -33,11 +33,11 @@ "typescript": "^5.3.3" }, "dependencies": { - "@meshsdk/common": "1.9.0-beta.95", - "@meshsdk/core-cst": "1.9.0-beta.95", - "@meshsdk/provider": "1.9.0-beta.95", - "@meshsdk/transaction": "1.9.0-beta.95", - "@meshsdk/wallet": "1.9.0-beta.95", + "@meshsdk/common": "1.9.0-beta.96", + "@meshsdk/core-cst": "1.9.0-beta.96", + "@meshsdk/provider": "1.9.0-beta.96", + "@meshsdk/transaction": "1.9.0-beta.96", + "@meshsdk/wallet": "1.9.0-beta.96", "libsodium-wrappers-sumo": "0.7.15" }, "prettier": "@meshsdk/configs/prettier", diff --git a/packages/mesh-hydra/package.json b/packages/mesh-hydra/package.json index b89f91ea0..211da18ca 100644 --- a/packages/mesh-hydra/package.json +++ b/packages/mesh-hydra/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/hydra", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "Mesh Hydra package", "main": "./dist/index.cjs", "browser": "./dist/index.js", @@ -27,9 +27,9 @@ "test": "jest" }, "dependencies": { - "@meshsdk/common": "1.9.0-beta.95", - "@meshsdk/core": "1.9.0-beta.95", - "@meshsdk/core-cst": "1.9.0-beta.95", + "@meshsdk/common": "1.9.0-beta.96", + "@meshsdk/core": "1.9.0-beta.96", + "@meshsdk/core-cst": "1.9.0-beta.96", "axios": "^1.7.2" }, "devDependencies": { diff --git a/packages/mesh-provider/package.json b/packages/mesh-provider/package.json index a3e1e6f95..0836fdb29 100644 --- a/packages/mesh-provider/package.json +++ b/packages/mesh-provider/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/provider", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "Blockchain data providers - https://meshjs.dev/providers", "main": "./dist/index.cjs", "browser": "./dist/index.js", @@ -35,8 +35,8 @@ "typescript": "^5.3.3" }, "dependencies": { - "@meshsdk/common": "1.9.0-beta.95", - "@meshsdk/core-cst": "1.9.0-beta.95", + "@meshsdk/common": "1.9.0-beta.96", + "@meshsdk/core-cst": "1.9.0-beta.96", "@utxorpc/sdk": "^0.6.7", "@utxorpc/spec": "^0.16.0", "axios": "^1.7.2", diff --git a/packages/mesh-react/package.json b/packages/mesh-react/package.json index 7e44062a9..373cf22be 100644 --- a/packages/mesh-react/package.json +++ b/packages/mesh-react/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/react", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "React component library - https://meshjs.dev/react", "main": "./dist/index.cjs", "browser": "./dist/index.js", @@ -30,9 +30,9 @@ }, "dependencies": { "@cardananium/cardano-peer-connect": "^1.2.19", - "@meshsdk/common": "1.9.0-beta.95", - "@meshsdk/transaction": "1.9.0-beta.95", - "@meshsdk/wallet": "1.9.0-beta.95", + "@meshsdk/common": "1.9.0-beta.96", + "@meshsdk/transaction": "1.9.0-beta.96", + "@meshsdk/wallet": "1.9.0-beta.96", "@meshsdk/web3-sdk": "0.0.50", "@radix-ui/react-dialog": "^1.1.2", "@radix-ui/react-dropdown-menu": "^2.1.2", diff --git a/packages/mesh-react/src/cardano-wallet/index.tsx b/packages/mesh-react/src/cardano-wallet/index.tsx index 042187b28..2a71b873b 100644 --- a/packages/mesh-react/src/cardano-wallet/index.tsx +++ b/packages/mesh-react/src/cardano-wallet/index.tsx @@ -152,7 +152,7 @@ function Header({ ) : ( )} - + {/* @ts-ignore */} {screens[screen].title} diff --git a/packages/mesh-svelte/package.json b/packages/mesh-svelte/package.json index 9a11964fc..dd74c7820 100644 --- a/packages/mesh-svelte/package.json +++ b/packages/mesh-svelte/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/svelte", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "Svelte component library - https://meshjs.dev/svelte", "type": "module", "exports": { @@ -26,7 +26,7 @@ "dev": "vite dev" }, "dependencies": { - "@meshsdk/core": "1.9.0-beta.95", + "@meshsdk/core": "1.9.0-beta.96", "bits-ui": "1.0.0-next.65" }, "devDependencies": { diff --git a/packages/mesh-transaction/package.json b/packages/mesh-transaction/package.json index decf1fa24..004b8bf2c 100644 --- a/packages/mesh-transaction/package.json +++ b/packages/mesh-transaction/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/transaction", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "Transactions - https://meshjs.dev/apis/transaction", "main": "./dist/index.cjs", "browser": "./dist/index.js", @@ -35,8 +35,8 @@ "typescript": "^5.3.3" }, "dependencies": { - "@meshsdk/common": "1.9.0-beta.95", - "@meshsdk/core-cst": "1.9.0-beta.95", + "@meshsdk/common": "1.9.0-beta.96", + "@meshsdk/core-cst": "1.9.0-beta.96", "@cardano-sdk/core": "^0.46.11", "@cardano-sdk/util": "^0.17.1", "@cardano-sdk/input-selection": "^0.14.27", diff --git a/packages/mesh-wallet/package.json b/packages/mesh-wallet/package.json index 26a51dd47..a17dd8ea0 100644 --- a/packages/mesh-wallet/package.json +++ b/packages/mesh-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/wallet", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "Wallets - https://meshjs.dev/apis/wallets", "main": "./dist/index.cjs", "browser": "./dist/index.js", @@ -35,9 +35,9 @@ "typescript": "^5.3.3" }, "dependencies": { - "@meshsdk/common": "1.9.0-beta.95", - "@meshsdk/core-cst": "1.9.0-beta.95", - "@meshsdk/transaction": "1.9.0-beta.95", + "@meshsdk/common": "1.9.0-beta.96", + "@meshsdk/core-cst": "1.9.0-beta.96", + "@meshsdk/transaction": "1.9.0-beta.96", "@simplewebauthn/browser": "^13.0.0", "libsodium-wrappers-sumo": "0.7.15" }, diff --git a/packages/midnight-contracts-wizard/package.json b/packages/midnight-contracts-wizard/package.json index af4b12916..4659351e2 100644 --- a/packages/midnight-contracts-wizard/package.json +++ b/packages/midnight-contracts-wizard/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/midnight-contracts-wizard", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "Create a new Midnight contracts project with selected smart contracts", "main": "dist/index.js", "bin": { diff --git a/packages/midnight-setup/package.json b/packages/midnight-setup/package.json index 5dafea784..80e01f29b 100644 --- a/packages/midnight-setup/package.json +++ b/packages/midnight-setup/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/midnight-setup", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "description": "Midnight Network integration SDK for MeshSDK - https://meshjs.dev/midnight", "main": "./dist/index.cjs", "browser": "./dist/index.js", diff --git a/scripts/mesh-cli/package.json b/scripts/mesh-cli/package.json index 56a64efb8..2e3e864f3 100644 --- a/scripts/mesh-cli/package.json +++ b/scripts/mesh-cli/package.json @@ -3,7 +3,7 @@ "description": "A quick and easy way to bootstrap your Web3 app using Mesh.", "homepage": "https://meshjs.dev", "author": "MeshJS", - "version": "1.9.0-beta.95", + "version": "1.9.0-beta.96", "license": "Apache-2.0", "type": "module", "main": "./dist/index.cjs", From be429e5dd5f6467eb8f52e5ec3ac2d82546141b0 Mon Sep 17 00:00:00 2001 From: Jingles Date: Wed, 14 Jan 2026 16:30:41 +0800 Subject: [PATCH 5/5] fix build error --- packages/mesh-core-cst/src/utils/builder.ts | 4 ++-- packages/mesh-core-cst/src/utils/script-data-hash.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/mesh-core-cst/src/utils/builder.ts b/packages/mesh-core-cst/src/utils/builder.ts index a31570f5c..3ab6cde5c 100644 --- a/packages/mesh-core-cst/src/utils/builder.ts +++ b/packages/mesh-core-cst/src/utils/builder.ts @@ -1,5 +1,5 @@ import { pbkdf2Sync } from "crypto"; -import * as Crypto from "@cardano-sdk/crypto"; +import blake2b from "blake2b"; import { HexBlob } from "@cardano-sdk/util"; import hash from "hash.js"; @@ -168,7 +168,7 @@ export const buildDRepID = ( addressType: AddressType = AddressType.EnterpriseKey, ): DRepID => { const dRepKeyBytes = Buffer.from(dRepKey, "hex"); - const dRepIdHex = Crypto.blake2b(28).update(dRepKeyBytes).digest("hex"); + const dRepIdHex = blake2b(28).update(dRepKeyBytes).digest("hex"); const paymentAddress = EnterpriseAddress.packParts({ networkId, paymentPart: { diff --git a/packages/mesh-core-cst/src/utils/script-data-hash.ts b/packages/mesh-core-cst/src/utils/script-data-hash.ts index 459fee10c..d5e6adbbd 100644 --- a/packages/mesh-core-cst/src/utils/script-data-hash.ts +++ b/packages/mesh-core-cst/src/utils/script-data-hash.ts @@ -1,6 +1,6 @@ /* eslint-disable unicorn/number-literal-case */ +import blake2b from "blake2b"; import { Cardano, Serialization } from "@cardano-sdk/core"; -import * as Crypto from "@cardano-sdk/crypto"; import { Hash32ByteBase16 } from "@cardano-sdk/crypto"; import { HexBlob } from "@cardano-sdk/util"; @@ -25,7 +25,7 @@ export const hashScriptData = ( costModels: Serialization.Costmdls, redemeers?: Serialization.Redeemers, datums?: Serialization.CborSet, -): Crypto.Hash32ByteBase16 | undefined => { +): Hash32ByteBase16 | undefined => { const writer = new Serialization.CborWriter(); if (datums && datums.size() > 0 && (!redemeers || redemeers.size() === 0)) { /* @@ -55,7 +55,7 @@ export const hashScriptData = ( ); } - const hashHex = Crypto.blake2b(32) + const hashHex = blake2b(32) .update(Buffer.from(writer.encode())) .digest("hex"); return Hash32ByteBase16.fromHexBlob(HexBlob(hashHex));