@ocap/tx-protocols 1.30.26 → 1.31.0

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 (118) hide show
  1. package/esm/execute.d.mts +7 -0
  2. package/esm/execute.mjs +196 -71
  3. package/esm/gas-security-guard.d.mts +374 -0
  4. package/esm/gas-security-guard.mjs +1101 -0
  5. package/esm/index.d.mts +35 -5
  6. package/esm/index.mjs +3 -1
  7. package/esm/pipes/ensure-cost.mjs +314 -58
  8. package/esm/protocols/account/delegate.mjs +64 -16
  9. package/esm/protocols/account/migrate.d.mts +3 -0
  10. package/esm/protocols/account/migrate.mjs +235 -35
  11. package/esm/protocols/account/revoke-delegate.d.mts +3 -3
  12. package/esm/protocols/account/revoke-delegate.mjs +70 -38
  13. package/esm/protocols/asset/acquire-v2.mjs +29 -12
  14. package/esm/protocols/asset/acquire-v3.mjs +78 -22
  15. package/esm/protocols/asset/calls/transfer-token.mjs +2 -1
  16. package/esm/protocols/asset/calls/transfer.mjs +1 -0
  17. package/esm/protocols/asset/consume.mjs +12 -4
  18. package/esm/protocols/asset/create.mjs +18 -5
  19. package/esm/protocols/asset/mint.mjs +23 -1
  20. package/esm/protocols/asset/pipes/exec-mint-hook.d.mts +21 -1
  21. package/esm/protocols/asset/pipes/exec-mint-hook.mjs +115 -1
  22. package/esm/protocols/asset/pipes/extract-factory-tokens.mjs +14 -8
  23. package/esm/protocols/asset/pipes/verify-itx-address.mjs +9 -0
  24. package/esm/protocols/asset/pipes/verify-itx-assets.mjs +21 -5
  25. package/esm/protocols/asset/update.d.mts +13 -2
  26. package/esm/protocols/asset/update.mjs +133 -14
  27. package/esm/protocols/factory/create.mjs +14 -6
  28. package/esm/protocols/governance/claim-stake.mjs +92 -10
  29. package/esm/protocols/governance/return-stake.mjs +44 -12
  30. package/esm/protocols/governance/revoke-stake.mjs +17 -5
  31. package/esm/protocols/governance/slash-stake.mjs +64 -25
  32. package/esm/protocols/governance/stake.mjs +63 -13
  33. package/esm/protocols/rollup/claim-reward.mjs +39 -20
  34. package/esm/protocols/rollup/close.mjs +1 -1
  35. package/esm/protocols/rollup/create-block.mjs +8 -7
  36. package/esm/protocols/rollup/create.mjs +17 -6
  37. package/esm/protocols/rollup/join.mjs +3 -3
  38. package/esm/protocols/rollup/leave.mjs +1 -1
  39. package/esm/protocols/rollup/migrate.mjs +7 -4
  40. package/esm/protocols/rollup/pipes/verify-evidence.mjs +12 -4
  41. package/esm/protocols/rollup/update.mjs +6 -1
  42. package/esm/protocols/token/create.mjs +23 -12
  43. package/esm/protocols/token/deposit-v2.d.mts +5 -1
  44. package/esm/protocols/token/deposit-v2.mjs +81 -29
  45. package/esm/protocols/token/withdraw-v2.mjs +33 -16
  46. package/esm/protocols/token-factory/burn.mjs +43 -10
  47. package/esm/protocols/token-factory/create.mjs +23 -14
  48. package/esm/protocols/token-factory/mint.mjs +54 -21
  49. package/esm/protocols/token-factory/pipes/verify-icon.mjs +1 -1
  50. package/esm/protocols/token-factory/update.mjs +16 -6
  51. package/esm/protocols/trade/exchange-v2.d.mts +4 -0
  52. package/esm/protocols/trade/exchange-v2.mjs +78 -22
  53. package/esm/protocols/trade/transfer-v2.mjs +44 -13
  54. package/esm/protocols/trade/transfer-v3.mjs +72 -31
  55. package/esm/util.d.mts +3 -1
  56. package/esm/util.mjs +26 -17
  57. package/lib/execute.cjs +193 -67
  58. package/lib/execute.d.cts +7 -0
  59. package/lib/gas-security-guard.cjs +1140 -0
  60. package/lib/gas-security-guard.d.cts +374 -0
  61. package/lib/index.cjs +122 -1
  62. package/lib/index.d.cts +36 -6
  63. package/lib/pipes/ensure-cost.cjs +313 -57
  64. package/lib/protocols/account/delegate.cjs +64 -16
  65. package/lib/protocols/account/migrate.cjs +235 -35
  66. package/lib/protocols/account/migrate.d.cts +3 -0
  67. package/lib/protocols/account/revoke-delegate.cjs +71 -39
  68. package/lib/protocols/account/revoke-delegate.d.cts +3 -3
  69. package/lib/protocols/asset/acquire-v2.cjs +28 -11
  70. package/lib/protocols/asset/acquire-v3.cjs +77 -20
  71. package/lib/protocols/asset/calls/transfer-token.cjs +3 -2
  72. package/lib/protocols/asset/calls/transfer.cjs +1 -0
  73. package/lib/protocols/asset/consume.cjs +11 -3
  74. package/lib/protocols/asset/create.cjs +19 -6
  75. package/lib/protocols/asset/mint.cjs +23 -1
  76. package/lib/protocols/asset/pipes/exec-mint-hook.cjs +117 -1
  77. package/lib/protocols/asset/pipes/exec-mint-hook.d.cts +21 -1
  78. package/lib/protocols/asset/pipes/extract-factory-tokens.cjs +14 -9
  79. package/lib/protocols/asset/pipes/verify-itx-address.cjs +9 -0
  80. package/lib/protocols/asset/pipes/verify-itx-assets.cjs +21 -5
  81. package/lib/protocols/asset/update.cjs +131 -12
  82. package/lib/protocols/asset/update.d.cts +13 -2
  83. package/lib/protocols/factory/create.cjs +14 -6
  84. package/lib/protocols/governance/claim-stake.cjs +92 -9
  85. package/lib/protocols/governance/claim-stake.d.cts +1 -1
  86. package/lib/protocols/governance/return-stake.cjs +44 -11
  87. package/lib/protocols/governance/return-stake.d.cts +1 -1
  88. package/lib/protocols/governance/revoke-stake.cjs +17 -5
  89. package/lib/protocols/governance/revoke-stake.d.cts +1 -1
  90. package/lib/protocols/governance/slash-stake.cjs +64 -24
  91. package/lib/protocols/governance/slash-stake.d.cts +1 -1
  92. package/lib/protocols/governance/stake.cjs +65 -14
  93. package/lib/protocols/rollup/claim-reward.cjs +39 -20
  94. package/lib/protocols/rollup/close.cjs +1 -1
  95. package/lib/protocols/rollup/create-block.cjs +9 -8
  96. package/lib/protocols/rollup/create-block.d.cts +1 -1
  97. package/lib/protocols/rollup/create.cjs +18 -7
  98. package/lib/protocols/rollup/join.cjs +3 -3
  99. package/lib/protocols/rollup/leave.cjs +1 -1
  100. package/lib/protocols/rollup/migrate.cjs +7 -4
  101. package/lib/protocols/rollup/pipes/verify-evidence.cjs +11 -3
  102. package/lib/protocols/rollup/update.cjs +6 -1
  103. package/lib/protocols/token/create.cjs +24 -13
  104. package/lib/protocols/token/deposit-v2.cjs +80 -28
  105. package/lib/protocols/token/deposit-v2.d.cts +5 -1
  106. package/lib/protocols/token/withdraw-v2.cjs +32 -15
  107. package/lib/protocols/token-factory/burn.cjs +42 -9
  108. package/lib/protocols/token-factory/create.cjs +24 -15
  109. package/lib/protocols/token-factory/mint.cjs +53 -20
  110. package/lib/protocols/token-factory/pipes/verify-icon.cjs +1 -1
  111. package/lib/protocols/token-factory/update.cjs +16 -6
  112. package/lib/protocols/trade/exchange-v2.cjs +76 -20
  113. package/lib/protocols/trade/exchange-v2.d.cts +4 -0
  114. package/lib/protocols/trade/transfer-v2.cjs +45 -14
  115. package/lib/protocols/trade/transfer-v3.cjs +72 -30
  116. package/lib/util.cjs +26 -17
  117. package/lib/util.d.cts +4 -2
  118. package/package.json +16 -16
@@ -1,16 +1,19 @@
1
1
  import { applyTokenChange, applyTokenUpdates } from "../../util.mjs";
2
2
  import ensure_cost_default from "../../pipes/ensure-cost.mjs";
3
3
  import ensure_gas_default from "../../pipes/ensure-gas.mjs";
4
- import { account, asset, delegation } from "@ocap/state";
4
+ import { toTypeInfo } from "@arcblock/did";
5
+ import { types } from "@ocap/mcrypto";
6
+ import { account, asset, delegation, token } from "@ocap/state";
5
7
  import { Runner, pipes, verifyAssetHierarchy } from "@ocap/tx-pipeline";
6
8
  import { BN, isSameDid } from "@ocap/util";
7
9
  import { CustomError } from "@ocap/util/lib/error";
8
- import Debug from "debug";
9
10
  import { getListField } from "@ocap/util/lib/get-list-field";
10
- import { schemas, v, vStripUnknown, vValidate } from "@arcblock/validator";
11
11
  import { getRelatedAddresses } from "@ocap/util/lib/get-related-addr";
12
+ import Debug from "debug";
13
+ import { schemas, v, vStripUnknown, vValidate } from "@arcblock/validator";
12
14
  import { promisify } from "node:util";
13
15
  import isEqual from "lodash/isEqual.js";
16
+ import uniqBy from "lodash/uniqBy.js";
14
17
 
15
18
  //#region src/protocols/trade/transfer-v3.ts
16
19
  const debug = Debug("@ocap/tx-protocols:transfer-v2");
@@ -58,7 +61,7 @@ runner.use(pipes.VerifyInfo([
58
61
  message: "An owner can not exist in tx input and output at the same time",
59
62
  fn: (ctx) => {
60
63
  const context = ctx;
61
- return (context.senders || []).every((x) => (context.receivers || []).includes(x) === false);
64
+ return (context.senders || []).every((x) => !(context.receivers || []).some((r) => isSameDid(r, x)));
62
65
  }
63
66
  },
64
67
  {
@@ -116,9 +119,9 @@ runner.use(pipes.ExtractState({
116
119
  table: "account"
117
120
  }));
118
121
  runner.use((context, next) => {
119
- const { tx: tx$1, senderState, inputTokens = [], tokenStates = [] } = context;
122
+ const { tx: tx$1, senderState, inputTokens = [], inputAssets = [], tokenStates = [] } = context;
120
123
  const senderRelated = senderState ? getRelatedAddresses(senderState) : [tx$1.from];
121
- if (inputTokens.every((tokenAddress) => {
124
+ if (inputTokens.length > 0 && inputAssets.length === 0 && inputTokens.every((tokenAddress) => {
122
125
  const tokenState = tokenStates.find((t) => t.address === tokenAddress);
123
126
  return tokenState && tokenState.type === "CreditToken" && senderRelated.includes(tokenState.issuer);
124
127
  })) return next();
@@ -136,7 +139,11 @@ runner.use(pipes.ExtractState({
136
139
  status: "OK",
137
140
  table: "account"
138
141
  }));
139
- runner.use(pipes.VerifyBlocked({ stateKeys: ["signerStates", "receiverStates"] }));
142
+ runner.use(pipes.VerifyBlocked({ stateKeys: [
143
+ "senderState",
144
+ "signerStates",
145
+ "receiverStates"
146
+ ] }));
140
147
  runner.use(pipes.AntiLandAttack({
141
148
  senderState: "signerStates",
142
149
  receiverState: "receiverStates"
@@ -147,14 +154,22 @@ runner.use(pipes.VerifyAccountMigration({
147
154
  addressKey: "tx.from"
148
155
  }));
149
156
  const getTransferV3Requirements = (ctx, index, signature) => {
150
- const { tx: tx$1, inputs = [], outputs = [], receiverStates = [] } = ctx;
157
+ const { tx: tx$1, inputs = [], outputs = [], receiverStates = [], senderState, signerStates = [], tokenStates = [], inputTokens = [], inputAssets = [] } = ctx;
151
158
  const signatures = getListField(tx$1, "signatures");
159
+ const isMultiSigCall = Boolean(signature || typeof index === "number");
152
160
  const targetOwner = signature?.signer || (typeof index === "number" ? signatures?.[index]?.signer : tx$1?.from);
153
161
  if (!targetOwner) return [];
154
- const input = inputs.find((x) => isSameDid(x.owner, targetOwner));
155
- if (!input) return [];
156
- const tokensList = getListField(input, "tokens");
157
- const assetsList = getListField(input, "assets");
162
+ if (isMultiSigCall && tx$1?.delegator && signature?.delegator && isSameDid(targetOwner, tx$1.from) && isSameDid(signature.delegator, tx$1.delegator)) return [];
163
+ const targetOwnerState = (isSameDid(targetOwner, tx$1?.from) ? senderState : void 0) || signerStates.find((s) => getRelatedAddresses(s).some((addr) => isSameDid(addr, targetOwner)));
164
+ const ownerRelated = targetOwnerState ? getRelatedAddresses(targetOwnerState) : [targetOwner];
165
+ const senderRelated = senderState ? getRelatedAddresses(senderState) : tx$1?.from ? [tx$1.from] : [];
166
+ const matchedInputs = !isMultiSigCall && inputTokens.length > 0 && inputAssets.length === 0 && inputTokens.every((tokenAddress) => {
167
+ const tokenState = tokenStates.find((t) => t.address === tokenAddress);
168
+ return tokenState && tokenState.type === "CreditToken" && senderRelated.includes(tokenState.issuer);
169
+ }) ? inputs : inputs.filter((x) => ownerRelated.some((addr) => isSameDid(x.owner, addr)));
170
+ if (matchedInputs.length === 0) return [];
171
+ const tokensList = matchedInputs.flatMap((inp) => getListField(inp, "tokens") || []);
172
+ const assetsList = matchedInputs.flatMap((inp) => getListField(inp, "assets") || []);
158
173
  const getReceiverAddresses = (owner) => {
159
174
  if (!owner) return [];
160
175
  const state = receiverStates.find((s) => getRelatedAddresses(s).some((addr) => isSameDid(addr, owner)));
@@ -202,6 +217,11 @@ runner.use(pipes.ExtractSigner({
202
217
  signerKey: "msSignerStates",
203
218
  delegatorKey: "delegatorStates"
204
219
  }));
220
+ runner.use(pipes.VerifyBlocked({ stateKeys: [
221
+ "delegatorState",
222
+ "msSignerStates",
223
+ "delegatorStates"
224
+ ] }));
205
225
  runner.use(pipes.VerifyDelegation({
206
226
  type: "multisig",
207
227
  signerKey: "msSignerStates",
@@ -231,8 +251,8 @@ runner.use(async (context, next) => {
231
251
  for (const input of inputs) {
232
252
  const { owner } = input;
233
253
  const assetsList = getListField(input, "assets");
234
- const states = assetStates.filter((x) => assetsList.includes(x.address));
235
- const signer = signerStates.find((x) => x.address === owner);
254
+ const states = assetStates.filter((x) => assetsList.some((a) => isSameDid(a, x.address)));
255
+ const signer = signerStates.find((x) => getRelatedAddresses(x).some((addr) => isSameDid(addr, owner)));
236
256
  try {
237
257
  await verifyAssetOwner({
238
258
  assets: states,
@@ -247,7 +267,7 @@ runner.use(async (context, next) => {
247
267
  const { owner } = output;
248
268
  const assetsList = getListField(output, "assets");
249
269
  if (assetsList.length) {
250
- const ownerState = receiverStates.find((s) => getRelatedAddresses(s).includes(owner)) || { address: owner };
270
+ const ownerState = receiverStates.find((s) => getRelatedAddresses(s).some((addr) => isSameDid(addr, owner))) || { address: account.ensureChecksumAddress(owner) };
251
271
  for (const assetAddr of assetsList) pendingOwners[assetAddr] = ownerState.address;
252
272
  }
253
273
  }
@@ -255,7 +275,12 @@ runner.use(async (context, next) => {
255
275
  const { owner } = output;
256
276
  const assetsList = getListField(output, "assets");
257
277
  if (assetsList.length) {
258
- const err = await verifyAssetHierarchy(assetsList, (receiverStates.find((s) => getRelatedAddresses(s).includes(owner)) || { address: owner }).address, context, pendingOwners);
278
+ const ownerState = receiverStates.find((s) => getRelatedAddresses(s).some((addr) => isSameDid(addr, owner))) || { address: account.ensureChecksumAddress(owner) };
279
+ if (toTypeInfo(ownerState.address).role === types.RoleType.ROLE_ASSET && assetsList.some((addr) => {
280
+ const st = assetStates.find((a) => a.address === addr);
281
+ return st && token.isTokenCharterAsset(st);
282
+ })) return next(new CustomError("INVALID_OWNER", "Token Charter NFT cannot be owned by an asset", { persist: true }));
283
+ const err = await verifyAssetHierarchy(assetsList, ownerState.address, context, pendingOwners);
259
284
  if (err) return next(err);
260
285
  }
261
286
  }
@@ -284,23 +309,27 @@ runner.use(async (context, next) => {
284
309
  const signerUpdates = {};
285
310
  inputs.forEach((x) => {
286
311
  const { owner } = x;
287
- signerUpdates[owner] = applyTokenUpdates(getListField(x, "tokens"), signerStates.find((s) => s.address === owner), "sub");
288
- if (senderChange && owner === senderChange.address) signerUpdates[owner] = applyTokenChange(signerUpdates[owner], senderChange);
312
+ const tokensList = getListField(x, "tokens");
313
+ const signerState = signerStates.find((s) => getRelatedAddresses(s).some((addr) => isSameDid(addr, owner)));
314
+ const canonicalOwner = signerState ? signerState.address : account.ensureChecksumAddress(owner);
315
+ signerUpdates[canonicalOwner] = applyTokenUpdates(tokensList, signerUpdates[canonicalOwner] || signerState, "sub");
289
316
  });
317
+ if (senderChange && signerUpdates[senderChange.address]) signerUpdates[senderChange.address] = applyTokenChange(signerUpdates[senderChange.address], senderChange);
290
318
  const receiverUpdates = {};
291
319
  const assetUpdates = {};
292
320
  outputs.forEach((x) => {
293
321
  const { owner } = x;
294
322
  const tokensList = getListField(x, "tokens");
295
323
  const assetsList = getListField(x, "assets");
296
- const ownerState = receiverStates.find((s) => getRelatedAddresses(s).includes(owner)) || { address: owner };
297
- receiverUpdates[ownerState.address] = applyTokenUpdates(tokensList, ownerState, "add");
298
- if (senderChange && ownerState.address === senderChange.address) receiverUpdates[ownerState.address] = applyTokenChange(receiverUpdates[ownerState.address], senderChange);
324
+ const ownerState = receiverStates.find((s) => getRelatedAddresses(s).some((addr) => isSameDid(addr, owner))) || { address: account.ensureChecksumAddress(owner) };
325
+ const baseState = receiverUpdates[ownerState.address] || signerUpdates[ownerState.address] || ownerState;
326
+ receiverUpdates[ownerState.address] = applyTokenUpdates(tokensList, baseState, "add");
299
327
  assetsList.forEach((address) => {
300
328
  assetUpdates[address] = { owner: ownerState.address };
301
329
  });
302
330
  });
303
- const sender = senderState ? senderState.address : tx$1.from;
331
+ if (senderChange && !signerUpdates[senderChange.address] && receiverUpdates[senderChange.address]) receiverUpdates[senderChange.address] = applyTokenChange(receiverUpdates[senderChange.address], senderChange);
332
+ const sender = senderState ? senderState.address : account.ensureChecksumAddress(tx$1.from);
304
333
  const isAlsoSigner = !!signerUpdates[sender];
305
334
  const isAlsoReceiver = !!receiverUpdates[sender];
306
335
  const senderUpdatesLocal = {};
@@ -313,31 +342,43 @@ runner.use(async (context, next) => {
313
342
  isAlsoReceiver
314
343
  });
315
344
  const existingSenderState = senderState ? await statedb.account.get(senderState.address, context) : null;
345
+ const nonSenderSigners = uniqBy(signerStates, "address").filter((x) => !isSameDid(x.address, sender));
346
+ const nonSenderSignerSet = new Set(nonSenderSigners.map((x) => x.address));
347
+ const canonicalReceivers = uniqBy(receivers.map((x) => {
348
+ const receiverState = receiverStates.find((s) => getRelatedAddresses(s).some((addr) => isSameDid(addr, x)));
349
+ return {
350
+ owner: receiverState ? receiverState.address : account.ensureChecksumAddress(x),
351
+ receiverState
352
+ };
353
+ }), "owner").filter((x) => !isSameDid(x.owner, sender) && !nonSenderSignerSet.has(x.owner));
316
354
  const [newSenderState, newSignerStates, newReceiverStates, newAssetStates, newDelegationState, newDelegationStates] = await Promise.all([
317
- statedb.account.updateOrCreate(existingSenderState ?? null, account.updateOrCreate(existingSenderState ?? null, Object.assign({
355
+ statedb.account.updateOrCreate(existingSenderState ?? null, account.updateOrCreate(existingSenderState ?? null, Object.assign({}, signerUpdates[sender] || {}, receiverUpdates[sender] || {}, senderUpdatesLocal[sender] || {}, {
318
356
  address: sender,
319
357
  nonce: tx$1.nonce,
320
358
  pk: tx$1.delegator ? senderState?.pk : tx$1.pk
321
- }, signerUpdates[sender] || {}, receiverUpdates[sender] || {}, senderUpdatesLocal[sender] || {}), context), context),
322
- Promise.all(signerStates.filter((x) => x.address !== sender).map(async (x) => {
359
+ }), context), context),
360
+ Promise.all(nonSenderSigners.map(async (x) => {
323
361
  const existing = await statedb.account.get(x.address, context);
324
362
  return statedb.account.updateOrCreate(existing ?? null, account.updateOrCreate(existing ?? null, {
325
363
  address: x.address,
326
- ...signerUpdates[x.address]
364
+ ...receiverUpdates[x.address] || signerUpdates[x.address]
327
365
  }, context), context);
328
366
  })),
329
- Promise.all(receivers.filter((x) => x !== sender).map((x) => {
330
- const receiverState = receiverStates.find((s) => getRelatedAddresses(s).includes(x));
331
- const owner = receiverState ? receiverState.address : x;
367
+ Promise.all(canonicalReceivers.map(({ owner, receiverState }) => {
332
368
  const updates = receiverUpdates[owner] || {};
333
369
  return statedb.account.updateOrCreate(receiverState ?? null, account.updateOrCreate(receiverState ?? null, {
334
370
  ...updates,
335
371
  address: owner
336
372
  }, context), context);
337
373
  })),
338
- Promise.all(assetStates.map((x) => statedb.asset.update(x.address, asset.update(x, assetUpdates[x.address], context), context))),
374
+ Promise.all(assetStates.map(async (x) => {
375
+ const nextOwner = assetUpdates[x.address]?.owner;
376
+ const updatedAsset = await statedb.asset.update(x.address, asset.update(x, assetUpdates[x.address], context), context);
377
+ if (nextOwner && token.isTokenCharterAsset(x)) await token.syncTokenCharterOwnership(x, nextOwner, statedb, context);
378
+ return updatedAsset;
379
+ })),
339
380
  context.isDelegationChanged && delegationState ? statedb.delegation.update(delegationState.address, delegation.update(delegationState, {}, context), context) : delegationState,
340
- context.isDelegationChanged && delegationStates.length ? Promise.all(delegationStates.map((x) => statedb.delegation.update(x.address, delegation.update(x, {}, context), context))) : delegationStates
381
+ context.isDelegationChanged && delegationStates.length ? Promise.all(delegationStates.filter((x) => !delegationState || !isSameDid(x.address, delegationState.address)).map((x) => statedb.delegation.update(x.address, delegation.update(x, {}, context), context))) : delegationStates
341
382
  ]);
342
383
  if (updateVaults) await updateVaults();
343
384
  context.senderState = newSenderState;
package/esm/util.d.mts CHANGED
@@ -16,6 +16,7 @@ interface IStateWithTokens {
16
16
  interface ITokenChange {
17
17
  token: string;
18
18
  delta: string | BN;
19
+ changes?: ITokenChange[];
19
20
  }
20
21
  /** Tx fee calculation params */
21
22
  interface ITxFeeParams {
@@ -72,6 +73,7 @@ interface ITxStateForReward {
72
73
  maxFee?: string;
73
74
  actualFee?: string;
74
75
  token?: {
76
+ address?: string;
75
77
  value: string;
76
78
  };
77
79
  proposer?: string;
@@ -114,7 +116,7 @@ interface ITokenInputForFix {
114
116
  declare const RATE_BASE: BN;
115
117
  declare const decodeAnySafe: (encoded: AnyData | null) => AnyData | null;
116
118
  declare const applyTokenUpdates: (tokens: ITokenUpdateInput[], state: IStateWithTokens | IStateWithTokens[] | null | undefined, operator: "add" | "sub") => IStateWithTokens | IStateWithTokens[] | Record<string, string>;
117
- declare const applyTokenChange: (state: IStateWithTokens | IStateWithTokens[], change: ITokenChange) => IStateWithTokens | IStateWithTokens[] | Record<string, never>;
119
+ declare const applyTokenChange: (state: IStateWithTokens | IStateWithTokens[], change: ITokenChange | ITokenChange[]) => IStateWithTokens | IStateWithTokens[] | Record<string, never>;
118
120
  declare const fixTokenInput: (input: ITokenInputForFix, config: IChainConfig) => ITokenInputForFix;
119
121
  declare const getTxFee: ({
120
122
  amount,
package/esm/util.mjs CHANGED
@@ -1,9 +1,9 @@
1
+ import { toStakeAddress } from "@arcblock/did-util";
1
2
  import { BN, fromTokenToUnit } from "@ocap/util";
2
3
  import { CustomError } from "@ocap/util/lib/error";
3
- import { toStakeAddress } from "@arcblock/did-util";
4
- import { decodeAny } from "@ocap/message";
5
4
  import { getListField } from "@ocap/util/lib/get-list-field";
6
5
  import cloneDeep from "lodash/cloneDeep.js";
6
+ import { decodeAny } from "@ocap/message";
7
7
  import flattenDeep from "lodash/flattenDeep.js";
8
8
  import groupBy from "lodash/groupBy.js";
9
9
 
@@ -68,6 +68,8 @@ const applyTokenUpdates = (tokens, state, operator) => {
68
68
  return Array.isArray(state) ? states : states[0];
69
69
  };
70
70
  const applyTokenChange = (state, change) => {
71
+ if (Array.isArray(change)) return change.reduce((acc, c) => applyTokenChange(acc, c), state);
72
+ if (Array.isArray(change.changes) && change.changes.length > 0) return change.changes.reduce((acc, c) => applyTokenChange(acc, c), state);
71
73
  const delta = typeof change.delta === "string" ? new BN(change.delta) : change.delta;
72
74
  if (delta.gt(ZERO)) return applyTokenUpdates([{
73
75
  address: change.token,
@@ -169,6 +171,7 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
169
171
  account: []
170
172
  };
171
173
  dynamicFeeTxs.forEach((x) => {
174
+ const txToken = x.tx.itxJson.token?.address || tokenAddress;
172
175
  const maxFee = new BN(x.tx.itxJson.maxFee);
173
176
  const defaults = getTxFee({
174
177
  amount: x.tx.itxJson.token.value,
@@ -188,11 +191,13 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
188
191
  const refundFee = maxFee.sub(actualFee).toString(10);
189
192
  changes.account.push({
190
193
  address: x.tx.from,
194
+ token: txToken,
191
195
  delta: refundFee,
192
196
  action: "refund"
193
197
  });
194
198
  changes.stake.push({
195
199
  address: locker,
200
+ token: txToken,
196
201
  delta: `-${refundFee}`,
197
202
  action: "refund"
198
203
  });
@@ -200,6 +205,7 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
200
205
  x.tx.itxJson.actualFee = actualFee.toString(10);
201
206
  });
202
207
  txStates.filter((x) => isGovernanceTx(x) === false).forEach((x) => {
208
+ const txToken = x.tx.itxJson.token?.address || tokenAddress;
203
209
  const user = x.tx.itxJson.token.value;
204
210
  const fee = x.tx.itxJson.actualFee;
205
211
  const total = getBNSum(user, fee);
@@ -208,6 +214,7 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
208
214
  result.mintedAmount = result.mintedAmount.add(new BN(total));
209
215
  changes.stake.push({
210
216
  address: toStakeAddress(x.tx.itxJson.proposer, address),
217
+ token: txToken,
211
218
  delta: total,
212
219
  action: "mint"
213
220
  });
@@ -216,6 +223,7 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
216
223
  result.burnedAmount = result.burnedAmount.add(new BN(user));
217
224
  changes.stake.push({
218
225
  address: toStakeAddress(x.tx.from, address),
226
+ token: txToken,
219
227
  delta: `-${user}`,
220
228
  action: "burn"
221
229
  });
@@ -225,22 +233,26 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
225
233
  stake: groupBy(changes.stake, "address"),
226
234
  account: groupBy(changes.account, "address")
227
235
  };
228
- result.stakeUpdates = Object.keys(grouped.stake).reduce((acc, x) => {
229
- acc[x] = {
230
- address: x,
231
- token: tokenAddress,
232
- delta: getBNSum(...grouped.stake[x].map((c) => c.delta)),
233
- action: grouped.stake[x][grouped.stake[x].length - 1].action
236
+ const aggregateAddressChanges = (items, addr) => {
237
+ const byToken = groupBy(items, "token");
238
+ const perToken = Object.keys(byToken).map((tok) => ({
239
+ address: addr,
240
+ token: tok,
241
+ delta: getBNSum(...byToken[tok].map((c) => c.delta)),
242
+ action: byToken[tok][byToken[tok].length - 1].action
243
+ }));
244
+ if (perToken.length === 1) return perToken[0];
245
+ return {
246
+ ...perToken[perToken.length - 1],
247
+ changes: perToken
234
248
  };
249
+ };
250
+ result.stakeUpdates = Object.keys(grouped.stake).reduce((acc, x) => {
251
+ acc[x] = aggregateAddressChanges(grouped.stake[x], x);
235
252
  return acc;
236
253
  }, {});
237
254
  result.accountUpdates = Object.keys(grouped.account).reduce((acc, x) => {
238
- acc[x] = {
239
- address: x,
240
- token: tokenAddress,
241
- delta: getBNSum(...grouped.account[x].map((c) => c.delta)),
242
- action: grouped.account[x][grouped.account[x].length - 1].action
243
- };
255
+ acc[x] = aggregateAddressChanges(grouped.account[x], x);
244
256
  return acc;
245
257
  }, {});
246
258
  return {
@@ -269,9 +281,6 @@ const isGasStakeValid = (state, config) => {
269
281
  if (state.tokens) {
270
282
  if (new BN(state.tokens[token.address] || 0).gte(expectedMin)) return true;
271
283
  }
272
- if (state.revokedTokens) {
273
- if (new BN(state.revokedTokens[token.address] || 0).gte(expectedMin)) return true;
274
- }
275
284
  return false;
276
285
  };
277
286
  const isHttpUrl = (s) => {