wallet v2

examples/developer-controlled-wallet/index.ts

@@ -46,8 +46,8 @@ async function main() {
 
   // Get Cardano wallet
   const { cardanoWallet: cardano } = await sdk.wallet.getWallet(info.id, "cardano");
-  const addresses = cardano!.getAddresses();
-  console.log("Cardano base address:", addresses.baseAddressBech32);
+  const cardanoAddress = await cardano!.getChangeAddressBech32();
+  console.log("Cardano base address:", cardanoAddress);
 
   // Get Spark wallet info
   const sparkWalletInfo = await sdk.wallet.sparkIssuer.getWallet(info.id);

examples/nextjs/app/page.tsx

@@ -48,7 +48,7 @@ export default function Home() {
       const user = web3Wallet.getUser();
 
       const cardanoAddress =
-        (await web3Wallet.cardano.getChangeAddress()) || "";
+        (await web3Wallet.cardano.getChangeAddressBech32()) || "";
       const bitcoinAddresses = await web3Wallet.bitcoin.getAddresses();
       const bitcoinAddress = bitcoinAddresses[0]?.address || "";
       const sparkAddressInfo = web3Wallet.spark.getAddress();

examples/react-native/App.tsx

@@ -64,7 +64,7 @@ export default function App() {
       const user = web3Wallet.getUser();
 
       const cardanoAddress =
-        (await web3Wallet.cardano.getChangeAddress()) || "";
+        (await web3Wallet.cardano.getChangeAddressBech32()) || "";
       const bitcoinAddresses = await web3Wallet.bitcoin.getAddresses();
       const bitcoinAddress = bitcoinAddresses[0]?.address || "";
       const sparkAddressInfo = web3Wallet.spark.getAddress();

examples/third-party-auth/app/page.tsx

@@ -50,7 +50,7 @@ export default function Home() {
               refreshToken: token as string,
             });
 
-            console.log(await wallet.cardano.getChangeAddress());
+            console.log(await wallet.cardano.getChangeAddressBech32());
           }}
         >
           Auto Sign In With Token{" "}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utxos/sdk",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "description": "UTXOS SDK - Web3 infrastructure platform for UTXO blockchains",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -66,7 +66,7 @@
     "@meshsdk/common": "1.9.0-beta.89",
     "@meshsdk/core-cst": "1.9.0-beta.89",
     "@meshsdk/transaction": "1.9.0-beta.89",
-    "@meshsdk/wallet": "1.9.0-beta.89",
+    "@meshsdk/wallet": "2.0.0-beta.5",
     "@peculiar/webcrypto": "^1.5.0",
     "axios": "^1.8.3",
     "base32-encoding": "^1.0.0",

src/functions/client/derive-wallet.test.ts

@@ -3,11 +3,14 @@ import { encryptWithCipher } from "../crypto";
 import { spiltKeyIntoShards } from "../key-shard";
 
 // Mock external wallet SDKs
+const mockCardanoWalletInstance = {
+  getUsedAddressesBech32: jest.fn().mockResolvedValue(["addr_test1..."]),
+};
+
 jest.mock("@meshsdk/wallet", () => ({
-  MeshWallet: jest.fn().mockImplementation(() => ({
-    init: jest.fn().mockResolvedValue(undefined),
-    getUsedAddresses: jest.fn().mockResolvedValue(["addr_test1..."]),
-  })),
+  MeshCardanoHeadlessWallet: {
+    fromMnemonic: jest.fn().mockResolvedValue(mockCardanoWalletInstance),
+  },
 }));
 
 jest.mock("@meshsdk/bitcoin", () => ({
@@ -28,7 +31,7 @@ jest.mock("@buildonspark/spark-sdk", () => ({
 
 // Import after mocks
 import { clientDeriveWallet } from "./derive-wallet";
-import { MeshWallet } from "@meshsdk/wallet";
+import { MeshCardanoHeadlessWallet } from "@meshsdk/wallet";
 import { EmbeddedWallet } from "@meshsdk/bitcoin";
 import { SparkWallet } from "@buildonspark/spark-sdk";
 
@@ -122,7 +125,7 @@ describe("clientDeriveWallet", () => {
     expect(EmbeddedWallet).toHaveBeenCalledWith(
       expect.objectContaining({ network: "Testnet" }),
     );
-    expect(MeshWallet).toHaveBeenCalledWith(
+    expect(MeshCardanoHeadlessWallet.fromMnemonic).toHaveBeenCalledWith(
       expect.objectContaining({ networkId: 0 }),
     );
     expect(SparkWallet.initialize).toHaveBeenCalledWith(
@@ -146,7 +149,7 @@ describe("clientDeriveWallet", () => {
     expect(EmbeddedWallet).toHaveBeenCalledWith(
       expect.objectContaining({ network: "Mainnet" }),
     );
-    expect(MeshWallet).toHaveBeenCalledWith(
+    expect(MeshCardanoHeadlessWallet.fromMnemonic).toHaveBeenCalledWith(
       expect.objectContaining({ networkId: 1 }),
     );
     expect(SparkWallet.initialize).toHaveBeenCalledWith(
@@ -241,24 +244,6 @@ describe("clientDeriveWallet", () => {
     expect(result.key).toBe(testMnemonic);
   });
 
-  it("initializes cardano wallet", async () => {
-    const shards = await spiltKeyIntoShards(testMnemonic);
-    const deviceKey = await deriveKeyFromPassword("device-password");
-
-    const encryptedDeviceShard = await encryptWithCipher({
-      data: shards[0]!,
-      key: deviceKey,
-    });
-
-    const result = await clientDeriveWallet(
-      encryptedDeviceShard,
-      deviceKey,
-      shards[1]!,
-      0,
-    );
-
-    expect(result.cardanoWallet.init).toHaveBeenCalled();
-  });
 });
 
 describe("clientDeriveWallet with 24-word mnemonic", () => {

src/functions/client/derive-wallet.ts

@@ -1,4 +1,5 @@
 import { IBitcoinProvider } from "@meshsdk/bitcoin";
+import { IFetcher } from "@meshsdk/common";
 import { decryptWithCipher } from "../crypto";
 import { combineShardsBuildWallet } from "../key-shard";
 
@@ -8,6 +9,7 @@ export async function clientDeriveWallet(
   custodialShard: string,
   networkId: 0 | 1,
   bitcoinProvider?: IBitcoinProvider,
+  fetcher?: IFetcher,
 ) {
   const keyShare1 = await decryptWithCipher({
     encryptedDataJSON: encryptedKeyShard,
@@ -21,6 +23,7 @@ export async function clientDeriveWallet(
       keyShare1,
       keyShare2,
       bitcoinProvider,
+      fetcher,
     );
 
   return { bitcoinWallet, cardanoWallet, sparkWallet, key };

src/functions/client/generate-wallet.test.ts

@@ -1,14 +1,16 @@
 import { crypto } from "../crypto";
 
 // Mock external wallet SDKs
+const mockCardanoWalletInstance = {
+  getChangeAddressBech32: jest.fn().mockResolvedValue(
+    "addr_test1qz2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3jcu5d8ps7zex2k2xt3uqxgjqnnj83ws8lhrn648jjxtwq2ytjqp",
+  ),
+};
+
 jest.mock("@meshsdk/wallet", () => ({
-  MeshWallet: jest.fn().mockImplementation(() => ({
-    init: jest.fn().mockResolvedValue(undefined),
-    getAddresses: jest.fn().mockResolvedValue({
-      baseAddressBech32:
-        "addr_test1qz2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3jcu5d8ps7zex2k2xt3uqxgjqnnj83ws8lhrn648jjxtwq2ytjqp",
-    }),
-  })),
+  MeshCardanoHeadlessWallet: {
+    fromMnemonic: jest.fn().mockResolvedValue(mockCardanoWalletInstance),
+  },
 }));
 
 jest.mock("@meshsdk/common", () => ({
@@ -47,7 +49,7 @@ jest.mock("@buildonspark/spark-sdk", () => ({
 // Import after mocks
 import { clientGenerateWallet } from "./generate-wallet";
 import { generateMnemonic } from "@meshsdk/common";
-import { MeshWallet } from "@meshsdk/wallet";
+import { MeshCardanoHeadlessWallet } from "@meshsdk/wallet";
 import { EmbeddedWallet } from "@meshsdk/bitcoin";
 import { SparkWallet } from "@buildonspark/spark-sdk";
 import { decryptWithCipher } from "../crypto";
@@ -204,13 +206,13 @@ describe("clientGenerateWallet", () => {
     );
   });
 
-  it("creates MeshWallet with networkId 1", async () => {
+  it("creates MeshCardanoHeadlessWallet with networkId 1", async () => {
     const deviceKey = await deriveKeyFromPassword("device-password");
     const recoveryKey = await deriveKeyFromPassword("recovery-password");
 
     await clientGenerateWallet(deviceKey, recoveryKey);
 
-    expect(MeshWallet).toHaveBeenCalledWith(
+    expect(MeshCardanoHeadlessWallet.fromMnemonic).toHaveBeenCalledWith(
       expect.objectContaining({ networkId: 1 }),
     );
   });

src/functions/client/generate-wallet.ts

@@ -1,4 +1,4 @@
-import { MeshWallet } from "@meshsdk/wallet";
+import { MeshCardanoHeadlessWallet } from "@meshsdk/wallet";
 import { generateMnemonic } from "@meshsdk/common";
 import { deserializeBech32Address } from "@meshsdk/core-cst";
 import { EmbeddedWallet } from "@meshsdk/bitcoin";
@@ -47,18 +47,15 @@ export async function clientGenerateWallet(
   const bitcoinMainnetPubKeyHash = bitcoinMainnetWallet.getPublicKey();
 
   /* cardano */
-  const cardanoWallet = new MeshWallet({
+  const cardanoWallet = await MeshCardanoHeadlessWallet.fromMnemonic({
+    mnemonic: mnemonic.split(" "),
     networkId: 1,
-    key: {
-      type: "mnemonic",
-      words: mnemonic.split(" "),
-    },
+    walletAddressType: 1,
   });
-  await cardanoWallet.init();
 
-  const cardanoAddresses = await cardanoWallet.getAddresses();
+  const cardanoBaseAddress = await cardanoWallet.getChangeAddressBech32();
   const cardanoKeyHashes = deserializeBech32Address(
-    cardanoAddresses.baseAddressBech32!,
+    cardanoBaseAddress,
   );
 
   /* spark */

src/functions/client/recovery.test.ts

@@ -6,9 +6,9 @@ import { shamirCombine } from "../key-shard";
 
 // Mock external wallet SDKs
 jest.mock("@meshsdk/wallet", () => ({
-  MeshWallet: jest.fn().mockImplementation(() => ({
-    init: jest.fn().mockResolvedValue(undefined),
-  })),
+  MeshCardanoHeadlessWallet: {
+    fromMnemonic: jest.fn().mockResolvedValue({}),
+  },
 }));
 
 jest.mock("@meshsdk/bitcoin", () => ({

src/functions/key-shard/combine-shards-build-wallet.test.ts

@@ -3,11 +3,14 @@ import { hexToBytes, bytesToString } from "../convertors";
 import { shamirCombine } from "./shamir-secret-sharing";
 
 // Mock external wallet SDKs
+const mockCardanoWalletInstance = {
+  getUsedAddressesBech32: jest.fn().mockResolvedValue(["addr_test1..."]),
+};
+
 jest.mock("@meshsdk/wallet", () => ({
-  MeshWallet: jest.fn().mockImplementation(() => ({
-    init: jest.fn().mockResolvedValue(undefined),
-    getUsedAddresses: jest.fn().mockResolvedValue(["addr_test1..."]),
-  })),
+  MeshCardanoHeadlessWallet: {
+    fromMnemonic: jest.fn().mockResolvedValue(mockCardanoWalletInstance),
+  },
 }));
 
 jest.mock("@meshsdk/bitcoin", () => ({
@@ -28,7 +31,7 @@ jest.mock("@buildonspark/spark-sdk", () => ({
 
 // Import after mocks are set up
 import { combineShardsBuildWallet } from "./combine-shards-build-wallet";
-import { MeshWallet } from "@meshsdk/wallet";
+import { MeshCardanoHeadlessWallet } from "@meshsdk/wallet";
 import { EmbeddedWallet } from "@meshsdk/bitcoin";
 import { SparkWallet } from "@buildonspark/spark-sdk";
 
@@ -101,38 +104,32 @@ describe("combineShardsBuildWallet", () => {
     );
   });
 
-  it("initializes MeshWallet with correct networkId for testnet", async () => {
+  it("initializes MeshCardanoHeadlessWallet with correct networkId for testnet", async () => {
     const mnemonic =
       "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about";
     const shards = await spiltKeyIntoShards(mnemonic);
 
     await combineShardsBuildWallet(0, shards[0]!, shards[1]!);
 
-    expect(MeshWallet).toHaveBeenCalledWith(
+    expect(MeshCardanoHeadlessWallet.fromMnemonic).toHaveBeenCalledWith(
       expect.objectContaining({
         networkId: 0,
-        key: expect.objectContaining({
-          type: "mnemonic",
-          words: mnemonic.split(" "),
-        }),
+        mnemonic: mnemonic.split(" "),
       }),
     );
   });
 
-  it("initializes MeshWallet with correct networkId for mainnet", async () => {
+  it("initializes MeshCardanoHeadlessWallet with correct networkId for mainnet", async () => {
     const mnemonic =
       "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about";
     const shards = await spiltKeyIntoShards(mnemonic);
 
     await combineShardsBuildWallet(1, shards[0]!, shards[1]!);
 
-    expect(MeshWallet).toHaveBeenCalledWith(
+    expect(MeshCardanoHeadlessWallet.fromMnemonic).toHaveBeenCalledWith(
       expect.objectContaining({
         networkId: 1,
-        key: expect.objectContaining({
-          type: "mnemonic",
-          words: mnemonic.split(" "),
-        }),
+        mnemonic: mnemonic.split(" "),
       }),
     );
   });
@@ -171,16 +168,6 @@ describe("combineShardsBuildWallet", () => {
     );
   });
 
-  it("calls cardanoWallet.init()", async () => {
-    const mnemonic =
-      "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about";
-    const shards = await spiltKeyIntoShards(mnemonic);
-
-    const result = await combineShardsBuildWallet(0, shards[0]!, shards[1]!);
-
-    expect(result.cardanoWallet.init).toHaveBeenCalled();
-  });
-
   it("passes bitcoinProvider to EmbeddedWallet when provided", async () => {
     const mnemonic =
       "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about";

src/functions/key-shard/combine-shards-build-wallet.ts

@@ -1,14 +1,16 @@
-import { MeshWallet } from "@meshsdk/wallet";
+import { MeshCardanoHeadlessWallet } from "@meshsdk/wallet";
 import { shamirCombine } from "./shamir-secret-sharing";
 import { bytesToString, hexToBytes } from "../convertors";
 import { EmbeddedWallet, IBitcoinProvider } from "@meshsdk/bitcoin";
+import { IFetcher } from "@meshsdk/common";
 import { SparkWallet } from "@buildonspark/spark-sdk";
 
 export async function combineShardsBuildWallet(
   networkId: 0 | 1,
   keyShard1: string,
   keyShard2: string,
   bitcoinProvider?: IBitcoinProvider,
+  fetcher?: IFetcher,
 ) {
   const _share1 = hexToBytes(keyShard1);
   const _share2 = hexToBytes(keyShard2);
@@ -25,16 +27,13 @@ export async function combineShardsBuildWallet(
     provider: bitcoinProvider,
   });
 
-  const cardanoWallet = new MeshWallet({
+  const cardanoWallet = await MeshCardanoHeadlessWallet.fromMnemonic({
+    mnemonic: mnemonic.split(" "),
     networkId: networkId,
-    key: {
-      type: "mnemonic",
-      words: mnemonic.split(" "),
-    },
+    walletAddressType: 1,
+    fetcher,
   });
 
-  await cardanoWallet.init();
-
   const { wallet: sparkWallet } = await SparkWallet.initialize({
     mnemonicOrSeed: mnemonic,
     options: {