@talismn/balances 0.0.0-pr660-20230328111733 → 0.0.0-pr660-20230328121248

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @talismn/balances
 
-## 0.0.0-pr660-20230328111733
+## 0.0.0-pr660-20230328121248
 
 ### Patch Changes
 
@@ -12,11 +12,11 @@
 - Updated dependencies [fa4d115f]
 - Updated dependencies [79f6ccf6]
 - Updated dependencies [c24dc1fb]
-  - @talismn/chain-connector@0.0.0-pr660-20230328111733
-  - @talismn/util@0.0.0-pr660-20230328111733
-  - @talismn/token-rates@0.0.0-pr660-20230328111733
-  - @talismn/chaindata-provider@0.0.0-pr660-20230328111733
-  - @talismn/chain-connector-evm@0.0.0-pr660-20230328111733
+  - @talismn/chain-connector@0.0.0-pr660-20230328121248
+  - @talismn/util@0.0.0-pr660-20230328121248
+  - @talismn/token-rates@0.0.0-pr660-20230328121248
+  - @talismn/chaindata-provider@0.0.0-pr660-20230328121248
+  - @talismn/chain-connector-evm@0.0.0-pr660-20230328121248
 
 ## 0.3.3
 

package/dist/declarations/src/TalismanBalancesDatabase.d.ts

@@ -1,13 +1,7 @@
 import { Dexie } from "dexie";
 import { BalanceJson } from "./types";
-type BalancesDbMeta = {
-    id: string;
-    value: string;
-};
 export declare class TalismanBalancesDatabase extends Dexie {
     balances: Dexie.Table<BalanceJson, string>;
-    meta: Dexie.Table<BalancesDbMeta, string>;
     constructor();
 }
 export declare const db: TalismanBalancesDatabase;
-export {};

package/dist/declarations/src/helpers.d.ts

@@ -12,10 +12,13 @@ export declare const createTypeRegistryCache: () => {
     getOrCreateTypeRegistry: (chainId: ChainId, metadataRpc?: `0x${string}`) => Registry;
 };
 export declare const filterMirrorTokens: (balance: Balance, i: number, balances: Balance[]) => boolean;
+export declare const getValidSubscriptionIds: () => Set<string>;
+export declare const createSubscriptionId: () => string;
+export declare const deleteSubscriptionId: () => void;
 /**
  * Sets all balance statuses from `live-${string}` to either `live` or `cached`
  */
-export declare const deriveStatuses: (latestSubscriptionId: string | undefined, balances: BalanceJson[]) => BalanceJson[];
+export declare const deriveStatuses: (validSubscriptionIds: string[], balances: BalanceJson[]) => BalanceJson[];
 /**
  * Used by a variety of balance modules to help encode and decode substrate state calls.
  */

package/dist/talismn-balances.cjs.dev.js

@@ -49,15 +49,14 @@ class TalismanBalancesDatabase extends dexie.Dexie {
     super("TalismanBalances");
 
     // https://dexie.org/docs/Tutorial/Design#database-versioning
-    this.version(2).stores({
+    this.version(1).stores({
       // You only need to specify properties that you wish to index.
       // The object store will allow any properties on your stored objects but you can only query them by indexed properties
       // https://dexie.org/docs/API-Reference#declare-database
       //
       // Never index properties containing images, movies or large (huge) strings. Store them in IndexedDB, yes! but just don’t index them!
       // https://dexie.org/docs/Version/Version.stores()#warning
-      balances: "id, source, status, address, tokenId",
-      meta: "id"
+      balances: "id, source, status, address, tokenId"
     });
 
     // this.on("ready", async () => {})
@@ -68,7 +67,7 @@ const db = new TalismanBalancesDatabase();
 
 var packageJson = {
 	name: "@talismn/balances",
-	version: "0.0.0-pr660-20230328111733",
+	version: "0.0.0-pr660-20230328121248",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -162,17 +161,41 @@ const filterMirrorTokens = (balance, i, balances) => {
   const mirrorOf = balance.token?.mirrorOf;
   return !mirrorOf || !balances.find(b => b.tokenId === mirrorOf);
 };
+const getValidSubscriptionIds = () => {
+  return new Set(localStorage.getItem("TalismanBalancesSubscriptionIds")?.split(",") ?? []);
+};
+const createSubscriptionId = () => {
+  // delete current id (if exists)
+  deleteSubscriptionId();
+
+  // create new id
+  const subscriptionId = Date.now().toString();
+  sessionStorage.setItem("TalismanBalancesSubscriptionId", subscriptionId);
+
+  // add to list of current ids
+  const subscriptionIds = getValidSubscriptionIds();
+  subscriptionIds.add(subscriptionId);
+  localStorage.setItem("TalismanBalancesSubscriptionIds", [...subscriptionIds].filter(Boolean).join(","));
+  return subscriptionId;
+};
+const deleteSubscriptionId = () => {
+  const subscriptionId = sessionStorage.getItem("TalismanBalancesSubscriptionId");
+  if (!subscriptionId) return;
+  const subscriptionIds = getValidSubscriptionIds();
+  subscriptionIds.delete(subscriptionId);
+  localStorage.setItem("TalismanBalancesSubscriptionIds", [...subscriptionIds].filter(Boolean).join(","));
+};
 
 /**
  * Sets all balance statuses from `live-${string}` to either `live` or `cached`
  */
-const deriveStatuses = (latestSubscriptionId, balances) => balances.map(balance => {
+const deriveStatuses = (validSubscriptionIds, balances) => balances.map(balance => {
   if (balance.status === "live" || balance.status === "cache" || balance.status === "stale") return balance;
-  if (!latestSubscriptionId) return {
+  if (validSubscriptionIds.length < 1) return {
     ...balance,
     status: "cache"
   };
-  if (balance.status.slice("live-".length) !== latestSubscriptionId) return {
+  if (!validSubscriptionIds.includes(balance.status.slice("live-".length))) return {
     ...balance,
     status: "cache"
   };
@@ -701,10 +724,13 @@ exports.StorageHelper = StorageHelper;
 exports.SumBalancesFormatter = SumBalancesFormatter;
 exports.TalismanBalancesDatabase = TalismanBalancesDatabase;
 exports.balances = balances;
+exports.createSubscriptionId = createSubscriptionId;
 exports.createTypeRegistryCache = createTypeRegistryCache;
 exports.db = db;
+exports.deleteSubscriptionId = deleteSubscriptionId;
 exports.deriveStatuses = deriveStatuses;
 exports.excludeFromFeePayableLocks = excludeFromFeePayableLocks;
 exports.excludeFromTransferableAmount = excludeFromTransferableAmount;
 exports.filterMirrorTokens = filterMirrorTokens;
+exports.getValidSubscriptionIds = getValidSubscriptionIds;
 exports.includeInTotalExtraAmount = includeInTotalExtraAmount;

package/dist/talismn-balances.cjs.prod.js

@@ -49,15 +49,14 @@ class TalismanBalancesDatabase extends dexie.Dexie {
     super("TalismanBalances");
 
     // https://dexie.org/docs/Tutorial/Design#database-versioning
-    this.version(2).stores({
+    this.version(1).stores({
       // You only need to specify properties that you wish to index.
       // The object store will allow any properties on your stored objects but you can only query them by indexed properties
       // https://dexie.org/docs/API-Reference#declare-database
       //
       // Never index properties containing images, movies or large (huge) strings. Store them in IndexedDB, yes! but just don’t index them!
       // https://dexie.org/docs/Version/Version.stores()#warning
-      balances: "id, source, status, address, tokenId",
-      meta: "id"
+      balances: "id, source, status, address, tokenId"
     });
 
     // this.on("ready", async () => {})
@@ -68,7 +67,7 @@ const db = new TalismanBalancesDatabase();
 
 var packageJson = {
 	name: "@talismn/balances",
-	version: "0.0.0-pr660-20230328111733",
+	version: "0.0.0-pr660-20230328121248",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -162,17 +161,41 @@ const filterMirrorTokens = (balance, i, balances) => {
   const mirrorOf = balance.token?.mirrorOf;
   return !mirrorOf || !balances.find(b => b.tokenId === mirrorOf);
 };
+const getValidSubscriptionIds = () => {
+  return new Set(localStorage.getItem("TalismanBalancesSubscriptionIds")?.split(",") ?? []);
+};
+const createSubscriptionId = () => {
+  // delete current id (if exists)
+  deleteSubscriptionId();
+
+  // create new id
+  const subscriptionId = Date.now().toString();
+  sessionStorage.setItem("TalismanBalancesSubscriptionId", subscriptionId);
+
+  // add to list of current ids
+  const subscriptionIds = getValidSubscriptionIds();
+  subscriptionIds.add(subscriptionId);
+  localStorage.setItem("TalismanBalancesSubscriptionIds", [...subscriptionIds].filter(Boolean).join(","));
+  return subscriptionId;
+};
+const deleteSubscriptionId = () => {
+  const subscriptionId = sessionStorage.getItem("TalismanBalancesSubscriptionId");
+  if (!subscriptionId) return;
+  const subscriptionIds = getValidSubscriptionIds();
+  subscriptionIds.delete(subscriptionId);
+  localStorage.setItem("TalismanBalancesSubscriptionIds", [...subscriptionIds].filter(Boolean).join(","));
+};
 
 /**
  * Sets all balance statuses from `live-${string}` to either `live` or `cached`
  */
-const deriveStatuses = (latestSubscriptionId, balances) => balances.map(balance => {
+const deriveStatuses = (validSubscriptionIds, balances) => balances.map(balance => {
   if (balance.status === "live" || balance.status === "cache" || balance.status === "stale") return balance;
-  if (!latestSubscriptionId) return {
+  if (validSubscriptionIds.length < 1) return {
     ...balance,
     status: "cache"
   };
-  if (balance.status.slice("live-".length) !== latestSubscriptionId) return {
+  if (!validSubscriptionIds.includes(balance.status.slice("live-".length))) return {
     ...balance,
     status: "cache"
   };
@@ -701,10 +724,13 @@ exports.StorageHelper = StorageHelper;
 exports.SumBalancesFormatter = SumBalancesFormatter;
 exports.TalismanBalancesDatabase = TalismanBalancesDatabase;
 exports.balances = balances;
+exports.createSubscriptionId = createSubscriptionId;
 exports.createTypeRegistryCache = createTypeRegistryCache;
 exports.db = db;
+exports.deleteSubscriptionId = deleteSubscriptionId;
 exports.deriveStatuses = deriveStatuses;
 exports.excludeFromFeePayableLocks = excludeFromFeePayableLocks;
 exports.excludeFromTransferableAmount = excludeFromTransferableAmount;
 exports.filterMirrorTokens = filterMirrorTokens;
+exports.getValidSubscriptionIds = getValidSubscriptionIds;
 exports.includeInTotalExtraAmount = includeInTotalExtraAmount;

package/dist/talismn-balances.esm.js

@@ -41,15 +41,14 @@ class TalismanBalancesDatabase extends Dexie {
     super("TalismanBalances");
 
     // https://dexie.org/docs/Tutorial/Design#database-versioning
-    this.version(2).stores({
+    this.version(1).stores({
       // You only need to specify properties that you wish to index.
       // The object store will allow any properties on your stored objects but you can only query them by indexed properties
       // https://dexie.org/docs/API-Reference#declare-database
       //
       // Never index properties containing images, movies or large (huge) strings. Store them in IndexedDB, yes! but just don’t index them!
       // https://dexie.org/docs/Version/Version.stores()#warning
-      balances: "id, source, status, address, tokenId",
-      meta: "id"
+      balances: "id, source, status, address, tokenId"
     });
 
     // this.on("ready", async () => {})
@@ -60,7 +59,7 @@ const db = new TalismanBalancesDatabase();
 
 var packageJson = {
 	name: "@talismn/balances",
-	version: "0.0.0-pr660-20230328111733",
+	version: "0.0.0-pr660-20230328121248",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -154,17 +153,41 @@ const filterMirrorTokens = (balance, i, balances) => {
   const mirrorOf = balance.token?.mirrorOf;
   return !mirrorOf || !balances.find(b => b.tokenId === mirrorOf);
 };
+const getValidSubscriptionIds = () => {
+  return new Set(localStorage.getItem("TalismanBalancesSubscriptionIds")?.split(",") ?? []);
+};
+const createSubscriptionId = () => {
+  // delete current id (if exists)
+  deleteSubscriptionId();
+
+  // create new id
+  const subscriptionId = Date.now().toString();
+  sessionStorage.setItem("TalismanBalancesSubscriptionId", subscriptionId);
+
+  // add to list of current ids
+  const subscriptionIds = getValidSubscriptionIds();
+  subscriptionIds.add(subscriptionId);
+  localStorage.setItem("TalismanBalancesSubscriptionIds", [...subscriptionIds].filter(Boolean).join(","));
+  return subscriptionId;
+};
+const deleteSubscriptionId = () => {
+  const subscriptionId = sessionStorage.getItem("TalismanBalancesSubscriptionId");
+  if (!subscriptionId) return;
+  const subscriptionIds = getValidSubscriptionIds();
+  subscriptionIds.delete(subscriptionId);
+  localStorage.setItem("TalismanBalancesSubscriptionIds", [...subscriptionIds].filter(Boolean).join(","));
+};
 
 /**
  * Sets all balance statuses from `live-${string}` to either `live` or `cached`
  */
-const deriveStatuses = (latestSubscriptionId, balances) => balances.map(balance => {
+const deriveStatuses = (validSubscriptionIds, balances) => balances.map(balance => {
   if (balance.status === "live" || balance.status === "cache" || balance.status === "stale") return balance;
-  if (!latestSubscriptionId) return {
+  if (validSubscriptionIds.length < 1) return {
     ...balance,
     status: "cache"
   };
-  if (balance.status.slice("live-".length) !== latestSubscriptionId) return {
+  if (!validSubscriptionIds.includes(balance.status.slice("live-".length))) return {
     ...balance,
     status: "cache"
   };
@@ -683,4 +706,4 @@ class SumBalancesFormatter {
   }
 }
 
-export { Balance, BalanceFormatter, BalanceStatusLive, Balances, DefaultBalanceModule, FiatSumBalancesFormatter, StorageHelper, SumBalancesFormatter, TalismanBalancesDatabase, balances, createTypeRegistryCache, db, deriveStatuses, excludeFromFeePayableLocks, excludeFromTransferableAmount, filterMirrorTokens, includeInTotalExtraAmount };
+export { Balance, BalanceFormatter, BalanceStatusLive, Balances, DefaultBalanceModule, FiatSumBalancesFormatter, StorageHelper, SumBalancesFormatter, TalismanBalancesDatabase, balances, createSubscriptionId, createTypeRegistryCache, db, deleteSubscriptionId, deriveStatuses, excludeFromFeePayableLocks, excludeFromTransferableAmount, filterMirrorTokens, getValidSubscriptionIds, includeInTotalExtraAmount };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances",
-  "version": "0.0.0-pr660-20230328111733",
+  "version": "0.0.0-pr660-20230328121248",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "UNLICENSED",
@@ -27,11 +27,11 @@
     "clean": "rm -rf dist && rm -rf .turbo rm -rf node_modules"
   },
   "dependencies": {
-    "@talismn/chain-connector": "^0.0.0-pr660-20230328111733",
-    "@talismn/chain-connector-evm": "^0.0.0-pr660-20230328111733",
-    "@talismn/chaindata-provider": "^0.0.0-pr660-20230328111733",
-    "@talismn/token-rates": "^0.0.0-pr660-20230328111733",
-    "@talismn/util": "^0.0.0-pr660-20230328111733",
+    "@talismn/chain-connector": "^0.0.0-pr660-20230328121248",
+    "@talismn/chain-connector-evm": "^0.0.0-pr660-20230328121248",
+    "@talismn/chaindata-provider": "^0.0.0-pr660-20230328121248",
+    "@talismn/token-rates": "^0.0.0-pr660-20230328121248",
+    "@talismn/util": "^0.0.0-pr660-20230328121248",
     "anylogger": "^1.0.11",
     "dexie": "^3.2.3"
   },