@ocap/config 1.13.63 → 1.13.67

package/lib/default.js

@@ -30,17 +30,19 @@ module.exports = {
       'fg:t:create_rollup_block': 4096,
       'fg:t:claim_block_reward': 1691,
     },
+    txFee: {
+      default: 0, // in ABT
+      'fg:t:create_asset': 1,
+      'fg:t:create_factory': 100,
+      'fg:t:create_token': 1000,
+      'fg:t:create_rollup': 10000,
+    },
     delegate: {
       deltaInterval: 18000,
       // list transaction protocols that can work with delegation
       // the transaction protocol must enable VerifyDelegation pipe before added here
       typeUrls: ['fg:t:transfer', 'fg:t:transfer_v2', 'fg:t:exchange_v2', 'fg:t:acquire_asset_v2'],
     },
-    declare: {
-      cost: 0,
-      hierarchy: 5,
-      restricted: false,
-    },
     supportedTxs: [
       'fg:t:transfer',
       'fg:t:transfer_v2',
@@ -82,6 +84,7 @@ module.exports = {
       'fg:t:claim_block_reward',
     ],
   },
+  vaults: {},
   accounts: [],
   token: {
     name: 'TestChainToken',

package/lib/index.js

@@ -10,8 +10,18 @@ const schema = require('./schema');
 const validate = (config) => {
   const { value, error } = schema.validate(config);
   if (error) {
-    console.error('Invalid ocap config', error.details.map((x) => x.message).join(', '));
-    throw new Error(`Invalid ocap config: ${error.details.map((x) => x.message).join(', ')}`);
+    console.error('Invalid config', error.details.map((x) => x.message).join(', '));
+    throw new Error(`Invalid config: ${error.details.map((x) => x.message).join(', ')}`);
+  }
+
+  const { vaults, transaction, accounts } = value;
+  if (Object.keys(vaults).some((v) => !accounts.find((x) => x.address === vaults[v]))) {
+    throw new Error('Invalid config: vault address does not exist in accounts');
+  }
+
+  const hasPaidTx = Object.keys(transaction.txFee).some((x) => transaction.txFee[x] > 0);
+  if (hasPaidTx && !vaults.txFee) {
+    throw new Error('Invalid config: vaults.txFee can not be empty when there are paid transactions');
   }
 
   return value;

package/lib/schema.js

@@ -1,9 +1,9 @@
-const Joi = require('joi');
+const Joi = require('@ocap/validator');
 
 const defaultConfig = require('./default');
 
 const accountSchema = {
-  address: Joi.string().required(),
+  address: Joi.DID().required(),
   pk: Joi.string().allow('').required(),
   balance: Joi.number().optional().default(0),
 };
@@ -15,23 +15,24 @@ const configSchema = Joi.object({
     maxAssetSize: Joi.number().positive().required(),
     maxListSize: Joi.number().positive().required(),
     maxMultisig: Joi.number().positive().required(),
-    maxTxSize: Joi.any(),
+    maxTxSize: Joi.object()
+      .pattern(Joi.string().pattern(/^(default|fg:t:[_a-z0-9]+)$/), Joi.number().integer().greater(0))
+      .required(),
     delegate: Joi.object({
       deltaInterval: Joi.number().positive(),
       typeUrls: Joi.array().items(Joi.string()),
     }).required(),
-    declare: Joi.object({
-      cost: Joi.number().positive().allow(0),
-      hierarchy: Joi.number().positive(),
-      restricted: Joi.boolean(),
-    }).required(),
     supportedTxs: Joi.array().items(Joi.string()).min(1).required(),
     multiSignV2Txs: Joi.array().items(Joi.string()).min(1).required(),
+    txFee: Joi.object()
+      .pattern(Joi.string().pattern(/^(default|fg:t:[_a-z0-9]+)$/), Joi.number().precision(6).min(0))
+      .required(),
   })
     .optional()
     .default(defaultConfig.transaction),
   moderator: Joi.object(accountSchema).required(),
   accounts: Joi.array().items(accountSchema).required(),
+  vaults: Joi.object().pattern(Joi.string().allow('quotaSlash', 'txFee'), Joi.DID()).default({}),
   token: Joi.object({
     name: Joi.string().required(),
     description: Joi.string().required(),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.63",
+  "version": "1.13.67",
   "description": "OCAP config parsing/validation and default",
   "main": "lib/index.js",
   "files": [
@@ -22,11 +22,11 @@
     "jest": "^27.3.1"
   },
   "dependencies": {
-    "@arcblock/did": "1.13.63",
-    "@arcblock/did-util": "1.13.63",
-    "@ocap/util": "1.13.63",
-    "joi": "^17.3.0",
+    "@arcblock/did": "1.13.67",
+    "@arcblock/did-util": "1.13.67",
+    "@ocap/util": "1.13.67",
+    "@ocap/validator": "1.13.67",
     "lodash": "^4.17.21"
   },
-  "gitHead": "7e40f22f90f4f5ac08fde3d4d3b7194aa792c95d"
+  "gitHead": "866f6a0dbf4fc22425b8583d84610880472a3109"
 }