@ocap/tx-protocols 1.31.1 → 1.31.3
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/bridge-release-crypto.d.mts +39 -0
- package/esm/bridge-release-crypto.mjs +88 -0
- package/esm/bridge-release-window.d.mts +47 -0
- package/esm/bridge-release-window.mjs +62 -0
- package/esm/bridge-reserve.d.mts +24 -0
- package/esm/bridge-reserve.mjs +41 -0
- package/esm/execute.d.mts +1 -1
- package/esm/execute.mjs +58 -5
- package/esm/gas-security-guard.d.mts +6 -2
- package/esm/gas-security-guard.mjs +16 -9
- package/esm/index.d.mts +37 -18
- package/esm/index.mjs +6 -2
- package/esm/pipes/ensure-cost.mjs +7 -1
- package/esm/pipes/write-ledger.d.mts +2 -2
- package/esm/pipes/write-ledger.mjs +6 -3
- package/esm/protocols/account/delegate.mjs +6 -4
- package/esm/protocols/account/migrate.mjs +5 -3
- package/esm/protocols/account/revoke-delegate.mjs +5 -3
- package/esm/protocols/asset/acquire-v2.mjs +3 -1
- package/esm/protocols/asset/acquire-v3.mjs +4 -2
- package/esm/protocols/asset/consume.mjs +3 -1
- package/esm/protocols/asset/create.mjs +4 -2
- package/esm/protocols/asset/mint.mjs +4 -2
- package/esm/protocols/asset/pipes/exec-mint-hook.mjs +1 -1
- package/esm/protocols/asset/pipes/verify-itx-address.mjs +1 -1
- package/esm/protocols/asset/pipes/verify-itx-assets.mjs +1 -1
- package/esm/protocols/asset/update.mjs +4 -2
- package/esm/protocols/bridge/release.d.mts +34 -0
- package/esm/protocols/bridge/release.mjs +385 -0
- package/esm/protocols/factory/create.mjs +4 -2
- package/esm/protocols/governance/claim-stake.mjs +4 -2
- package/esm/protocols/governance/return-stake.mjs +4 -2
- package/esm/protocols/governance/revoke-ledger.mjs +1 -1
- package/esm/protocols/governance/revoke-stake.d.mts +7 -2
- package/esm/protocols/governance/revoke-stake.mjs +49 -28
- package/esm/protocols/governance/slash-stake.mjs +5 -3
- package/esm/protocols/governance/stake.mjs +6 -4
- package/esm/protocols/rollup/bridge-create.d.mts +13 -0
- package/esm/protocols/rollup/bridge-create.mjs +206 -0
- package/esm/protocols/rollup/bridge-membership.d.mts +10 -0
- package/esm/protocols/rollup/bridge-membership.mjs +154 -0
- package/esm/protocols/rollup/bridge-migrate.d.mts +10 -0
- package/esm/protocols/rollup/bridge-migrate.mjs +208 -0
- package/esm/protocols/rollup/bridge-v2.d.mts +113 -0
- package/esm/protocols/rollup/bridge-v2.mjs +219 -0
- package/esm/protocols/rollup/claim-reward.mjs +4 -2
- package/esm/protocols/rollup/close.d.mts +2 -1
- package/esm/protocols/rollup/close.mjs +59 -6
- package/esm/protocols/rollup/create-block.mjs +4 -2
- package/esm/protocols/rollup/create.d.mts +3 -0
- package/esm/protocols/rollup/create.mjs +45 -6
- package/esm/protocols/rollup/join.d.mts +2 -1
- package/esm/protocols/rollup/join.mjs +31 -23
- package/esm/protocols/rollup/leave.d.mts +2 -1
- package/esm/protocols/rollup/leave.mjs +32 -24
- package/esm/protocols/rollup/migrate.d.mts +2 -1
- package/esm/protocols/rollup/migrate.mjs +19 -10
- package/esm/protocols/rollup/pause.d.mts +4 -1
- package/esm/protocols/rollup/pause.mjs +50 -6
- package/esm/protocols/rollup/pipes/verify-evidence.mjs +2 -2
- package/esm/protocols/rollup/resume.d.mts +2 -1
- package/esm/protocols/rollup/resume.mjs +26 -6
- package/esm/protocols/rollup/update.d.mts +5 -1
- package/esm/protocols/rollup/update.mjs +56 -9
- package/esm/protocols/token/create.mjs +4 -2
- package/esm/protocols/token/deposit-v2.mjs +5 -3
- package/esm/protocols/token/withdraw-v2.mjs +5 -3
- package/esm/protocols/token-factory/burn.mjs +4 -2
- package/esm/protocols/token-factory/create.mjs +8 -4
- package/esm/protocols/token-factory/mint.mjs +4 -2
- package/esm/protocols/token-factory/update.mjs +20 -5
- package/esm/protocols/trade/exchange-v2.d.mts +5 -1
- package/esm/protocols/trade/exchange-v2.mjs +89 -4
- package/esm/protocols/trade/transfer-v2.mjs +15 -4
- package/esm/protocols/trade/transfer-v3.mjs +5 -3
- package/esm/stateless-prefix.d.mts +16 -0
- package/esm/stateless-prefix.mjs +82 -0
- package/esm/tx-timer.d.mts +1 -1
- package/esm/tx-timer.mjs +1 -1
- package/esm/util.mjs +2 -2
- package/lib/bridge-release-crypto.cjs +93 -0
- package/lib/bridge-release-crypto.d.cts +39 -0
- package/lib/bridge-release-window.cjs +69 -0
- package/lib/bridge-release-window.d.cts +47 -0
- package/lib/bridge-reserve.cjs +45 -0
- package/lib/bridge-reserve.d.cts +24 -0
- package/lib/execute.cjs +58 -5
- package/lib/gas-security-guard.cjs +16 -9
- package/lib/gas-security-guard.d.cts +6 -2
- package/lib/index.cjs +8 -1
- package/lib/index.d.cts +36 -17
- package/lib/pipes/ensure-cost.cjs +7 -1
- package/lib/pipes/write-ledger.cjs +6 -3
- package/lib/pipes/write-ledger.d.cts +2 -2
- package/lib/protocols/account/delegate.cjs +6 -4
- package/lib/protocols/account/migrate.cjs +5 -3
- package/lib/protocols/account/revoke-delegate.cjs +5 -3
- package/lib/protocols/asset/acquire-v2.cjs +3 -1
- package/lib/protocols/asset/acquire-v3.cjs +4 -2
- package/lib/protocols/asset/consume.cjs +3 -1
- package/lib/protocols/asset/create.cjs +4 -2
- package/lib/protocols/asset/mint.cjs +4 -2
- package/lib/protocols/asset/pipes/exec-mint-hook.cjs +1 -1
- package/lib/protocols/asset/pipes/verify-itx-address.cjs +1 -1
- package/lib/protocols/asset/pipes/verify-itx-assets.cjs +1 -1
- package/lib/protocols/asset/update.cjs +4 -2
- package/lib/protocols/bridge/release.cjs +390 -0
- package/lib/protocols/bridge/release.d.cts +34 -0
- package/lib/protocols/factory/create.cjs +4 -2
- package/lib/protocols/governance/claim-stake.cjs +4 -2
- package/lib/protocols/governance/return-stake.cjs +4 -2
- package/lib/protocols/governance/revoke-ledger.cjs +1 -1
- package/lib/protocols/governance/revoke-stake.cjs +49 -28
- package/lib/protocols/governance/revoke-stake.d.cts +7 -2
- package/lib/protocols/governance/slash-stake.cjs +5 -3
- package/lib/protocols/governance/stake.cjs +6 -4
- package/lib/protocols/rollup/bridge-create.cjs +209 -0
- package/lib/protocols/rollup/bridge-create.d.cts +13 -0
- package/lib/protocols/rollup/bridge-membership.cjs +157 -0
- package/lib/protocols/rollup/bridge-membership.d.cts +10 -0
- package/lib/protocols/rollup/bridge-migrate.cjs +212 -0
- package/lib/protocols/rollup/bridge-migrate.d.cts +10 -0
- package/lib/protocols/rollup/bridge-v2.cjs +244 -0
- package/lib/protocols/rollup/bridge-v2.d.cts +113 -0
- package/lib/protocols/rollup/claim-reward.cjs +4 -2
- package/lib/protocols/rollup/close.cjs +59 -6
- package/lib/protocols/rollup/close.d.cts +2 -1
- package/lib/protocols/rollup/create-block.cjs +4 -2
- package/lib/protocols/rollup/create.cjs +45 -6
- package/lib/protocols/rollup/create.d.cts +3 -0
- package/lib/protocols/rollup/join.cjs +31 -23
- package/lib/protocols/rollup/join.d.cts +2 -1
- package/lib/protocols/rollup/leave.cjs +32 -24
- package/lib/protocols/rollup/leave.d.cts +2 -1
- package/lib/protocols/rollup/migrate.cjs +19 -10
- package/lib/protocols/rollup/migrate.d.cts +2 -1
- package/lib/protocols/rollup/pause.cjs +50 -6
- package/lib/protocols/rollup/pause.d.cts +4 -1
- package/lib/protocols/rollup/pipes/verify-evidence.cjs +2 -2
- package/lib/protocols/rollup/resume.cjs +26 -6
- package/lib/protocols/rollup/resume.d.cts +2 -1
- package/lib/protocols/rollup/update.cjs +56 -9
- package/lib/protocols/rollup/update.d.cts +5 -1
- package/lib/protocols/token/create.cjs +4 -2
- package/lib/protocols/token/deposit-v2.cjs +5 -3
- package/lib/protocols/token/withdraw-v2.cjs +5 -3
- package/lib/protocols/token-factory/burn.cjs +4 -2
- package/lib/protocols/token-factory/create.cjs +8 -4
- package/lib/protocols/token-factory/mint.cjs +4 -2
- package/lib/protocols/token-factory/update.cjs +20 -5
- package/lib/protocols/trade/exchange-v2.cjs +90 -3
- package/lib/protocols/trade/exchange-v2.d.cts +5 -1
- package/lib/protocols/trade/transfer-v2.cjs +15 -4
- package/lib/protocols/trade/transfer-v3.cjs +5 -3
- package/lib/stateless-prefix.cjs +88 -0
- package/lib/stateless-prefix.d.cts +16 -0
- package/lib/tx-timer.cjs +1 -1
- package/lib/tx-timer.d.cts +1 -1
- package/lib/util.cjs +2 -2
- package/package.json +16 -16
- package/tools/fixtures.ts +9 -4
|
@@ -25,6 +25,9 @@ type Context = IReadyContext<TCreateRollupTx> & IWithSender & Partial<IWithToken
|
|
|
25
25
|
rollupState?: IRollupState | null;
|
|
26
26
|
/** Whether delegation state changed */
|
|
27
27
|
isDelegationChanged?: boolean;
|
|
28
|
+
/** v2 (on-chain bridge) create */
|
|
29
|
+
isBridgeV2?: boolean;
|
|
30
|
+
bridgeInput?: unknown;
|
|
28
31
|
};
|
|
29
32
|
declare const runner: Runner<Context>;
|
|
30
33
|
//#endregion
|
|
@@ -3,16 +3,18 @@ const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
|
|
|
3
3
|
const require_util = require('../../util.cjs');
|
|
4
4
|
const require_pipes_ensure_cost = require('../../pipes/ensure-cost.cjs');
|
|
5
5
|
const require_pipes_ensure_gas = require('../../pipes/ensure-gas.cjs');
|
|
6
|
+
const require_protocols_rollup_bridge_v2 = require('./bridge-v2.cjs');
|
|
6
7
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
7
8
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
8
9
|
const require_protocols_rollup_pipes_verify_evidence = require('./pipes/verify-evidence.cjs');
|
|
9
10
|
const require_index = require('../../node_modules/valibot/dist/index.cjs');
|
|
11
|
+
const require_protocols_rollup_bridge_membership = require('./bridge-membership.cjs');
|
|
12
|
+
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
13
|
+
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
14
|
let _arcblock_did = require("@arcblock/did");
|
|
11
15
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
12
16
|
let _ocap_state = require("@ocap/state");
|
|
13
|
-
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
14
17
|
let _ocap_util = require("@ocap/util");
|
|
15
|
-
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
16
18
|
let debug = require("debug");
|
|
17
19
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
18
20
|
let _arcblock_validator = require("@arcblock/validator");
|
|
@@ -34,18 +36,22 @@ const schema = require_index.pipe(require_index.object({
|
|
|
34
36
|
signaturesList: require_index.pipe(_arcblock_validator.schemas.multiSig, require_index.minLength(1)),
|
|
35
37
|
data: require_index.optional(require_index.nullable(require_index.any()))
|
|
36
38
|
}), (0, _arcblock_validator.vStripUnknown)());
|
|
37
|
-
runner.use(({
|
|
39
|
+
runner.use(require_protocols_rollup_bridge_v2.peekBridge("itx.rollup", { rejectV1IfDisabled: "join_rollup" }));
|
|
40
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(({ itx }, next) => {
|
|
38
41
|
const { error } = (0, _arcblock_validator.vValidate)(schema, itx);
|
|
39
42
|
return next(error ? new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`) : void 0);
|
|
40
|
-
});
|
|
43
|
+
}));
|
|
44
|
+
runner.use(require_protocols_rollup_bridge_membership.membershipSchemaV2("join"));
|
|
41
45
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
42
46
|
from: "itx.rollup",
|
|
43
47
|
to: "rollupState",
|
|
44
48
|
status: "INVALID_ROLLUP",
|
|
45
49
|
table: "rollup"
|
|
46
50
|
}));
|
|
47
|
-
runner.use(
|
|
48
|
-
runner.use((
|
|
51
|
+
runner.use(require_protocols_rollup_bridge_v2.loadBridge);
|
|
52
|
+
runner.use(require_protocols_rollup_bridge_v2.rejectRollupV1IfDisabled("join_rollup"));
|
|
53
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_status.default({ paused: false })));
|
|
54
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1((context, next) => {
|
|
49
55
|
const { tx, itx, rollupState } = context;
|
|
50
56
|
const validator = {
|
|
51
57
|
pk: (0, _ocap_util.toHex)(tx.pk),
|
|
@@ -58,50 +64,51 @@ runner.use((context, next) => {
|
|
|
58
64
|
context.newValidator = validator;
|
|
59
65
|
context.validatorsHash = _ocap_merkle_tree.default.getListHash([validator.address]);
|
|
60
66
|
return next();
|
|
61
|
-
});
|
|
62
|
-
runner.use(require_protocols_rollup_pipes_verify_signers.default({
|
|
67
|
+
}));
|
|
68
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_signers.default({
|
|
63
69
|
signersKey: "itx.signaturesList",
|
|
64
70
|
allowSender: false
|
|
65
|
-
}));
|
|
66
|
-
runner.use(require_protocols_rollup_pipes_verify_evidence.default({
|
|
71
|
+
})));
|
|
72
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_evidence.default({
|
|
67
73
|
evidenceKey: "validatorsHash",
|
|
68
74
|
signaturesKey: "itx.signaturesList",
|
|
69
75
|
verifyMethod: "ethVerify"
|
|
70
|
-
}));
|
|
71
|
-
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
76
|
+
})));
|
|
77
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(_ocap_tx_pipeline.pipes.ExtractState({
|
|
72
78
|
from: "itx.evidence.hash",
|
|
73
79
|
to: "evidenceState",
|
|
74
80
|
status: "OK",
|
|
75
81
|
table: "evidence"
|
|
76
|
-
}));
|
|
77
|
-
runner.use(({ evidenceState }, next) => {
|
|
82
|
+
})));
|
|
83
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(({ evidenceState }, next) => {
|
|
78
84
|
if (evidenceState) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "Join evidence already seen on this chain"));
|
|
79
85
|
return next();
|
|
80
|
-
});
|
|
81
|
-
runner.use(require_protocols_rollup_pipes_verify_signers.default({
|
|
86
|
+
}));
|
|
87
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_signers.default({
|
|
82
88
|
signersKey: "tx.signaturesList",
|
|
83
89
|
allowSender: false
|
|
84
|
-
}));
|
|
90
|
+
})));
|
|
91
|
+
runner.use(require_protocols_rollup_bridge_membership.membershipChecks("join"));
|
|
85
92
|
runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSigV2({ signersKey: "signers" }));
|
|
86
|
-
runner.use((context, next) => {
|
|
93
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1((context, next) => {
|
|
87
94
|
const { tx, itx } = context;
|
|
88
95
|
context.stakeAddress = (0, _arcblock_did_util.toStakeAddress)(tx.from, itx.rollup);
|
|
89
96
|
return next();
|
|
90
|
-
});
|
|
91
|
-
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
97
|
+
}));
|
|
98
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(_ocap_tx_pipeline.pipes.ExtractState({
|
|
92
99
|
from: "stakeAddress",
|
|
93
100
|
to: "stakeState",
|
|
94
101
|
status: "INVALID_STAKE_STATE",
|
|
95
102
|
table: "stake"
|
|
96
|
-
}));
|
|
97
|
-
runner.use((context, next) => {
|
|
103
|
+
})));
|
|
104
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1((context, next) => {
|
|
98
105
|
const { stakeState, rollupState } = context;
|
|
99
106
|
if (stakeState?.revocable === false) return next(new _ocap_util_lib_error.CustomError("INVALID_STAKE_STATE", `Staking already locked: ${stakeState.address}`));
|
|
100
107
|
const actualStake = new _ocap_util.BN(stakeState?.tokens[rollupState?.tokenAddress || ""] || 0);
|
|
101
108
|
const requiredStake = new _ocap_util.BN(rollupState?.minStakeAmount || 0);
|
|
102
109
|
if (actualStake.lt(requiredStake)) return next(new _ocap_util_lib_error.CustomError("INVALID_STAKE_STATE", `Staking does not match min stake amount: ${requiredStake}`));
|
|
103
110
|
return next();
|
|
104
|
-
});
|
|
111
|
+
}));
|
|
105
112
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
106
113
|
from: "tx.from",
|
|
107
114
|
to: "senderState",
|
|
@@ -127,6 +134,7 @@ runner.use(require_pipes_ensure_gas.default(() => ({
|
|
|
127
134
|
runner.use(require_pipes_ensure_cost.default({ attachSenderChanges: true }));
|
|
128
135
|
runner.use(_ocap_tx_pipeline.pipes.TakeStateSnapshot());
|
|
129
136
|
runner.use(async (context, next) => {
|
|
137
|
+
if (context.isBridgeV2) return require_protocols_rollup_bridge_membership.membershipStep("join")(context, next);
|
|
130
138
|
const { tx, itx, rollupState, statedb, senderState, stakeState, newValidator, stakeAddress, senderUpdates, updateVaults } = context;
|
|
131
139
|
const newValidators = rollupState.validators.concat([newValidator]);
|
|
132
140
|
const [newSenderState, newRollupState, newStakeState, newEvidenceState] = await Promise.all([
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BridgeCtxMixin } from "./bridge-v2.cjs";
|
|
1
2
|
import { IEvidenceState, IReadyContext, IRollupValidator, IWithRollup, IWithSender, IWithSigners, IWithStake, TJoinRollupTx } from "@ocap/types";
|
|
2
3
|
import { Runner } from "@ocap/tx-pipeline";
|
|
3
4
|
|
|
@@ -8,7 +9,7 @@ import { Runner } from "@ocap/tx-pipeline";
|
|
|
8
9
|
* Phase: IReadyContext (after TakeStateSnapshot)
|
|
9
10
|
* Mixins: IWithRollup (required), IWithSender (required), IWithSigners (required), IWithStake (required)
|
|
10
11
|
*/
|
|
11
|
-
type Context = IReadyContext<TJoinRollupTx> & IWithRollup & IWithSender & IWithSigners & IWithStake & {
|
|
12
|
+
type Context = IReadyContext<TJoinRollupTx> & IWithRollup & IWithSender & IWithSigners & IWithStake & BridgeCtxMixin & {
|
|
12
13
|
/** Evidence state (null if not seen before) */
|
|
13
14
|
evidenceState?: IEvidenceState | null;
|
|
14
15
|
/** New validator to add */
|
|
@@ -2,15 +2,17 @@ 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
|
+
const require_protocols_rollup_bridge_v2 = require('./bridge-v2.cjs');
|
|
5
6
|
const require_protocols_rollup_pipes_ensure_validator = require('./pipes/ensure-validator.cjs');
|
|
6
7
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
7
8
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
8
9
|
const require_protocols_rollup_pipes_verify_evidence = require('./pipes/verify-evidence.cjs');
|
|
9
10
|
const require_index = require('../../node_modules/valibot/dist/index.cjs');
|
|
10
|
-
|
|
11
|
-
let _ocap_state = require("@ocap/state");
|
|
11
|
+
const require_protocols_rollup_bridge_membership = require('./bridge-membership.cjs');
|
|
12
12
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
13
13
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
14
|
+
let _arcblock_did_util = require("@arcblock/did-util");
|
|
15
|
+
let _ocap_state = require("@ocap/state");
|
|
14
16
|
let debug = require("debug");
|
|
15
17
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
16
18
|
let _arcblock_validator = require("@arcblock/validator");
|
|
@@ -29,65 +31,70 @@ const schema = require_index.pipe(require_index.object({
|
|
|
29
31
|
signaturesList: require_index.pipe(_arcblock_validator.schemas.multiSig, require_index.minLength(1)),
|
|
30
32
|
data: require_index.optional(require_index.nullable(require_index.any()))
|
|
31
33
|
}), (0, _arcblock_validator.vStripUnknown)());
|
|
32
|
-
runner.use(({
|
|
34
|
+
runner.use(require_protocols_rollup_bridge_v2.peekBridge("itx.rollup", { rejectV1IfDisabled: "leave_rollup" }));
|
|
35
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(({ itx }, next) => {
|
|
33
36
|
const { error } = (0, _arcblock_validator.vValidate)(schema, itx);
|
|
34
37
|
return next(error ? new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`) : void 0);
|
|
35
|
-
});
|
|
38
|
+
}));
|
|
39
|
+
runner.use(require_protocols_rollup_bridge_membership.membershipSchemaV2("leave"));
|
|
36
40
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
37
41
|
from: "itx.rollup",
|
|
38
42
|
to: "rollupState",
|
|
39
43
|
status: "INVALID_ROLLUP",
|
|
40
44
|
table: "rollup"
|
|
41
45
|
}));
|
|
42
|
-
runner.use(
|
|
43
|
-
runner.use(
|
|
44
|
-
runner.use((
|
|
46
|
+
runner.use(require_protocols_rollup_bridge_v2.loadBridge);
|
|
47
|
+
runner.use(require_protocols_rollup_bridge_v2.rejectRollupV1IfDisabled("leave_rollup"));
|
|
48
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_ensure_validator.default(false)));
|
|
49
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_status.default({ paused: false })));
|
|
50
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1((context, next) => {
|
|
45
51
|
context.validatorsHash = _ocap_merkle_tree.default.getListHash([context.tx.from]);
|
|
46
52
|
return next();
|
|
47
|
-
});
|
|
48
|
-
runner.use(require_protocols_rollup_pipes_verify_signers.default({
|
|
53
|
+
}));
|
|
54
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_signers.default({
|
|
49
55
|
signersKey: "itx.signaturesList",
|
|
50
56
|
allowSender: false,
|
|
51
57
|
allowShrink: true
|
|
52
|
-
}));
|
|
53
|
-
runner.use(require_protocols_rollup_pipes_verify_evidence.default({
|
|
58
|
+
})));
|
|
59
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_evidence.default({
|
|
54
60
|
evidenceKey: "validatorsHash",
|
|
55
61
|
signaturesKey: "itx.signaturesList",
|
|
56
62
|
verifyMethod: "ethVerify"
|
|
57
|
-
}));
|
|
58
|
-
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
63
|
+
})));
|
|
64
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(_ocap_tx_pipeline.pipes.ExtractState({
|
|
59
65
|
from: "itx.evidence.hash",
|
|
60
66
|
to: "evidenceState",
|
|
61
67
|
status: "OK",
|
|
62
68
|
table: "evidence"
|
|
63
|
-
}));
|
|
64
|
-
runner.use((context, next) => {
|
|
69
|
+
})));
|
|
70
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1((context, next) => {
|
|
65
71
|
if (context.evidenceState) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "Leave evidence already seen on this chain"));
|
|
66
72
|
return next();
|
|
67
|
-
});
|
|
68
|
-
runner.use(require_protocols_rollup_pipes_verify_signers.default({
|
|
73
|
+
}));
|
|
74
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_signers.default({
|
|
69
75
|
signersKey: "tx.signaturesList",
|
|
70
76
|
allowSender: false,
|
|
71
77
|
allowShrink: true
|
|
72
|
-
}));
|
|
78
|
+
})));
|
|
79
|
+
runner.use(require_protocols_rollup_bridge_membership.membershipChecks("leave"));
|
|
73
80
|
runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSigV2({ signersKey: "signers" }));
|
|
74
|
-
runner.use((context, next) => {
|
|
81
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1((context, next) => {
|
|
75
82
|
const { tx, rollupState } = context;
|
|
76
83
|
if (rollupState?.seedValidators.some((x) => x.address === tx.from)) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", `Address ${tx.from} can not leave since it's seed validator`));
|
|
77
84
|
if (rollupState?.validators.some((x) => x.address === tx.from) === false) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", `Address ${tx.from} not exist in validator whitelist`));
|
|
78
85
|
return next();
|
|
79
|
-
});
|
|
80
|
-
runner.use((context, next) => {
|
|
86
|
+
}));
|
|
87
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1((context, next) => {
|
|
81
88
|
const { tx, itx } = context;
|
|
82
89
|
context.stakeAddress = (0, _arcblock_did_util.toStakeAddress)(tx.from, itx.rollup);
|
|
83
90
|
return next();
|
|
84
|
-
});
|
|
85
|
-
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
91
|
+
}));
|
|
92
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(_ocap_tx_pipeline.pipes.ExtractState({
|
|
86
93
|
from: "stakeAddress",
|
|
87
94
|
to: "stakeState",
|
|
88
95
|
status: "INVALID_STAKE_STATE",
|
|
89
96
|
table: "stake"
|
|
90
|
-
}));
|
|
97
|
+
})));
|
|
91
98
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
92
99
|
from: "tx.from",
|
|
93
100
|
to: "senderState",
|
|
@@ -113,6 +120,7 @@ runner.use(require_pipes_ensure_gas.default(() => ({
|
|
|
113
120
|
runner.use(require_pipes_ensure_cost.default({ attachSenderChanges: true }));
|
|
114
121
|
runner.use(_ocap_tx_pipeline.pipes.TakeStateSnapshot());
|
|
115
122
|
runner.use(async (context, next) => {
|
|
123
|
+
if (context.isBridgeV2) return require_protocols_rollup_bridge_membership.membershipStep("leave")(context, next);
|
|
116
124
|
const { tx, itx, rollupState, statedb, senderState, stakeState, stakeAddress, senderUpdates, updateVaults } = context;
|
|
117
125
|
const newValidators = rollupState.validators.filter((x) => x.address !== tx.from);
|
|
118
126
|
const [newSenderState, newRollupState, newStakeState, newEvidenceState] = await Promise.all([
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BridgeCtxMixin } from "./bridge-v2.cjs";
|
|
1
2
|
import { IEvidenceState, IReadyContext, IWithRollup, IWithSender, IWithSigners, IWithStake, TLeaveRollupTx } from "@ocap/types";
|
|
2
3
|
import { Runner } from "@ocap/tx-pipeline";
|
|
3
4
|
|
|
@@ -8,7 +9,7 @@ import { Runner } from "@ocap/tx-pipeline";
|
|
|
8
9
|
* Phase: IReadyContext (after TakeStateSnapshot)
|
|
9
10
|
* Mixins: IWithRollup (required), IWithSender (required), IWithSigners (required), IWithStake (required)
|
|
10
11
|
*/
|
|
11
|
-
type Context = IReadyContext<TLeaveRollupTx> & IWithRollup & IWithSender & IWithSigners & IWithStake & {
|
|
12
|
+
type Context = IReadyContext<TLeaveRollupTx> & IWithRollup & IWithSender & IWithSigners & IWithStake & BridgeCtxMixin & {
|
|
12
13
|
/** Hash of validators being removed */
|
|
13
14
|
validatorsHash?: string;
|
|
14
15
|
/** Evidence state (null if not seen before) */
|
|
@@ -2,12 +2,14 @@ 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
|
+
const require_protocols_rollup_bridge_v2 = require('./bridge-v2.cjs');
|
|
5
6
|
const require_protocols_rollup_pipes_ensure_validator = require('./pipes/ensure-validator.cjs');
|
|
6
7
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
7
8
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
8
|
-
|
|
9
|
+
const require_protocols_rollup_bridge_migrate = require('./bridge-migrate.cjs');
|
|
9
10
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
10
11
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
|
+
let _ocap_state = require("@ocap/state");
|
|
11
13
|
let _arcblock_validator = require("@arcblock/validator");
|
|
12
14
|
|
|
13
15
|
//#region src/protocols/rollup/migrate.ts
|
|
@@ -22,31 +24,37 @@ const schema = _arcblock_validator.v.pipe(_arcblock_validator.v.object({
|
|
|
22
24
|
message: _arcblock_validator.v.pipe(_arcblock_validator.v.string(), _arcblock_validator.v.trim(), _arcblock_validator.v.minLength(1), _arcblock_validator.v.maxLength(512)),
|
|
23
25
|
data: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any()))
|
|
24
26
|
}), (0, _arcblock_validator.vStripUnknown)());
|
|
25
|
-
runner.use(({
|
|
27
|
+
runner.use(require_protocols_rollup_bridge_v2.peekBridge("itx.rollup", { rejectV1IfDisabled: "migrate_rollup" }));
|
|
28
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(({ itx }, next) => {
|
|
26
29
|
const { error } = (0, _arcblock_validator.vValidate)(schema, itx);
|
|
27
30
|
return next(error ? new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`) : void 0);
|
|
28
|
-
});
|
|
31
|
+
}));
|
|
32
|
+
runner.use(require_protocols_rollup_bridge_migrate.migrateSchemaV2);
|
|
29
33
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
30
34
|
from: "itx.rollup",
|
|
31
35
|
to: "rollupState",
|
|
32
36
|
status: "INVALID_ROLLUP",
|
|
33
37
|
table: "rollup"
|
|
34
38
|
}));
|
|
35
|
-
runner.use(
|
|
39
|
+
runner.use(require_protocols_rollup_bridge_v2.loadBridge);
|
|
40
|
+
runner.use(require_protocols_rollup_bridge_v2.rejectRollupV1IfDisabled("migrate_rollup"));
|
|
41
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1((context, next) => {
|
|
36
42
|
const { itx, rollupState } = context;
|
|
37
43
|
const targetType = _ocap_state.rollup.getRollupTargetType(rollupState);
|
|
38
44
|
if (!(itx.type === "vault" ? Boolean(itx.to) && _ocap_state.rollup.isValidRollupVaultAddress(itx.to, targetType) : _ocap_state.rollup.isValidRollupContractAddress(itx.to, targetType))) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "Invalid itx: \"to\" Expected wallet type to be \"ethereum\""));
|
|
39
45
|
return next();
|
|
40
|
-
});
|
|
41
|
-
runner.use(require_protocols_rollup_pipes_ensure_validator.default(true));
|
|
42
|
-
runner.use(require_protocols_rollup_pipes_verify_status.default({
|
|
46
|
+
}));
|
|
47
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_ensure_validator.default(true)));
|
|
48
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_status.default({
|
|
43
49
|
paused: true,
|
|
44
50
|
closed: false
|
|
45
|
-
}));
|
|
46
|
-
runner.use(
|
|
51
|
+
})));
|
|
52
|
+
runner.use(require_protocols_rollup_bridge_migrate.migrateBridgeChecks);
|
|
53
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_signers.default({
|
|
47
54
|
signersKey: "tx.signaturesList",
|
|
48
55
|
allowSender: true
|
|
49
|
-
}));
|
|
56
|
+
})));
|
|
57
|
+
runner.use(require_protocols_rollup_bridge_migrate.migrateBridgeAuth);
|
|
50
58
|
runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSigV2({ signersKey: "signers" }));
|
|
51
59
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
52
60
|
from: "tx.from",
|
|
@@ -74,6 +82,7 @@ runner.use(require_pipes_ensure_cost.default({ attachSenderChanges: true }));
|
|
|
74
82
|
runner.use(_ocap_tx_pipeline.pipes.TakeStateSnapshot());
|
|
75
83
|
runner.use(async (context, next) => {
|
|
76
84
|
const { tx, itx, statedb, rollupState, senderState, senderUpdates, updateVaults } = context;
|
|
85
|
+
if (context.isBridgeV2) return require_protocols_rollup_bridge_migrate.migrateBridgeStep(context, next);
|
|
77
86
|
let updates = {};
|
|
78
87
|
if (itx.type === "vault") updates = _ocap_state.rollup.migrateVault(rollupState, itx.to, context);
|
|
79
88
|
if (itx.type === "contract") updates = _ocap_state.rollup.migrateContract(rollupState, itx.to, context);
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BridgeCtxMixin } from "./bridge-v2.cjs";
|
|
1
2
|
import { IReadyContext, IWithRollup, IWithSender, IWithSigners, TMigrateRollupTx } from "@ocap/types";
|
|
2
3
|
import { Runner } from "@ocap/tx-pipeline";
|
|
3
4
|
|
|
@@ -8,7 +9,7 @@ import { Runner } from "@ocap/tx-pipeline";
|
|
|
8
9
|
* Phase: IReadyContext (after TakeStateSnapshot)
|
|
9
10
|
* Mixins: IWithRollup (required), IWithSender (required), IWithSigners (required)
|
|
10
11
|
*/
|
|
11
|
-
type Context = IReadyContext<TMigrateRollupTx> & IWithRollup & IWithSender & IWithSigners;
|
|
12
|
+
type Context = IReadyContext<TMigrateRollupTx> & IWithRollup & IWithSender & IWithSigners & BridgeCtxMixin;
|
|
12
13
|
declare const runner: Runner<Context>;
|
|
13
14
|
//#endregion
|
|
14
15
|
export { runner as default };
|
|
@@ -2,12 +2,14 @@ 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
|
+
const require_protocols_rollup_bridge_v2 = require('./bridge-v2.cjs');
|
|
5
6
|
const require_protocols_rollup_pipes_ensure_validator = require('./pipes/ensure-validator.cjs');
|
|
6
7
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
7
8
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
8
|
-
let _ocap_state = require("@ocap/state");
|
|
9
9
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
10
10
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
11
|
+
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
12
|
+
let _ocap_state = require("@ocap/state");
|
|
11
13
|
let _arcblock_validator = require("@arcblock/validator");
|
|
12
14
|
|
|
13
15
|
//#region src/protocols/rollup/pause.ts
|
|
@@ -19,6 +21,7 @@ const schema = _arcblock_validator.v.pipe(_arcblock_validator.v.object({
|
|
|
19
21
|
}),
|
|
20
22
|
data: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any()))
|
|
21
23
|
}), (0, _arcblock_validator.vStripUnknown)());
|
|
24
|
+
runner.use(require_protocols_rollup_bridge_v2.peekBridge("itx.rollup"));
|
|
22
25
|
runner.use(({ itx }, next) => {
|
|
23
26
|
const { error } = (0, _arcblock_validator.vValidate)(schema, itx);
|
|
24
27
|
return next(error ? new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`) : void 0);
|
|
@@ -29,12 +32,44 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
29
32
|
status: "INVALID_ROLLUP",
|
|
30
33
|
table: "rollup"
|
|
31
34
|
}));
|
|
32
|
-
runner.use(
|
|
33
|
-
runner.use(
|
|
34
|
-
runner.use(
|
|
35
|
+
runner.use(require_protocols_rollup_bridge_v2.loadBridge);
|
|
36
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_ensure_validator.default(true)));
|
|
37
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_status.default({ paused: false })));
|
|
38
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_signers.default({
|
|
35
39
|
signersKey: "tx.signaturesList",
|
|
36
40
|
allowSender: true
|
|
37
|
-
}));
|
|
41
|
+
})));
|
|
42
|
+
runner.use((context, next) => {
|
|
43
|
+
if (!context.isBridgeV2) return next();
|
|
44
|
+
const state = context.rollupState;
|
|
45
|
+
const body = context.bridgeBody;
|
|
46
|
+
if (state.closed) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "The rollup is closed"));
|
|
47
|
+
const pausedNow = _ocap_state.rollup.isBridgePausedAt(state, context.txSec);
|
|
48
|
+
const asLone = () => {
|
|
49
|
+
if ((0, _ocap_util_lib_get_list_field.getListField)(context, "tx.signaturesList").length > 0 || !body.pausers.some((p) => _ocap_state.rollup.sameAddress(p, context.tx.from))) return false;
|
|
50
|
+
return true;
|
|
51
|
+
};
|
|
52
|
+
return require_protocols_rollup_bridge_v2.VerifyBridgeAuthority({
|
|
53
|
+
owner: "required",
|
|
54
|
+
quorum: "threshold"
|
|
55
|
+
})(context, (err) => {
|
|
56
|
+
if (!err) {
|
|
57
|
+
if (pausedNow && state.paused && body.lonePause === null) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "The rollup is already paused"));
|
|
58
|
+
context.pauseKind = "quorum";
|
|
59
|
+
return next();
|
|
60
|
+
}
|
|
61
|
+
if (!asLone()) return next(err);
|
|
62
|
+
if (pausedNow) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "The rollup is already paused"));
|
|
63
|
+
try {
|
|
64
|
+
context.nextBody = _ocap_state.rollup.applyLonePause(body, context.tx.from, context.txSec);
|
|
65
|
+
} catch (e) {
|
|
66
|
+
return next(new _ocap_util_lib_error.CustomError("INVALID_TX", e.message));
|
|
67
|
+
}
|
|
68
|
+
context.pauseKind = "lone";
|
|
69
|
+
context.signers = [];
|
|
70
|
+
return next();
|
|
71
|
+
});
|
|
72
|
+
});
|
|
38
73
|
runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSigV2({ signersKey: "signers" }));
|
|
39
74
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
40
75
|
from: "tx.from",
|
|
@@ -62,10 +97,19 @@ runner.use(require_pipes_ensure_cost.default({ attachSenderChanges: true }));
|
|
|
62
97
|
runner.use(_ocap_tx_pipeline.pipes.TakeStateSnapshot());
|
|
63
98
|
runner.use(async (context, next) => {
|
|
64
99
|
const { tx, itx, rollupState, statedb, senderState, senderUpdates, updateVaults } = context;
|
|
100
|
+
let nextRollup;
|
|
101
|
+
if (context.isBridgeV2) {
|
|
102
|
+
const body = context.pauseKind === "lone" ? context.nextBody : {
|
|
103
|
+
...context.bridgeBody,
|
|
104
|
+
lonePause: null,
|
|
105
|
+
lastLonePause: {}
|
|
106
|
+
};
|
|
107
|
+
nextRollup = _ocap_state.rollup.updateBridge(context.rollupStateOrig, require_protocols_rollup_bridge_v2.bridgeUpdates(context, body, { paused: true }), context);
|
|
108
|
+
} else nextRollup = _ocap_state.rollup.pause(rollupState, context);
|
|
65
109
|
const [newSenderState, newRollupState] = await Promise.all([statedb.account.update(senderState.address, _ocap_state.account.update(senderState, {
|
|
66
110
|
nonce: tx.nonce,
|
|
67
111
|
...senderUpdates
|
|
68
|
-
}, context), context), statedb.rollup.update(itx.rollup,
|
|
112
|
+
}, context), context), statedb.rollup.update(itx.rollup, nextRollup, context)]);
|
|
69
113
|
if (updateVaults) await updateVaults();
|
|
70
114
|
context.senderState = newSenderState;
|
|
71
115
|
context.rollupState = newRollupState;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BridgeCtxMixin } from "./bridge-v2.cjs";
|
|
1
2
|
import { IReadyContext, IWithRollup, IWithSender, IWithSigners, TPauseRollupTx } from "@ocap/types";
|
|
2
3
|
import { Runner } from "@ocap/tx-pipeline";
|
|
3
4
|
|
|
@@ -8,7 +9,9 @@ import { Runner } from "@ocap/tx-pipeline";
|
|
|
8
9
|
* Phase: IReadyContext (after TakeStateSnapshot)
|
|
9
10
|
* Mixins: IWithRollup (required), IWithSender (required), IWithSigners (required)
|
|
10
11
|
*/
|
|
11
|
-
type Context = IReadyContext<TPauseRollupTx> & IWithRollup & IWithSender & IWithSigners
|
|
12
|
+
type Context = IReadyContext<TPauseRollupTx> & IWithRollup & IWithSender & IWithSigners & BridgeCtxMixin & {
|
|
13
|
+
pauseKind?: 'quorum' | 'lone';
|
|
14
|
+
};
|
|
12
15
|
declare const runner: Runner<Context>;
|
|
13
16
|
//#endregion
|
|
14
17
|
export { runner as default };
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
2
2
|
const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
|
|
3
|
+
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
4
|
+
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
3
5
|
let _arcblock_did = require("@arcblock/did");
|
|
4
6
|
let _ocap_state = require("@ocap/state");
|
|
5
7
|
let _ocap_util = require("@ocap/util");
|
|
6
|
-
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
7
|
-
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
8
8
|
let lodash_get = require("lodash/get");
|
|
9
9
|
lodash_get = require_rolldown_runtime.__toESM(lodash_get);
|
|
10
10
|
let _ocap_wallet = require("@ocap/wallet");
|
|
@@ -2,12 +2,13 @@ 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
|
+
const require_protocols_rollup_bridge_v2 = require('./bridge-v2.cjs');
|
|
5
6
|
const require_protocols_rollup_pipes_ensure_validator = require('./pipes/ensure-validator.cjs');
|
|
6
7
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
7
8
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
8
|
-
let _ocap_state = require("@ocap/state");
|
|
9
9
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
10
10
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
11
|
+
let _ocap_state = require("@ocap/state");
|
|
11
12
|
let _arcblock_validator = require("@arcblock/validator");
|
|
12
13
|
|
|
13
14
|
//#region src/protocols/rollup/resume.ts
|
|
@@ -19,6 +20,7 @@ const schema = _arcblock_validator.v.pipe(_arcblock_validator.v.object({
|
|
|
19
20
|
}),
|
|
20
21
|
data: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any()))
|
|
21
22
|
}), (0, _arcblock_validator.vStripUnknown)());
|
|
23
|
+
runner.use(require_protocols_rollup_bridge_v2.peekBridge("itx.rollup", { rejectV1IfDisabled: "resume_rollup" }));
|
|
22
24
|
runner.use(({ itx }, next) => {
|
|
23
25
|
const { error } = (0, _arcblock_validator.vValidate)(schema, itx);
|
|
24
26
|
return next(error ? new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`) : void 0);
|
|
@@ -29,14 +31,27 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
29
31
|
status: "INVALID_ROLLUP",
|
|
30
32
|
table: "rollup"
|
|
31
33
|
}));
|
|
32
|
-
runner.use(
|
|
33
|
-
runner.use(
|
|
34
|
+
runner.use(require_protocols_rollup_bridge_v2.loadBridge);
|
|
35
|
+
runner.use(require_protocols_rollup_bridge_v2.rejectRollupV1IfDisabled("resume_rollup"));
|
|
36
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_ensure_validator.default(true)));
|
|
37
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_status.default({
|
|
34
38
|
paused: true,
|
|
35
39
|
closed: false
|
|
36
|
-
}));
|
|
37
|
-
runner.use(
|
|
40
|
+
})));
|
|
41
|
+
runner.use((context, next) => {
|
|
42
|
+
if (!context.isBridgeV2) return next();
|
|
43
|
+
const state = context.rollupState;
|
|
44
|
+
if (state.closed) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "The rollup is closed"));
|
|
45
|
+
if (!_ocap_state.rollup.isBridgePausedAt(state, context.txSec)) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "The rollup is not paused"));
|
|
46
|
+
return next();
|
|
47
|
+
});
|
|
48
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_signers.default({
|
|
38
49
|
signersKey: "tx.signaturesList",
|
|
39
50
|
allowSender: true
|
|
51
|
+
})));
|
|
52
|
+
runner.use(require_protocols_rollup_bridge_v2.VerifyBridgeAuthority({
|
|
53
|
+
owner: "required",
|
|
54
|
+
quorum: "threshold"
|
|
40
55
|
}));
|
|
41
56
|
runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSigV2({ signersKey: "signers" }));
|
|
42
57
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
@@ -65,10 +80,15 @@ runner.use(require_pipes_ensure_cost.default({ attachSenderChanges: true }));
|
|
|
65
80
|
runner.use(_ocap_tx_pipeline.pipes.TakeStateSnapshot());
|
|
66
81
|
runner.use(async (context, next) => {
|
|
67
82
|
const { tx, itx, rollupState, statedb, senderState, senderUpdates, updateVaults } = context;
|
|
83
|
+
const nextRollup = context.isBridgeV2 ? _ocap_state.rollup.updateBridge(context.rollupStateOrig, require_protocols_rollup_bridge_v2.bridgeUpdates(context, {
|
|
84
|
+
...context.bridgeBody,
|
|
85
|
+
lonePause: null,
|
|
86
|
+
lastLonePause: {}
|
|
87
|
+
}, { paused: false }), context) : _ocap_state.rollup.resume(rollupState, context);
|
|
68
88
|
const [newSenderState, newRollupState] = await Promise.all([statedb.account.update(senderState.address, _ocap_state.account.update(senderState, {
|
|
69
89
|
nonce: tx.nonce,
|
|
70
90
|
...senderUpdates
|
|
71
|
-
}, context), context), statedb.rollup.update(itx.rollup,
|
|
91
|
+
}, context), context), statedb.rollup.update(itx.rollup, nextRollup, context)]);
|
|
72
92
|
if (updateVaults) await updateVaults();
|
|
73
93
|
context.senderState = newSenderState;
|
|
74
94
|
context.rollupState = newRollupState;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BridgeCtxMixin } from "./bridge-v2.cjs";
|
|
1
2
|
import { IReadyContext, IWithRollup, IWithSender, IWithSigners, TResumeRollupTx } from "@ocap/types";
|
|
2
3
|
import { Runner } from "@ocap/tx-pipeline";
|
|
3
4
|
|
|
@@ -8,7 +9,7 @@ import { Runner } from "@ocap/tx-pipeline";
|
|
|
8
9
|
* Phase: IReadyContext (after TakeStateSnapshot)
|
|
9
10
|
* Mixins: IWithRollup (required), IWithSender (required), IWithSigners (required)
|
|
10
11
|
*/
|
|
11
|
-
type Context = IReadyContext<TResumeRollupTx> & IWithRollup & IWithSender & IWithSigners;
|
|
12
|
+
type Context = IReadyContext<TResumeRollupTx> & IWithRollup & IWithSender & IWithSigners & BridgeCtxMixin;
|
|
12
13
|
declare const runner: Runner<Context>;
|
|
13
14
|
//#endregion
|
|
14
15
|
export { runner as default };
|