@ocap/resolver 1.20.7 → 1.20.9

package/lib/index.js

@@ -685,7 +685,7 @@ module.exports = class OCAPResolver {
       return { validators: [] };
     }
 
-    const rollup = await this.runAsLambda((txn) => this.statedb.rollup.get(args.rollupAddress, { txn }));
+    const rollup = await this.statedb.rollup.get(args.rollupAddress);
     if (!rollup) {
       return { validators: [] };
     }
@@ -695,7 +695,7 @@ module.exports = class OCAPResolver {
       await Promise.all(
         result.validators.map((x) => {
           const stakeAddress = toStakeAddress(x.address, args.rollupAddress);
-          return this.runAsLambda((txn) => this.statedb.stake.get(stakeAddress, { txn }));
+          return this.statedb.stake.get(stakeAddress);
         })
       )
     ).filter(Boolean);
@@ -801,11 +801,11 @@ module.exports = class OCAPResolver {
   }
 
   getChain() {
-    return this.runAsLambda((txn) => this.statedb.chain.get(CHAIN_ADDR, { txn }));
+    return this.statedb.chain.get(CHAIN_ADDR);
   }
 
   getToken(id) {
-    return this.runAsLambda((txn) => this.statedb.token.get(id, { txn }));
+    return this.statedb.token.get(id);
   }
 
   async initializeStateDB() {
@@ -817,9 +817,10 @@ module.exports = class OCAPResolver {
 
     // Auto persist config to chain state
     // Will throw error if immutable chain config are updated
-    const info = await this.getChain();
     await this.runAsLambda(
       async (txn) => {
+        const info = await this.statedb.chain.get(CHAIN_ADDR, { txn });
+
         if (!info) {
           const state = chainState.create({ ...this.config, address: CHAIN_ADDR }, context);
           const result = await chainDB.create(CHAIN_ADDR, state, { txn });
@@ -836,18 +837,19 @@ module.exports = class OCAPResolver {
     // Auto persist token state, just once
     // Since the token info should not be changed after restart
     if (this.tokenItx) {
-      const existToken = await this.getToken(this.tokenItx.address);
-      if (!existToken) {
-        await this.runAsLambda(
-          async (txn) => {
+      await this.runAsLambda(
+        async (txn) => {
+          const existToken = await this.statedb.token.get(this.tokenItx.address);
+
+          if (!existToken) {
             const state = tokenState.create(this.tokenItx, context);
             const result = await tokenDB.create(this.tokenItx.address, state, { txn });
             tokenDB.emit('create', result, { txn });
             this.logger.debug('create token state', { address: result?.address });
-          },
-          { commitMessage: 'initialize token' }
-        );
-      }
+          }
+        },
+        { commitMessage: 'initialize token' }
+      );
 
       // Auto populate token holder accounts if not exist
       await this.runAsLambda(
@@ -952,7 +954,7 @@ module.exports = class OCAPResolver {
     }
 
     const unified = isValidDid(id) ? toAddress(id) : id;
-    const state = await this.runAsLambda((txn) => this.statedb[table].get(unified, { txn, ...extraParams }));
+    const state = await this.statedb[table].get(unified, { ...extraParams });
     if (state) {
       if (dataKey) {
         set(state, dataKey, formatData(get(state, dataKey)));
@@ -1050,9 +1052,7 @@ module.exports = class OCAPResolver {
     }
 
     if (typeUrl === 'fg:t:account_migrate') {
-      const fromState = await this.runAsLambda((txn) =>
-        this.statedb.account.get(tx.tx.from, { txn, traceMigration: false })
-      );
+      const fromState = await this.statedb.account.get(tx.tx.from, { traceMigration: false });
       if (fromState) {
         tx.receipts = getTxReceipts(tx, { config: this.config, fromState });
       }

package/lib/token-distribution.js

@@ -347,10 +347,7 @@ class TokenDistributionManager {
   }
 
   async getStakeState(address, ctx) {
-    const stakeState = await this.resolver.runAsLambda((txn) =>
-      this.resolver.statedb.stake.get(address, { ...ctx, txn })
-    );
-
+    const stakeState = await this.resolver.statedb.stake.get(address, ctx);
     return stakeState;
   }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.20.7",
+  "version": "1.20.9",
   "description": "GraphQL resolver built upon ocap statedb and GQL layer",
   "main": "lib/index.js",
   "files": [
@@ -13,26 +13,26 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "devDependencies": {
-    "jest": "^29.7.0"
+    "jest": "^29.7.0",
+    "@ocap/indexdb-memory": "1.20.9",
+    "@ocap/statedb-memory": "1.20.9"
   },
   "dependencies": {
     "debug": "^4.3.6",
     "lodash": "^4.17.21",
     "queue": "^6",
-    "@arcblock/did": "1.20.7",
-    "@arcblock/did-util": "1.20.7",
-    "@arcblock/validator": "1.20.7",
-    "@ocap/config": "1.20.7",
-    "@ocap/indexdb": "1.20.7",
-    "@ocap/mcrypto": "1.20.7",
-    "@ocap/state": "1.20.7",
-    "@ocap/message": "1.20.7",
-    "@ocap/tx-protocols": "1.20.7",
-    "@ocap/wallet": "1.20.7",
-    "@ocap/statedb-memory": "1.20.7",
-    "@ocap/indexdb-memory": "1.20.7",
-    "@arcblock/did-ext": "1.20.7",
-    "@ocap/util": "1.20.7"
+    "@arcblock/did": "1.20.9",
+    "@arcblock/did-ext": "1.20.9",
+    "@arcblock/did-util": "1.20.9",
+    "@arcblock/validator": "1.20.9",
+    "@ocap/config": "1.20.9",
+    "@ocap/indexdb": "1.20.9",
+    "@ocap/mcrypto": "1.20.9",
+    "@ocap/message": "1.20.9",
+    "@ocap/state": "1.20.9",
+    "@ocap/tx-protocols": "1.20.9",
+    "@ocap/util": "1.20.9",
+    "@ocap/wallet": "1.20.9"
   },
   "scripts": {
     "lint": "eslint tests lib",