@ocap/tx-protocols 1.14.2 → 1.14.6

package/README.md

@@ -72,6 +72,7 @@ But this will make some transaction protocol logic harder to understand.
 The are some inconsistencies in server and client implementation code.
 
 On the server side, `delegator` must be interpreted as `delegatee`, but in `@ocap/client`, `delegator` is interpreted as `delegator`.
+For delegated create-x transactions, the service-fee is charged against `tx.from`.
 
 ### How to add a new tx protocol
 

package/lib/execute.js

@@ -62,7 +62,7 @@ module.exports = ({ filter, runAsLambda }) => {
           // we should only flush events when retry is not supported
           // otherwise the outer caller should handle these 2
           if (shouldPersistTx(err) && isRetrySupported === false) {
-            const txState = context.states.tx.create(context, err ? err.code : 'OK');
+            const txState = context.states.tx.create(context, err ? err.code || 'INTERNAL' : 'OK');
             try {
               await context.statedb.tx.create(txState.hash, txState, context);
             } catch (e) {
@@ -100,7 +100,7 @@ module.exports = ({ filter, runAsLambda }) => {
       } finally {
         if (shouldPersistTx(error)) {
           try {
-            const txState = context.states.tx.create(ctx, error ? error.code : 'OK');
+            const txState = context.states.tx.create(ctx, error ? error.code || 'INTERNAL' : 'OK');
             flushEvents(ctx, { txState });
             await runAsLambda(async (txn) => {
               const newCtx = { ...omit(ctx, ['txn']), txn };

package/lib/protocols/account/declare.js

@@ -38,11 +38,15 @@ runner.use(
     const { tx, itx, statedb } = context;
     const tokens = { [context.config.token.address]: '0' };
 
-    context.senderState = await statedb.account.create(
-      tx.from,
-      account.create({ address: tx.from, pk: toBase58(tx.pk), nonce: tx.nonce, tokens, ...itx }, context),
-      context
-    );
+    const [senderState] = await Promise.all([
+      statedb.account.create(
+        tx.from,
+        account.create({ address: tx.from, pk: toBase58(tx.pk), nonce: tx.nonce, tokens, ...itx }, context),
+        context
+      ),
+    ]);
+
+    context.senderState = senderState;
 
     next();
   },

package/lib/protocols/asset/create.js

@@ -2,7 +2,6 @@
 const Error = require('@ocap/util/lib/error');
 const isEmpty = require('lodash/isEmpty');
 const cloneDeep = require('lodash/cloneDeep');
-const Joi = require('@ocap/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, asset } = require('@ocap/state');
 const { toAssetAddress } = require('@arcblock/did-util');
@@ -11,25 +10,15 @@ const { toAssetAddress } = require('@arcblock/did-util');
 const debug = require('debug')(`${require('../../../package.json').name}:create-asset`);
 
 const { decodeAnySafe } = require('../../util');
-const ensureTxFee = require('../rollup/pipes/ensure-tx-fee');
+const ensureServiceFee = require('../rollup/pipes/ensure-service-fee');
 
 const runner = new Runner();
 
 runner.use(pipes.VerifyMultiSig(0));
 
 // Verify itx
-const schema = Joi.object({
-  moniker: Joi.string().min(2).max(255).required(),
-  data: Joi.any().required(),
-  readonly: Joi.boolean().default(false),
-  transferrable: Joi.boolean().default(false),
-  ttl: Joi.number().min(0).default(0),
-  parent: Joi.DID().optional().allow(''),
-  address: Joi.DID().role('ROLE_ASSET').required(),
-  issuer: Joi.DID().optional().allow(''),
-}).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
-  const { error } = schema.validate(itx);
+  const { error } = asset.schema.validate(itx);
   if (error) {
     return next(new Error('INVALID_TX', `Invalid itx: ${error.message}`));
   }
@@ -92,7 +81,7 @@ runner.use(
 // Ensure parent exist
 runner.use(pipes.ExtractState({ from: 'itx.parent', to: 'parentAsset', status: 'INVALID_ASSET', table: 'asset' }));
 
-runner.use(ensureTxFee);
+runner.use(ensureServiceFee);
 
 // Update asset state
 runner.use(

package/lib/protocols/factory/create.js

@@ -14,7 +14,7 @@ const { toFactoryAddress } = require('@arcblock/did-util');
 const debug = require('debug')(`${require('../../../package.json').name}:create-factory`);
 
 const { decodeAnySafe } = require('../../util');
-const ensureTxFee = require('../rollup/pipes/ensure-tx-fee');
+const ensureServiceFee = require('../rollup/pipes/ensure-service-fee');
 
 const runner = new Runner();
 
@@ -106,7 +106,7 @@ runner.use((context, next) => {
   return next(new Error('INVALID_FACTORY_INPUT', 'Not all input.assets exist on chain'));
 });
 
-runner.use(ensureTxFee);
+runner.use(ensureServiceFee);
 
 // Create factory state
 runner.use(

package/lib/protocols/rollup/create.js

@@ -12,7 +12,7 @@ const { toRollupAddress } = require('@arcblock/did-util');
 const debug = require('debug')(`${require('../../../package.json').name}:create-rollup`);
 
 const { decodeAnySafe } = require('../../util');
-const ensureTxFee = require('./pipes/ensure-tx-fee');
+const ensureServiceFee = require('./pipes/ensure-service-fee');
 
 const runner = new Runner();
 
@@ -108,7 +108,7 @@ runner.use(
   ])
 );
 
-runner.use(ensureTxFee);
+runner.use(ensureServiceFee);
 
 // 5. create rollup state
 runner.use(
@@ -125,6 +125,7 @@ runner.use(
       vaultUpdates,
     } = context;
 
+    const issuer = delegatorState ? delegatorState.address : senderState.address;
     const [newSenderState, rollupState, newVaultState] = await Promise.all([
       statedb.account.update(
         senderState.address,
@@ -137,7 +138,7 @@ runner.use(
         rollup.create(
           {
             ...formattedItx,
-            issuer: delegatorState ? delegatorState.address : senderState.address,
+            issuer,
             validators: formattedItx.seedValidators,
             data: rollupData,
           },

package/lib/protocols/rollup/pipes/{ensure-tx-fee.js → ensure-service-fee.js}

@@ -3,7 +3,6 @@ const { fromTokenToUnit, BN } = require('@ocap/util');
 
 const { applyTokenUpdates } = require('../../../util');
 
-// FIXME: There maybe bug for tx that decrease senderState token balance
 module.exports = async (context, next) => {
   const { config, statedb, txType, senderState } = context;
   const txFee = config.transaction.txFee[txType];

package/lib/protocols/token/create.js

@@ -10,7 +10,7 @@ const { fromTokenToUnit } = require('@ocap/util');
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:create-token`);
 const { decodeAnySafe } = require('../../util');
-const ensureTxFee = require('../rollup/pipes/ensure-tx-fee');
+const ensureServiceFee = require('../rollup/pipes/ensure-service-fee');
 
 const MAX_TOTAL_SUPPLY = fromTokenToUnit(10000 * 100000000, 18); // 32
 
@@ -92,7 +92,7 @@ runner.use(async (context, next) => {
   return next();
 });
 
-runner.use(ensureTxFee);
+runner.use(ensureServiceFee);
 
 // Update sender state, token state
 runner.use(
@@ -105,6 +105,7 @@ runner.use(
     senderUpdates.tokens = senderUpdates.tokens || {};
 
     // We are definitely creating a different token, so it is safe to set tokens to initial supply
+    // For delegated create-token, the delegator is the actual token-holder
     if (delegatorState) {
       delegatorUpdates.tokens = delegatorState.tokens || {};
       delegatorUpdates.tokens[itx.address] = itx.initialSupply;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.14.2",
+  "version": "1.14.6",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -12,24 +12,26 @@
   "scripts": {
     "lint": "eslint tests lib",
     "lint:fix": "eslint --fix tests lib",
+    "start": "node tools/start-chain.js",
     "test": "jest --forceExit --detectOpenHandles",
-    "coverage": "npm run test -- --coverage"
+    "test:ci": "jest --forceExit --detectOpenHandles --coverage",
+    "coverage": "start-server-and-test start http://127.0.0.1:4001 test:ci"
   },
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.14.2",
-    "@arcblock/did-util": "1.14.2",
-    "@ocap/asset": "1.14.2",
-    "@ocap/mcrypto": "1.14.2",
-    "@ocap/merkle-tree": "1.14.2",
-    "@ocap/message": "1.14.2",
-    "@ocap/state": "1.14.2",
-    "@ocap/tx-pipeline": "1.14.2",
-    "@ocap/util": "1.14.2",
-    "@ocap/validator": "1.14.2",
-    "@ocap/wallet": "1.14.2",
+    "@arcblock/did": "1.14.6",
+    "@arcblock/did-util": "1.14.6",
+    "@ocap/asset": "1.14.6",
+    "@ocap/mcrypto": "1.14.6",
+    "@ocap/merkle-tree": "1.14.6",
+    "@ocap/message": "1.14.6",
+    "@ocap/state": "1.14.6",
+    "@ocap/tx-pipeline": "1.14.6",
+    "@ocap/util": "1.14.6",
+    "@ocap/validator": "1.14.6",
+    "@ocap/wallet": "1.14.6",
     "debug": "^4.3.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
@@ -40,7 +42,8 @@
     "elliptic": "6.5.3"
   },
   "devDependencies": {
-    "jest": "^27.3.1"
+    "jest": "^27.3.1",
+    "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "6ef13ed89e546879db9c88a21691940963466617"
+  "gitHead": "dd379a7d1bd2a46be27a29e6f0c65fa161ec0b0c"
 }