Refactor btc

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",

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,6 +25,9 @@
   },
   "dependencies": {
     "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3",
+    "@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",
     "bip39": "^3.1.0",

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";

packages/bitcoin/src/multi-chain/index.ts

@@ -0,0 +1,4 @@
+export {
+  MaestroMultiChainProvider,
+  type MaestroMultiChainConfig
+} from "./maestro-unified";

packages/mesh-provider/src/multi-chain/maestro-unified.ts → 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}`);
   }
-}
+}

packages/bitcoin/tsup.config.ts

@@ -7,6 +7,7 @@ export default defineConfig({
   splitting: false,
   sourcemap: true,
   clean: true,
+  target: "esnext",
   external: [
     "bip32",
     "ecpair",

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",

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",

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,15 +31,15 @@
   },
   "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",
     "tsup": "^8.0.2",
     "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",

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",

packages/mesh-core-cst/src/utils/builder.ts

@@ -1,5 +1,5 @@
 import { pbkdf2Sync } from "crypto";
-import { blake2b, ready } 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 = blake2b.hash(HexBlob.fromBytes(dRepKeyBytes), 28);
+  const dRepIdHex = blake2b(28).update(dRepKeyBytes).digest("hex");
   const paymentAddress = EnterpriseAddress.packParts({
     networkId,
     paymentPart: {

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<Cardano.PlutusData, PlutusData>,
-): Crypto.Hash32ByteBase16 | undefined => {
+): Hash32ByteBase16 | undefined => {
   const writer = new Serialization.CborWriter();
   if (datums && datums.size() > 0 && (!redemeers || redemeers.size() === 0)) {
     /*
@@ -55,5 +55,8 @@ export const hashScriptData = (
     );
   }
 
-  return Hash32ByteBase16.fromHexBlob(Crypto.blake2b.hash(writer.encode(), 32));
+  const hashHex = blake2b(32)
+    .update(Buffer.from(writer.encode()))
+    .digest("hex");
+  return Hash32ByteBase16.fromHexBlob(HexBlob(hashHex));
 };

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",

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": {

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,9 +35,8 @@
     "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",
+    "@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",

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";

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,10 +30,9 @@
   },
   "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",
+    "@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",

packages/mesh-react/src/cardano-wallet/index.tsx

@@ -152,7 +152,7 @@ function Header({
         ) : (
           <span style={{ width: "24px" }}></span>
         )}
-        <span>
+        <span className="mesh-text-white">
           {/* @ts-ignore */}
           {screens[screen].title}
         </span>

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 (
     <TooltipProvider>
@@ -99,18 +97,6 @@ export default function ScreenMain({
             }}
           />
         )}
-
-        <WalletIcon
-          iconReactNode={IconBitcoin()}
-          name={"Bitcoin"}
-          action={async () => {
-            const wallet = await BrowserWallet.enable(
-              "Mesh SDK want to connect",
-            );
-            setBitcoinWallet(wallet, "Bitcoin");
-            setOpen(false);
-          }}
-        />
       </div>
     </TooltipProvider>
   );