@ocap/tx-protocols 1.30.24 → 1.30.26
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 +6 -2
- package/esm/execute.mjs +214 -25
- package/esm/index.d.mts +25 -2
- package/esm/index.mjs +2 -2
- package/esm/pipes/ensure-cost.mjs +2 -2
- package/esm/pipes/write-ledger.mjs +7 -0
- package/esm/protocols/account/delegate.mjs +7 -6
- package/esm/protocols/account/migrate.mjs +2 -2
- package/esm/protocols/account/revoke-delegate.mjs +1 -1
- package/esm/protocols/asset/acquire-v2.mjs +25 -6
- package/esm/protocols/asset/acquire-v3.d.mts +11 -1
- package/esm/protocols/asset/acquire-v3.mjs +78 -9
- package/esm/protocols/asset/consume.mjs +1 -1
- package/esm/protocols/asset/create.mjs +1 -1
- package/esm/protocols/asset/mint.mjs +8 -2
- package/esm/protocols/asset/pipes/verify-itx-address.mjs +1 -1
- package/esm/protocols/asset/update.mjs +1 -1
- package/esm/protocols/factory/create.mjs +4 -3
- package/esm/protocols/governance/claim-stake.mjs +2 -2
- package/esm/protocols/governance/return-stake.mjs +2 -2
- package/esm/protocols/governance/revoke-stake.mjs +2 -2
- package/esm/protocols/governance/slash-stake.mjs +2 -2
- package/esm/protocols/governance/stake.mjs +2 -2
- package/esm/protocols/rollup/claim-reward.mjs +5 -4
- package/esm/protocols/rollup/close.mjs +1 -1
- package/esm/protocols/rollup/create-block.mjs +1 -1
- package/esm/protocols/rollup/create.mjs +1 -1
- package/esm/protocols/rollup/join.mjs +2 -2
- package/esm/protocols/rollup/leave.mjs +1 -1
- package/esm/protocols/rollup/migrate.mjs +1 -1
- package/esm/protocols/rollup/pause.mjs +1 -1
- package/esm/protocols/rollup/pipes/verify-evidence.mjs +5 -2
- package/esm/protocols/rollup/pipes/verify-signers.mjs +5 -3
- package/esm/protocols/rollup/resume.mjs +1 -1
- package/esm/protocols/rollup/update.mjs +4 -4
- package/esm/protocols/token/create.mjs +2 -2
- package/esm/protocols/token/deposit-v2.mjs +2 -2
- package/esm/protocols/token/withdraw-v2.mjs +13 -9
- package/esm/protocols/token-factory/burn.mjs +4 -4
- package/esm/protocols/token-factory/create.mjs +2 -2
- package/esm/protocols/token-factory/mint.mjs +2 -2
- package/esm/protocols/token-factory/update.mjs +7 -5
- package/esm/protocols/trade/exchange-v2.d.mts +3 -1
- package/esm/protocols/trade/exchange-v2.mjs +69 -11
- package/esm/protocols/trade/transfer-v2.mjs +39 -23
- package/esm/protocols/trade/transfer-v3.d.mts +11 -1
- package/esm/protocols/trade/transfer-v3.mjs +102 -11
- package/esm/tx-timer.d.mts +5 -0
- package/esm/tx-timer.mjs +13 -0
- package/esm/util.mjs +2 -1
- package/lib/execute.cjs +211 -20
- package/lib/execute.d.cts +6 -2
- package/lib/index.cjs +3 -1
- package/lib/index.d.cts +25 -2
- package/lib/pipes/ensure-cost.cjs +2 -2
- package/lib/pipes/write-ledger.cjs +7 -0
- package/lib/protocols/account/delegate.cjs +7 -6
- package/lib/protocols/account/migrate.cjs +2 -2
- package/lib/protocols/account/revoke-delegate.cjs +1 -1
- package/lib/protocols/asset/acquire-v2.cjs +24 -5
- package/lib/protocols/asset/acquire-v3.cjs +77 -8
- package/lib/protocols/asset/acquire-v3.d.cts +11 -1
- package/lib/protocols/asset/consume.cjs +1 -1
- package/lib/protocols/asset/create.cjs +1 -1
- package/lib/protocols/asset/mint.cjs +7 -1
- package/lib/protocols/asset/pipes/verify-itx-address.cjs +1 -1
- package/lib/protocols/asset/update.cjs +1 -1
- package/lib/protocols/factory/create.cjs +4 -3
- package/lib/protocols/governance/claim-stake.cjs +2 -2
- package/lib/protocols/governance/return-stake.cjs +2 -2
- package/lib/protocols/governance/revoke-stake.cjs +2 -2
- package/lib/protocols/governance/slash-stake.cjs +2 -2
- package/lib/protocols/governance/stake.cjs +2 -2
- package/lib/protocols/rollup/claim-reward.cjs +5 -4
- package/lib/protocols/rollup/close.cjs +1 -1
- package/lib/protocols/rollup/create-block.cjs +1 -1
- package/lib/protocols/rollup/create.cjs +1 -1
- package/lib/protocols/rollup/join.cjs +2 -2
- package/lib/protocols/rollup/leave.cjs +1 -1
- package/lib/protocols/rollup/migrate.cjs +1 -1
- package/lib/protocols/rollup/pause.cjs +1 -1
- package/lib/protocols/rollup/pipes/verify-evidence.cjs +5 -2
- package/lib/protocols/rollup/pipes/verify-signers.cjs +5 -4
- package/lib/protocols/rollup/resume.cjs +1 -1
- package/lib/protocols/rollup/update.cjs +4 -4
- package/lib/protocols/token/create.cjs +2 -2
- package/lib/protocols/token/deposit-v2.cjs +2 -2
- package/lib/protocols/token/withdraw-v2.cjs +13 -9
- package/lib/protocols/token-factory/burn.cjs +4 -4
- package/lib/protocols/token-factory/create.cjs +2 -2
- package/lib/protocols/token-factory/mint.cjs +2 -2
- package/lib/protocols/token-factory/update.cjs +7 -5
- package/lib/protocols/trade/exchange-v2.cjs +68 -10
- package/lib/protocols/trade/exchange-v2.d.cts +3 -1
- package/lib/protocols/trade/transfer-v2.cjs +39 -23
- package/lib/protocols/trade/transfer-v3.cjs +101 -10
- package/lib/protocols/trade/transfer-v3.d.cts +11 -1
- package/lib/tx-timer.cjs +13 -0
- package/lib/tx-timer.d.cts +5 -0
- package/lib/util.cjs +2 -1
- package/package.json +16 -16
|
@@ -9,10 +9,10 @@ const require_protocols_asset_pipes_verify_itx_address = require('./pipes/verify
|
|
|
9
9
|
const require_protocols_asset_pipes_verify_itx_assets = require('./pipes/verify-itx-assets.cjs');
|
|
10
10
|
const require_protocols_asset_pipes_verify_itx_variables = require('./pipes/verify-itx-variables.cjs');
|
|
11
11
|
const require_protocols_asset_pipes_verify_mint_limit = require('./pipes/verify-mint-limit.cjs');
|
|
12
|
-
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
13
|
-
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
14
12
|
let _ocap_state = require("@ocap/state");
|
|
13
|
+
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
15
14
|
let _ocap_util = require("@ocap/util");
|
|
15
|
+
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
16
16
|
let debug = require("debug");
|
|
17
17
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
18
18
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
@@ -168,6 +168,53 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
|
168
168
|
addressKey: "tx.from"
|
|
169
169
|
}));
|
|
170
170
|
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: ["signerStates", "ownerState"] }));
|
|
171
|
+
const getAcquireAssetV3Requirements = (ctx, index, signature) => {
|
|
172
|
+
const { tx, itx, inputs = [] } = ctx;
|
|
173
|
+
const signatures = (0, _ocap_util_lib_get_list_field.getListField)(tx, "signatures");
|
|
174
|
+
const targetOwner = signature?.signer || (typeof index === "number" ? signatures?.[index]?.signer : tx?.from);
|
|
175
|
+
if (!targetOwner) return [];
|
|
176
|
+
const input = inputs.find((x) => (0, _ocap_util.isSameDid)(x.owner, targetOwner));
|
|
177
|
+
if (!input) return [];
|
|
178
|
+
const tokensList = (0, _ocap_util_lib_get_list_field.getListField)(input, "tokens");
|
|
179
|
+
const assetsList = (0, _ocap_util_lib_get_list_field.getListField)(input, "assets");
|
|
180
|
+
return [...tokensList.map((t) => ({
|
|
181
|
+
type: "token",
|
|
182
|
+
address: t.address,
|
|
183
|
+
value: t.value,
|
|
184
|
+
to: itx?.factory ? [itx.factory] : []
|
|
185
|
+
})), ...assetsList.map((a) => ({
|
|
186
|
+
type: "asset",
|
|
187
|
+
address: a,
|
|
188
|
+
to: itx?.factory ? [itx.factory] : []
|
|
189
|
+
}))];
|
|
190
|
+
};
|
|
191
|
+
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
192
|
+
from: "tx.delegator",
|
|
193
|
+
to: "delegatorState",
|
|
194
|
+
status: "OK",
|
|
195
|
+
table: "account"
|
|
196
|
+
}));
|
|
197
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
198
|
+
stateKey: "delegatorState",
|
|
199
|
+
addressKey: "tx.delegator"
|
|
200
|
+
}));
|
|
201
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyDelegation({
|
|
202
|
+
type: "signature",
|
|
203
|
+
signerKey: "senderState",
|
|
204
|
+
delegatorKey: "delegatorState",
|
|
205
|
+
getRequirements: (ctx) => getAcquireAssetV3Requirements(ctx)
|
|
206
|
+
}));
|
|
207
|
+
runner.use(_ocap_tx_pipeline.pipes.ExtractSigner({
|
|
208
|
+
signerKey: "msSignerStates",
|
|
209
|
+
delegatorKey: "delegatorStates"
|
|
210
|
+
}));
|
|
211
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyDelegation({
|
|
212
|
+
type: "multisig",
|
|
213
|
+
signerKey: "msSignerStates",
|
|
214
|
+
delegatorKey: "delegatorStates",
|
|
215
|
+
delegationKey: "delegationStates",
|
|
216
|
+
getRequirements: (ctx, index, sig) => getAcquireAssetV3Requirements(ctx, index, sig)
|
|
217
|
+
}));
|
|
171
218
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
172
219
|
from: "tokens",
|
|
173
220
|
to: "tokenStates",
|
|
@@ -178,6 +225,12 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyTokenBalance({
|
|
|
178
225
|
ownerKey: "signerStates",
|
|
179
226
|
conditionKey: "inputs"
|
|
180
227
|
}));
|
|
228
|
+
runner.use(_ocap_tx_pipeline.pipes.verifyTokenAccess({
|
|
229
|
+
statesKey: "tokenStates",
|
|
230
|
+
listFieldKey: "spenders",
|
|
231
|
+
accountKeys: ["signerStates"],
|
|
232
|
+
errorMessage: "Account {address} is not allowed to use token {tokenAddress}"
|
|
233
|
+
}));
|
|
181
234
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
182
235
|
from: "assets",
|
|
183
236
|
to: "assetStates",
|
|
@@ -210,6 +263,11 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
210
263
|
}));
|
|
211
264
|
runner.use(require_protocols_asset_pipes_verify_itx_address.default("acquire-v3"));
|
|
212
265
|
runner.use(require_protocols_asset_pipes_verify_itx_assets.default);
|
|
266
|
+
runner.use(async (context, next) => {
|
|
267
|
+
const { itx, ownerState, assets = [] } = context;
|
|
268
|
+
const owner = ownerState ? ownerState.address : itx.owner;
|
|
269
|
+
return next(await (0, _ocap_tx_pipeline.verifyAssetHierarchy)([itx.address], owner, context, void 0, assets) || void 0);
|
|
270
|
+
});
|
|
213
271
|
runner.use(require_pipes_ensure_gas.default((context) => {
|
|
214
272
|
const result = {
|
|
215
273
|
create: 1,
|
|
@@ -224,7 +282,7 @@ runner.use(require_pipes_ensure_gas.default((context) => {
|
|
|
224
282
|
runner.use(require_pipes_ensure_cost.default({ attachSenderChanges: true }));
|
|
225
283
|
runner.use(_ocap_tx_pipeline.pipes.TakeStateSnapshot());
|
|
226
284
|
runner.use(async (context, next) => {
|
|
227
|
-
const { tx, itx, txTime, inputs = [], statedb, senderState, ownerState, factoryState, factoryTokens = [], mintedAsset, mintedAddress, signerStates = [], senderChange, updateVaults, assetStates = [] } = context;
|
|
285
|
+
const { tx, itx, txTime, inputs = [], statedb, senderState, ownerState, factoryState, factoryTokens = [], mintedAsset, mintedAddress, signerStates = [], senderChange, updateVaults, assetStates = [], delegationState, delegationStates = [] } = context;
|
|
228
286
|
const signerUpdates = {};
|
|
229
287
|
inputs.forEach((x) => {
|
|
230
288
|
const { owner: owner$1 } = x;
|
|
@@ -238,11 +296,12 @@ runner.use(async (context, next) => {
|
|
|
238
296
|
Object.assign(factoryUpdates, require_util.applyTokenUpdates(factoryTokens, factoryState, "add"));
|
|
239
297
|
context.tokenUpdates = require_util.applyTokenUpdates(factoryTokens, { tokens: {} }, "add");
|
|
240
298
|
}
|
|
241
|
-
const
|
|
242
|
-
|
|
299
|
+
const existingSenderState = senderState ? await statedb.account.get(senderState.address, context) : null;
|
|
300
|
+
const [newSenderState, newReceiverState, assetState, newSignerStates, newFactoryState, newAssetStates, newDelegationState, newDelegationStates] = await Promise.all([
|
|
301
|
+
statedb.account.updateOrCreate(existingSenderState ?? null, _ocap_state.account.updateOrCreate(existingSenderState ?? null, Object.assign({
|
|
243
302
|
address: tx.from,
|
|
244
303
|
nonce: tx.nonce,
|
|
245
|
-
pk: tx.pk
|
|
304
|
+
pk: tx.delegator ? senderState?.pk : tx.pk
|
|
246
305
|
}, signerUpdates[tx.from] || (senderChange ? require_util.applyTokenChange(senderState, senderChange) : {})), context), context),
|
|
247
306
|
ownerState || owner === tx.from ? Promise.resolve(ownerState) : statedb.account.create(owner, _ocap_state.account.create({ address: owner }, context), context),
|
|
248
307
|
statedb.asset.create(itx.address, _ocap_state.asset.create({
|
|
@@ -250,9 +309,17 @@ runner.use(async (context, next) => {
|
|
|
250
309
|
owner,
|
|
251
310
|
address: mintedAddress
|
|
252
311
|
}, context), context),
|
|
253
|
-
Promise.all(signerStates.filter((x) => x.address !== tx.from).map((x) =>
|
|
312
|
+
Promise.all(signerStates.filter((x) => x.address !== tx.from).map(async (x) => {
|
|
313
|
+
const existing = await statedb.account.get(x.address, context);
|
|
314
|
+
return statedb.account.updateOrCreate(existing ?? null, _ocap_state.account.updateOrCreate(existing ?? null, {
|
|
315
|
+
address: x.address,
|
|
316
|
+
...signerUpdates[x.address]
|
|
317
|
+
}, context), context);
|
|
318
|
+
})),
|
|
254
319
|
statedb.factory.update(factoryState.address, _ocap_state.factory.update(factoryState, factoryUpdates, context), context),
|
|
255
|
-
Promise.all(assetStates.map((x) => statedb.asset.update(x.address, _ocap_state.asset.update(x, { consumedTime: txTime }, context), context)))
|
|
320
|
+
Promise.all(assetStates.map((x) => statedb.asset.update(x.address, _ocap_state.asset.update(x, { consumedTime: txTime }, context), context))),
|
|
321
|
+
context.isDelegationChanged && delegationState ? statedb.delegation.update(delegationState.address, _ocap_state.delegation.update(delegationState, {}, context), context) : delegationState,
|
|
322
|
+
context.isDelegationChanged && delegationStates.length ? Promise.all(delegationStates.map((x) => statedb.delegation.update(x.address, _ocap_state.delegation.update(x, {}, context), context))) : delegationStates
|
|
256
323
|
]);
|
|
257
324
|
if (updateVaults) await updateVaults();
|
|
258
325
|
context.senderState = newSenderState;
|
|
@@ -261,6 +328,8 @@ runner.use(async (context, next) => {
|
|
|
261
328
|
context.assetState = assetState;
|
|
262
329
|
context.factoryState = newFactoryState;
|
|
263
330
|
context.assetStates = newAssetStates;
|
|
331
|
+
context.delegationState = newDelegationState ?? void 0;
|
|
332
|
+
context.delegationStates = newDelegationStates;
|
|
264
333
|
debug$1("acquire-v3", assetState);
|
|
265
334
|
next();
|
|
266
335
|
}, { persistError: true });
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IAccountState, IAssetFactoryState, IAssetState, IReadyContext, ITokenState, IWithAsset, IWithFactory, IWithOwner, IWithReceiver, IWithSender, IWithSigners, TAcquireAssetV3Tx } from "@ocap/types";
|
|
1
|
+
import { IAccountState, IAssetFactoryState, IAssetState, IDelegateState, IReadyContext, ITokenState, IWithAsset, IWithFactory, IWithOwner, IWithReceiver, IWithSender, IWithSigners, TAcquireAssetV3Tx } from "@ocap/types";
|
|
2
2
|
import { Runner } from "@ocap/tx-pipeline";
|
|
3
3
|
|
|
4
4
|
//#region src/protocols/asset/acquire-v3.d.ts
|
|
@@ -53,6 +53,16 @@ type Context = IReadyContext<TAcquireAssetV3Tx> & Partial<IWithSender> & Partial
|
|
|
53
53
|
mintedAddress?: string;
|
|
54
54
|
/** Token updates for factory (non-instant settlement) */
|
|
55
55
|
tokenUpdates?: Record<string, string>;
|
|
56
|
+
/** Delegator account state for tx.delegator */
|
|
57
|
+
delegatorState?: IAccountState;
|
|
58
|
+
/** Explicit delegation state for tx.delegator */
|
|
59
|
+
delegationState?: IDelegateState;
|
|
60
|
+
/** Signer states extracted from tx.signatures */
|
|
61
|
+
msSignerStates?: IAccountState[];
|
|
62
|
+
/** Delegator states extracted from tx.signatures */
|
|
63
|
+
delegatorStates?: (IAccountState | null)[];
|
|
64
|
+
/** Explicit delegation states for tx.signatures */
|
|
65
|
+
delegationStates?: IDelegateState[];
|
|
56
66
|
};
|
|
57
67
|
declare const runner: Runner<Context>;
|
|
58
68
|
//#endregion
|
|
@@ -2,9 +2,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
2
2
|
const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
|
|
3
3
|
const require_pipes_ensure_cost = require('../../pipes/ensure-cost.cjs');
|
|
4
4
|
const require_pipes_ensure_gas = require('../../pipes/ensure-gas.cjs');
|
|
5
|
+
let _ocap_state = require("@ocap/state");
|
|
5
6
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
6
7
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
7
|
-
let _ocap_state = require("@ocap/state");
|
|
8
8
|
let debug = require("debug");
|
|
9
9
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
10
10
|
let _arcblock_validator = require("@arcblock/validator");
|
|
@@ -3,10 +3,10 @@ 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 _ocap_state = require("@ocap/state");
|
|
6
7
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
7
8
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
8
9
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
9
|
-
let _ocap_state = require("@ocap/state");
|
|
10
10
|
let debug = require("debug");
|
|
11
11
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
12
12
|
let _ocap_message = require("@ocap/message");
|
|
@@ -6,9 +6,9 @@ const require_protocols_asset_pipes_verify_itx_address = require('./pipes/verify
|
|
|
6
6
|
const require_protocols_asset_pipes_verify_itx_assets = require('./pipes/verify-itx-assets.cjs');
|
|
7
7
|
const require_protocols_asset_pipes_verify_itx_variables = require('./pipes/verify-itx-variables.cjs');
|
|
8
8
|
const require_protocols_asset_pipes_verify_mint_limit = require('./pipes/verify-mint-limit.cjs');
|
|
9
|
+
let _ocap_state = require("@ocap/state");
|
|
9
10
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
10
11
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
11
|
-
let _ocap_state = require("@ocap/state");
|
|
12
12
|
let debug = require("debug");
|
|
13
13
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
14
14
|
let _arcblock_validator = require("@arcblock/validator");
|
|
@@ -119,6 +119,12 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyUpdater({
|
|
|
119
119
|
ownerKey: "ownerState"
|
|
120
120
|
}));
|
|
121
121
|
runner.use(require_protocols_asset_pipes_verify_itx_assets.default);
|
|
122
|
+
runner.use(async (context, next) => {
|
|
123
|
+
const { itx, ownerAddress, assetStates = [] } = context;
|
|
124
|
+
const owner = ownerAddress || itx.owner;
|
|
125
|
+
const consumedAssets = assetStates.map((x) => x.address);
|
|
126
|
+
return next(await (0, _ocap_tx_pipeline.verifyAssetHierarchy)([itx.address], owner, context, void 0, consumedAssets) || void 0);
|
|
127
|
+
});
|
|
122
128
|
runner.use(require_pipes_ensure_gas.default((context) => {
|
|
123
129
|
const result = {
|
|
124
130
|
create: 1,
|
|
@@ -47,7 +47,7 @@ const verify_itx_address = (mode) => (context, next) => {
|
|
|
47
47
|
senderState,
|
|
48
48
|
delegatorState
|
|
49
49
|
});
|
|
50
|
-
return next(new _ocap_util_lib_error.CustomError("INVALID_ASSET",
|
|
50
|
+
return next(new _ocap_util_lib_error.CustomError("INVALID_ASSET", `Invalid itx.address: does not match with minted asset address${mode === "acquire-v2" || mode === "acquire-v3" ? " (check that itx.issuer.id/itx.issuer.pk match the trusted issuer's actual on-chain public key — a stale or wrong issuer.pk is the most common cause)" : ""}`));
|
|
51
51
|
}
|
|
52
52
|
context.ownerAddress = owner.address;
|
|
53
53
|
context.mintedAsset = minted.asset;
|
|
@@ -3,9 +3,9 @@ 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 _ocap_state = require("@ocap/state");
|
|
6
7
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
7
8
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
8
|
-
let _ocap_state = require("@ocap/state");
|
|
9
9
|
let debug = require("debug");
|
|
10
10
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
11
11
|
let _arcblock_validator = require("@arcblock/validator");
|
|
@@ -3,13 +3,13 @@ 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 _ocap_state = require("@ocap/state");
|
|
6
7
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
|
+
let _ocap_util = require("@ocap/util");
|
|
7
9
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
8
10
|
let lodash_get = require("lodash/get");
|
|
9
11
|
lodash_get = require_rolldown_runtime.__toESM(lodash_get);
|
|
10
12
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
11
|
-
let _ocap_state = require("@ocap/state");
|
|
12
|
-
let _ocap_util = require("@ocap/util");
|
|
13
13
|
let debug = require("debug");
|
|
14
14
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
15
15
|
let _ocap_message = require("@ocap/message");
|
|
@@ -117,7 +117,8 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
117
117
|
from: "factoryProps.trustedIssuers",
|
|
118
118
|
to: "issuerStates",
|
|
119
119
|
table: "account",
|
|
120
|
-
status: "INVALID_ISSUER_STATE"
|
|
120
|
+
status: "INVALID_ISSUER_STATE",
|
|
121
|
+
message: (address) => `Trusted issuer account has no on-chain record yet: ${address}. The wallet must appear on chain (e.g. send or receive a transaction) before it can be used as a trusted issuer.`
|
|
121
122
|
}));
|
|
122
123
|
runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
123
124
|
stateKey: "issuerStates",
|
|
@@ -3,10 +3,10 @@ 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 _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
7
|
-
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
8
6
|
let _ocap_state = require("@ocap/state");
|
|
7
|
+
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
9
8
|
let _ocap_util = require("@ocap/util");
|
|
9
|
+
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
10
|
let debug = require("debug");
|
|
11
11
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
12
12
|
let _arcblock_validator = require("@arcblock/validator");
|
|
@@ -3,10 +3,10 @@ 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 _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
7
|
-
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
8
6
|
let _ocap_state = require("@ocap/state");
|
|
7
|
+
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
9
8
|
let _ocap_util = require("@ocap/util");
|
|
9
|
+
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
10
|
let debug = require("debug");
|
|
11
11
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
12
12
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
@@ -3,10 +3,10 @@ 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 _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
7
|
-
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
8
6
|
let _ocap_state = require("@ocap/state");
|
|
7
|
+
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
9
8
|
let _ocap_util = require("@ocap/util");
|
|
9
|
+
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
10
|
let debug = require("debug");
|
|
11
11
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
12
12
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
@@ -3,10 +3,10 @@ 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 _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
7
|
-
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
8
6
|
let _ocap_state = require("@ocap/state");
|
|
7
|
+
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
9
8
|
let _ocap_util = require("@ocap/util");
|
|
9
|
+
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
10
|
let debug = require("debug");
|
|
11
11
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
12
12
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
@@ -3,13 +3,13 @@ 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 _ocap_state = require("@ocap/state");
|
|
6
7
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
|
+
let _ocap_util = require("@ocap/util");
|
|
7
9
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
8
10
|
let lodash_pick = require("lodash/pick");
|
|
9
11
|
lodash_pick = require_rolldown_runtime.__toESM(lodash_pick);
|
|
10
12
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
11
|
-
let _ocap_state = require("@ocap/state");
|
|
12
|
-
let _ocap_util = require("@ocap/util");
|
|
13
13
|
let debug = require("debug");
|
|
14
14
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
15
15
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
@@ -6,11 +6,11 @@ const require_pipes_ensure_gas = require('../../pipes/ensure-gas.cjs');
|
|
|
6
6
|
const require_protocols_rollup_pipes_ensure_validator = require('./pipes/ensure-validator.cjs');
|
|
7
7
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
8
8
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
9
|
+
let _ocap_state = require("@ocap/state");
|
|
9
10
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
11
|
+
let _ocap_util = require("@ocap/util");
|
|
10
12
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
11
13
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
12
|
-
let _ocap_state = require("@ocap/state");
|
|
13
|
-
let _ocap_util = require("@ocap/util");
|
|
14
14
|
let debug = require("debug");
|
|
15
15
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
16
16
|
let lodash_cloneDeep = require("lodash/cloneDeep");
|
|
@@ -193,7 +193,7 @@ runner.use((context, next) => {
|
|
|
193
193
|
});
|
|
194
194
|
const txSignatures = txData.signatures;
|
|
195
195
|
const blockSignatures = blockState.signatures;
|
|
196
|
-
const validators = txSignatures.map((s) => s.signer).concat(blockSignatures.map((s) => s.signer));
|
|
196
|
+
const validators = Array.from(new Set(txSignatures.map((s) => s.signer).concat(blockSignatures.map((s) => s.signer))));
|
|
197
197
|
const validatorShare = validator.div(new _ocap_util.BN(validators.length));
|
|
198
198
|
validators.forEach((v$1) => changes.account.push({
|
|
199
199
|
address: v$1,
|
|
@@ -206,7 +206,8 @@ runner.use((context, next) => {
|
|
|
206
206
|
delta: proposer.toString(10),
|
|
207
207
|
action: "fee"
|
|
208
208
|
});
|
|
209
|
-
const
|
|
209
|
+
const blockSignatures = blockState.signatures;
|
|
210
|
+
const validators = Array.from(new Set(blockSignatures.map((s) => s.signer)));
|
|
210
211
|
const validatorShares = require_util.splitTxFee({
|
|
211
212
|
total: validator.toString(10),
|
|
212
213
|
shares: validators.reduce((acc, signer) => {
|
|
@@ -5,10 +5,10 @@ const require_pipes_ensure_gas = require('../../pipes/ensure-gas.cjs');
|
|
|
5
5
|
const require_protocols_rollup_pipes_ensure_validator = require('./pipes/ensure-validator.cjs');
|
|
6
6
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
7
7
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
8
|
+
let _ocap_state = require("@ocap/state");
|
|
8
9
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
9
10
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
11
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
11
|
-
let _ocap_state = require("@ocap/state");
|
|
12
12
|
let _arcblock_validator = require("@arcblock/validator");
|
|
13
13
|
|
|
14
14
|
//#region src/protocols/rollup/close.ts
|
|
@@ -7,12 +7,12 @@ const require_protocols_rollup_pipes_ensure_validator = require('./pipes/ensure-
|
|
|
7
7
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
8
8
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
9
9
|
const require_protocols_rollup_pipes_verify_evidence = require('./pipes/verify-evidence.cjs');
|
|
10
|
+
let _ocap_state = require("@ocap/state");
|
|
10
11
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
11
12
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
13
|
let lodash_pick = require("lodash/pick");
|
|
13
14
|
lodash_pick = require_rolldown_runtime.__toESM(lodash_pick);
|
|
14
15
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
15
|
-
let _ocap_state = require("@ocap/state");
|
|
16
16
|
let debug = require("debug");
|
|
17
17
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
18
18
|
let _ocap_message = require("@ocap/message");
|
|
@@ -3,11 +3,11 @@ 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 _ocap_state = require("@ocap/state");
|
|
6
7
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
7
8
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
8
9
|
let _arcblock_did = require("@arcblock/did");
|
|
9
10
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
10
|
-
let _ocap_state = require("@ocap/state");
|
|
11
11
|
let debug = require("debug");
|
|
12
12
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
13
13
|
let _ocap_message = require("@ocap/message");
|
|
@@ -7,12 +7,12 @@ const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-si
|
|
|
7
7
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
8
8
|
const require_protocols_rollup_pipes_verify_evidence = require('./pipes/verify-evidence.cjs');
|
|
9
9
|
const require_index = require('../../node_modules/valibot/dist/index.cjs');
|
|
10
|
+
let _ocap_state = require("@ocap/state");
|
|
10
11
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
12
|
+
let _ocap_util = require("@ocap/util");
|
|
11
13
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
14
|
let _arcblock_did = require("@arcblock/did");
|
|
13
15
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
14
|
-
let _ocap_state = require("@ocap/state");
|
|
15
|
-
let _ocap_util = require("@ocap/util");
|
|
16
16
|
let debug = require("debug");
|
|
17
17
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
18
18
|
let _arcblock_validator = require("@arcblock/validator");
|
|
@@ -7,10 +7,10 @@ const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-si
|
|
|
7
7
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
8
8
|
const require_protocols_rollup_pipes_verify_evidence = require('./pipes/verify-evidence.cjs');
|
|
9
9
|
const require_index = require('../../node_modules/valibot/dist/index.cjs');
|
|
10
|
+
let _ocap_state = require("@ocap/state");
|
|
10
11
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
11
12
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
13
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
13
|
-
let _ocap_state = require("@ocap/state");
|
|
14
14
|
let debug = require("debug");
|
|
15
15
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
16
16
|
let _arcblock_validator = require("@arcblock/validator");
|
|
@@ -5,9 +5,9 @@ const require_pipes_ensure_gas = require('../../pipes/ensure-gas.cjs');
|
|
|
5
5
|
const require_protocols_rollup_pipes_ensure_validator = require('./pipes/ensure-validator.cjs');
|
|
6
6
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
7
7
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
8
|
+
let _ocap_state = require("@ocap/state");
|
|
8
9
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
9
10
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
|
-
let _ocap_state = require("@ocap/state");
|
|
11
11
|
let _arcblock_validator = require("@arcblock/validator");
|
|
12
12
|
|
|
13
13
|
//#region src/protocols/rollup/migrate.ts
|
|
@@ -5,9 +5,9 @@ const require_pipes_ensure_gas = require('../../pipes/ensure-gas.cjs');
|
|
|
5
5
|
const require_protocols_rollup_pipes_ensure_validator = require('./pipes/ensure-validator.cjs');
|
|
6
6
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
7
7
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
8
|
+
let _ocap_state = require("@ocap/state");
|
|
8
9
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
9
10
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
|
-
let _ocap_state = require("@ocap/state");
|
|
11
11
|
let _arcblock_validator = require("@arcblock/validator");
|
|
12
12
|
|
|
13
13
|
//#region src/protocols/rollup/pause.ts
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
2
2
|
const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
|
|
3
|
+
let _ocap_util = require("@ocap/util");
|
|
3
4
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
4
5
|
let lodash_get = require("lodash/get");
|
|
5
6
|
lodash_get = require_rolldown_runtime.__toESM(lodash_get);
|
|
6
7
|
let _arcblock_did = require("@arcblock/did");
|
|
7
|
-
let
|
|
8
|
+
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
8
9
|
let _ocap_wallet = require("@ocap/wallet");
|
|
9
10
|
|
|
10
11
|
//#region src/protocols/rollup/pipes/verify-evidence.ts
|
|
@@ -12,7 +13,9 @@ function CreateVerifyEvidencePipe({ evidenceKey, signaturesKey, verifyMethod = "
|
|
|
12
13
|
if (["verify", "ethVerify"].includes(verifyMethod) === false) throw new _ocap_util_lib_error.CustomError("INVALID_ARGUMENT", `Invalid verify method: ${verifyMethod}, supported methods are: verify, ethVerify`);
|
|
13
14
|
return async (context, next) => {
|
|
14
15
|
const evidence = (0, lodash_get.default)(context, evidenceKey);
|
|
15
|
-
const signatures = (0,
|
|
16
|
+
const signatures = (0, _ocap_util_lib_get_list_field.getListField)(context, signaturesKey);
|
|
17
|
+
const signers = signatures.map((s) => s.signer);
|
|
18
|
+
if (new Set(signers).size !== signers.length) return next(new _ocap_util_lib_error.CustomError("INVALID_SIGNATURE", `Duplicate signers in ${signaturesKey} are not allowed`));
|
|
16
19
|
for (const sig of signatures) {
|
|
17
20
|
const { signer, pk, delegator, signature } = sig;
|
|
18
21
|
const address = delegator || signer;
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
2
2
|
const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
|
|
3
3
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
4
|
-
let
|
|
5
|
-
lodash_get = require_rolldown_runtime.__toESM(lodash_get);
|
|
4
|
+
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
6
5
|
|
|
7
6
|
//#region src/protocols/rollup/pipes/verify-signers.ts
|
|
8
7
|
function CreateVerifySignersPipe({ signersKey, allowSender = true, allowShrink = false }) {
|
|
@@ -10,14 +9,15 @@ function CreateVerifySignersPipe({ signersKey, allowSender = true, allowShrink =
|
|
|
10
9
|
const { tx, rollupState } = context;
|
|
11
10
|
const rollup = rollupState;
|
|
12
11
|
const { minSignerCount, maxSignerCount } = rollup;
|
|
13
|
-
const signatures = (0,
|
|
12
|
+
const signatures = (0, _ocap_util_lib_get_list_field.getListField)(context, signersKey);
|
|
14
13
|
const signerCount = signatures.length;
|
|
14
|
+
if (signatures.some((x) => Boolean(x.delegator))) return next(new _ocap_util_lib_error.CustomError("INVALID_SIGNATURE", `Invalid: ${signersKey}, delegation is not allowed`));
|
|
15
15
|
const seedValidators = (rollup.seedValidators ?? []).map((x) => x.address);
|
|
16
16
|
const validators = (rollup.validators ?? []).map((x) => x.address);
|
|
17
17
|
if (!allowSender && signatures.some((x) => x.signer === tx.from)) return next(new _ocap_util_lib_error.CustomError("INVALID_SIGNATURE", `Invalid: ${signersKey}, sender not allowed to sign`));
|
|
18
|
+
if (signerCount > maxSignerCount) return next(new _ocap_util_lib_error.CustomError("INVALID_SIGNATURE", `Invalid: ${signersKey}, Expect at most ${maxSignerCount} signatures, got ${signerCount}`));
|
|
18
19
|
if (validators.length > minSignerCount) {
|
|
19
20
|
if (signerCount < minSignerCount) return next(new _ocap_util_lib_error.CustomError("INVALID_SIGNATURE", `Invalid: ${signersKey}, expect at least ${minSignerCount} signatures, got ${signerCount}`));
|
|
20
|
-
if (signerCount > maxSignerCount) return next(new _ocap_util_lib_error.CustomError("INVALID_SIGNATURE", `Invalid: ${signersKey}, Expect at most ${maxSignerCount} signatures, got ${signerCount}`));
|
|
21
21
|
} else {
|
|
22
22
|
let actualValidatorCount = validators.length;
|
|
23
23
|
if (!allowSender && allowShrink) actualValidatorCount -= 1;
|
|
@@ -25,6 +25,7 @@ function CreateVerifySignersPipe({ signersKey, allowSender = true, allowShrink =
|
|
|
25
25
|
if (signerCount < expectedSignerCount) return next(new _ocap_util_lib_error.CustomError("INVALID_SIGNATURE", `Invalid ${signersKey}, all validators are expected to sign because we have less than ${expectedSignerCount} validators`));
|
|
26
26
|
}
|
|
27
27
|
const signers = signatures.map((x) => x.signer);
|
|
28
|
+
if (new Set(signers).size !== signers.length) return next(new _ocap_util_lib_error.CustomError("INVALID_SIGNATURE", `Invalid: ${signersKey}, duplicate signers are not allowed`));
|
|
28
29
|
const missingSigner = seedValidators.find((x) => signers.includes(x) === false);
|
|
29
30
|
if (missingSigner) return next(new _ocap_util_lib_error.CustomError("INVALID_SIGNATURE", `Invalid: ${signersKey}, missing signature from seed validator: ${missingSigner}`));
|
|
30
31
|
const invalidSigner = signers.find((x) => validators.includes(x) === false);
|
|
@@ -5,9 +5,9 @@ const require_pipes_ensure_gas = require('../../pipes/ensure-gas.cjs');
|
|
|
5
5
|
const require_protocols_rollup_pipes_ensure_validator = require('./pipes/ensure-validator.cjs');
|
|
6
6
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
7
7
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
8
|
+
let _ocap_state = require("@ocap/state");
|
|
8
9
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
9
10
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
|
-
let _ocap_state = require("@ocap/state");
|
|
11
11
|
let _arcblock_validator = require("@arcblock/validator");
|
|
12
12
|
|
|
13
13
|
//#region src/protocols/rollup/resume.ts
|
|
@@ -6,10 +6,10 @@ const require_pipes_ensure_gas = require('../../pipes/ensure-gas.cjs');
|
|
|
6
6
|
const require_protocols_rollup_pipes_ensure_validator = require('./pipes/ensure-validator.cjs');
|
|
7
7
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
8
8
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
9
|
-
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
10
|
-
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
11
9
|
let _ocap_state = require("@ocap/state");
|
|
10
|
+
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
12
11
|
let _ocap_util = require("@ocap/util");
|
|
12
|
+
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
13
13
|
let debug = require("debug");
|
|
14
14
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
15
15
|
let _arcblock_validator = require("@arcblock/validator");
|
|
@@ -25,9 +25,9 @@ const schema = _arcblock_validator.v.pipe(_arcblock_validator.v.object({
|
|
|
25
25
|
minStakeAmount: (0, _arcblock_validator.vBN)((0, _arcblock_validator.vBNGreater)(0)),
|
|
26
26
|
maxStakeAmount: (0, _arcblock_validator.vBN)((0, _arcblock_validator.vBNGreater)(0)),
|
|
27
27
|
minSignerCount: _arcblock_validator.v.pipe(_arcblock_validator.v.number(), _arcblock_validator.v.integer()),
|
|
28
|
-
maxSignerCount: _arcblock_validator.v.pipe(_arcblock_validator.v.number(), _arcblock_validator.v.integer(), _arcblock_validator.v.minValue(1), _arcblock_validator.v.maxValue(
|
|
28
|
+
maxSignerCount: _arcblock_validator.v.pipe(_arcblock_validator.v.number(), _arcblock_validator.v.integer(), _arcblock_validator.v.minValue(1), _arcblock_validator.v.maxValue(16)),
|
|
29
29
|
minBlockSize: _arcblock_validator.v.pipe(_arcblock_validator.v.number(), _arcblock_validator.v.integer(), _arcblock_validator.v.minValue(1)),
|
|
30
|
-
maxBlockSize: _arcblock_validator.v.pipe(_arcblock_validator.v.number(), _arcblock_validator.v.integer(), _arcblock_validator.v.minValue(1), _arcblock_validator.v.maxValue(
|
|
30
|
+
maxBlockSize: _arcblock_validator.v.pipe(_arcblock_validator.v.number(), _arcblock_validator.v.integer(), _arcblock_validator.v.minValue(1), _arcblock_validator.v.maxValue(256)),
|
|
31
31
|
minBlockInterval: _arcblock_validator.v.pipe(_arcblock_validator.v.number(), _arcblock_validator.v.integer(), _arcblock_validator.v.minValue(1), _arcblock_validator.v.maxValue(3600)),
|
|
32
32
|
minBlockConfirmation: _arcblock_validator.v.pipe(_arcblock_validator.v.number(), _arcblock_validator.v.integer(), _arcblock_validator.v.minValue(1), _arcblock_validator.v.maxValue(100)),
|
|
33
33
|
minDepositAmount: (0, _arcblock_validator.vBN)((0, _arcblock_validator.vBNPositive)()),
|
|
@@ -3,11 +3,11 @@ 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 _ocap_state = require("@ocap/state");
|
|
6
7
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
|
+
let _ocap_util = require("@ocap/util");
|
|
7
9
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
8
10
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
9
|
-
let _ocap_state = require("@ocap/state");
|
|
10
|
-
let _ocap_util = require("@ocap/util");
|
|
11
11
|
let debug = require("debug");
|
|
12
12
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
13
13
|
let lodash_cloneDeep = require("lodash/cloneDeep");
|
|
@@ -5,11 +5,11 @@ const require_pipes_ensure_cost = require('../../pipes/ensure-cost.cjs');
|
|
|
5
5
|
const require_pipes_ensure_gas = require('../../pipes/ensure-gas.cjs');
|
|
6
6
|
const require_protocols_rollup_pipes_verify_signers = require('../rollup/pipes/verify-signers.cjs');
|
|
7
7
|
const require_protocols_rollup_pipes_verify_status = require('../rollup/pipes/verify-status.cjs');
|
|
8
|
+
let _ocap_state = require("@ocap/state");
|
|
8
9
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
10
|
+
let _ocap_util = require("@ocap/util");
|
|
9
11
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
12
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
11
|
-
let _ocap_state = require("@ocap/state");
|
|
12
|
-
let _ocap_util = require("@ocap/util");
|
|
13
13
|
let debug = require("debug");
|
|
14
14
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
15
15
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|