@ocap/resolver 1.19.15 → 1.19.16

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018-2019 ArcBlock
+Copyright 2018-2025 ArcBlock
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/index.js

@@ -22,6 +22,7 @@ const { DEFAULT_TOKEN_DECIMAL } = require('@ocap/util/lib/constant');
 const { createExecutor } = require('@ocap/tx-protocols');
 const { decodeAnySafe } = require('@ocap/tx-protocols/lib/util');
 const { Joi } = require('@arcblock/validator');
+const Queue = require('queue');
 
 const {
   createIndexedAccount,
@@ -96,6 +97,12 @@ const maxGasOps = {
   'fg:t:claim_block_reward': { create: 2, update: 38 },
 };
 
+const txRequestConfig = {
+  maxRequest: Number(process.env.TX_MAX_REQUEST) || 200,
+  concurrent: Number(process.env.TX_CONCURRENCY) || 10,
+  timeout: Number(process.env.TX_TIMEOUT) || 1000 * 30,
+};
+
 const formatData = (data) => {
   if (!data) {
     return data;
@@ -172,7 +179,7 @@ module.exports = class OCAPResolver {
       throw new Error('OCAP Resolver requires a valid indexdb implementation to work');
     }
 
-    this.logger = logger || { info: debug, warn: debug, error: debug, debug };
+    this.logger = logger || console;
 
     this.statedb = statedb;
     this.indexdb = indexdb;
@@ -182,6 +189,11 @@ module.exports = class OCAPResolver {
     this.chainAddr = md5(config.chainId);
     this.tokenItx = Config.genTokenItx(this.config);
     this.consensus = `${statedb.name} v${statedb.version}`;
+    this.queue = new Queue({
+      autostart: true,
+      concurrency: txRequestConfig.concurrent,
+      timeout: txRequestConfig.timeout,
+    });
 
     if (indexdb) {
       this.tokenCache = getTokenCacheInstance(indexdb.token);
@@ -206,18 +218,21 @@ module.exports = class OCAPResolver {
     }
 
     this.connectIndexDB();
-    this.runAsLambda((txn) => this.initializeStateDB(txn)).catch((err) => {
-      console.error('Failed to initialize statedb:', err.message);
+    this.initializeStateDB().catch((err) => {
+      this.logger.error('Failed to initialize statedb:', err.message);
       process.exit(1);
     });
   }
 
-  async sendTx({ tx: txBase64, extra }, ctx = {}) {
+  sendTx({ tx: txBase64, extra }, ctx = {}) {
     debug('sendTx', { txBase64, request: ctx.request });
 
     if (process.env.CHAIN_MODE === 'readonly') {
       throw new CustomError('FORBIDDEN', 'This chain node is running in readonly mode');
     }
+    if (this.queue.length >= txRequestConfig.maxRequest) {
+      throw new CustomError('FORBIDDEN', 'Chain is busy');
+    }
 
     // 0. create new context
     // NOTE: if you add more fields here, please remember to change core/tx-protocols/lib/execute.js
@@ -234,11 +249,18 @@ module.exports = class OCAPResolver {
       },
     };
 
-    // 1. execute and persist the transaction
-    const result = await this.executor.execute(context);
-
-    // 2. Return the hash
-    return result.txHash;
+    // eslint-disable-next-line no-async-promise-executor
+    return new Promise((resolve, reject) => {
+      const task = async () => {
+        try {
+          const result = await this.executor.execute(context);
+          resolve(result.txHash);
+        } catch (err) {
+          reject(err);
+        }
+      };
+      this.queue.push(task);
+    });
   }
 
   getTx({ hash }, ctx) {
@@ -786,56 +808,62 @@ module.exports = class OCAPResolver {
     return this.runAsLambda((txn) => this.statedb.token.get(id, { txn }));
   }
 
-  async initializeStateDB(txn) {
+  async initializeStateDB() {
     const { accounts, token } = this.config;
     const { account: accountDB, chain: chainDB, token: tokenDB } = this.statedb;
     const { account: accountState, chain: chainState, token: tokenState } = states;
 
-    const ctx = { txn };
     const context = { txTime: new Date().toISOString(), txHash: '' };
 
     // Auto persist config to chain state
     // Will throw error if immutable chain config are updated
     const info = await this.getChain();
-    if (!info) {
-      const state = chainState.create({ ...this.config, address: CHAIN_ADDR }, context);
-      const result = await chainDB.create(CHAIN_ADDR, state, ctx);
-      debug('create chain state', result);
-    } else if (isEqual(pick(info, Object.keys(this.config)), this.config) === false) {
-      const state = chainState.update(info, this.config, context);
-      const result = await chainDB.update(CHAIN_ADDR, state, ctx);
-      debug('update chain state', result);
-    }
+    await this.runAsLambda(async (txn) => {
+      if (!info) {
+        const state = chainState.create({ ...this.config, address: CHAIN_ADDR }, context);
+        const result = await chainDB.create(CHAIN_ADDR, state, { txn });
+        this.logger.info('create chain state', { result });
+      } else if (isEqual(pick(info, Object.keys(this.config)), this.config) === false) {
+        const state = chainState.update(info, this.config, context);
+        const result = await chainDB.update(CHAIN_ADDR, state, { txn });
+        this.logger.info('update chain state', { result });
+      }
+    });
 
     // 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) {
-        const state = tokenState.create(this.tokenItx, context);
-        const result = await tokenDB.create(this.tokenItx.address, state, ctx);
-        tokenDB.emit('create', result, ctx);
-        debug('create token state', result);
+        await this.runAsLambda(async (txn) => {
+          const state = tokenState.create(this.tokenItx, context);
+          const result = await tokenDB.create(this.tokenItx.address, state, { txn });
+          tokenDB.emit('create', result, { txn });
+          this.logger.info('create token state', { address: result?.address });
+        });
       }
 
       // Auto populate token holder accounts if not exist
-      for (let i = 0; i < accounts.length; i++) {
-        const { address, balance, moniker } = accounts[i];
-        try {
-          const existAccount = await accountDB.get(address, ctx);
-          if (!existAccount) {
-            const balanceStr = fromTokenToUnit(balance, token.decimal).toString(10);
-            const state = accountState.create(
-              { address, tokens: { [this.tokenItx.address]: balanceStr }, moniker: moniker || 'token-holder' },
-              context
-            );
-            const result = await accountDB.create(address, state, ctx);
-            accountDB.emit('create', result, ctx);
+      await this.runAsLambda(async (txn) => {
+        for (let i = 0; i < accounts.length; i++) {
+          const { address, balance, moniker, pk } = accounts[i];
+          try {
+            const existAccount = await accountDB.get(address, { txn });
+            if (!existAccount) {
+              const balanceStr = fromTokenToUnit(balance, token.decimal).toString(10);
+              const state = accountState.create(
+                { address, tokens: { [this.tokenItx.address]: balanceStr }, moniker: moniker || 'token-holder', pk },
+                context
+              );
+              const result = await accountDB.create(address, state, { txn });
+              accountDB.emit('create', result, { txn });
+              this.logger.info('init account done', { address });
+            }
+          } catch (err) {
+            this.logger.error('Failed to initialize initial token holders', err);
           }
-        } catch (err) {
-          console.error('Failed to initialize initial token holders', err);
         }
-      }
+      });
     }
   }
 

package/lib/token-distribution.js

@@ -347,9 +347,9 @@ class TokenDistributionManager {
   }
 
   async getStakeState(address, ctx) {
-    const stakeState =
-      ctx?.stateSnapshot?.[address] ||
-      (await this.resolver.runAsLambda((txn) => this.resolver.statedb.stake.get(address, { txn })));
+    const stakeState = await this.resolver.runAsLambda((txn) =>
+      this.resolver.statedb.stake.get(address, { ...ctx, txn })
+    );
 
     return stakeState;
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.19.15",
+  "version": "1.19.16",
   "description": "GraphQL resolver built upon ocap statedb and GQL layer",
   "main": "lib/index.js",
   "files": [
@@ -22,18 +22,19 @@
     "jest": "^29.7.0"
   },
   "dependencies": {
-    "@arcblock/did": "1.19.15",
-    "@arcblock/did-util": "1.19.15",
-    "@arcblock/validator": "1.19.15",
-    "@ocap/config": "1.19.15",
-    "@ocap/indexdb": "1.19.15",
-    "@ocap/mcrypto": "1.19.15",
-    "@ocap/message": "1.19.15",
-    "@ocap/state": "1.19.15",
-    "@ocap/tx-protocols": "1.19.15",
-    "@ocap/util": "1.19.15",
+    "@arcblock/did": "1.19.16",
+    "@arcblock/did-util": "1.19.16",
+    "@arcblock/validator": "1.19.16",
+    "@ocap/config": "1.19.16",
+    "@ocap/indexdb": "1.19.16",
+    "@ocap/mcrypto": "1.19.16",
+    "@ocap/message": "1.19.16",
+    "@ocap/state": "1.19.16",
+    "@ocap/tx-protocols": "1.19.16",
+    "@ocap/util": "1.19.16",
     "debug": "^4.3.6",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "queue": "^6"
   },
-  "gitHead": "ab6cd19ab8633c815ab0235b7ab5d80fc071de15"
+  "gitHead": "9c3c349e48fc3c5a63aba6068ba5d31cc46d81c9"
 }