@ocap/resolver 1.17.23 → 1.18.1

package/lib/hooks.js

@@ -188,7 +188,9 @@ const onClaimBlockReward = async (tx, ctx, indexdb) => {
 
       const receipt = tx.receipts.find((x) => x.address === signer);
       if (receipt) {
-        const change = receipt.changes.find((x) => x.target === rollupState.tokenAddress);
+        const change = receipt.changes.find(
+          (x) => x.target === rollupState.tokenAddress && new BN(x.value).isNeg() === false
+        );
         doc.totalGain = new BN(doc.totalGain).add(new BN(change.value).abs()).toString(10);
         await indexdb.rollupValidator.update(signer, doc);
         debug('update rollup validator on claim reward', signer);

package/lib/index.js

@@ -156,7 +156,7 @@ module.exports = class OCAPResolver {
     });
   }
 
-  async sendTx({ tx: txBase64 }) {
+  async sendTx({ tx: txBase64 }, ctx = {}) {
     debug('sendTx', txBase64);
 
     if (process.env.CHAIN_MODE === 'readonly') {
@@ -164,7 +164,7 @@ module.exports = class OCAPResolver {
     }
 
     // 0. create new context
-    const context = { txBase64, statedb: this.statedb, indexdb: this.indexdb, config: this.config };
+    const context = { ...ctx, txBase64, statedb: this.statedb, indexdb: this.indexdb, config: this.config };
 
     // 1. execute and persist the transaction
     const result = await this.executor.execute(context);
@@ -474,6 +474,11 @@ module.exports = class OCAPResolver {
       token,
       txConfig: {
         ...transaction,
+        txGas: {
+          ...transaction.txGas,
+          minStake: fromTokenToUnit(transaction.txGas.minStake, token.decimal).toString(10),
+          maxStake: fromTokenToUnit(transaction.txGas.maxStake, 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) })),
@@ -687,13 +692,13 @@ module.exports = class OCAPResolver {
 
       // Auto populate token holder accounts if not exist
       for (let i = 0; i < accounts.length; i++) {
-        const { address, balance } = accounts[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: 'token-holder' },
+              { address, tokens: { [this.tokenItx.address]: balanceStr }, moniker: moniker || 'token-holder' },
               context
             );
             const result = await accountDB.create(address, state, ctx);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.23",
+  "version": "1.18.1",
   "description": "GraphQL resolver built upon ocap statedb and GQL layer",
   "main": "lib/index.js",
   "files": [
@@ -22,18 +22,18 @@
     "jest": "^27.5.1"
   },
   "dependencies": {
-    "@arcblock/did": "1.17.23",
-    "@arcblock/did-util": "1.17.23",
-    "@arcblock/validator": "1.17.23",
-    "@ocap/config": "1.17.23",
-    "@ocap/indexdb": "1.17.23",
-    "@ocap/mcrypto": "1.17.23",
-    "@ocap/message": "1.17.23",
-    "@ocap/state": "1.17.23",
-    "@ocap/tx-protocols": "1.17.23",
-    "@ocap/util": "1.17.23",
+    "@arcblock/did": "1.18.1",
+    "@arcblock/did-util": "1.18.1",
+    "@arcblock/validator": "1.18.1",
+    "@ocap/config": "1.18.1",
+    "@ocap/indexdb": "1.18.1",
+    "@ocap/mcrypto": "1.18.1",
+    "@ocap/message": "1.18.1",
+    "@ocap/state": "1.18.1",
+    "@ocap/tx-protocols": "1.18.1",
+    "@ocap/util": "1.18.1",
     "debug": "^4.3.4",
     "lodash": "^4.17.21"
   },
-  "gitHead": "aecdce3fc6aaee32ea60db191d61962963f5e0bf"
+  "gitHead": "7735e4243a1ba253eb14d960ca272974eaf94623"
 }