@ocap/tx-protocols 1.22.1 → 1.22.3

package/lib/protocols/token-factory/create.js

@@ -48,9 +48,9 @@ runner.use((context, next) => {
   return next();
 });
 
-// Ensure factory and token address is valid
 runner.use(
   pipes.VerifyInfo([
+    // verify token address is valid
     {
       error: 'INVALID_TOKEN',
       message: 'Token address is not valid',
@@ -58,6 +58,7 @@ runner.use(
         return toTokenAddress({ ...context.itx.token, address: '' }) === context.itx.token.address;
       },
     },
+    // verify token factory address is valid
     {
       error: 'INVALID_TOKEN_FACTORY',
       message: 'Token factory address is not valid',
@@ -69,12 +70,7 @@ runner.use(
         return toTokenFactoryAddress(itx) === context.itx.address;
       },
     },
-  ])
-);
-
-// Ensure reserve address is config.token.address
-runner.use(
-  pipes.VerifyInfo([
+    // verify reserve address is config.token.address
     {
       error: 'INVALID_RESERVE_ADDRESS',
       message: 'Reserve address is not valid',
@@ -83,6 +79,18 @@ runner.use(
   ])
 );
 
+// Ensure symbol is not internal
+runner.use((context, next) => {
+  const { internalSymbols } = context.config;
+  const { symbol } = context.itx.token;
+
+  if (internalSymbols.includes(symbol.toUpperCase())) {
+    return next(new Error('INVALID_SYMBOL', `Token symbol can not be ${symbol}`));
+  }
+
+  return next();
+});
+
 // Ensure token factory not exist
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'tokenFactoryState', table: 'tokenFactory', status: 'OK' }));
 runner.use(
@@ -116,11 +124,7 @@ runner.use(pipes.VerifyBlocked({ stateKeys: ['senderState'] }));
 // Ensure uniqueness of token symbol
 runner.use(
   async function EnsureTokenSymbol(context, next) {
-    const { symbol } = context.config.token;
     const itxToken = context.itx.token;
-    if (symbol.toLowerCase() === itxToken.symbol.toLowerCase()) {
-      return next(new Error('DUPLICATE_SYMBOL', `Token symbol can not be ${symbol}`));
-    }
 
     const exist = await context.statedb.token.existBySymbol(itxToken.symbol, context);
     if (exist) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.22.1",
+  "version": "1.22.3",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -18,19 +18,19 @@
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
     "url-join": "^4.0.1",
-    "@arcblock/did": "1.22.1",
-    "@arcblock/did-util": "1.22.1",
-    "@arcblock/jwt": "1.22.1",
-    "@arcblock/validator": "1.22.1",
-    "@ocap/client": "1.22.1",
-    "@ocap/asset": "1.22.1",
-    "@ocap/mcrypto": "1.22.1",
-    "@ocap/merkle-tree": "1.22.1",
-    "@ocap/message": "1.22.1",
-    "@ocap/state": "1.22.1",
-    "@ocap/tx-pipeline": "1.22.1",
-    "@ocap/util": "1.22.1",
-    "@ocap/wallet": "1.22.1"
+    "@arcblock/did": "1.22.3",
+    "@arcblock/did-util": "1.22.3",
+    "@arcblock/jwt": "1.22.3",
+    "@arcblock/validator": "1.22.3",
+    "@ocap/asset": "1.22.3",
+    "@ocap/client": "1.22.3",
+    "@ocap/merkle-tree": "1.22.3",
+    "@ocap/mcrypto": "1.22.3",
+    "@ocap/message": "1.22.3",
+    "@ocap/state": "1.22.3",
+    "@ocap/tx-pipeline": "1.22.3",
+    "@ocap/util": "1.22.3",
+    "@ocap/wallet": "1.22.3"
   },
   "resolutions": {
     "bn.js": "5.2.1",
@@ -39,8 +39,8 @@
   "devDependencies": {
     "jest": "^29.7.0",
     "start-server-and-test": "^1.14.0",
-    "@ocap/e2e-test": "1.22.1",
-    "@ocap/statedb-memory": "1.22.1"
+    "@ocap/e2e-test": "1.22.3",
+    "@ocap/statedb-memory": "1.22.3"
   },
   "scripts": {
     "lint": "eslint tests lib",