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