@ledgerhq/live-common 34.55.0-nightly.20251220023811 → 34.55.0-nightly.20251224024018

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.55.0-nightly.20251220023811",
+  "version": "34.55.0-nightly.20251224024018",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -178,79 +178,79 @@
     "xstate": "^5.19.2",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.15.0-nightly.20251220023811",
-    "@ledgerhq/coin-aptos": "^3.8.0-nightly.20251220023811",
-    "@ledgerhq/coin-bitcoin": "^0.27.0-nightly.20251220023811",
-    "@ledgerhq/coin-canton": "^0.12.0-nightly.20251220023811",
-    "@ledgerhq/coin-cardano": "^0.16.0-nightly.20251220023811",
-    "@ledgerhq/coin-casper": "^2.5.0-nightly.20251220023811",
-    "@ledgerhq/coin-celo": "^1.8.0-nightly.20251220023811",
-    "@ledgerhq/coin-cosmos": "^0.21.0-nightly.20251220023811",
-    "@ledgerhq/coin-evm": "^2.37.0-nightly.20251220023811",
-    "@ledgerhq/coin-filecoin": "^1.16.0-nightly.20251220023811",
-    "@ledgerhq/coin-framework": "^6.11.0-nightly.20251220023811",
-    "@ledgerhq/coin-hedera": "^1.16.0-nightly.20251220023811",
-    "@ledgerhq/coin-icon": "^0.16.0-nightly.20251220023811",
-    "@ledgerhq/coin-internet_computer": "^1.12.0-nightly.20251220023811",
-    "@ledgerhq/coin-kaspa": "^1.6.0-nightly.20251220023811",
-    "@ledgerhq/coin-mina": "^1.5.0-nightly.20251220023811",
-    "@ledgerhq/coin-near": "^0.17.0-nightly.20251220023811",
-    "@ledgerhq/coin-polkadot": "^6.14.0-nightly.20251220023811",
-    "@ledgerhq/coin-multiversx": "^0.9.0-nightly.20251220023811",
-    "@ledgerhq/coin-solana": "^0.39.0-nightly.20251220023811",
-    "@ledgerhq/coin-stacks": "^0.13.0-nightly.20251220023811",
-    "@ledgerhq/coin-stellar": "^6.9.0-nightly.20251220023811",
-    "@ledgerhq/coin-sui": "^0.19.0-nightly.20251220023811",
-    "@ledgerhq/coin-tezos": "^6.11.0-nightly.20251220023811",
-    "@ledgerhq/coin-ton": "^0.18.0-nightly.20251220023811",
-    "@ledgerhq/coin-tron": "^5.8.0-nightly.20251220023811",
-    "@ledgerhq/coin-vechain": "^2.14.0-nightly.20251220023811",
-    "@ledgerhq/coin-xrp": "^7.10.0-nightly.20251220023811",
-    "@ledgerhq/cryptoassets": "^13.35.0-nightly.20251220023811",
-    "@ledgerhq/device-core": "^0.6.11-nightly.20251220023811",
-    "@ledgerhq/devices": "8.8.0-nightly.20251220023811",
-    "@ledgerhq/hw-app-algorand": "^6.31.11-nightly.20251220023811",
-    "@ledgerhq/errors": "^6.28.0-nightly.20251220023811",
-    "@ledgerhq/hw-app-aptos": "^6.34.11-nightly.20251220023811",
-    "@ledgerhq/hw-app-btc": "^10.14.0-nightly.20251220023811",
-    "@ledgerhq/hw-app-cosmos": "^6.32.11-nightly.20251220023811",
-    "@ledgerhq/hw-app-celo": "^6.35.6-nightly.20251220023811",
-    "@ledgerhq/hw-app-exchange": "^0.18.2-nightly.20251220023811",
-    "@ledgerhq/hw-app-hedera": "^1.2.11-nightly.20251220023811",
-    "@ledgerhq/hw-app-eth": "^7.1.0-nightly.20251220023811",
-    "@ledgerhq/hw-app-kaspa": "^1.3.4-nightly.20251220023811",
-    "@ledgerhq/hw-app-icon": "^1.3.11-nightly.20251220023811",
-    "@ledgerhq/hw-app-multiversx": "^6.26.2-nightly.20251220023811",
-    "@ledgerhq/hw-app-near": "^6.31.11-nightly.20251220023811",
-    "@ledgerhq/hw-app-polkadot": "^6.34.11-nightly.20251220023811",
-    "@ledgerhq/hw-app-str": "^7.3.0-nightly.20251220023811",
+    "@ledgerhq/coin-algorand": "^0.15.0-nightly.20251224024018",
+    "@ledgerhq/coin-aptos": "^3.8.0-nightly.20251224024018",
+    "@ledgerhq/coin-bitcoin": "^0.27.0-nightly.20251224024018",
+    "@ledgerhq/coin-canton": "^0.12.0-nightly.20251224024018",
+    "@ledgerhq/coin-cardano": "^0.16.0-nightly.20251224024018",
+    "@ledgerhq/coin-casper": "^2.5.0-nightly.20251224024018",
+    "@ledgerhq/coin-celo": "^1.8.0-nightly.20251224024018",
+    "@ledgerhq/coin-cosmos": "^0.21.0-nightly.20251224024018",
+    "@ledgerhq/coin-evm": "^2.37.0-nightly.20251224024018",
+    "@ledgerhq/coin-filecoin": "^1.16.0-nightly.20251224024018",
+    "@ledgerhq/coin-framework": "^6.11.0-nightly.20251224024018",
+    "@ledgerhq/coin-hedera": "^1.16.0-nightly.20251224024018",
+    "@ledgerhq/coin-icon": "^0.16.0-nightly.20251224024018",
+    "@ledgerhq/coin-kaspa": "^1.6.0-nightly.20251224024018",
+    "@ledgerhq/coin-mina": "^1.5.0-nightly.20251224024018",
+    "@ledgerhq/coin-internet_computer": "^1.12.0-nightly.20251224024018",
+    "@ledgerhq/coin-multiversx": "^0.9.0-nightly.20251224024018",
+    "@ledgerhq/coin-polkadot": "^6.14.0-nightly.20251224024018",
+    "@ledgerhq/coin-near": "^0.17.0-nightly.20251224024018",
+    "@ledgerhq/coin-solana": "^0.39.0-nightly.20251224024018",
+    "@ledgerhq/coin-stellar": "^6.9.0-nightly.20251224024018",
+    "@ledgerhq/coin-stacks": "^0.13.0-nightly.20251224024018",
+    "@ledgerhq/coin-sui": "^0.19.0-nightly.20251224024018",
+    "@ledgerhq/coin-tezos": "^6.11.0-nightly.20251224024018",
+    "@ledgerhq/coin-ton": "^0.18.0-nightly.20251224024018",
+    "@ledgerhq/coin-tron": "^5.8.0-nightly.20251224024018",
+    "@ledgerhq/coin-vechain": "^2.14.0-nightly.20251224024018",
+    "@ledgerhq/coin-xrp": "^7.10.0-nightly.20251224024018",
+    "@ledgerhq/cryptoassets": "^13.35.0-nightly.20251224024018",
+    "@ledgerhq/device-core": "^0.6.11-nightly.20251224024018",
+    "@ledgerhq/devices": "8.8.0-nightly.20251224024018",
+    "@ledgerhq/errors": "^6.28.0-nightly.20251224024018",
+    "@ledgerhq/hw-app-algorand": "^6.31.11-nightly.20251224024018",
+    "@ledgerhq/hw-app-aptos": "^6.34.11-nightly.20251224024018",
+    "@ledgerhq/hw-app-btc": "^10.14.0-nightly.20251224024018",
+    "@ledgerhq/hw-app-cosmos": "^6.32.11-nightly.20251224024018",
+    "@ledgerhq/hw-app-celo": "^6.35.6-nightly.20251224024018",
+    "@ledgerhq/hw-app-eth": "^7.1.0-nightly.20251224024018",
+    "@ledgerhq/hw-app-hedera": "^1.2.11-nightly.20251224024018",
+    "@ledgerhq/hw-app-exchange": "^0.18.2-nightly.20251224024018",
+    "@ledgerhq/hw-app-icon": "^1.3.11-nightly.20251224024018",
+    "@ledgerhq/hw-app-kaspa": "^1.3.4-nightly.20251224024018",
+    "@ledgerhq/hw-app-multiversx": "^6.26.2-nightly.20251224024018",
+    "@ledgerhq/hw-app-near": "^6.31.11-nightly.20251224024018",
+    "@ledgerhq/hw-app-polkadot": "^6.34.11-nightly.20251224024018",
+    "@ledgerhq/hw-app-str": "^7.3.0-nightly.20251224024018",
     "@ledgerhq/hw-app-sui": "^1.4.0",
-    "@ledgerhq/hw-app-tezos": "^6.31.11-nightly.20251220023811",
-    "@ledgerhq/hw-app-trx": "^6.31.11-nightly.20251220023811",
-    "@ledgerhq/hw-app-xrp": "^6.32.9-nightly.20251220023811",
-    "@ledgerhq/hw-app-vet": "^0.8.2-nightly.20251220023811",
-    "@ledgerhq/hw-transport": "6.31.15-nightly.20251220023811",
-    "@ledgerhq/hw-bolos": "^6.32.11-nightly.20251220023811",
-    "@ledgerhq/hw-transport-mocker": "^6.30.0-nightly.20251220023811",
-    "@ledgerhq/client-ids": "^0.2.0-nightly.20251220023811",
-    "@ledgerhq/ledger-cal-service": "^1.9.3-nightly.20251220023811",
-    "@ledgerhq/ledger-trust-service": "^0.4.5-nightly.20251220023811",
-    "@ledgerhq/live-config": "^3.3.0-nightly.20251220023811",
-    "@ledgerhq/live-countervalues": "^0.10.3-nightly.20251220023811",
-    "@ledgerhq/live-countervalues-react": "^0.7.5-nightly.20251220023811",
-    "@ledgerhq/live-dmk-shared": "^0.16.0-nightly.20251220023811",
-    "@ledgerhq/live-env": "^2.23.0-nightly.20251220023811",
-    "@ledgerhq/live-hooks": "0.3.0-nightly.20251220023811",
-    "@ledgerhq/live-network": "^2.1.4-nightly.20251220023811",
+    "@ledgerhq/hw-app-tezos": "^6.32.0-nightly.20251224024018",
+    "@ledgerhq/hw-app-trx": "^6.31.11-nightly.20251224024018",
+    "@ledgerhq/hw-app-vet": "^0.8.2-nightly.20251224024018",
+    "@ledgerhq/hw-app-xrp": "^6.32.9-nightly.20251224024018",
+    "@ledgerhq/hw-bolos": "^6.32.11-nightly.20251224024018",
+    "@ledgerhq/hw-transport": "6.31.15-nightly.20251224024018",
+    "@ledgerhq/hw-transport-mocker": "^6.30.0-nightly.20251224024018",
+    "@ledgerhq/client-ids": "^0.2.0-nightly.20251224024018",
+    "@ledgerhq/ledger-cal-service": "^1.10.0-nightly.20251224024018",
+    "@ledgerhq/live-config": "^3.3.0-nightly.20251224024018",
+    "@ledgerhq/ledger-trust-service": "^0.4.5-nightly.20251224024018",
+    "@ledgerhq/live-countervalues": "^0.10.3-nightly.20251224024018",
+    "@ledgerhq/live-countervalues-react": "^0.7.5-nightly.20251224024018",
+    "@ledgerhq/live-dmk-shared": "^0.16.0-nightly.20251224024018",
+    "@ledgerhq/live-hooks": "0.3.0-nightly.20251224024018",
+    "@ledgerhq/live-env": "^2.23.0-nightly.20251224024018",
+    "@ledgerhq/live-network": "^2.1.4-nightly.20251224024018",
+    "@ledgerhq/live-signer-evm": "^0.11.0-nightly.20251224024018",
     "@ledgerhq/live-promise": "^0.1.1",
-    "@ledgerhq/live-signer-canton": "^0.5.4-nightly.20251220023811",
-    "@ledgerhq/live-signer-evm": "^0.11.0-nightly.20251220023811",
-    "@ledgerhq/live-signer-solana": "^0.8.0-nightly.20251220023811",
-    "@ledgerhq/live-wallet": "^0.17.0-nightly.20251220023811",
+    "@ledgerhq/live-signer-canton": "^0.5.4-nightly.20251224024018",
+    "@ledgerhq/live-signer-solana": "^0.8.0-nightly.20251224024018",
+    "@ledgerhq/live-wallet": "^0.17.0-nightly.20251224024018",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/speculos-transport": "^0.4.0-nightly.20251220023811",
-    "@ledgerhq/wallet-api-acre-module": "^0.11.0-nightly.20251220023811",
-    "@ledgerhq/wallet-api-exchange-module": "^0.20.0-nightly.20251220023811"
+    "@ledgerhq/wallet-api-acre-module": "^0.11.0-nightly.20251224024018",
+    "@ledgerhq/speculos-transport": "^0.4.0-nightly.20251224024018",
+    "@ledgerhq/wallet-api-exchange-module": "^0.20.0-nightly.20251224024018"
   },
   "devDependencies": {
     "@solana/web3.js": "1.95.4",
@@ -297,10 +297,10 @@
     "undici": "6.19.2",
     "uuid": "^8.3.2",
     "ws": "8.18.3",
-    "@ledgerhq/device-react": "^0.3.5-nightly.20251220023811",
-    "@ledgerhq/types-cryptoassets": "^7.31.0-nightly.20251220023811",
+    "@ledgerhq/types-cryptoassets": "^7.31.0-nightly.20251224024018",
+    "@ledgerhq/device-react": "^0.3.5-nightly.20251224024018",
     "@ledgerhq/types-devices": "^6.27.0",
-    "@ledgerhq/types-live": "^6.91.0-nightly.20251220023811"
+    "@ledgerhq/types-live": "^6.91.0-nightly.20251224024018"
   },
   "scripts": {
     "build": "zx ./scripts/build-ts.mjs",

package/src/account/recentAddresses.test.ts

@@ -17,7 +17,13 @@ describe("RecentAddressesStore", () => {
     const addresses = store.getAddresses("ethereum");
     expect(addresses).toEqual([newAddress]);
     expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(1);
-    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress] });
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({
+      ethereum: [
+        expect.objectContaining({
+          address: newAddress,
+        }),
+      ],
+    });
   });
 
   it("should add a second address and return addresses sorted by insertion", async () => {
@@ -26,14 +32,21 @@ describe("RecentAddressesStore", () => {
     let addresses = store.getAddresses("ethereum");
     expect(addresses).toEqual([newAddress]);
     expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(1);
-    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress] });
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({
+      ethereum: [expect.objectContaining({ address: newAddress })],
+    });
 
     const newAddress2 = "0xB69B37A4Fb4A18b3258f974ff6e9f529AD2647b1";
     await store.addAddress("ethereum", newAddress2);
     addresses = store.getAddresses("ethereum");
     expect(addresses).toEqual([newAddress2, newAddress]);
     expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(2);
-    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress2, newAddress] });
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({
+      ethereum: [
+        expect.objectContaining({ address: newAddress2 }),
+        expect.objectContaining({ address: newAddress }),
+      ],
+    });
   });
 
   it("should replace at first place when an address is already saved", async () => {
@@ -42,43 +55,61 @@ describe("RecentAddressesStore", () => {
     let addresses = store.getAddresses("ethereum");
     expect(addresses).toEqual([newAddress]);
     expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(1);
-    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress] });
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({
+      ethereum: [expect.objectContaining({ address: newAddress })],
+    });
 
     const newAddress2 = "0xB69B37A4Fb4A18b3258f974ff6e9f529AD2647b1";
     await store.addAddress("ethereum", newAddress2);
     addresses = store.getAddresses("ethereum");
     expect(addresses).toEqual([newAddress2, newAddress]);
     expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(2);
-    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress2, newAddress] });
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({
+      ethereum: [
+        expect.objectContaining({ address: newAddress2 }),
+        expect.objectContaining({ address: newAddress }),
+      ],
+    });
 
     await store.addAddress("ethereum", newAddress);
     addresses = store.getAddresses("ethereum");
     expect(addresses).toEqual([newAddress, newAddress2]);
     expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(3);
-    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress, newAddress2] });
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({
+      ethereum: [
+        expect.objectContaining({ address: newAddress }),
+        expect.objectContaining({ address: newAddress2 }),
+      ],
+    });
   });
 
   it("should replace at first place and remove last element when addresses exceed count limit", async () => {
-    let expectedAddresses: string[] = [];
+    const expectedAddresses: string[] = [];
+    const expectedObjects: any[] = [];
     for (let index = 0; index < RECENT_ADDRESSES_COUNT_LIMIT; index++) {
-      await store.addAddress("ethereum", `0x66c4371aE8FFeD2ec1c2EBbbcCfb7E494181E1E3${index}`);
-      expectedAddresses.unshift(`0x66c4371aE8FFeD2ec1c2EBbbcCfb7E494181E1E3${index}`);
+      const addr = `0x66c4371aE8FFeD2ec1c2EBbbcCfb7E494181E1E3${index}`;
+      await store.addAddress("ethereum", addr);
+      expectedAddresses.unshift(addr);
+      expectedObjects.unshift(expect.objectContaining({ address: addr }));
     }
 
     let addresses = store.getAddresses("ethereum");
     expect(addresses).toEqual(expectedAddresses);
     expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(RECENT_ADDRESSES_COUNT_LIMIT);
-    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: expectedAddresses });
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: expectedObjects });
 
     const newAddress2 = "0xB69B37A4Fb4A18b3258f974ff6e9f529AD2647b1";
     expectedAddresses.splice(expectedAddresses.length - 1, 1);
-    expectedAddresses = [newAddress2, ...expectedAddresses];
+    expectedAddresses.unshift(newAddress2);
+
+    expectedObjects.splice(expectedObjects.length - 1, 1);
+    expectedObjects.unshift(expect.objectContaining({ address: newAddress2 }));
 
     await store.addAddress("ethereum", newAddress2);
     addresses = store.getAddresses("ethereum");
     expect(addresses).toEqual(expectedAddresses);
     expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(RECENT_ADDRESSES_COUNT_LIMIT + 1);
-    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: expectedAddresses });
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: expectedObjects });
   });
 
   it("should add an address of a different currency", async () => {
@@ -88,7 +119,9 @@ describe("RecentAddressesStore", () => {
     let addresses = store.getAddresses("ethereum");
     expect(addresses).toEqual([newAddress]);
     expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(1);
-    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress] });
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({
+      ethereum: [expect.objectContaining({ address: newAddress })],
+    });
 
     const newAddress2 = "bc1pxlmrudqyq8qd8pfsc4mpmlaw56x6vtcr9m8nvp8kj3gckefc4kmqhkg4l7";
     await store.addAddress("bitcoin", newAddress2);
@@ -97,8 +130,75 @@ describe("RecentAddressesStore", () => {
     expect(addresses).toEqual([newAddress2]);
     expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(2);
     expect(onAddAddressCompleteMock).toHaveBeenCalledWith({
-      ethereum: [newAddress],
-      bitcoin: [newAddress2],
+      ethereum: [expect.objectContaining({ address: newAddress })],
+      bitcoin: [expect.objectContaining({ address: newAddress2 })],
+    });
+  });
+
+  it("should update timestamp and move to top when re-adding an existing address", async () => {
+    const address1 = "0x66c4371aE8FFeD2ec1c2EBbbcCfb7E494181E1E3";
+    const address2 = "0xB69B37A4Fb4A18b3258f974ff6e9f529AD2647b1";
+    const address3 = "0x742d35Cc6634C0532925a3b844Bc9e7595f0bEb0";
+
+    const now = Date.now();
+    const oneYear = 365 * 24 * 60 * 60 * 1000;
+    const threeYearsAgo = now - 3 * oneYear;
+    const oneYearAgo = now - oneYear;
+
+    const dateNowSpy = jest.spyOn(Date, "now");
+
+    // Add address1 3 years ago
+    dateNowSpy.mockReturnValue(threeYearsAgo);
+    await store.addAddress("ethereum", address1);
+
+    // Add address2 1 year ago
+    dateNowSpy.mockReturnValue(oneYearAgo);
+    await store.addAddress("ethereum", address2);
+
+    // Add address3 now
+    dateNowSpy.mockReturnValue(now);
+    await store.addAddress("ethereum", address3);
+
+    let addresses = store.getAddresses("ethereum");
+    expect(addresses).toEqual([address3, address2, address1]);
+
+    // Re-add address1 (the oldest one) now
+    const reAddTime = now + 1000;
+    dateNowSpy.mockReturnValue(reAddTime);
+    await store.addAddress("ethereum", address1);
+
+    addresses = store.getAddresses("ethereum");
+    expect(addresses).toEqual([address1, address3, address2]);
+
+    expect(onAddAddressCompleteMock).toHaveBeenLastCalledWith({
+      ethereum: [
+        expect.objectContaining({ address: address1, lastUsed: reAddTime }),
+        expect.objectContaining({ address: address3, lastUsed: now }),
+        expect.objectContaining({ address: address2, lastUsed: oneYearAgo }),
+      ],
     });
   });
+
+  it("should migrate legacy string addresses to RecentAddress objects on setup", async () => {
+    const legacyAddress1 = "0x66c4371aE8FFeD2ec1c2EBbbcCfb7E494181E1E3";
+    const legacyAddress2 = "0xB69B37A4Fb4A18b3258f974ff6e9f529AD2647b1";
+    const modernAddress = "0x742d35Cc6634C0532925a3b844Bc9e7595f0bEb0";
+    const modernTimestamp = 1234567890;
+
+    const legacyCache: any = {
+      ethereum: [
+        legacyAddress1,
+        { address: modernAddress, lastUsed: modernTimestamp },
+        legacyAddress2,
+      ],
+    };
+
+    setupRecentAddressesStore(legacyCache, onAddAddressCompleteMock);
+    store = getRecentAddressesStore();
+
+    const addresses = store.getAddresses("ethereum");
+
+    // Order should be preserved: legacy1, modern, legacy2
+    expect(addresses).toEqual([legacyAddress1, modernAddress, legacyAddress2]);
+  });
 });

package/src/account/recentAddresses.ts

@@ -1,6 +1,8 @@
+import type { RecentAddressesState, RecentAddress } from "@ledgerhq/types-live";
+
 export const RECENT_ADDRESSES_COUNT_LIMIT = 12;
 
-export type RecentAddressesCache = Record<string, string[]>;
+export type RecentAddressesCache = RecentAddressesState;
 
 export interface RecentAddressesStore {
   addAddress(currency: string, address: string): void;
@@ -8,8 +10,6 @@ export interface RecentAddressesStore {
   getAddresses(currency: string): string[];
 }
 
-type CallbackMode = "triggerCallback" | "skipCallback";
-
 let recentAddressesStore: RecentAddressesStore | null = null;
 
 export function getRecentAddressesStore(): RecentAddressesStore {
@@ -30,26 +30,43 @@ export function setupRecentAddressesStore(
 
 class RecentAddressesStoreImpl implements RecentAddressesStore {
   private addressesByCurrency: RecentAddressesCache = {};
-  private readonly onAddAddressComplete: (addressesByCurrency: Record<string, string[]>) => void;
+  private readonly onAddAddressComplete: (addressesByCurrency: RecentAddressesCache) => void;
 
   constructor(
     addressesByCurrency: RecentAddressesCache,
     onAddAddressComplete: (addressesByCurrency: RecentAddressesCache) => void,
   ) {
-    this.addressesByCurrency = { ...addressesByCurrency };
+    this.addressesByCurrency = this.sanitizeCache(addressesByCurrency);
     this.onAddAddressComplete = onAddAddressComplete;
   }
 
+  private sanitizeCache(cache: RecentAddressesCache): RecentAddressesCache {
+    const sanitized: RecentAddressesCache = {};
+    for (const currency in cache) {
+      const entries = cache[currency] as (RecentAddress | string)[];
+      sanitized[currency] = entries.map(entry => {
+        if (typeof entry === "string") {
+          return { address: entry, lastUsed: Date.now() };
+        }
+        return entry;
+      });
+    }
+    return sanitized;
+  }
+
   addAddress(currency: string, address: string): void {
-    this.addAddressToCache(currency, address, "triggerCallback");
+    this.addAddressToCache(currency, address, Date.now(), true);
   }
 
   syncAddresses(cache: RecentAddressesCache): void {
     const previousAddresses = { ...this.addressesByCurrency };
     this.addressesByCurrency = { ...cache };
     for (const currency in previousAddresses) {
-      for (const address of previousAddresses[currency]) {
-        this.addAddressToCache(currency, address, "skipCallback");
+      const entries = previousAddresses[currency] as (RecentAddress | string)[];
+      for (const entry of entries) {
+        const address = typeof entry === "string" ? entry : entry.address;
+        const timestamp = typeof entry === "string" ? undefined : entry.lastUsed;
+        this.addAddressToCache(currency, address, timestamp ?? Date.now(), false);
       }
     }
 
@@ -58,26 +75,33 @@ class RecentAddressesStoreImpl implements RecentAddressesStore {
 
   getAddresses(currency: string): string[] {
     const addresses = this.addressesByCurrency[currency];
-    return addresses ?? [];
+    if (!addresses) return [];
+    return addresses.map(entry => entry.address);
   }
 
-  private addAddressToCache(currency: string, address: string, callbackMode: CallbackMode): void {
+  private addAddressToCache(
+    currency: string,
+    address: string,
+    timestamp: number,
+    shouldTriggerCallback: boolean,
+  ): void {
     if (!this.addressesByCurrency[currency]) {
       this.addressesByCurrency[currency] = [];
     }
 
     const addresses = this.addressesByCurrency[currency];
-    const addressIndex = addresses.indexOf(address);
+    const addressIndex = addresses.findIndex(entry => entry.address === address);
+
     if (addressIndex !== -1) {
       addresses.splice(addressIndex, 1);
     } else if (addresses.length >= RECENT_ADDRESSES_COUNT_LIMIT) {
       addresses.pop();
     }
 
-    addresses.unshift(address);
+    addresses.unshift({ address, lastUsed: timestamp });
     this.addressesByCurrency[currency] = [...addresses];
 
-    if (callbackMode === "triggerCallback") {
+    if (shouldTriggerCallback) {
       this.onAddAddressComplete(this.addressesByCurrency);
     }
   }