@ocap/resolver 1.24.8 → 1.25.0

package/lib/api.js

@@ -0,0 +1,71 @@
+const { Router } = require('express');
+const { getNftBGColorFromDid, getSvg } = require('@arcblock/nft-display');
+
+function createAPIHandler({ resolver }) {
+  const router = Router();
+
+  router.get('/token/display', async (req, res) => {
+    const { address } = req.query;
+    if (!address) {
+      return res.status(400).json({ error: 'address is required' });
+    }
+
+    const token = await resolver.getTokenState({ address });
+
+    if (!token) {
+      return res.status(400).json({ error: 'token not found' });
+    }
+
+    let iconUri = '';
+
+    if (token.icon) {
+      let iconWidth = 40;
+      let iconHeight = 40;
+
+      // Extract viewBox dimensions to ensure the icon displays properly in nft-display
+      const viewBoxMatch = token.icon.match(/viewBox\s*=\s*["']([^"']+)["']/i);
+      if (viewBoxMatch) {
+        const viewBoxValues = viewBoxMatch[1].split(/\s+/);
+        if (viewBoxValues.length >= 4) {
+          iconWidth = +viewBoxValues[2] || iconWidth;
+          iconHeight = +viewBoxValues[3] || iconHeight;
+        }
+      }
+
+      const fixedSvg = token.icon.replace(/<svg([^>]*)>/, `<svg$1 width="${iconWidth}" height="${iconHeight}">`);
+
+      iconUri = `data:image/svg+xml;base64,${Buffer.from(fixedSvg).toString('base64')}`;
+    }
+
+    const svg = getSvg({
+      color: getNftBGColorFromDid(address),
+
+      did: address,
+      variant: 'app-passport',
+      verifiable: true,
+      chain: 'arcblock',
+
+      header: {
+        icon: iconUri,
+        name: token.symbol,
+      },
+
+      issuer: {
+        name: token.symbol,
+        icon: iconUri,
+      },
+
+      extra: {
+        key: 'Name',
+        value: token.name,
+      },
+    });
+
+    res.setHeader('Content-Type', 'image/svg+xml');
+    res.send(svg);
+  });
+
+  return router;
+}
+
+module.exports = { createAPIHandler };

package/lib/hooks.js

@@ -295,6 +295,12 @@ const onAccountMigrate = async (tx, resolver) => {
   }
 };
 
+const onUpdateToken = (tokenDoc, ctx, indexdb, resolver) => {
+  if (resolver.tokenCache) {
+    resolver.tokenCache.set(tokenDoc.address, tokenDoc);
+  }
+};
+
 const onCreateTx = async (tx, ctx, resolver) => {
   // Always update distribution even if tx failed cause there might be had gas
   try {
@@ -331,4 +337,4 @@ const onCreateTx = async (tx, ctx, resolver) => {
   }
 };
 
-module.exports = { onCreateRollup, onCreateTx, onCreateRollupBlock };
+module.exports = { onCreateRollup, onCreateTx, onCreateRollupBlock, onUpdateToken };

package/lib/index.js

@@ -87,7 +87,7 @@ const maxGasOps = {
   'fg:t:transfer_v3': { create: 9, update: 16 },
   'fg:t:exchange_v2': { create: 1, update: 18 },
 
-  'fg:t:create_token_factory': { create: 2, update: 2 },
+  'fg:t:create_token_factory': { create: 2, update: 3 },
   'fg:t:update_token_factory': { create: 0, update: 3 },
   'fg:t:mint_token': { create: 2, update: 13 },
   'fg:t:burn_token': { create: 2, update: 13 },
@@ -510,6 +510,9 @@ module.exports = class OCAPResolver {
       if (typeof state.decimal === 'undefined') {
         state.decimal = DEFAULT_TOKEN_DECIMAL;
       }
+      if (state.metadata) {
+        state.metadata = formatData(state.metadata);
+      }
     }
 
     return state;
@@ -524,11 +527,11 @@ module.exports = class OCAPResolver {
       onRead: async (state) => {
         if (state) {
           const [token, reserveToken] = await Promise.all([
-            this.tokenCache.get(state.tokenAddress),
-            this.tokenCache.get(state.reserveAddress),
+            this.getTokenState({ address: state.tokenAddress }),
+            this.getTokenState({ address: state.reserveAddress }),
           ]);
-          state.token = token;
-          state.reserveToken = reserveToken;
+          state.token = { ...token, metadata: formatData(token.metadata) };
+          state.reserveToken = { ...reserveToken, metadata: formatData(reserveToken.metadata) };
         }
 
         return state;
@@ -613,6 +616,10 @@ module.exports = class OCAPResolver {
           minStake: fromTokenToUnit(transaction.txGas.minStake, token.decimal).toString(10),
           maxStake: fromTokenToUnit(transaction.txGas.maxStake, token.decimal).toString(10),
         },
+        txStake: {
+          ...transaction.txStake,
+          createToken: fromTokenToUnit(transaction.txStake.createToken, token.decimal).toString(10),
+        },
         txFee: Object.keys(transaction.txFee)
           .filter((x) => x !== 'default')
           .map((x) => ({ typeUrl: x, fee: fromTokenToUnit(transaction.txFee[x], token.decimal).toString(10) })),
@@ -695,7 +702,7 @@ module.exports = class OCAPResolver {
   }
 
   listTokens(args, ctx) {
-    return this._doPaginatedSearch('listTokens', args, 'tokens', 'data', ctx);
+    return this._doPaginatedSearch('listTokens', args, 'tokens', ['data', 'metadata'], ctx);
   }
 
   listTokenFactories(args, ctx) {
@@ -946,7 +953,7 @@ module.exports = class OCAPResolver {
     const mapping = {
       asset: [createIndexedAsset, 'address'],
       delegation: [createIndexedDelegation, 'address'],
-      token: [createIndexedToken, 'address'],
+      token: [createIndexedToken, 'address', null, hooks.onUpdateToken],
       factory: [createIndexedFactory, 'address'],
       stake: [createIndexedStake, 'address'],
       rollup: [createIndexedRollup, 'address', hooks.onCreateRollup],
@@ -962,7 +969,7 @@ module.exports = class OCAPResolver {
           const doc = await fn(x, ctx, this.indexdb);
           await this.indexdb[table].insert(doc);
           if (typeof onCreate === 'function') {
-            await onCreate(doc, ctx, this.indexdb);
+            await onCreate(doc, ctx, this.indexdb, this);
           }
         } catch (error) {
           this.logger.error(`create ${table} index failed`, { [table]: x, error });
@@ -975,7 +982,7 @@ module.exports = class OCAPResolver {
           const doc = await fn(x, ctx, this.indexdb);
           await this.indexdb[table].update(doc[key], doc);
           if (typeof onUpdate === 'function') {
-            await onUpdate(doc, ctx, this.indexdb);
+            await onUpdate(doc, ctx, this.indexdb, this);
           }
         } catch (error) {
           this.logger.error(`update ${table} index failed`, { [table]: x, error });
@@ -1029,7 +1036,11 @@ module.exports = class OCAPResolver {
     if (dataKey) {
       data = await Promise.all(
         items.map(async (x) => {
-          let tx = set(x, dataKey, formatData(get(x, dataKey)));
+          let tx = x;
+          // dataKey can be an array or string
+          [].concat(dataKey).forEach((key) => {
+            tx = set(tx, key, formatData(get(tx, key)));
+          });
           if (listKey === 'transactions') {
             tx = await this.formatTx(tx, ctx);
           }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.24.8",
+  "version": "1.25.0",
   "description": "GraphQL resolver built upon ocap statedb and GQL layer",
   "main": "lib/index.js",
   "files": [
@@ -14,25 +14,27 @@
   "license": "MIT",
   "devDependencies": {
     "jest": "^29.7.0",
-    "@ocap/indexdb-memory": "1.24.8",
-    "@ocap/statedb-memory": "1.24.8"
+    "@ocap/indexdb-memory": "1.25.0",
+    "@ocap/statedb-memory": "1.25.0"
   },
   "dependencies": {
+    "@arcblock/nft-display": "^3.1.41",
     "debug": "^4.3.6",
+    "express": "^4.19.2",
     "lodash": "^4.17.21",
     "queue": "^6",
-    "@arcblock/did": "1.24.8",
-    "@arcblock/did-ext": "1.24.8",
-    "@arcblock/did-util": "1.24.8",
-    "@arcblock/validator": "1.24.8",
-    "@ocap/config": "1.24.8",
-    "@ocap/indexdb": "1.24.8",
-    "@ocap/mcrypto": "1.24.8",
-    "@ocap/message": "1.24.8",
-    "@ocap/state": "1.24.8",
-    "@ocap/tx-protocols": "1.24.8",
-    "@ocap/util": "1.24.8",
-    "@ocap/wallet": "1.24.8"
+    "@arcblock/did": "1.25.0",
+    "@arcblock/did-ext": "1.25.0",
+    "@arcblock/did-util": "1.25.0",
+    "@arcblock/validator": "1.25.0",
+    "@ocap/config": "1.25.0",
+    "@ocap/indexdb": "1.25.0",
+    "@ocap/mcrypto": "1.25.0",
+    "@ocap/message": "1.25.0",
+    "@ocap/state": "1.25.0",
+    "@ocap/tx-protocols": "1.25.0",
+    "@ocap/util": "1.25.0",
+    "@ocap/wallet": "1.25.0"
   },
   "scripts": {
     "lint": "eslint tests lib",