@ocap/resolver 1.13.32 → 1.13.36

package/lib/hooks.js

@@ -46,7 +46,7 @@ const onCreateRollup = async (rollup, ctx, indexdb) => {
   });
 };
 
-const ensureRollupValidator = async (address, rollupAddress, ctx, indexdb) => {
+const ensureRollupValidator = async (address, rollupAddress, ctx, indexdb, upsert = true) => {
   const doc = await indexdb.rollupValidator.get(address);
   if (doc) {
     if (!doc.pk || !doc.endpoint) {
@@ -54,11 +54,15 @@ const ensureRollupValidator = async (address, rollupAddress, ctx, indexdb) => {
       const validator = rollup.validators.find((v) => v.address === address);
       doc.pk = validator.pk;
       doc.endpoint = validator.endpoint;
+      doc.rollup = rollup.address;
       return indexdb.rollupValidator.update(address, doc);
     }
 
     return doc;
   }
+  if (upsert === false) {
+    throw new Error('Rollup validator not found and upsert is disabled');
+  }
 
   const stakeAddress = toStakeAddress(address, rollupAddress);
   const [rollup, stake, account] = await Promise.all([
@@ -106,6 +110,7 @@ const onCreateRollupBlock = async (block, ctx, indexdb) => {
     try {
       const doc = await ensureRollupValidator(address, rollupState.address, ctx, indexdb);
 
+      doc.rollup = rollupState.address;
       doc.renaissanceTime = block.genesisTime;
       doc.verifiedBlockCount += 1;
       if (address === proposer) {
@@ -186,6 +191,10 @@ const onStake = async (tx, ctx, indexdb) => {
     }
 
     const address = tx.tx.from;
+    if (rollup.validators.find((x) => x.address === address) === undefined) {
+      return;
+    }
+
     const stakeAddress = toStakeAddress(address, rollup.address);
     const doc = await ensureRollupValidator(address, rollup.address, ctx, indexdb);
 
@@ -210,7 +219,7 @@ const onRevokeStake = async (tx, ctx, indexdb) => {
     }
 
     const address = tx.tx.from;
-    const doc = await ensureRollupValidator(address, rollup.address, ctx, indexdb);
+    const doc = await ensureRollupValidator(address, rollup.address, ctx, indexdb, false);
     const receipt = ctx.txState.receipts.find((x) => x.address === stake.address);
     const change = receipt.changes.find((x) => x.target === rollup.tokenAddress);
 

package/lib/index.js

@@ -542,16 +542,18 @@ module.exports = class OCAPResolver {
     }
 
     const result = await this._doPaginatedSearch('listRollupValidators', args, 'validators', null, ctx);
-    const stakes = await Promise.all(
-      result.validators.map((x) => {
-        const stakeAddress = toStakeAddress(x.address, args.rollupAddress);
-        return this.runAsLambda((txn) => this.statedb.stake.get(stakeAddress, { txn }));
-      })
-    );
+    const stakes = (
+      await Promise.all(
+        result.validators.map((x) => {
+          const stakeAddress = toStakeAddress(x.address, args.rollupAddress);
+          return this.runAsLambda((txn) => this.statedb.stake.get(stakeAddress, { txn }));
+        })
+      )
+    ).filter(Boolean);
     result.validators.forEach((x) => {
       const stakeAddress = toStakeAddress(x.address, args.rollupAddress);
       const stake = stakes.find((s) => s.address === stakeAddress);
-      x.availableStake = stake.tokens[rollup.tokenAddress];
+      x.availableStake = stake ? stake.tokens[rollup.tokenAddress] : '0';
     });
 
     return result;
@@ -562,21 +564,21 @@ module.exports = class OCAPResolver {
       return { results: [] };
     }
 
-    const doSearch = async (type) => {
-      const result = await this.indexdb[type].get(args.keyword);
-      return result ? { type, id: args.keyword } : null;
+    const doSearch = async (type, keyword) => {
+      const result = await this.indexdb[type].get(keyword);
+      return result ? { type, id: keyword } : null;
     };
 
     const entitiesByDid = ['account', 'asset', 'delegation', 'factory', 'token', 'stake', 'rollup'];
     if (isValidDid(args.keyword)) {
-      const results = await Promise.all(entitiesByDid.map(doSearch));
+      const results = await Promise.all(entitiesByDid.map((type) => doSearch(type, args.keyword)));
       return { results: results.filter(Boolean) };
     }
 
     if (states.Joi.hashRegexp.test(args.keyword)) {
       const results = await Promise.all([
-        this.indexdb.tx.get(args.keyword.toUpperCase()),
-        this.indexdb.rollupBlock.get(args.keyword),
+        doSearch('tx', args.keyword.toUpperCase()),
+        doSearch('rollupBlock', args.keyword),
       ]);
       return { results: results.filter(Boolean) };
     }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.32",
+  "version": "1.13.36",
   "description": "GraphQL resolver built upon ocap statedb and GQL layer",
   "main": "lib/index.js",
   "files": [
@@ -22,17 +22,17 @@
     "jest": "^26.6.3"
   },
   "dependencies": {
-    "@arcblock/did": "1.13.32",
-    "@arcblock/did-util": "1.13.32",
-    "@ocap/config": "1.13.32",
-    "@ocap/indexdb": "1.13.32",
-    "@ocap/mcrypto": "1.13.32",
-    "@ocap/message": "1.13.32",
-    "@ocap/state": "1.13.32",
-    "@ocap/tx-protocols": "1.13.32",
-    "@ocap/util": "1.13.32",
+    "@arcblock/did": "1.13.36",
+    "@arcblock/did-util": "1.13.36",
+    "@ocap/config": "1.13.36",
+    "@ocap/indexdb": "1.13.36",
+    "@ocap/mcrypto": "1.13.36",
+    "@ocap/message": "1.13.36",
+    "@ocap/state": "1.13.36",
+    "@ocap/tx-protocols": "1.13.36",
+    "@ocap/util": "1.13.36",
     "debug": "^4.3.2",
     "lodash": "^4.17.21"
   },
-  "gitHead": "30a6554645478a0c3c29477e6e9954c8d42272e0"
+  "gitHead": "856b0a35bdc74c11d18f19f49bfa9cd2a85dd8db"
 }