@ocap/tx-protocols 1.16.16 → 1.17.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/execute.js +1 -1
- package/lib/protocols/account/declare.js +2 -2
- package/lib/protocols/account/delegate.js +3 -3
- package/lib/protocols/account/migrate.js +3 -3
- package/lib/protocols/account/revoke-delegate.js +2 -2
- package/lib/protocols/asset/create.js +1 -1
- package/lib/protocols/asset/pipes/extract-factory-tokens.js +1 -1
- package/lib/protocols/asset/pipes/verify-acquire-params.js +2 -2
- package/lib/protocols/asset/pipes/verify-itx-address.js +1 -1
- package/lib/protocols/asset/pipes/verify-itx-assets.js +2 -2
- package/lib/protocols/asset/pipes/verify-itx-variables.js +2 -2
- package/lib/protocols/asset/pipes/verify-mint-limit.js +1 -1
- package/lib/protocols/asset/update.js +2 -2
- package/lib/protocols/factory/create.js +1 -1
- package/lib/protocols/governance/claim-stake.js +4 -4
- package/lib/protocols/governance/revoke-stake.js +1 -1
- package/lib/protocols/governance/stake.js +2 -2
- package/lib/protocols/rollup/claim-reward.js +4 -4
- package/lib/protocols/rollup/create-block.js +8 -8
- package/lib/protocols/rollup/create.js +1 -1
- package/lib/protocols/rollup/join.js +4 -4
- package/lib/protocols/rollup/leave.js +4 -4
- package/lib/protocols/rollup/migrate-contract.js +2 -2
- package/lib/protocols/rollup/migrate-token.js +2 -2
- package/lib/protocols/rollup/pause.js +2 -2
- package/lib/protocols/rollup/pipes/ensure-service-fee.js +1 -1
- package/lib/protocols/rollup/pipes/verify-evidence.js +1 -1
- package/lib/protocols/rollup/pipes/verify-signers.js +1 -1
- package/lib/protocols/rollup/resume.js +2 -2
- package/lib/protocols/rollup/update.js +2 -2
- package/lib/protocols/token/create.js +3 -3
- package/lib/protocols/token/deposit-v2.js +5 -5
- package/lib/protocols/token/withdraw-v2.js +4 -4
- package/lib/protocols/trade/exchange-v2.js +2 -2
- package/lib/protocols/trade/transfer-v2.js +1 -1
- package/lib/protocols/trade/transfer-v3.js +1 -1
- package/lib/util.js +1 -1
- package/package.json +13 -13
package/lib/execute.js
CHANGED
|
@@ -3,7 +3,7 @@ const get = require('lodash/get');
|
|
|
3
3
|
const pick = require('lodash/pick');
|
|
4
4
|
const omit = require('lodash/omit');
|
|
5
5
|
const camelCase = require('lodash/camelCase');
|
|
6
|
-
const Error = require('@ocap/util/lib/error');
|
|
6
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
7
7
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
8
8
|
|
|
9
9
|
const getTxName = (typeUrl) => camelCase(typeUrl.split(':').pop());
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
-
const Joi = require('@arcblock/validator');
|
|
1
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
2
|
+
const { Joi } = require('@arcblock/validator');
|
|
3
3
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
4
4
|
const { account } = require('@ocap/state');
|
|
5
5
|
const { toBase58 } = require('@ocap/util');
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/* eslint-disable max-len */
|
|
2
2
|
const get = require('lodash/get');
|
|
3
|
-
const Joi = require('@arcblock/validator');
|
|
4
|
-
const Error = require('@ocap/util/lib/error');
|
|
5
|
-
const getListField = require('@ocap/util/lib/get-list-field');
|
|
3
|
+
const { Joi } = require('@arcblock/validator');
|
|
4
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
5
|
+
const { getListField } = require('@ocap/util/lib/get-list-field');
|
|
6
6
|
const { delegation, account } = require('@ocap/state');
|
|
7
7
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
8
8
|
const { toDelegateAddress } = require('@arcblock/did-util');
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
-
const Joi = require('@arcblock/validator');
|
|
3
|
-
const getRelatedAddresses = require('@ocap/util/lib/get-related-addr');
|
|
1
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
2
|
+
const { Joi } = require('@arcblock/validator');
|
|
3
|
+
const { getRelatedAddresses } = require('@ocap/util/lib/get-related-addr');
|
|
4
4
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
5
5
|
const { fromPublicKey, toTypeInfo } = require('@arcblock/did');
|
|
6
6
|
const { account } = require('@ocap/state');
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const get = require('lodash/get');
|
|
2
2
|
const cloneDeep = require('lodash/cloneDeep');
|
|
3
|
-
const Joi = require('@arcblock/validator');
|
|
4
|
-
const getListField = require('@ocap/util/lib/get-list-field');
|
|
3
|
+
const { Joi } = require('@arcblock/validator');
|
|
4
|
+
const { getListField } = require('@ocap/util/lib/get-list-field');
|
|
5
5
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
6
6
|
const { delegation, account } = require('@ocap/state');
|
|
7
7
|
const { toDelegateAddress } = require('@arcblock/did-util');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* eslint-disable indent */
|
|
2
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
3
3
|
const isEmpty = require('lodash/isEmpty');
|
|
4
4
|
const cloneDeep = require('lodash/cloneDeep');
|
|
5
5
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const uniqBy = require('lodash/uniqBy');
|
|
2
2
|
const { BN } = require('@ocap/util');
|
|
3
|
-
const createSortedList = require('@ocap/util/lib/create-sorted-list');
|
|
3
|
+
const { createSortedList } = require('@ocap/util/lib/create-sorted-list');
|
|
4
4
|
|
|
5
5
|
// Create token requirements from factoryState
|
|
6
6
|
module.exports = (context, next) => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
-
const getListField = require('@ocap/util/lib/get-list-field');
|
|
1
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
2
|
+
const { getListField } = require('@ocap/util/lib/get-list-field');
|
|
3
3
|
|
|
4
4
|
module.exports =
|
|
5
5
|
(mode) =>
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
-
const getListField = require('@ocap/util/lib/get-list-field');
|
|
1
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
2
|
+
const { getListField } = require('@ocap/util/lib/get-list-field');
|
|
3
3
|
|
|
4
4
|
module.exports = (context, next) => {
|
|
5
5
|
const { factoryState, expectedFactoryStates = [], assetStates: actualAssetStates = [], itx } = context;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
-
const getListField = require('@ocap/util/lib/get-list-field');
|
|
1
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
2
|
+
const { getListField } = require('@ocap/util/lib/get-list-field');
|
|
3
3
|
|
|
4
4
|
module.exports = (context, next) => {
|
|
5
5
|
const { factoryState, itx } = context;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const deepDiff = require('deep-diff');
|
|
2
|
-
const Error = require('@ocap/util/lib/error');
|
|
3
|
-
const Joi = require('@arcblock/validator');
|
|
2
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
3
|
+
const { Joi } = require('@arcblock/validator');
|
|
4
4
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
5
5
|
const { account, asset } = require('@ocap/state');
|
|
6
6
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
const get = require('lodash/get');
|
|
3
3
|
const isEmpty = require('empty-value');
|
|
4
4
|
const cloneDeep = require('lodash/cloneDeep');
|
|
5
|
-
const Error = require('@ocap/util/lib/error');
|
|
5
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
6
6
|
const { isValidFactory } = require('@ocap/asset');
|
|
7
7
|
const { formatMessage } = require('@ocap/message');
|
|
8
8
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
-
const Joi = require('@arcblock/validator');
|
|
1
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
2
|
+
const { Joi, patterns } = require('@arcblock/validator');
|
|
3
3
|
const { BN } = require('@ocap/util');
|
|
4
4
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
5
5
|
const { account, asset, stake, evidence } = require('@ocap/state');
|
|
6
|
-
const getRelatedAddresses = require('@ocap/util/lib/get-related-addr');
|
|
6
|
+
const { getRelatedAddresses } = require('@ocap/util/lib/get-related-addr');
|
|
7
7
|
|
|
8
8
|
// eslint-disable-next-line global-require
|
|
9
9
|
const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v2`);
|
|
@@ -18,7 +18,7 @@ runner.use(pipes.VerifyMultiSig(0));
|
|
|
18
18
|
const schema = Joi.object({
|
|
19
19
|
address: Joi.DID().role('ROLE_STAKE').required(),
|
|
20
20
|
evidence: Joi.object({
|
|
21
|
-
hash: Joi.string().regex(
|
|
21
|
+
hash: Joi.string().regex(patterns.txHash).required(),
|
|
22
22
|
}).required(),
|
|
23
23
|
data: Joi.any().optional(),
|
|
24
24
|
}).options({ stripUnknown: true, noDefaults: false });
|
|
@@ -2,7 +2,7 @@ const isEmpty = require('empty-value');
|
|
|
2
2
|
const { BN } = require('@ocap/util');
|
|
3
3
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
4
4
|
const { account, stake } = require('@ocap/state');
|
|
5
|
-
const getRelatedAddresses = require('@ocap/util/lib/get-related-addr');
|
|
5
|
+
const { getRelatedAddresses } = require('@ocap/util/lib/get-related-addr');
|
|
6
6
|
|
|
7
7
|
// eslint-disable-next-line global-require
|
|
8
8
|
const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v2`);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
const pick = require('lodash/pick');
|
|
2
2
|
const { promisify } = require('util');
|
|
3
3
|
const isEmpty = require('empty-value');
|
|
4
|
-
const Joi = require('@arcblock/validator');
|
|
5
|
-
const Error = require('@ocap/util/lib/error');
|
|
4
|
+
const { Joi } = require('@arcblock/validator');
|
|
5
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
6
6
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
7
7
|
const { toStakeAddress } = require('@arcblock/did-util');
|
|
8
8
|
const { account, asset, stake } = require('@ocap/state');
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
const uniqBy = require('lodash/uniqBy');
|
|
2
2
|
const groupBy = require('lodash/groupBy');
|
|
3
3
|
const cloneDeep = require('lodash/cloneDeep');
|
|
4
|
-
const Joi = require('@arcblock/validator');
|
|
5
|
-
const Error = require('@ocap/util/lib/error');
|
|
4
|
+
const { Joi, patterns } = require('@arcblock/validator');
|
|
5
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
6
6
|
const { BN } = require('@ocap/util');
|
|
7
7
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
8
8
|
const { account, stake, evidence, rollupBlock } = require('@ocap/state');
|
|
@@ -20,9 +20,9 @@ const runner = new Runner();
|
|
|
20
20
|
const schema = Joi.object({
|
|
21
21
|
rollup: Joi.DID().role('ROLE_ROLLUP').required(),
|
|
22
22
|
blockHeight: Joi.number().integer().greater(0).required(),
|
|
23
|
-
blockHash: Joi.string().regex(
|
|
23
|
+
blockHash: Joi.string().regex(patterns.txHash).required(),
|
|
24
24
|
evidence: Joi.object({
|
|
25
|
-
hash: Joi.string().regex(
|
|
25
|
+
hash: Joi.string().regex(patterns.txHash).required(),
|
|
26
26
|
}).required(),
|
|
27
27
|
publisher: Joi.DID().wallet('ethereum').required(),
|
|
28
28
|
data: Joi.any().optional(),
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/* eslint-disable indent */
|
|
2
2
|
const pick = require('lodash/pick');
|
|
3
|
-
const Error = require('@ocap/util/lib/error');
|
|
3
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
4
4
|
const MerkleTree = require('@ocap/merkle-tree');
|
|
5
|
-
const Joi = require('@arcblock/validator');
|
|
5
|
+
const { Joi, schemas, patterns } = require('@arcblock/validator');
|
|
6
6
|
const { formatMessage } = require('@ocap/message');
|
|
7
7
|
const { toStakeAddress } = require('@arcblock/did-util');
|
|
8
8
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
@@ -20,18 +20,18 @@ const runner = new Runner();
|
|
|
20
20
|
|
|
21
21
|
// 1. verify itx
|
|
22
22
|
const schema = Joi.object({
|
|
23
|
-
hash: Joi.string().regex(
|
|
23
|
+
hash: Joi.string().regex(patterns.txHash).required(),
|
|
24
24
|
height: Joi.number().integer().greater(0).required(),
|
|
25
|
-
merkleRoot: Joi.string().regex(
|
|
25
|
+
merkleRoot: Joi.string().regex(patterns.txHash).required(),
|
|
26
26
|
previousHash: Joi.string().when('height', {
|
|
27
27
|
is: 1,
|
|
28
28
|
then: Joi.string().optional().allow(''),
|
|
29
|
-
otherwise: Joi.string().regex(
|
|
29
|
+
otherwise: Joi.string().regex(patterns.txHash).required(),
|
|
30
30
|
}),
|
|
31
|
-
txsHash: Joi.string().regex(
|
|
32
|
-
txsList: Joi.array().items(Joi.string().regex(
|
|
31
|
+
txsHash: Joi.string().regex(patterns.txHash).required(),
|
|
32
|
+
txsList: Joi.array().items(Joi.string().regex(patterns.txHash).required()).min(1).unique().required(),
|
|
33
33
|
proposer: Joi.DID().wallet('ethereum').required(),
|
|
34
|
-
signaturesList:
|
|
34
|
+
signaturesList: schemas.multiSig.min(1).required(),
|
|
35
35
|
rollup: Joi.DID().role('ROLE_ROLLUP').required(),
|
|
36
36
|
minReward: Joi.BN().min(0).required(),
|
|
37
37
|
data: Joi.any().optional(),
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable indent */
|
|
2
2
|
const isEmpty = require('empty-value');
|
|
3
3
|
const cloneDeep = require('lodash/cloneDeep');
|
|
4
|
-
const Error = require('@ocap/util/lib/error');
|
|
4
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
5
5
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
6
6
|
const { account, rollup } = require('@ocap/state');
|
|
7
7
|
const { formatMessage } = require('@ocap/message');
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/* eslint-disable indent */
|
|
2
2
|
const MerkleTree = require('@ocap/merkle-tree');
|
|
3
3
|
const joinUrl = require('url-join');
|
|
4
|
-
const Error = require('@ocap/util/lib/error');
|
|
5
|
-
const Joi = require('@arcblock/validator');
|
|
4
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
5
|
+
const { Joi, schemas, patterns } = require('@arcblock/validator');
|
|
6
6
|
const { BN, toHex } = require('@ocap/util');
|
|
7
7
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
8
8
|
const { account, rollup, stake, evidence } = require('@ocap/state');
|
|
@@ -25,9 +25,9 @@ const schema = Joi.object({
|
|
|
25
25
|
.uri({ scheme: [/https?/] })
|
|
26
26
|
.required(),
|
|
27
27
|
evidence: Joi.object({
|
|
28
|
-
hash: Joi.string().regex(
|
|
28
|
+
hash: Joi.string().regex(patterns.txHash).required(),
|
|
29
29
|
}).required(),
|
|
30
|
-
signaturesList:
|
|
30
|
+
signaturesList: schemas.multiSig.min(1).required(),
|
|
31
31
|
data: Joi.any().optional(),
|
|
32
32
|
}).options({ stripUnknown: true, noDefaults: false });
|
|
33
33
|
runner.use(({ itx }, next) => {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable indent */
|
|
2
2
|
const MerkleTree = require('@ocap/merkle-tree');
|
|
3
|
-
const Error = require('@ocap/util/lib/error');
|
|
4
|
-
const Joi = require('@arcblock/validator');
|
|
3
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
4
|
+
const { Joi, schemas, patterns } = require('@arcblock/validator');
|
|
5
5
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
6
6
|
const { account, rollup, stake, evidence } = require('@ocap/state');
|
|
7
7
|
const { toStakeAddress } = require('@arcblock/did-util');
|
|
@@ -19,9 +19,9 @@ const runner = new Runner();
|
|
|
19
19
|
const schema = Joi.object({
|
|
20
20
|
rollup: Joi.DID().role('ROLE_ROLLUP').required(),
|
|
21
21
|
evidence: Joi.object({
|
|
22
|
-
hash: Joi.string().regex(
|
|
22
|
+
hash: Joi.string().regex(patterns.txHash).required(),
|
|
23
23
|
}).required(),
|
|
24
|
-
signaturesList:
|
|
24
|
+
signaturesList: schemas.multiSig.min(1).required(),
|
|
25
25
|
data: Joi.any().optional(),
|
|
26
26
|
}).options({ stripUnknown: true, noDefaults: false });
|
|
27
27
|
runner.use(({ itx }, next) => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
-
const Joi = require('@arcblock/validator');
|
|
1
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
2
|
+
const { Joi } = require('@arcblock/validator');
|
|
3
3
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
4
4
|
const { account, rollup } = require('@ocap/state');
|
|
5
5
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
-
const Joi = require('@arcblock/validator');
|
|
1
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
2
|
+
const { Joi } = require('@arcblock/validator');
|
|
3
3
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
4
4
|
const { account } = require('@ocap/state');
|
|
5
5
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
-
const Joi = require('@arcblock/validator');
|
|
1
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
2
|
+
const { Joi } = require('@arcblock/validator');
|
|
3
3
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
4
4
|
const { account, rollup } = require('@ocap/state');
|
|
5
5
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const get = require('lodash/get');
|
|
2
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
3
3
|
const { toHex } = require('@ocap/util');
|
|
4
4
|
const { toTypeInfo } = require('@arcblock/did');
|
|
5
5
|
const { fromPublicKey } = require('@ocap/wallet');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const get = require('lodash/get');
|
|
2
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
3
3
|
|
|
4
4
|
module.exports = function CreateVerifySignersPipe({ signersKey, allowSender = true, allowShrink = false }) {
|
|
5
5
|
return (context, next) => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
-
const Joi = require('@arcblock/validator');
|
|
1
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
2
|
+
const { Joi } = require('@arcblock/validator');
|
|
3
3
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
4
4
|
const { account, rollup } = require('@ocap/state');
|
|
5
5
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const Error = require('@ocap/util/lib/error');
|
|
2
|
-
const Joi = require('@arcblock/validator');
|
|
1
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
2
|
+
const { Joi } = require('@arcblock/validator');
|
|
3
3
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
4
4
|
const { account, rollup } = require('@ocap/state');
|
|
5
5
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const isEmpty = require('empty-value');
|
|
2
2
|
const cloneDeep = require('lodash/cloneDeep');
|
|
3
|
-
const Joi = require('@arcblock/validator');
|
|
4
|
-
const Error = require('@ocap/util/lib/error');
|
|
3
|
+
const { Joi, schemas } = require('@arcblock/validator');
|
|
4
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
5
5
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
6
6
|
const { account, token } = require('@ocap/state');
|
|
7
7
|
const { toTokenAddress } = require('@arcblock/did-util');
|
|
@@ -28,7 +28,7 @@ const schema = Joi.object({
|
|
|
28
28
|
icon: Joi.string().optional().valid(''),
|
|
29
29
|
totalSupply: Joi.BN().greater(0).max(MAX_TOTAL_SUPPLY).required(),
|
|
30
30
|
initialSupply: Joi.BN().greater(0).max(Joi.ref('totalSupply')).required(),
|
|
31
|
-
foreignToken:
|
|
31
|
+
foreignToken: schemas.foreignToken.optional().default(null),
|
|
32
32
|
data: Joi.any().optional(),
|
|
33
33
|
}).options({ stripUnknown: true, noDefaults: false });
|
|
34
34
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable indent */
|
|
2
|
-
const Error = require('@ocap/util/lib/error');
|
|
3
|
-
const Joi = require('@arcblock/validator');
|
|
4
|
-
const getListField = require('@ocap/util/lib/get-list-field');
|
|
2
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
3
|
+
const { Joi, schemas, patterns } = require('@arcblock/validator');
|
|
4
|
+
const { getListField } = require('@ocap/util/lib/get-list-field');
|
|
5
5
|
const { BN, fromUnitToToken } = require('@ocap/util');
|
|
6
6
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
7
7
|
const { account, stake, evidence } = require('@ocap/state');
|
|
@@ -15,11 +15,11 @@ const VerifyPaused = require('../rollup/pipes/verify-paused');
|
|
|
15
15
|
const { applyTokenUpdates, getTxFee, getBNSum, getRewardLocker } = require('../../util');
|
|
16
16
|
|
|
17
17
|
const schema = Joi.object({
|
|
18
|
-
token:
|
|
18
|
+
token: schemas.tokenInput.required(),
|
|
19
19
|
to: Joi.DID().wallet('ethereum').required(),
|
|
20
20
|
proposer: Joi.DID().wallet('ethereum').required(),
|
|
21
21
|
evidence: Joi.object({
|
|
22
|
-
hash: Joi.string().regex(
|
|
22
|
+
hash: Joi.string().regex(patterns.txHash).required(),
|
|
23
23
|
}).required(),
|
|
24
24
|
rollup: Joi.DID().role('ROLE_ROLLUP').required(),
|
|
25
25
|
actualFee: Joi.BN().min(0).required(),
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable indent */
|
|
2
|
-
const Error = require('@ocap/util/lib/error');
|
|
3
|
-
const Joi = require('@arcblock/validator');
|
|
4
|
-
const getListField = require('@ocap/util/lib/get-list-field');
|
|
2
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
3
|
+
const { Joi, schemas } = require('@arcblock/validator');
|
|
4
|
+
const { getListField } = require('@ocap/util/lib/get-list-field');
|
|
5
5
|
const { BN, fromUnitToToken } = require('@ocap/util');
|
|
6
6
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
7
7
|
const { account, stake } = require('@ocap/state');
|
|
@@ -16,7 +16,7 @@ const { applyTokenUpdates, getTxFee, getBNSum, getRewardLocker } = require('../.
|
|
|
16
16
|
const verifyMultiSigV2 = pipes.VerifyMultiSigV2({ signersKey: 'signers' });
|
|
17
17
|
|
|
18
18
|
const schema = Joi.object({
|
|
19
|
-
token:
|
|
19
|
+
token: schemas.tokenInput.required(),
|
|
20
20
|
to: Joi.DID().wallet('ethereum').required(),
|
|
21
21
|
rollup: Joi.DID().role('ROLE_ROLLUP').required(),
|
|
22
22
|
proposer: Joi.DID().wallet('ethereum').optional().allow('').default(''),
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const isEmpty = require('empty-value');
|
|
2
|
-
const getListField = require('@ocap/util/lib/get-list-field');
|
|
3
|
-
const createSortedList = require('@ocap/util/lib/create-sorted-list');
|
|
2
|
+
const { getListField } = require('@ocap/util/lib/get-list-field');
|
|
3
|
+
const { createSortedList } = require('@ocap/util/lib/create-sorted-list');
|
|
4
4
|
const { decodeBigInt } = require('@ocap/message');
|
|
5
5
|
const { BN } = require('@ocap/util');
|
|
6
6
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const isEmpty = require('empty-value');
|
|
2
|
-
const getListField = require('@ocap/util/lib/get-list-field');
|
|
2
|
+
const { getListField } = require('@ocap/util/lib/get-list-field');
|
|
3
3
|
const { decodeBigInt } = require('@ocap/message');
|
|
4
4
|
const { BN } = require('@ocap/util');
|
|
5
5
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
@@ -6,7 +6,7 @@ const isEqual = require('lodash/isEqual');
|
|
|
6
6
|
const { BN } = require('@ocap/util');
|
|
7
7
|
const { Runner, pipes } = require('@ocap/tx-pipeline');
|
|
8
8
|
const { account, asset } = require('@ocap/state');
|
|
9
|
-
const getRelatedAddresses = require('@ocap/util/lib/get-related-addr');
|
|
9
|
+
const { getRelatedAddresses } = require('@ocap/util/lib/get-related-addr');
|
|
10
10
|
|
|
11
11
|
// eslint-disable-next-line global-require
|
|
12
12
|
const debug = require('debug')(`${require('../../../package.json').name}:transfer-v2`);
|
package/lib/util.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const groupBy = require('lodash/groupBy');
|
|
2
2
|
const flattenDeep = require('lodash/flattenDeep');
|
|
3
|
-
const Error = require('@ocap/util/lib/error');
|
|
3
|
+
const { CustomError: Error } = require('@ocap/util/lib/error');
|
|
4
4
|
const { BN } = require('@ocap/util');
|
|
5
5
|
const { decodeAny } = require('@ocap/message');
|
|
6
6
|
const { toStakeAddress } = require('@arcblock/did-util');
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"publishConfig": {
|
|
4
4
|
"access": "public"
|
|
5
5
|
},
|
|
6
|
-
"version": "1.
|
|
6
|
+
"version": "1.17.1",
|
|
7
7
|
"description": "Predefined tx pipeline sets to execute certain type of transactions",
|
|
8
8
|
"main": "lib/index.js",
|
|
9
9
|
"files": [
|
|
@@ -21,17 +21,17 @@
|
|
|
21
21
|
"author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
|
|
22
22
|
"license": "MIT",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@arcblock/did": "1.
|
|
25
|
-
"@arcblock/did-util": "1.
|
|
26
|
-
"@arcblock/validator": "1.
|
|
27
|
-
"@ocap/asset": "1.
|
|
28
|
-
"@ocap/mcrypto": "1.
|
|
29
|
-
"@ocap/merkle-tree": "1.
|
|
30
|
-
"@ocap/message": "1.
|
|
31
|
-
"@ocap/state": "1.
|
|
32
|
-
"@ocap/tx-pipeline": "1.
|
|
33
|
-
"@ocap/util": "1.
|
|
34
|
-
"@ocap/wallet": "1.
|
|
24
|
+
"@arcblock/did": "1.17.1",
|
|
25
|
+
"@arcblock/did-util": "1.17.1",
|
|
26
|
+
"@arcblock/validator": "1.17.1",
|
|
27
|
+
"@ocap/asset": "1.17.1",
|
|
28
|
+
"@ocap/mcrypto": "1.17.1",
|
|
29
|
+
"@ocap/merkle-tree": "1.17.1",
|
|
30
|
+
"@ocap/message": "1.17.1",
|
|
31
|
+
"@ocap/state": "1.17.1",
|
|
32
|
+
"@ocap/tx-pipeline": "1.17.1",
|
|
33
|
+
"@ocap/util": "1.17.1",
|
|
34
|
+
"@ocap/wallet": "1.17.1",
|
|
35
35
|
"debug": "^4.3.3",
|
|
36
36
|
"deep-diff": "^1.0.2",
|
|
37
37
|
"empty-value": "^1.0.1",
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"jest": "^27.3.1",
|
|
47
47
|
"start-server-and-test": "^1.14.0"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "ca2ac264d9d6358680d5be99fcdd4685d0c999fc"
|
|
50
50
|
}
|