@sundaeswap/wallet-lite 0.0.95 → 0.0.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sundaeswap/wallet-lite",
-  "version": "0.0.95",
+  "version": "0.0.97",
   "license": "MIT",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -61,6 +61,7 @@
     "@babel/preset-typescript": "^7.24.7",
     "@happy-dom/global-registrator": "^16.5.3",
     "@sundaeswap/babel-preset": "^2.0.15",
+    "@tanstack/react-query": "^5.51.11",
     "@testing-library/dom": "^10.1.0",
     "@testing-library/react": "^16.0.0",
     "@testing-library/react-hooks": "^8.0.1",

package/src/@types/observer.ts

@@ -18,6 +18,9 @@ export interface IWindowCip30Extension {
   icon: string;
   isEnabled: () => Promise<boolean>;
   name: string;
+  experimental?: {
+    feeAddress?: string;
+  };
 }
 
 /**

package/src/__data__/assets.ts

@@ -1,113 +1,23 @@
+import { Serialization } from "@cardano-sdk/core";
+import { HexBlob } from "@cardano-sdk/util";
 import { AssetAmount } from "@sundaeswap/asset";
 import { normalizeAssetIdWithDot } from "../utils/assets";
+import { mockBalance } from "./eternl";
 
-export const assetIds = [
-  "ada.lovelace",
-  "04b95368393c821f180deee8229fbd941baaf9bd748ebcdbf7adbb147273455247",
-  "063bbb14b22e39aedf7beba84d7ce9ea771a6f19d9ad02f70d6f3eaa446973636f536f6c6172697345787472617330313431",
-  "063bbb14b22e39aedf7beba84d7ce9ea771a6f19d9ad02f70d6f3eaa446973636f536f6c6172697345787472617339303038",
-  "0cf7296fe09e9225d8cc0a444ee60e8d4f09c1c5f3dbc8aaee1ebc705448554e54",
-  "1088b361c41f49906645cedeeb7a9ef0e0b793b1a2d24f623ea748764861766f63576f726c647336393339",
-  "2b7e1c65b836affa518d0a63067e52962c37e0485cf28edcd970bff676424f4f4b",
-  "2d3b299285e911a6dddb915d03d47970a45cb0a08aa8a138dba39c6f4b4a4232393932",
-  "3059f54ae7c2d56237bd921a864eb090d7d0c98b2775f9784f854fdd72434f5049",
-  "3e9499856b0421b4424c8fc3a75c4e05aadab5e05f1337304efb6c1f53505f6b55325a4164",
-  "41142faeb5e3c644625966715c0a844bb4d6aeef2bcdbf535b14e5a57448414e444c45",
-  "46e607b3046a34c95e7c29e47047618dbf5e10de777ba56c590cfd5c4e45574d5f31",
-  "477cec772adb1466b301fb8161f505aa66ed1ee8d69d3e7984256a43477574656e62657267204269626c65202336393232",
-  "477cec772adb1466b301fb8161f505aa66ed1ee8d69d3e7984256a43477574656e62657267204269626c65202337393130",
-  "477cec772adb1466b301fb8161f505aa66ed1ee8d69d3e7984256a43477574656e62657267204269626c65202339313538",
-  "51a5e236c4de3af2b8020442e2a26f454fda3b04cb621c1294a0ef34424f4f4b",
-  "5c1abfb2c2b2a4ce2fa731cdb2f793fcd4ab2c2c05b8ee39b142a4a64d694c4b3630",
-  "6a10a650be925743cb0e5592442326dd1094e107b1b0402c13160ebd446973636f696e45617272696e673335",
-  "76dbbc78587bf972c710f22a0807a6905a8a5e713418515fc9abeed1646973636f736f6c617269733038393233",
-  "7f9a722eac5d460444e4df7e65144785e7f16de8579c00663232879c4e49444f57415645303831",
-  "8d7526784ef72fe0ccdd085976ada0da88e7fb013e38e794b09233414245415244",
-  "9293316c91ff5143e3bc60d78d44dfb87edff59d61b99cf4c938d9084142544e",
-  "92a7b9d9d8e6111ca2105409e0f0efea9661d2a0bd44e322253420b453505f354956317337",
-  "9460f3352773623741fcf6fd471668998021c3ebb805413c80e9b43941424f4f4b",
-  "960d6f6cb6d3f8d9746bff157000ca71ed1c8cc419fff09796ee9e8a4d694c4b44726f707a20315f3236",
-  "a0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235484f534b59",
-  "a706fc87764cde4ac018c38bf61630c1065932db49e6f495be3b29f8436f636f4c6f636f477265656e50616c6d53314e465431363537",
-  "ad14d754d349ac1a6cbd3e08d404e67bc5b3ab265884736a5bf07eb05448554e54",
-  "ae1b29e34cb98ca4e02011a2b2c465261ae9805a1e256c41647a952072424f4f4b",
-  "b6a7467ea1deb012808ef4e87b5ff371e85f7142d7b356a40d9b42a0436f726e75636f70696173205b76696120436861696e506f72742e696f5d",
-  "bf5aebb0481d3b0031eac8b495808235f7d5f252421504e64f3729dd4d494e544b4559",
-  "c117f33edeee4b531dfdb85ead5753433c9dbd875629bc971013ffac42656174426f792023343136",
-  "c117f33edeee4b531dfdb85ead5753433c9dbd875629bc971013ffac42656174426f79202331383334",
-  "c117f33edeee4b531dfdb85ead5753433c9dbd875629bc971013ffac42656174426f79202332363237",
-  "c117f33edeee4b531dfdb85ead5753433c9dbd875629bc971013ffac42656174426f79202336343934",
-  "c281975562f394761771f13f599881517fa8455946e7e30454de22da474f415454726962653034313736",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697331313738",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697331343434",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697331363037",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697331373030",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697331383538",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697332333938",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697332343734",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697332353239",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697332353837",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697332393635",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697333303938",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697333323235",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697334303031",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697334323638",
-  "d0112837f8f856b2ca14f69b375bc394e73d146fdadcc993bb993779446973636f536f6c6172697334343533",
-  "d1218edd90bd8446051a22d043b4cc7369ad48be46299528f8b22c487241584f",
-  "d55bf9d2ad12cc55e4ed29d97c64dba0e4905d3c80f800449f3d51f04368616e6765",
-  "df6268fb872b81a349469825c23bd4d0f5fb4b35bcba547493b35fd6446f78786f536f6c6172697330313431",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe36976",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3666171",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3666472",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe368756773",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe36d696e69",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe372656b74",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe377656233",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe36269703339",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3636f2d6f70",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3656964616e",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe36761746573",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe374616e7961",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3647275646765",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe366696e6c6579",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe36b6f65706b65",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe36d616b657273",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe36d6f6465726e",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe373796e746178",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe37a656b696168",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3636176656d616e",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe364697372757074",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3656e6372797074",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe368757362616e64",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe36d696e696d616c",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe370726f66696c65",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe370757273756974",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3736176696e6773",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3616c64657262696e",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe362726577636c7562",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe36f726967696e616c",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3706c61793277696e",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe37072656d69657265",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3646179747261646572",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe363687269737469616e6e",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3706f7274666f6c696f31",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3706f7274666f6c696f32",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3706f7274666f6c696f33",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe373756666696369656e74",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe373757270726973656d65",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe36f70706f7274756e697374",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3736f6c6f7072656e657572",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe3737572766976616c697374",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe374686562726577636c7562",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe36472756467657265706f7274",
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe368617070796e657779656172",
-  "f55ac9646c45e899603a5617d398570705fd7b93278a6e4879136f954d6f6f6e6c69676874313834",
-  "f55ac9646c45e899603a5617d398570705fd7b93278a6e4879136f954d6f6f6e6c69676874313937",
-  "f55ac9646c45e899603a5617d398570705fd7b93278a6e4879136f954d6f6f6e6c69676874323237",
-  "f66d78b4a3cb3d37afa0ec36461e51ecbde00f26c8f0a68f94b6988069425443",
-];
+const assets = Serialization.Value.fromCbor(HexBlob(mockBalance));
+const assetsCore = assets.toCore();
+export const mockWalletAssetIds: string[] = [];
 
-export const assetMap = assetIds.map((id) => {
+if (assetsCore.coins > 0n) {
+  mockWalletAssetIds.push("ada.lovelace");
+}
+if (assetsCore.assets) {
+  for (const [assetId] of assetsCore.assets) {
+    mockWalletAssetIds.push(assetId);
+  }
+}
+
+export const assetMap = mockWalletAssetIds.map((id) => {
   const assetId = normalizeAssetIdWithDot(id);
   const name = Buffer.from(id.slice(56), "hex").toString("utf-8");
 

package/src/__data__/eternl.ts

@@ -1,4 +1,4 @@
-export const usedAddresses = [
+export const mockUsedAddresses = [
   "00c279a3fb3b4e62bbc78e288783b58045d4ae82a18867d8352d02775a121fd22e0b57ac206fefc763f8bfa0771919f5218b40691eea4514d0",
   "00e855cd3dbc30bad8ac8fffbed87d36325b407a8e934b1507725fcd80121fd22e0b57ac206fefc763f8bfa0771919f5218b40691eea4514d0",
   "00129ee829b3cea5762f0c1077db667390a9ee007825a0ed7b1150d35d121fd22e0b57ac206fefc763f8bfa0771919f5218b40691eea4514d0",
@@ -125,16 +125,16 @@ export const usedAddresses = [
   "6033b94204fa0c33953e26834572de06f89496dd9b910c98d622e21612",
 ];
 
-export const unusedAddresses = [
+export const mockUnusedAddresses = [
   "00c279a3fb3b4e62bbc78e288783b58045d4ae82a18867d8352d02775a121fd22e0b57ac206fefc763f8bfa0771919f5218b40691eea4514d0",
 ];
 
-export const balance =
+export const mockBalance =
   "821b00000004c09febb6b818581c06dd6a12db0a3eb41a9fa243dd53df588418d4819f245f36d8c45f49aa4b5265776172645374616b65014f546173746554657374506f6c6963790150526577617264466f6c64506f6c6963790151436f6c6c656374466f6c64506f6c6963790151546f6b656e486f6c646572506f6c696379015254617374655465737456616c696461746f720153526577617264466f6c6456616c696461746f720154436f6c6c656374466f6c6456616c696461746f720154546f6b656e486f6c64657256616c696461746f7201575461737465546573745374616b6556616c696461746f7201581c14e957a7799ee1feb0afe68a7abeb6f642832d28045e71fb0003b1cba1495454507265766965771b0000001878e4fd18581c2fe3c3364b443194b10954771c95819b8d6ed464033c21f03f8facb5a144695553441b0000000185d7560a581c4086577ed57c514f8e29b78f42ef4f379363355a3b65b9a032ee30c9a1446c70202d1a00bcd161581c44a1eb2d9f58add4eb1932bd0048e6a1947e85e3fe4f32956a110414a458200014df10035002e600d25a96003ecd1746007f59bac2788355687d18c79271191a00214ed558200014df102e74e6af9739616dd021f547bca1f68c937b566bb6ca2e4782e760011a0042f18658200014df10bd9437d9ec1a559d053f05dc38d337c32d1d0746952ea961f874c39a1abe4fb74958200014df10fe7606868521244f4a86d5e88ef483de7a441b286f4d751550518ff81a37c01cb3581c633a136877ed6ad0ab33e69a22611319673474c8bd0a79a4c76d9289a158200014df101750b21414d4198763ee4d442f5c03a295a13a6028def9be4a7854631a009ca627581c6c6011f808562c80d7d24b9462e3eec41bea9d96e3e7a51e620a061ea344425443621a97883a4d444a5059621b000019f16e3daf24464d41544943621b000000024dda5412581c8140c4b89428fc264e90b10c71c53a4c3f9ce52b676bf1d9b51eb9caa458200014df100ae1b3f34bfbf30e2fb38305f3a6c27aece138ba7febe13d5db3e1341a7960ea6b58200014df1034c2b9d553d3a74b3ac67cc8cefb423af0f77fc84664420090e099901a19c9dd1f58200014df105b3955db22793705b4e6f34871ef5429bace12e909fb1ccf862c60e91a0006d2ed58200014df108bf66e915c450ad94866abb02802821b599e32f43536a42470b21ea21a005bfec8581c824faecc3a7312f5cad0397dd9ffb96e15dd4cf6a3cf16e23d7352b3a1401b000000e8d4a51000581c919d4c2c9455016289341b1a14dedf697687af31751170d56a31466ea14874434c41524954591b000000cf898883f8581c99b071ce8580d6a3a11b4902145adb8bfd0d2a03935af8cf66403e15b14443484f431a01696cc444555344431a0bebc200465242455252591b000000ba8c6bfdef465342455252591b0000596460ffa1ed48544553545f4e4654014874526577617264731a203046184a546573744173736574311a009896804a546573744173736574321a009896804a546573744173736574331a009896804a546573744173736574341a009896804a546573744173736574351a009896804a546573744173736574361a009896804a546573744173736574371a009896804a546573744173736574381a009896804a546573744173736574391a009896804b54657374417373657431301a009884405153616c7361536f6c61726973233031343101581c99e7cd5c0aca25bc3e90be7e318326a188f913a07bbfe09b3bace0d4a1495454507265766965771b00000417d7b93b42581ca51963f936f00b0def70fc1196e70603cb95c85f18e836be6ba2ad8ba149446966667573696f6e1b000000016506cbcb581cb89bdcb78010912ce6e98c97d5ab38e8e62f3d0851cdca0811e4ae92aa4b5265776172645374616b65014f546173746554657374506f6c6963790150526577617264466f6c64506f6c6963790151436f6c6c656374466f6c64506f6c6963790151546f6b656e486f6c646572506f6c696379015254617374655465737456616c696461746f720153526577617264466f6c6456616c696461746f720154436f6c6c656374466f6c6456616c696461746f720154546f6b656e486f6c64657256616c696461746f7201575461737465546573745374616b6556616c696461746f7201581cba0062b8f68bb8f80d4509e53d97a554381030b5e84832115376cb0aa148544553545f4e465401581ccaaaa4dd8b3b5c9dae65573cdb0bc2e989c43c3963d06b93d37687f1a150537461626c6520446966667573696f6e1a00273a8a581ccadd6bf1f7535eed785b01169b03fc800360b396ab5617b560fccd4ea448544553545f4e465401514e45574d5f566f74655f507265766965771b00002d794ca2a4225353616c7361536f6c61726973446973636f696e196d60554e45574d5f50726f706f73616c5f5072657669657702581cd35c752af635d9e9cb79aea44537a57a5ecd91e23133cd7f210f0070a1456d544f53491822581cd441227553a0f1a965fee7d60a0f724b368dd1bddbc208730fccebcfa1465242455252591a0167e3da581cd606298f0f892cce3f4df1585d3723f3817be8198abbc0c83bb89fadaa4b5265776172645374616b65014f546173746554657374506f6c6963790150526577617264466f6c64506f6c6963790151436f6c6c656374466f6c64506f6c6963790151546f6b656e486f6c646572506f6c696379015254617374655465737456616c696461746f720153526577617264466f6c6456616c696461746f720154436f6c6c656374466f6c6456616c696461746f720154546f6b656e486f6c64657256616c696461746f7201575461737465546573745374616b6556616c696461746f7201581cd805c13981d8b6b239ab4df3a3c6de653fcb426312b768e90304fa41a7581f46534e0f050513190d2dffcc8ea86a615c8cbb9690f367e439071e8d3a241c01581f46534e4bab725e4899fb4b628f8e4773fcdffcbd1b34666736d2a4d9935b6d01581f46534e6e12a1701cb5b4173e4e21bd8ffa98f4ccd2a9b90cc325f561d972f301581f46534e7ae7c9465ccc850e25cacec07820883be9e1a972931511d63d078d9401581f46534e7fa42f43b2d7e1a9d8e3276f68d37b9b8a0746991b3f7a420673aca001581f46534eb0158422435c0130845b3141353463420e28f42696c18cef305a7c3101581f46534efeae1e5d3310dab9193f315e3124e97fc462b0b523b545e235c4704b01581cd8906ca5c7ba124a0407a32dab37b2c82b13b3dcd9111e42940dcea4a1480014df105553444d1b00000037e11d5fff581cf99a0cc5bac393156aa088bbe28993679feb59de74ccdb0c8586213aa158200014df10fc2c4a6ae8048b0b5affc169dfd496a7ace7d08288c476d9d7a5804e1a000f4240581cfa3eff2047fdf9293c5feef4dc85ce58097ea1c6da4845a351535183a14574494e44591a0fbd2529";
 
-export const network = 0;
+export const mockNetwork = 0;
 
-export const utxos = [
+export const mockUtxos = [
   "828258202ffa2cb637456ddc2326ff71ca525cc3c066b74aa0e7251df708640280782a6f0082583900c279a3fb3b4e62bbc78e288783b58045d4ae82a18867d8352d02775a121fd22e0b57ac206fefc763f8bfa0771919f5218b40691eea4514d01ab2d05e00",
   "82825820739753ecb91d7ca749748e789f114db73650d70ee3241fb937abe8dba37dcb920182583900c279a3fb3b4e62bbc78e288783b58045d4ae82a18867d8352d02775a121fd22e0b57ac206fefc763f8bfa0771919f5218b40691eea4514d0821a1d56b205a1581c44a1eb2d9f58add4eb1932bd0048e6a1947e85e3fe4f32956a110414a158200014df10035002e600d25a96003ecd1746007f59bac2788355687d18c79271191a00214ed5",
   "8282582068869e3b2181917a443240a11e865352010138b63b60fb28869779cdd459c07c0182583900c279a3fb3b4e62bbc78e288783b58045d4ae82a18867d8352d02775a121fd22e0b57ac206fefc763f8bfa0771919f5218b40691eea4514d0821a1109e7c0a1581c99b071ce8580d6a3a11b4902145adb8bfd0d2a03935af8cf66403e15a1465242455252591a00603449",

package/src/classes/WalletBalanceMap.class.ts

@@ -62,7 +62,7 @@ export class WalletBalanceMap<
     const map: TAssetAmountMap<AssetMetadata> = new WalletAssetMap();
     [...this.entries()].forEach(([key, asset]) => {
       const isHandle = this._handlePolicyIds[this._observer.network]?.some(
-        (policyId) => asset.metadata.assetId.includes(policyId),
+        (policyId) => asset.id.includes(policyId),
       );
 
       if (isHandle) {

package/src/classes/WalletObserver.class.ts

@@ -673,7 +673,8 @@ export class WalletObserver<
 
     const start = performance.now();
     try {
-      const address = this.api.experimental?.feeAddress;
+      const address =
+        window.cardano?.[this.activeWallet!]?.experimental?.feeAddress;
       const end = performance.now();
 
       if (this._options.debug) {

package/src/classes/WalletObserverUtils.class.ts

@@ -48,6 +48,8 @@ export class WalletObserverUtils {
       this.network,
       stakingCredential,
     );
-    return stakingAddress.toAddress().toBech32();
+
+    const bech32 = stakingAddress.toAddress().toBech32();
+    return bech32;
   }
 }

package/src/classes/__tests__/WalletBalanceMap.test.ts

@@ -1,6 +1,7 @@
 import { beforeEach, describe, expect, it, spyOn, test } from "bun:test";
 
-import { assetIds, assetMap } from "../../__data__/assets.js";
+import { IAssetAmountMetadata } from "@sundaeswap/asset";
+import { mockWalletAssetIds } from "../../__data__/assets.js";
 import { normalizeAssetIdWithDot } from "../../utils/assets.js";
 import { WalletBalanceMap } from "../WalletBalanceMap.class.js";
 import { WalletObserver } from "../WalletObserver.class.js";
@@ -8,17 +9,28 @@ import { WalletObserver } from "../WalletObserver.class.js";
 let instance: WalletBalanceMap;
 
 const fungibleId = "ada.lovelace";
-const handleId =
-  "8d18d786e92776c824607fd8e193ec535c79dc61ea2405ddf3b09fe36d696e696d616c";
 const nftId =
-  "477cec772adb1466b301fb8161f505aa66ed1ee8d69d3e7984256a43477574656e62657267204269626c65202336393232";
+  "06dd6a12db0a3eb41a9fa243dd53df588418d4819f245f36d8c45f49.5265776172645374616b65";
 
-beforeEach(() => {
-  const observer = new WalletObserver();
-  instance = new WalletBalanceMap(observer);
-  assetMap.forEach(({ key, assetAmount }) => {
-    instance.set(key, assetAmount);
+beforeEach(async () => {
+  const observer = new WalletObserver({
+    metadataResolver: async ({ assetIds, normalizeAssetId }) => {
+      const map = new Map<string, IAssetAmountMetadata>();
+      for (const id of assetIds) {
+        const decimals = id === nftId ? 0 : 6;
+        map.set(normalizeAssetId(id), {
+          assetId: normalizeAssetId(id),
+          decimals,
+        });
+      }
+      return map;
+    },
   });
+  await observer.connectWallet("eternl");
+  const balanceMap = await observer.getBalanceMap();
+  if (balanceMap instanceof WalletBalanceMap) {
+    instance = balanceMap;
+  }
 });
 
 describe("WalletBalanceMap", () => {
@@ -30,26 +42,28 @@ describe("WalletBalanceMap", () => {
   });
 
   it("should setup the test instance properly", () => {
-    expect(instance.size).toEqual(103);
-    expect([...instance.keys()]).toEqual(assetIds.map(normalizeAssetIdWithDot));
+    expect(instance.size).toEqual(mockWalletAssetIds.length);
+    expect([...instance.keys()]).toEqual(
+      mockWalletAssetIds.map(normalizeAssetIdWithDot),
+    );
   });
 
   test("getFungibleTokens()", () => {
     const fungible = instance.getFungibleTokens();
     expect(fungible).toBeInstanceOf(Map);
-    expect(fungible.size).toEqual(55);
+    // It will be one less than the total because we set the decimals for only one of them to 0.
+    expect(fungible.size).toEqual(mockWalletAssetIds.length - 1);
 
     expect(fungible.get(fungibleId)).toBeDefined();
-    expect(fungible.get(handleId)).toBeUndefined();
     expect(fungible.get(nftId)).toBeUndefined();
   });
 
   test("getHandles()", () => {
     const handles = instance.getHandles();
     expect(handles).toBeInstanceOf(Map);
-    expect(handles.size).toEqual(45);
+    // No handles exist in the dataset.
+    expect(handles.size).toEqual(0);
 
-    expect(handles.get(handleId)).toBeDefined();
     expect(handles.get(nftId)).toBeUndefined();
     expect(handles.get(fungibleId)).toBeUndefined();
   });
@@ -57,20 +71,18 @@ describe("WalletBalanceMap", () => {
   test("getNonFungibleTokens()", () => {
     const nfts = instance.getNonFungibleTokens();
     expect(nfts).toBeInstanceOf(Map);
-    expect(nfts.size).toEqual(3);
+    expect(nfts.size).toEqual(1);
 
     expect(nfts.get(nftId)).toBeDefined();
-    expect(nfts.get(handleId)).toBeUndefined();
     expect(nfts.get(fungibleId)).toBeUndefined();
   });
 
   test("getNonFungibleTokens(withHandles?: true)", () => {
     const nfts = instance.getNonFungibleTokens(true);
     expect(nfts).toBeInstanceOf(Map);
-    expect(nfts.size).toEqual(48);
+    expect(nfts.size).toEqual(1);
 
     expect(nfts.get(nftId)).toBeDefined();
-    expect(nfts.get(handleId)).toBeDefined();
     expect(nfts.get(fungibleId)).toBeUndefined();
   });
 

package/src/classes/__tests__/WalletObserver.test.ts

@@ -1,11 +1,12 @@
 import { IAssetAmountMetadata } from "@sundaeswap/asset";
 import { afterEach, describe, expect, it, spyOn, test } from "bun:test";
 
-import { assetIds } from "../../__data__/assets.js";
+import { Cardano } from "@cardano-sdk/core";
+import { mockWalletAssetIds } from "../../__data__/assets.js";
 import {
-  network,
-  unusedAddresses,
-  usedAddresses,
+  mockNetwork,
+  mockUnusedAddresses,
+  mockUsedAddresses,
 } from "../../__data__/eternl.js";
 import {
   EWalletObserverEvents,
@@ -154,29 +155,42 @@ describe("WalletObserver", async () => {
       expect(spiedDispatch).toHaveBeenNthCalledWith(
         4,
         EWalletObserverEvents.GET_BALANCE_MAP_END,
-        {
+        expect.objectContaining({
           balanceMap: expect.objectContaining({
-            size: assetIds.length,
+            size: mockWalletAssetIds.length,
           }),
-        },
+        }),
       );
       expect(spiedDispatch).toHaveBeenNthCalledWith(
         5,
         EWalletObserverEvents.SYNCING_WALLET_END,
         expect.objectContaining({
           balanceMap: expect.objectContaining({
-            size: assetIds.length,
+            size: mockWalletAssetIds.length,
+          }),
+          network: mockNetwork,
+          unusedAddresses: expect.objectContaining({
+            length: mockUnusedAddresses.length,
+          }),
+          usedAddresses: expect.objectContaining({
+            length: mockUsedAddresses.length,
           }),
-          network,
-          unusedAddresses,
-          usedAddresses,
         }),
       );
 
-      expect(syncResults.balanceMap.size).toEqual(assetIds.length);
-      expect(syncResults.network).toBe(network);
-      expect(syncResults.unusedAddresses).toEqual(unusedAddresses);
-      expect(syncResults.usedAddresses).toEqual(usedAddresses);
+      expect(syncResults.balanceMap).toHaveProperty(
+        "size",
+        mockWalletAssetIds.length,
+      );
+      expect(syncResults.network).toBe(mockNetwork);
+      expect(syncResults.unusedAddresses).toHaveProperty(
+        "length",
+        mockUnusedAddresses.length,
+      );
+      expect(syncResults.usedAddresses).toHaveProperty(
+        "length",
+        mockUsedAddresses.length,
+      );
     });
 
     it("should connect correctly with persistence", async () => {
@@ -196,14 +210,23 @@ describe("WalletObserver", async () => {
 
       const syncResults = await observer.sync();
 
-      expect(syncResults.balanceMap.size).toEqual(assetIds.length);
-      expect(syncResults.network).toBe(network);
-      expect(syncResults.unusedAddresses).toEqual(unusedAddresses);
-      expect(syncResults.usedAddresses).toEqual(usedAddresses);
+      expect(syncResults.balanceMap).toHaveProperty(
+        "size",
+        mockWalletAssetIds.length,
+      );
+      expect(syncResults.network).toBe(mockNetwork);
+      expect(syncResults.unusedAddresses).toHaveProperty(
+        "length",
+        mockUnusedAddresses.length,
+      );
+      expect(syncResults.usedAddresses).toHaveProperty(
+        "length",
+        mockUsedAddresses.length,
+      );
       expect(
         window.localStorage.getItem(WalletObserver.PERSISTENCE_CACHE_KEY),
       ).toEqual(
-        `{"activeWallet":"eternl","mainAddress":"${usedAddresses[0]}"}`,
+        `{"activeWallet":"eternl","mainAddress":"${Cardano.Address.fromString(mockUsedAddresses[0])?.toBech32()}"}`,
       );
     });
   });
@@ -224,13 +247,15 @@ describe("WalletObserver", async () => {
       expect(
         window.localStorage.getItem(WalletObserver.PERSISTENCE_CACHE_KEY),
       ).toEqual(
-        `{"activeWallet":"eternl","mainAddress":"${usedAddresses[0]}"}`,
+        `{"activeWallet":"eternl","mainAddress":"${Cardano.Address.fromString(mockUsedAddresses[0])?.toBech32()}"}`,
       );
 
       await observer.sync();
 
       expect(observer.activeWallet).toEqual("eternl");
-      expect(observer.getCachedAssetMetadata().size).toEqual(assetIds.length);
+      expect(observer.getCachedAssetMetadata().size).toEqual(
+        mockWalletAssetIds.length,
+      );
 
       observer.disconnect();
 
@@ -263,8 +288,6 @@ describe("WalletObserver", async () => {
           },
         },
       });
-      const spiedOnConnect = spyOn(observer, "connectWallet");
-      const spiedOnDisconnect = spyOn(observer, "disconnect");
 
       expect(observer.peerConnectInstance).toBeUndefined();
 
@@ -277,17 +300,6 @@ describe("WalletObserver", async () => {
           instance: data.instance,
         }),
       );
-
-      // Simulate injection.
-      // @ts-expect-error Simulating the actual function.
-      data.instance.__testStartServer();
-      expect(spiedOnConnect).toHaveBeenCalledWith("eternl-p2p");
-
-      data.instance.shutdownServer();
-      expect(spiedOnDisconnect).toHaveBeenCalled();
-
-      // Restore window.
-      delete window.cardano?.["eternl-p2p"];
     });
   });
 });

package/src/classes/__tests__/WalletObserverUtils.test.ts

@@ -1,17 +1,16 @@
 import {
   afterAll,
   beforeAll,
-  beforeEach,
   describe,
   expect,
   it,
+  Mock,
   mock,
   spyOn,
 } from "bun:test";
-import { merge } from "lodash";
 
-import { coreModuleMock } from "../../../setup-tests.js";
-import * as getLibModules from "../../utils/getLibs.js";
+// import { coreModuleMock } from "../../../setup-tests.js";
+import { Cardano } from "@cardano-sdk/core";
 import { WalletObserverUtils } from "../WalletObserverUtils.class.js";
 
 const testAddress =
@@ -19,59 +18,24 @@ const testAddress =
 const stakeAddress =
   "stake_test1uqfpl53wpdt6cgr0alrk879l5pm3jx04yx95q6g7afz3f5quuwrwt";
 
-const fromBech32Mock = mock();
-const getStakeCredentialMock = mock(() => ({
-  hash: "121fd22e0b57ac206fefc763f8bfa0771919f5218b40691eea4514d0",
-  type: 1,
-}));
-const fromAddressMock = mock(() => ({
-  getPaymentCredential: mock(() => ({
-    hash: "c279a3fb3b4e62bbc78e288783b58045d4ae82a18867d8352d02775a",
-    type: 0,
-  })),
-  getStakeCredential: getStakeCredentialMock,
-}));
-const isValidMock = mock();
-const spiedOnGetCardanoCore = spyOn(getLibModules, "getCardanoCore");
-
-beforeAll(() => {
-  mock.module("@cardano-sdk/core", () =>
-    merge(coreModuleMock, {
-      Cardano: {
-        Address: {
-          isValidBech32: isValidMock,
-          fromBech32: fromBech32Mock,
-        },
-        BaseAddress: {
-          fromAddress: fromAddressMock,
-        },
-        RewardAddress: {
-          fromCredentials: mock(() => ({
-            toAddress: mock(() => ({
-              toBech32: mock(() => stakeAddress),
-            })),
-          })),
-        },
-      },
-    }),
-  );
-});
-
 afterAll(() => {
   mock.restore();
 });
 
 describe("WalletObserverUtils", async () => {
-  const instance = await WalletObserverUtils.new(0);
+  let instance: WalletObserverUtils;
+  let isValidMock: Mock<(bech32: string) => boolean>;
+  let fromBech32Mock: Mock<(bech32: string) => Cardano.Address>;
 
-  beforeEach(() => {
-    isValidMock.mockImplementation(() => true);
+  beforeAll(async () => {
+    instance = await WalletObserverUtils.new(0);
+    isValidMock = spyOn(instance.Cardano.Address, "isValidBech32");
+    fromBech32Mock = spyOn(instance.Cardano.Address, "fromBech32");
   });
 
   it("should instantiate with expected defaults", () => {
     expect(instance).toBeInstanceOf(WalletObserverUtils);
     expect(instance.network).toEqual(0);
-    expect(spiedOnGetCardanoCore).toHaveBeenCalledTimes(1);
   });
 
   it("should be able to switch networks", () => {
@@ -89,7 +53,7 @@ describe("WalletObserverUtils", async () => {
     });
 
     it("should throw an error if the address is malformed", () => {
-      isValidMock.mockImplementation(() => false);
+      isValidMock.mockImplementationOnce(() => false);
       expect(() => instance.getAddressDetails("invalid")).toThrowError(
         "Expected a Bech32 encoded address.",
       );
@@ -103,14 +67,12 @@ describe("WalletObserverUtils", async () => {
         stakeAddress,
       );
 
-      isValidMock.mockImplementation(() => false);
+      isValidMock.mockImplementationOnce(() => false);
       expect(() => instance.getBech32StakingAddress("invalid")).toThrowError(
         "Expected a Bech32 encoded address.",
       );
       expect(isValidMock).toHaveBeenCalled();
 
-      // @ts-expect-error It can be undefined.
-      getStakeCredentialMock.mockImplementation(() => undefined);
       expect(() => instance.getBech32StakingAddress("invalid")).toThrowError(
         "Expected a Bech32 encoded address.",
       );

package/src/react-components/__tests__/hooks/useAvailableExtensions.test.tsx

@@ -3,7 +3,7 @@ import { act } from "@testing-library/react";
 import { renderHook } from "@testing-library/react-hooks";
 import { describe, expect, it } from "bun:test";
 
-import { mockedEternlWallet } from "../../../../setup-tests.js";
+import { mockedEternlWallet } from "../../../../../setup-tests.js";
 import {
   IWalletObserverProviderProps,
   useAvailableExtensions,

package/src/react-components/__tests__/hooks/useWalletObserver.test.tsx

@@ -1,11 +1,12 @@
 import { act, renderHook } from "@testing-library/react-hooks";
 import { describe, expect, it } from "bun:test";
 
-import { assetIds } from "../../../__data__/assets.js";
+import { Cardano } from "@cardano-sdk/core";
+import { mockWalletAssetIds } from "../../../__data__/assets.js";
 import {
-  network,
-  unusedAddresses,
-  usedAddresses,
+  mockNetwork,
+  mockUnusedAddresses,
+  mockUsedAddresses,
 } from "../../../__data__/eternl.js";
 import { WalletObserver } from "../../../classes/WalletObserver.class.js";
 import {
@@ -52,11 +53,21 @@ describe("useWalletObserver", () => {
 
     expect(result.current.activeWallet).toEqual("eternl");
     expect(result.current.adaBalance.amount.toString()).not.toEqual("0");
-    expect(result.current.balance.size).toEqual(assetIds.length);
+    expect(result.current.balance.size).toEqual(mockWalletAssetIds.length);
     expect(result.current.isCip45).toBeFalse();
-    expect(result.current.mainAddress).toEqual(usedAddresses[0]);
-    expect(result.current.network).toEqual(network);
-    expect(result.current.unusedAddresses).toEqual(unusedAddresses);
-    expect(result.current.usedAddresses).toEqual(usedAddresses);
+    expect(result.current.mainAddress).toEqual(
+      Cardano.Address.fromString(mockUsedAddresses[0])!.toBech32(),
+    );
+    expect(result.current.network).toEqual(mockNetwork);
+    expect(result.current.unusedAddresses).toEqual(
+      mockUnusedAddresses.map((cbor) =>
+        Cardano.Address.fromString(cbor)!.toBech32(),
+      ),
+    );
+    expect(result.current.usedAddresses).toEqual(
+      mockUsedAddresses.map((cbor) =>
+        Cardano.Address.fromString(cbor)!.toBech32(),
+      ),
+    );
   });
 });

package/src/react-components/hooks/useWalletHandles.ts

@@ -22,7 +22,12 @@ export const useWalletHandles = <
   >({
     queryKey,
     queryFn: async () => {
-      return getHandleMetadata(state.balance.getHandles(), state.network || 0);
+      const result = await getHandleMetadata(
+        state.balance.getHandles(),
+        state.network || 0,
+      );
+
+      return result;
     },
     refetchInterval: false,
     notifyOnChangeProps: ["data", "isLoading"],