Merge pull request #7 from MeshJS/fix/get-balance-mesh

Fix/get balance mesh

Author: twwu123

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/wallet",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.9",
   "description": "Wallets - https://meshjs.dev/apis/wallets",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",
@@ -34,7 +34,8 @@
     "@ianvs/prettier-plugin-sort-imports": "^4.4.1",
     "@meshsdk/common": "1.9.0-beta.100",
     "@meshsdk/provider": "1.9.0-beta.99",
-    "@types/jest": "^29.5.12",
+    "@types/jest": "^29.5.14",
+    "@types/mocha": "^10.0.10",
     "dotenv": "^16.4.5",
     "eslint": "^8.57.0",
     "jest": "^29.7.0",

package.json

@@ -1,7 +1,7 @@
 import { Cardano, Serialization } from "@cardano-sdk/core";
 import { HexBlob } from "@cardano-sdk/util";
 
-import { Asset, UTxO } from "@meshsdk/common";
+import { Asset, MeshValue, UTxO } from "@meshsdk/common";
 
 import { CardanoInMemoryBip32 } from "../../../bip32/cardano-in-memory-bip32";
 import {
@@ -159,7 +159,9 @@ export class MeshCardanoHeadlessWallet extends CardanoHeadlessWallet {
       throw new Error("[CardanoWallet] No fetcher provided");
     }
     const utxos = await this.fetchAccountUtxos();
-    return utxos.map((utxo) => utxo.output.amount).flat();
+    const values = utxos.map((utxo) => utxo.output.amount).flat();
+    const meshValue = MeshValue.fromAssets(values);
+    return meshValue.toAssets();
   }
 
   /**

src/cardano/wallet/mesh/mesh-wallet.ts

@@ -0,0 +1,35 @@
+import { MeshValue } from "@meshsdk/common";
+
+describe("Value", () => {
+  it("conversion to and from mesh value should combine assets", () => {
+    expect(
+      MeshValue.fromAssets([
+        {
+          unit: "lovelace",
+          quantity: "1172951349",
+        },
+        {
+          unit: "lovelace",
+          quantity: "998427280116",
+        },
+        {
+          unit: "lovelace",
+          quantity: "2000000",
+        },
+        {
+          unit: "922827a68ed2e816886d8f271c03f8342dfb53a45bd0a9f5ccc0ed94",
+          quantity: "1502000000",
+        },
+      ]).toAssets(),
+    ).toEqual([
+      {
+        unit: "lovelace",
+        quantity: "999602231465",
+      },
+      {
+        unit: "922827a68ed2e816886d8f271c03f8342dfb53a45bd0a9f5ccc0ed94",
+        quantity: "1502000000",
+      },
+    ]);
+  });
+});

test/utils/value.test.ts

@@ -1,11 +1,12 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "display": "Default",
-  "include": ["src/**/*"],
+  "include": ["src/**/*", "test/**/*", "jest.config.ts"],
   "exclude": ["dist", "node_modules"],
   "compilerOptions": {
     "target": "ES2020",
     "lib": ["ES2020", "DOM"],
+    "types": ["jest", "node"],
     "module": "commonjs",
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true