@ocap/tx-protocols 1.29.27 → 1.30.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.
Files changed (78) hide show
  1. package/esm/_virtual/rolldown_runtime.mjs +32 -0
  2. package/esm/node_modules/bn.js/lib/bn.mjs +2551 -0
  3. package/esm/node_modules/valibot/dist/index.mjs +663 -0
  4. package/esm/protocols/account/delegate.mjs +42 -36
  5. package/esm/protocols/account/migrate.mjs +7 -10
  6. package/esm/protocols/account/revoke-delegate.mjs +11 -11
  7. package/esm/protocols/asset/acquire-v2.mjs +19 -13
  8. package/esm/protocols/asset/acquire-v3.mjs +17 -14
  9. package/esm/protocols/asset/consume.mjs +9 -9
  10. package/esm/protocols/asset/create.mjs +2 -1
  11. package/esm/protocols/asset/mint.mjs +19 -13
  12. package/esm/protocols/asset/update.mjs +11 -11
  13. package/esm/protocols/governance/claim-stake.mjs +10 -10
  14. package/esm/protocols/governance/return-stake.mjs +11 -11
  15. package/esm/protocols/governance/revoke-stake.mjs +10 -10
  16. package/esm/protocols/governance/slash-stake.mjs +11 -11
  17. package/esm/protocols/governance/stake.mjs +16 -16
  18. package/esm/protocols/rollup/claim-reward.mjs +21 -18
  19. package/esm/protocols/rollup/close.mjs +16 -13
  20. package/esm/protocols/rollup/create-block.mjs +25 -22
  21. package/esm/protocols/rollup/join.mjs +14 -12
  22. package/esm/protocols/rollup/leave.mjs +12 -11
  23. package/esm/protocols/rollup/migrate.mjs +15 -12
  24. package/esm/protocols/rollup/pause.mjs +9 -9
  25. package/esm/protocols/rollup/resume.mjs +9 -9
  26. package/esm/protocols/rollup/update.mjs +31 -28
  27. package/esm/protocols/token/create.mjs +25 -22
  28. package/esm/protocols/token/deposit-v2.mjs +20 -14
  29. package/esm/protocols/token/withdraw-v2.mjs +20 -14
  30. package/esm/protocols/token-factory/burn.mjs +12 -12
  31. package/esm/protocols/token-factory/create.mjs +45 -37
  32. package/esm/protocols/token-factory/mint.mjs +13 -12
  33. package/esm/protocols/token-factory/update.mjs +21 -21
  34. package/esm/protocols/trade/exchange-v2.mjs +15 -15
  35. package/esm/protocols/trade/transfer-v2.mjs +12 -12
  36. package/esm/protocols/trade/transfer-v3.mjs +7 -10
  37. package/esm/util.d.mts +3 -1
  38. package/esm/util.mjs +16 -1
  39. package/lib/_virtual/rolldown_runtime.cjs +2 -0
  40. package/lib/node_modules/bn.js/lib/bn.cjs +2554 -0
  41. package/lib/node_modules/valibot/dist/index.cjs +683 -0
  42. package/lib/protocols/account/delegate.cjs +41 -35
  43. package/lib/protocols/account/migrate.cjs +6 -9
  44. package/lib/protocols/account/revoke-delegate.cjs +10 -10
  45. package/lib/protocols/asset/acquire-v2.cjs +18 -12
  46. package/lib/protocols/asset/acquire-v3.cjs +16 -13
  47. package/lib/protocols/asset/consume.cjs +8 -8
  48. package/lib/protocols/asset/create.cjs +2 -1
  49. package/lib/protocols/asset/mint.cjs +18 -12
  50. package/lib/protocols/asset/update.cjs +10 -10
  51. package/lib/protocols/governance/claim-stake.cjs +9 -9
  52. package/lib/protocols/governance/return-stake.cjs +10 -10
  53. package/lib/protocols/governance/revoke-stake.cjs +9 -9
  54. package/lib/protocols/governance/slash-stake.cjs +10 -10
  55. package/lib/protocols/governance/stake.cjs +15 -15
  56. package/lib/protocols/rollup/claim-reward.cjs +20 -17
  57. package/lib/protocols/rollup/close.cjs +15 -12
  58. package/lib/protocols/rollup/create-block.cjs +24 -21
  59. package/lib/protocols/rollup/join.cjs +13 -11
  60. package/lib/protocols/rollup/leave.cjs +11 -10
  61. package/lib/protocols/rollup/migrate.cjs +14 -11
  62. package/lib/protocols/rollup/pause.cjs +8 -8
  63. package/lib/protocols/rollup/resume.cjs +8 -8
  64. package/lib/protocols/rollup/update.cjs +29 -27
  65. package/lib/protocols/token/create.cjs +23 -20
  66. package/lib/protocols/token/deposit-v2.cjs +19 -13
  67. package/lib/protocols/token/withdraw-v2.cjs +19 -13
  68. package/lib/protocols/token-factory/burn.cjs +11 -11
  69. package/lib/protocols/token-factory/create.cjs +43 -35
  70. package/lib/protocols/token-factory/mint.cjs +12 -11
  71. package/lib/protocols/token-factory/update.cjs +19 -19
  72. package/lib/protocols/trade/exchange-v2.cjs +14 -14
  73. package/lib/protocols/trade/transfer-v2.cjs +11 -11
  74. package/lib/protocols/trade/transfer-v3.cjs +6 -9
  75. package/lib/util.cjs +17 -0
  76. package/lib/util.d.cts +3 -1
  77. package/package.json +16 -18
  78. package/tools/fixtures.ts +2 -1
@@ -3,6 +3,7 @@ const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
3
3
  const require_util = require('../../util.cjs');
4
4
  const require_pipes_ensure_cost = require('../../pipes/ensure-cost.cjs');
5
5
  const require_pipes_ensure_gas = require('../../pipes/ensure-gas.cjs');
6
+ const require_index = require('../../node_modules/valibot/dist/index.cjs');
6
7
  const require_protocols_token_factory_pipes_calc_reserve = require('./pipes/calc-reserve.cjs');
7
8
  let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
8
9
  let _ocap_util_lib_error = require("@ocap/util/lib/error");
@@ -15,18 +16,18 @@ let _arcblock_validator = require("@arcblock/validator");
15
16
 
16
17
  //#region src/protocols/token-factory/mint.ts
17
18
  const runner = new _ocap_tx_pipeline.Runner("mint_token");
18
- const schema = _arcblock_validator.Joi.object({
19
- tokenFactory: _arcblock_validator.Joi.DID().prefix().role("ROLE_TOKEN_FACTORY").required(),
20
- receiver: _arcblock_validator.schemas.tokenHolder.required(),
21
- amount: _arcblock_validator.Joi.BN().greater(0).required(),
22
- data: _arcblock_validator.Joi.any().optional().allow(null),
23
- inputsList: _arcblock_validator.schemas.multiInput.optional()
24
- }).options({
25
- stripUnknown: true,
26
- noDefaults: false
27
- });
19
+ const schema = require_index.pipe(require_index.object({
20
+ tokenFactory: (0, _arcblock_validator.vDID)({
21
+ prefix: true,
22
+ role: "ROLE_TOKEN_FACTORY"
23
+ }),
24
+ receiver: _arcblock_validator.schemas.tokenHolder,
25
+ amount: (0, _arcblock_validator.vBN)((0, _arcblock_validator.vBNGreater)(0)),
26
+ data: require_index.optional(require_index.nullable(require_index.any())),
27
+ inputsList: require_index.optional(_arcblock_validator.schemas.multiInput)
28
+ }), (0, _arcblock_validator.vStripUnknown)());
28
29
  runner.use(({ itx }, next) => {
29
- const { error } = schema.validate(itx);
30
+ const { error } = (0, _arcblock_validator.vValidate)(schema, itx);
30
31
  if (error) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`));
31
32
  return next();
32
33
  });
@@ -18,33 +18,33 @@ const debug$1 = (0, debug.default)("@ocap/tx-protocols:update-token-factory");
18
18
  const runner = new _ocap_tx_pipeline.Runner("update_token_factory");
19
19
  const isTest = process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test" || process.env.CI;
20
20
  runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSig(0));
21
- const schema = _arcblock_validator.Joi.object({
22
- address: _arcblock_validator.Joi.DID().prefix().role("ROLE_TOKEN_FACTORY").required(),
23
- feeRate: _arcblock_validator.Joi.number().min(0).max(2e3).optional().allow(null),
24
- token: _arcblock_validator.Joi.object({
25
- icon: _arcblock_validator.Joi.string().optional().allow(null, ""),
26
- website: _arcblock_validator.Joi.string().uri({
27
- scheme: isTest ? ["http", "https"] : ["https"],
28
- allowRelative: false
29
- }).max(256).optional().allow(null, ""),
30
- metadata: _arcblock_validator.Joi.any().optional().allow(null)
31
- }).optional().allow(null),
32
- data: _arcblock_validator.Joi.any().optional().allow(null)
33
- }).options({
34
- stripUnknown: true,
35
- noDefaults: false
36
- });
21
+ const schema = _arcblock_validator.v.pipe(_arcblock_validator.v.object({
22
+ address: (0, _arcblock_validator.vDID)({
23
+ prefix: true,
24
+ role: "ROLE_TOKEN_FACTORY"
25
+ }),
26
+ feeRate: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.pipe(_arcblock_validator.v.number(), _arcblock_validator.v.minValue(0), _arcblock_validator.v.maxValue(2e3)))),
27
+ token: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.object({
28
+ icon: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.union([_arcblock_validator.v.literal(""), _arcblock_validator.v.string()]))),
29
+ website: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.union([_arcblock_validator.v.literal(""), _arcblock_validator.v.pipe(_arcblock_validator.v.string(), _arcblock_validator.v.maxLength(256), _arcblock_validator.v.check(isTest ? require_util.isHttpUrl : require_util.isHttpsUrl, "Must be a valid URL"))]))),
30
+ metadata: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any()))
31
+ }))),
32
+ data: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any()))
33
+ }), (0, _arcblock_validator.vStripUnknown)());
37
34
  runner.use((context, next) => {
38
- const { error } = schema.validate(context.itx);
35
+ const { error } = (0, _arcblock_validator.vValidate)(schema, context.itx);
39
36
  if (error) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`));
40
37
  if (context.itx.token?.metadata) {
41
38
  const metadata = require_util.decodeAnySafe(context.itx.token.metadata ?? null);
42
39
  if (metadata) {
43
- const { error: metadataError, value: metadataValue } = _ocap_state.token.metadataSchema.validate(metadata.value);
40
+ const { error: metadataError, value: metadataValue } = (0, _arcblock_validator.vValidate)(_ocap_state.token.metadataSchema, metadata.value);
44
41
  if (metadataError) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid metadata: ${metadataError.message}`));
42
+ const validKeys = new Set(Object.keys(metadataValue));
43
+ const orderedValue = {};
44
+ for (const key of Object.keys(metadata?.value || {})) if (validKeys.has(key)) orderedValue[key] = metadataValue[key];
45
45
  context.itx.token.metadata = {
46
46
  ...metadata,
47
- value: metadataValue
47
+ value: orderedValue
48
48
  };
49
49
  }
50
50
  }
@@ -19,22 +19,22 @@ lodash_isEmpty = require_rolldown_runtime.__toESM(lodash_isEmpty);
19
19
  //#region src/protocols/trade/exchange-v2.ts
20
20
  const debug$1 = (0, debug.default)("@ocap/tx-protocols:exchange-v2");
21
21
  const runner = new _ocap_tx_pipeline.Runner("exchange_v2");
22
- const exchangeInfoSchema = _arcblock_validator.Joi.object({
23
- value: _arcblock_validator.Joi.any().optional().allow(null),
24
- tokensList: _arcblock_validator.Joi.array().items(_arcblock_validator.schemas.tokenInput).default([]),
25
- assetsList: _arcblock_validator.Joi.array().items(_arcblock_validator.Joi.DID().prefix().role("ROLE_ASSET")).default([])
26
- });
27
- const schema = _arcblock_validator.Joi.object({
28
- to: _arcblock_validator.schemas.tokenHolder.required(),
29
- sender: exchangeInfoSchema.required(),
30
- receiver: exchangeInfoSchema.required(),
31
- data: _arcblock_validator.Joi.any().optional().allow(null)
32
- }).options({
33
- stripUnknown: true,
34
- noDefaults: false
22
+ const exchangeInfoSchema = _arcblock_validator.v.object({
23
+ value: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any())),
24
+ tokensList: _arcblock_validator.v.optional(_arcblock_validator.v.array(_arcblock_validator.schemas.tokenInput), []),
25
+ assetsList: _arcblock_validator.v.optional(_arcblock_validator.v.array((0, _arcblock_validator.vDID)({
26
+ prefix: true,
27
+ role: "ROLE_ASSET"
28
+ })), [])
35
29
  });
30
+ const schema = _arcblock_validator.v.pipe(_arcblock_validator.v.object({
31
+ to: _arcblock_validator.schemas.tokenHolder,
32
+ sender: exchangeInfoSchema,
33
+ receiver: exchangeInfoSchema,
34
+ data: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any()))
35
+ }), (0, _arcblock_validator.vStripUnknown)());
36
36
  runner.use(({ itx }, next) => {
37
- const { error } = schema.validate(itx);
37
+ const { error } = (0, _arcblock_validator.vValidate)(schema, itx);
38
38
  return next(error ? new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`) : void 0);
39
39
  });
40
40
  runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSig(1));
@@ -18,18 +18,18 @@ lodash_isEmpty = require_rolldown_runtime.__toESM(lodash_isEmpty);
18
18
  //#region src/protocols/trade/transfer-v2.ts
19
19
  const runner = new _ocap_tx_pipeline.Runner("transfer_v2");
20
20
  runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSig(0));
21
- const schema = _arcblock_validator.Joi.object({
22
- to: _arcblock_validator.schemas.tokenHolder.required(),
23
- value: _arcblock_validator.Joi.any().optional().allow(null),
24
- tokensList: _arcblock_validator.Joi.array().items(_arcblock_validator.schemas.tokenInput).default([]),
25
- assetsList: _arcblock_validator.Joi.array().items(_arcblock_validator.Joi.DID().prefix().role("ROLE_ASSET")).default([]),
26
- data: _arcblock_validator.Joi.any().optional().allow(null)
27
- }).options({
28
- stripUnknown: true,
29
- noDefaults: false
30
- });
21
+ const schema = _arcblock_validator.v.pipe(_arcblock_validator.v.object({
22
+ to: _arcblock_validator.schemas.tokenHolder,
23
+ value: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any())),
24
+ tokensList: _arcblock_validator.v.optional(_arcblock_validator.v.array(_arcblock_validator.schemas.tokenInput), []),
25
+ assetsList: _arcblock_validator.v.optional(_arcblock_validator.v.array((0, _arcblock_validator.vDID)({
26
+ prefix: true,
27
+ role: "ROLE_ASSET"
28
+ })), []),
29
+ data: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any()))
30
+ }), (0, _arcblock_validator.vStripUnknown)());
31
31
  runner.use((context, next) => {
32
- const { error } = schema.validate(context.itx);
32
+ const { error } = (0, _arcblock_validator.vValidate)(schema, context.itx);
33
33
  if (error) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`));
34
34
  return next();
35
35
  });
@@ -23,16 +23,13 @@ const verifyAssetOwner = (0, node_util.promisify)(_ocap_tx_pipeline.pipes.Verify
23
23
  assetKey: "assets",
24
24
  ownerKey: "owner"
25
25
  }));
26
- const schema = _arcblock_validator.Joi.object({
27
- inputsList: _arcblock_validator.schemas.multiInput.min(1).required(),
28
- outputsList: _arcblock_validator.schemas.multiInput.min(1).required(),
29
- data: _arcblock_validator.Joi.any().optional().allow(null)
30
- }).options({
31
- stripUnknown: true,
32
- noDefaults: false
33
- });
26
+ const schema = _arcblock_validator.v.pipe(_arcblock_validator.v.object({
27
+ inputsList: _arcblock_validator.v.pipe(_arcblock_validator.schemas.multiInput, _arcblock_validator.v.minLength(1)),
28
+ outputsList: _arcblock_validator.v.pipe(_arcblock_validator.schemas.multiInput, _arcblock_validator.v.minLength(1)),
29
+ data: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any()))
30
+ }), (0, _arcblock_validator.vStripUnknown)());
34
31
  runner.use(({ itx }, next) => {
35
- const { error } = schema.validate(itx);
32
+ const { error } = (0, _arcblock_validator.vValidate)(schema, itx);
36
33
  return next(error ? new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`) : void 0);
37
34
  });
38
35
  runner.use(_ocap_tx_pipeline.pipes.VerifyTxInput({
package/lib/util.cjs CHANGED
@@ -277,6 +277,21 @@ const isGasStakeValid = (state, config) => {
277
277
  }
278
278
  return false;
279
279
  };
280
+ const isHttpUrl = (s) => {
281
+ try {
282
+ const url = new URL(s);
283
+ return ["http:", "https:"].includes(url.protocol);
284
+ } catch {
285
+ return false;
286
+ }
287
+ };
288
+ const isHttpsUrl = (s) => {
289
+ try {
290
+ return new URL(s).protocol === "https:";
291
+ } catch {
292
+ return false;
293
+ }
294
+ };
280
295
 
281
296
  //#endregion
282
297
  exports.RATE_BASE = RATE_BASE;
@@ -293,4 +308,6 @@ exports.isFixedFee = isFixedFee;
293
308
  exports.isGasStakeAddress = isGasStakeAddress;
294
309
  exports.isGasStakeInput = isGasStakeInput;
295
310
  exports.isGasStakeValid = isGasStakeValid;
311
+ exports.isHttpUrl = isHttpUrl;
312
+ exports.isHttpsUrl = isHttpsUrl;
296
313
  exports.splitTxFee = splitTxFee;
package/lib/util.d.cts CHANGED
@@ -137,5 +137,7 @@ declare const ensureBlockReward: (rollupState: IRollupStateForReward, minReward:
137
137
  declare const isGasStakeAddress: (sender: string, stakeId: string) => boolean;
138
138
  declare const isGasStakeInput: (inputs: ITxInput[], token: string) => boolean;
139
139
  declare const isGasStakeValid: (state: IStakeState | null | undefined, config: IChainConfig) => boolean;
140
+ declare const isHttpUrl: (s: string) => boolean;
141
+ declare const isHttpsUrl: (s: string) => boolean;
140
142
  //#endregion
141
- export { RATE_BASE, applyTokenChange, applyTokenUpdates, decodeAnySafe, ensureBlockReward, fixTokenInput, getBNSum, getDelegationRequirements, getRewardLocker, getTxFee, isFixedFee, isGasStakeAddress, isGasStakeInput, isGasStakeValid, splitTxFee };
143
+ export { RATE_BASE, applyTokenChange, applyTokenUpdates, decodeAnySafe, ensureBlockReward, fixTokenInput, getBNSum, getDelegationRequirements, getRewardLocker, getTxFee, isFixedFee, isGasStakeAddress, isGasStakeInput, isGasStakeValid, isHttpUrl, isHttpsUrl, splitTxFee };
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "publishConfig": {
4
4
  "access": "public"
5
5
  },
6
- "version": "1.29.27",
6
+ "version": "1.30.1",
7
7
  "description": "Predefined tx pipeline sets to execute certain type of transactions",
8
8
  "type": "module",
9
9
  "main": "./lib/index.cjs",
@@ -46,22 +46,22 @@
46
46
  "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
47
47
  "license": "MIT",
48
48
  "dependencies": {
49
- "@arcblock/did": "1.29.27",
50
- "@arcblock/did-util": "1.29.27",
51
- "@arcblock/jwt": "1.29.27",
52
- "@arcblock/validator": "1.29.27",
53
- "@arcblock/vc": "1.29.27",
49
+ "@arcblock/did": "1.30.1",
50
+ "@arcblock/did-util": "1.30.1",
51
+ "@arcblock/jwt": "1.30.1",
52
+ "@arcblock/validator": "1.30.1",
53
+ "@arcblock/vc": "1.30.1",
54
54
  "@blocklet/xss": "^0.3.7",
55
- "@ocap/asset": "1.29.27",
56
- "@ocap/client": "1.29.27",
57
- "@ocap/mcrypto": "1.29.27",
58
- "@ocap/merkle-tree": "1.29.27",
59
- "@ocap/message": "1.29.27",
60
- "@ocap/state": "1.29.27",
61
- "@ocap/tx-pipeline": "1.29.27",
62
- "@ocap/types": "1.29.27",
63
- "@ocap/util": "1.29.27",
64
- "@ocap/wallet": "1.29.27",
55
+ "@ocap/asset": "1.30.1",
56
+ "@ocap/client": "1.30.1",
57
+ "@ocap/mcrypto": "1.30.1",
58
+ "@ocap/merkle-tree": "1.30.1",
59
+ "@ocap/message": "1.30.1",
60
+ "@ocap/state": "1.30.1",
61
+ "@ocap/tx-pipeline": "1.30.1",
62
+ "@ocap/types": "1.30.1",
63
+ "@ocap/util": "1.30.1",
64
+ "@ocap/wallet": "1.30.1",
65
65
  "debug": "^4.4.3",
66
66
  "deep-diff": "^1.0.2",
67
67
  "lodash": "^4.17.23",
@@ -72,8 +72,6 @@
72
72
  "elliptic": "6.5.3"
73
73
  },
74
74
  "devDependencies": {
75
- "@ocap/e2e-test": "1.29.27",
76
- "@ocap/statedb-memory": "1.29.27",
77
75
  "@types/debug": "^4.1.12",
78
76
  "@types/lodash": "^4.17.16",
79
77
  "start-server-and-test": "^1.14.0"
package/tools/fixtures.ts CHANGED
@@ -472,10 +472,11 @@ export const createTokenFactoryStake = async ({ sender, nonce, amount = 100, tok
472
472
  return { stakeAddress };
473
473
  };
474
474
 
475
+ const _originalFetch = globalThis.fetch;
475
476
  export const mockWebsiteVC = (subject: any, issuer: any, options: any = {}) => {
476
477
  spyOn(global, 'fetch').mockImplementation(((url: any, ...rest: any[]) => {
477
478
  if (!url.includes('/ocap/tokens.json')) {
478
- return (globalThis as any).require('node-fetch-commonjs')(url, ...rest);
479
+ return _originalFetch(url, ...rest);
479
480
  }
480
481
 
481
482
  return Promise.resolve({