@ocap/indexdb 1.18.18 → 1.18.20

package/lib/util.js

@@ -6,15 +6,19 @@ const uniqBy = require('lodash/uniqBy');
 const { createSortedList } = require('@ocap/util/lib/create-sorted-list');
 const { BN } = require('@ocap/util');
 
-const formatTokenMeta = (token, tokenStates) => {
+const formatTokenMeta = (token, tokenStates, ...rest) => {
   if (!tokenStates) {
     return token;
   }
 
-  const tokenState = tokenStates.find((x) => x.address === token.address);
-  token.decimal = tokenState.decimal;
-  token.unit = tokenState.unit;
-  token.symbol = tokenState.symbol;
+  const tokenState = tokenStates.filter(Boolean).find((x) => x.address === token.address);
+  if (tokenState) {
+    token.decimal = tokenState.decimal;
+    token.unit = tokenState.unit;
+    token.symbol = tokenState.symbol;
+  } else {
+    console.warn('Invalid token state on formatting', token, tokenStates, ...rest);
+  }
 
   return token;
 };
@@ -235,13 +239,18 @@ const createIndexedTransaction = async (tx, ctx, indexdb) => {
 
 const createIndexedStake = async (x, ctx, indexdb) => {
   const tokens = uniq(Object.keys(x.tokens || {}).concat(Object.keys(x.revokedTokens || {})));
-  const tokenStates = await Promise.all(tokens.map((t) => indexdb.token.get(t)));
+  const existTokenStates = ctx.tokenStates || [];
+  const missingTokenStates = await Promise.all(
+    tokens.filter((a) => !existTokenStates.find((t) => t.address === a)).map((t) => indexdb.token.get(t))
+  );
+  const tokenStates = [...existTokenStates, ...missingTokenStates];
   return {
     ...pick(x, [
       'address',
       'sender',
       'receiver',
       'assets',
+      'slashers',
       'revocable',
       'data',
       'message',
@@ -249,7 +258,7 @@ const createIndexedStake = async (x, ctx, indexdb) => {
       'revokedAssets',
     ]),
     tokens: Object.keys(x.tokens || {}).map((address) =>
-      formatTokenMeta({ address, balance: x.tokens[address] }, tokenStates)
+      formatTokenMeta({ address, balance: x.tokens[address] }, tokenStates, x)
     ),
     revokedTokens: Object.keys(x.revokedTokens || {}).map((address) =>
       formatTokenMeta({ address, balance: x.revokedTokens[address] }, tokenStates)

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.18",
+  "version": "1.18.20",
   "description": "Defines the basic interface for OCAP IndexDB",
   "main": "lib/main.js",
   "files": [
@@ -25,10 +25,10 @@
     "jest": "^27.5.1"
   },
   "dependencies": {
-    "@ocap/state": "1.18.18",
-    "@ocap/util": "1.18.18",
+    "@ocap/state": "1.18.20",
+    "@ocap/util": "1.18.20",
     "kareem": "^2.4.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "c8575d3072c92339706ecb31613ed2ec75553745"
+  "gitHead": "f220849b0c31f7f90281684080f001e18df9e077"
 }