@ocap/tx-protocols 1.13.66 → 1.13.70

package/lib/execute.js

@@ -29,7 +29,7 @@ module.exports = ({ filter, runAsLambda }) => {
       // Since bloom-filters may give false positive, we need to check for statedb if replay detected
       const exist = await context.statedb.tx.get(context.txHash, context);
       if (exist) {
-        return next(new Error('FORBIDDEN', 'Can not execute duplicate transaction'));
+        return next(new Error('DUPLICATE_TX', 'Can not execute duplicate transaction'));
       }
     }
 

package/lib/protocols/asset/acquire-v3.js

@@ -82,7 +82,7 @@ runner.use(
 );
 
 // 5. verify sender & signer & owner
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'senders', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'itx.owner', to: 'ownerState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
@@ -152,7 +152,7 @@ runner.use(
       );
     });
 
-    const isAlsoSigner = !!signerUpdates[senderState.address];
+    const isAlsoSigner = !!signerUpdates[tx.from];
     const owner = ownerState ? ownerState.address : itx.owner;
 
     // Factory updates
@@ -166,12 +166,12 @@ runner.use(
 
     const [newSenderState, newReceiverState, assetState, newSignerStates, newFactoryState, newAssetStates] =
       await Promise.all([
-        // Update sender state
-        statedb.account.update(
-          senderState.address,
-          account.update(
+        // update sender
+        statedb.account.updateOrCreate(
+          senderState,
+          account.updateOrCreate(
             senderState,
-            Object.assign({ nonce: tx.nonce, pk: tx.pk }, signerUpdates[senderState.address] || {}),
+            Object.assign({ address: tx.from, nonce: tx.nonce, pk: tx.pk }, signerUpdates[tx.from] || {}),
             context
           ),
           context
@@ -192,7 +192,7 @@ runner.use(
         // Update signer state
         Promise.all(
           signerStates
-            .filter((x) => x.address !== senderState.address)
+            .filter((x) => x.address !== tx.from)
             .map((x) =>
               statedb.account.update(x.address, account.update(x, signerUpdates[x.address], context), context)
             )

package/lib/protocols/asset/create.js

@@ -77,7 +77,7 @@ runner.use(
     // For security consideration, user can not create fake assets from a factory
     // https://github.com/ArcBlock/asset-chain/issues/97
     {
-      error: 'FORBIDDEN',
+      error: 'CREATE_FROM_FACTORY',
       message: 'You can only get asset from factory from acquire or mint',
       fn: ({ itx, factoryState }) => !(itx.parent && factoryState),
       persist: true,

package/lib/protocols/asset/mint.js

@@ -31,7 +31,7 @@ runner.use(pipes.ExtractState({ from: 'itx.owner', to: 'ownerState', status: 'OK
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'OWNER_ONLY_OPERATION',
       message: 'Only factory owner is allowed to mint',
       fn: ({ factoryState, senderState }) => factoryState.owner === senderState.address,
       persist: true,

package/lib/protocols/asset/pipes/verify-mint-limit.js

@@ -9,5 +9,5 @@ module.exports = ({ factoryState }, next) => {
     return next();
   }
 
-  return next(new Error('FORBIDDEN', 'This request will exceed factory mint limit'));
+  return next(new Error('EXCEED_MINT_LIMIT', 'This request will exceed factory mint limit'));
 };

package/lib/protocols/factory/create.js

@@ -72,7 +72,7 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'factoryState', status:
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'DUPLICATE_FACTORY',
       message: 'This asset factory already exist on chain',
       fn: (context) => isEmpty(context.factoryState),
     },

package/lib/protocols/governance/claim-stake.js

@@ -31,7 +31,7 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: '
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'SENDER_NOT_MATCH',
       message: 'You are not allowed to claim stake from this address',
       fn: ({ tx, stakeState }) => tx.from === stakeState.sender,
     },
@@ -43,7 +43,7 @@ runner.use(pipes.ExtractState({ from: 'itx.evidence.hash', to: 'evidenceState',
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'ALREADY_CLAIMED',
       message: 'Revoke evidence already seen on this chain',
       fn: ({ evidenceState }) => !evidenceState,
     },
@@ -70,7 +70,7 @@ runner.use(
       fn: ({ txState, itx }) => txState.tx.itxJson.address === itx.address,
     },
     {
-      error: 'FORBIDDEN',
+      error: 'WITHIN_WAITING_PERIOD',
       message: 'You can not claim stake before waiting period ends',
       fn: ({ txState, stakeState, txTime }) => {
         const end = +new Date(txState.time) + (stakeState.revokeWaitingPeriod || 0) * 1000;

package/lib/protocols/governance/revoke-stake.js

@@ -49,12 +49,12 @@ runner.use(
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'SENDER_NOT_MATCH',
       message: 'You are not allowed to revoke stake from this address',
       fn: ({ tx, stakeState }) => tx.from === stakeState.sender,
     },
     {
-      error: 'FORBIDDEN',
+      error: 'STAKE_NOT_REVOCABLE',
       message: 'This stake address is not revocable',
       fn: ({ stakeState }) => stakeState.revocable,
     },

package/lib/protocols/governance/stake.js

@@ -64,9 +64,9 @@ runner.use(pipes.VerifyMultiSigV2({ signersKey: 'senders' }));
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: 'OK', table: 'stake' }));
 
 // 5. verify sender & signer & receiver
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
-runner.use(pipes.ExtractState({ from: 'senders', to: 'signerStates', status: 'INVALID_SIGNER_STATE' }));
-runner.use(pipes.ExtractState({ from: 'itx.receiver', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK', table: 'account' }));
+runner.use(pipes.ExtractState({ from: 'senders', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'itx.receiver', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' })); // can by any type
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
 // 6. verify token state and balance
@@ -115,15 +115,15 @@ runner.use(
       stakeUpdates.assets.push(...assetsList);
     });
 
-    const isAlsoSigner = !!signerUpdates[senderState.address];
+    const isAlsoSigner = !!signerUpdates[tx.from];
 
     const [newSenderState, newSignerStates, newStakeState, newAssetStates] = await Promise.all([
       // Update sender state
-      statedb.account.update(
-        senderState.address,
-        account.update(
+      statedb.account.updateOrCreate(
+        senderState,
+        account.updateOrCreate(
           senderState,
-          Object.assign({ nonce: tx.nonce, pk: tx.pk }, signerUpdates[senderState.address] || {}),
+          Object.assign({ address: tx.from, nonce: tx.nonce, pk: tx.pk }, signerUpdates[tx.from] || {}),
           context
         ),
         context
@@ -132,7 +132,7 @@ runner.use(
       // Update signer state
       Promise.all(
         signerStates
-          .filter((x) => x.address !== senderState.address)
+          .filter((x) => x.address !== tx.from)
           .map((x) => statedb.account.update(x.address, account.update(x, signerUpdates[x.address], context), context))
       ),
 

package/lib/protocols/rollup/claim-reward.js

@@ -264,7 +264,10 @@ runner.use(
       ),
     ]);
 
-    context.stakeStates = newStakeStates;
+    // to avoid this to be incorrectly indexed
+    delete context.stakeState;
+
+    context.stakeStates = newStakeStates.filter((x) => updates.stake[x.address]);
     context.accountStates = newAccountStates;
     context.blockState = newBlockState;
 

package/lib/protocols/rollup/create-block.js

@@ -252,70 +252,74 @@ runner.use(
     const { tx, itx, statedb, rollupState, senderState, stakeStates, txStates, formattedItx } = context;
     const senderStates = context.senderStates || [];
 
-    const [newSenderState, newStakeStates, newSenderStates, newRollupState, rollupBlockState] = await Promise.all([
-      // update sender(proposer) account
-      statedb.account.update(
-        senderState.address,
-        account.update(senderState, Object.assign({ nonce: tx.nonce }), context),
-        context
-      ),
-
-      // update stake states
-      Promise.all(
-        stakeStates.map((x) =>
-          context.stakeUpdates[x.address]
-            ? statedb.stake.update(
-                x.address,
-                stake.update(x, applyTokenChange(x, context.stakeUpdates[x.address]), context),
-                context
-              )
-            : Promise.resolve(x)
-        )
-      ),
-
-      // update tx owner states: those may get refund
-      Promise.all(
-        senderStates.map((x) =>
-          statedb.account.update(
-            x.address,
-            account.update(x, applyTokenChange(x, context.accountUpdates[x.address]), context),
-            context
+    const [newSenderState, newStakeStates, newSenderStates, newRollupState, rollupBlockState, newTxStates] =
+      await Promise.all([
+        // update sender(proposer) account
+        statedb.account.update(
+          senderState.address,
+          account.update(senderState, Object.assign({ nonce: tx.nonce }), context),
+          context
+        ),
+
+        // update stake states
+        Promise.all(
+          stakeStates.map((x) =>
+            context.stakeUpdates[x.address]
+              ? statedb.stake.update(
+                  x.address,
+                  stake.update(x, applyTokenChange(x, context.stakeUpdates[x.address]), context),
+                  context
+                )
+              : Promise.resolve(x)
           )
-        )
-      ),
-
-      // Update rollup state
-      statedb.rollup.update(
-        rollupState.address,
-        rollup.update(rollupState, { blockHeight: itx.height, blockHash: itx.hash }, context),
-        context
-      ),
-
-      // Create rollup block
-      statedb.rollupBlock.create(
-        itx.hash,
-        rollupBlock.create(
-          {
-            ...formattedItx,
-            ...['rewardAmount', 'mintedAmount', 'burnedAmount'].reduce((acc, x) => {
-              acc[x] = context[x].toString(10);
-              return acc;
-            }, {}),
-          },
+        ),
+
+        // update tx owner states: those may get refund
+        Promise.all(
+          senderStates.map((x) =>
+            statedb.account.update(
+              x.address,
+              account.update(x, applyTokenChange(x, context.accountUpdates[x.address]), context),
+              context
+            )
+          )
+        ),
+
+        // Update rollup state
+        statedb.rollup.update(
+          rollupState.address,
+          rollup.update(rollupState, { blockHeight: itx.height, blockHash: itx.hash }, context),
+          context
+        ),
+
+        // Create rollup block
+        statedb.rollupBlock.create(
+          itx.hash,
+          rollupBlock.create(
+            {
+              ...formattedItx,
+              ...['rewardAmount', 'mintedAmount', 'burnedAmount'].reduce((acc, x) => {
+                acc[x] = context[x].toString(10);
+                return acc;
+              }, {}),
+            },
+            context
+          ),
           context
         ),
-        context
-      ),
 
-      // Update tx states: mark as finalized
-      Promise.all(txStates.map((x) => statedb.tx.update(x.hash, Tx.update(x, { finalized: true, tx: x.tx }), context))),
-    ]);
+        // Update tx states: mark as finalized
+        Promise.all(
+          txStates.map((x) => statedb.tx.update(x.hash, Tx.update(x, { finalized: true, tx: x.tx }), context))
+        ),
+      ]);
 
     context.senderState = newSenderState;
-    context.stakeStates = newStakeStates;
+    context.stakeStates = newStakeStates.filter((x) => context.stakeUpdates[x.address]);
     context.newSenderStates = newSenderStates;
     context.rollupState = newRollupState;
     context.rollupBlockState = rollupBlockState;
+    context.txStates = newTxStates;
 
     context.updatedAccounts = [...Object.values(context.stakeUpdates), ...Object.values(context.accountUpdates)];
 

package/lib/protocols/rollup/create.js

@@ -88,7 +88,7 @@ runner.use(async (context, next) => {
   const { statedb, itx } = context;
   const exist = await statedb.rollup.existByToken(itx.tokenAddress, context);
   if (exist) {
-    return next(new Error('FORBIDDEN', 'Only 1 rollup can be created for the token'));
+    return next(new Error('DUPLICATE_ROLLUP', 'Only 1 rollup can be created for the token'));
   }
 
   return next();
@@ -99,7 +99,7 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'rollupState', status:
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'DUPLICATE_ROLLUP',
       message: 'This rollup already exist on chain',
       fn: (context) => isEmpty(context.rollupState),
     },

package/lib/protocols/rollup/pipes/ensure-tx-fee.js

@@ -10,8 +10,8 @@ module.exports = async (context, next) => {
   const vaultState = await statedb.account.get(config.vaults.txFee, context);
 
   if (!txFee) {
-    context.senderUpdates = { tokens: {} };
-    context.vaultUpdates = { tokens: {} };
+    context.senderUpdates = {};
+    context.vaultUpdates = {};
     context.vaultState = vaultState;
     context.updatedAccounts = [];
     return next();

package/lib/protocols/token/create.js

@@ -66,7 +66,7 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'tokenState', table: 't
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'DUPLICATE_TOKEN',
       message: 'Token address already exists on chain',
       fn: (context) => isEmpty(context.tokenState),
     },
@@ -77,12 +77,12 @@ runner.use(
 runner.use(async (context, next) => {
   const { symbol } = context.config.token;
   if (symbol.toLowerCase() === context.itx.symbol.toLowerCase()) {
-    return next(new Error('FORBIDDEN', `Token symbol can not be ${symbol}`));
+    return next(new Error('DUPLICATE_SYMBOL', `Token symbol can not be ${symbol}`));
   }
 
   const exist = await context.statedb.token.existBySymbol(context.itx.symbol, context);
   if (exist) {
-    return next(new Error('FORBIDDEN', 'Token symbol already exists'));
+    return next(new Error('DUPLICATE_SYMBOL', 'Token symbol already exists'));
   }
 
   return next();
@@ -97,6 +97,7 @@ runner.use(
     const data = decodeAnySafe(itx.data);
 
     // We are definitely creating a different token, so it is safe to set tokens to initial supply
+    senderUpdates.tokens = senderUpdates.tokens || {};
     senderUpdates.tokens[itx.address] = itx.initialSupply;
 
     const [newSenderState, tokenState, newVaultState] = await Promise.all([

package/lib/util.js

@@ -54,7 +54,7 @@ const decodeAnySafe = (encoded) => {
 
 const applyTokenUpdates = (tokens, state, operator) => {
   if (['add', 'sub'].includes(operator) === false) {
-    throw new Error('FORBIDDEN', `Invalid operator when applyTokenUpdates: ${operator}`);
+    throw new Error('UNEXPECTED_OPERATOR', `Invalid operator when applyTokenUpdates: ${operator}`);
   }
 
   if (!state) {
@@ -69,7 +69,7 @@ const applyTokenUpdates = (tokens, state, operator) => {
     const balance = new BN(oldTokens[address] || 0);
     const newBalance = balance[operator](requirement);
     if (newBalance.lt(ZERO)) {
-      throw new Error('FORBIDDEN', `Negative token balance when applyTokenUpdates for ${address}`);
+      throw new Error('NEGATIVE_TOKEN_BALANCE', `Negative token balance when applyTokenUpdates for ${address}`);
     }
     newTokens[address] = newBalance.toString(10);
   }
@@ -102,16 +102,16 @@ const getTxFee = ({ amount, feeRate, maxFee, minFee, stringify = true }) => {
   const minFeeAmount = new BN(minFee);
 
   if (feeRate < 0) {
-    throw new Error('FORBIDDEN', 'Unexpected negative feeRate when getTxFee, abort!');
+    throw new Error('NEGATIVE_FEE_RATE', 'Unexpected negative feeRate when getTxFee, abort!');
   }
   if (userAmount.lt(ZERO)) {
-    throw new Error('FORBIDDEN', 'Unexpected negative amount when getTxFee, abort!');
+    throw new Error('NEGATIVE_AMOUNT', 'Unexpected negative amount when getTxFee, abort!');
   }
   if (maxFeeAmount.lt(ZERO)) {
-    throw new Error('FORBIDDEN', 'Unexpected negative maxFee when getTxFee, abort!');
+    throw new Error('NEGATIVE_MAX_FEE', 'Unexpected negative maxFee when getTxFee, abort!');
   }
   if (minFeeAmount.lt(ZERO)) {
-    throw new Error('FORBIDDEN', 'Unexpected negative minFee when getTxFee, abort!');
+    throw new Error('NEGATIVE_MIN_FEE', 'Unexpected negative minFee when getTxFee, abort!');
   }
 
   // total fee
@@ -144,11 +144,11 @@ const getTxFee = ({ amount, feeRate, maxFee, minFee, stringify = true }) => {
 const splitTxFee = ({ total, shares = {}, stringify = true }) => {
   const totalAmount = new BN(total);
   if (totalAmount.lt(ZERO)) {
-    throw new Error('FORBIDDEN', 'Unexpected negative total when splitTxFee, abort!');
+    throw new Error('NEGATIVE_TOTAL_AMOUNT', 'Unexpected negative total when splitTxFee, abort!');
   }
   Object.keys(shares).forEach((key) => {
     if (shares[key] < 0) {
-      throw new Error('FORBIDDEN', `Unexpected negative shares[${key}] when splitTxFee, abort!`);
+      throw new Error('NEGATIVE_FEE_SHARE', `Unexpected negative shares[${key}] when splitTxFee, abort!`);
     }
   });
 
@@ -217,7 +217,7 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
     }
 
     if (actualFee.lt(ZERO)) {
-      throw new Error('FORBIDDEN', 'Got negative actualFee for tx, abort!');
+      throw new Error('NEGATIVE_ACTUAL_FEE', 'Got negative actualFee for tx, abort!');
     }
 
     // If the actualFee is less than the maxFee, user will have a refund

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.66",
+  "version": "1.13.70",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -19,17 +19,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.13.66",
-    "@arcblock/did-util": "1.13.66",
-    "@ocap/asset": "1.13.66",
-    "@ocap/mcrypto": "1.13.66",
-    "@ocap/merkle-tree": "1.13.66",
-    "@ocap/message": "1.13.66",
-    "@ocap/state": "1.13.66",
-    "@ocap/tx-pipeline": "1.13.66",
-    "@ocap/util": "1.13.66",
-    "@ocap/validator": "1.13.66",
-    "@ocap/wallet": "1.13.66",
+    "@arcblock/did": "1.13.70",
+    "@arcblock/did-util": "1.13.70",
+    "@ocap/asset": "1.13.70",
+    "@ocap/mcrypto": "1.13.70",
+    "@ocap/merkle-tree": "1.13.70",
+    "@ocap/message": "1.13.70",
+    "@ocap/state": "1.13.70",
+    "@ocap/tx-pipeline": "1.13.70",
+    "@ocap/util": "1.13.70",
+    "@ocap/validator": "1.13.70",
+    "@ocap/wallet": "1.13.70",
     "debug": "^4.3.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
@@ -42,5 +42,5 @@
   "devDependencies": {
     "jest": "^27.3.1"
   },
-  "gitHead": "1395a8dccee398dd0aed47c2b54a2c6e350d8621"
+  "gitHead": "17d673049138356f4cce9ca3d59e2f531b479c2d"
 }