@ocap/tx-protocols 1.31.1 → 1.31.2
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
|
@@ -3,13 +3,14 @@ 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_ensure_validator = require('./pipes/ensure-validator.cjs');
|
|
7
8
|
const require_protocols_rollup_pipes_verify_signers = require('./pipes/verify-signers.cjs');
|
|
8
9
|
const require_protocols_rollup_pipes_verify_status = require('./pipes/verify-status.cjs');
|
|
9
|
-
let _ocap_state = require("@ocap/state");
|
|
10
10
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
11
|
-
let _ocap_util = require("@ocap/util");
|
|
12
11
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
|
+
let _ocap_state = require("@ocap/state");
|
|
13
|
+
let _ocap_util = require("@ocap/util");
|
|
13
14
|
let debug = require("debug");
|
|
14
15
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
15
16
|
let _arcblock_validator = require("@arcblock/validator");
|
|
@@ -43,29 +44,64 @@ const schema = _arcblock_validator.v.pipe(_arcblock_validator.v.object({
|
|
|
43
44
|
maxWithdrawFee: (0, _arcblock_validator.vBN)((0, _arcblock_validator.vBNPositive)()),
|
|
44
45
|
data: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any()))
|
|
45
46
|
}), _arcblock_validator.v.forward(_arcblock_validator.v.check((input) => new _ocap_util.BN(input.maxStakeAmount).gt(new _ocap_util.BN(input.minStakeAmount)), "maxStakeAmount must be > minStakeAmount"), ["maxStakeAmount"]), _arcblock_validator.v.forward(_arcblock_validator.v.check((input) => input.maxSignerCount > input.minSignerCount, "maxSignerCount must be > minSignerCount"), ["maxSignerCount"]), _arcblock_validator.v.forward(_arcblock_validator.v.check((input) => input.maxBlockSize > input.minBlockSize, "maxBlockSize must be > minBlockSize"), ["maxBlockSize"]), _arcblock_validator.v.forward(_arcblock_validator.v.check((input) => new _ocap_util.BN(input.maxDepositAmount).gt(new _ocap_util.BN(input.minDepositAmount)), "maxDepositAmount must be > minDepositAmount"), ["maxDepositAmount"]), _arcblock_validator.v.forward(_arcblock_validator.v.check((input) => new _ocap_util.BN(input.maxWithdrawAmount).gt(new _ocap_util.BN(input.minWithdrawAmount)), "maxWithdrawAmount must be > minWithdrawAmount"), ["maxWithdrawAmount"]), _arcblock_validator.v.forward(_arcblock_validator.v.check((input) => new _ocap_util.BN(input.maxDepositFee).gt(new _ocap_util.BN(input.minDepositFee)), "maxDepositFee must be > minDepositFee"), ["maxDepositFee"]), _arcblock_validator.v.forward(_arcblock_validator.v.check((input) => new _ocap_util.BN(input.maxWithdrawFee).gt(new _ocap_util.BN(input.minWithdrawFee)), "maxWithdrawFee must be > minWithdrawFee"), ["maxWithdrawFee"]), (0, _arcblock_validator.vStripUnknown)());
|
|
46
|
-
runner.use(({
|
|
47
|
+
runner.use(require_protocols_rollup_bridge_v2.peekBridge("itx.rollup", { rejectV1IfDisabled: "update_rollup" }));
|
|
48
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(({ itx }, next) => {
|
|
47
49
|
const { error } = (0, _arcblock_validator.vValidate)(schema, itx);
|
|
48
50
|
return next(error ? new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`) : void 0);
|
|
49
|
-
});
|
|
50
|
-
runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
51
|
+
}));
|
|
52
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
51
53
|
error: "INVALID_TX",
|
|
52
54
|
message: "Sum of itx.proposerFeeShare and itx.publisherFeeShare must be less than 10000",
|
|
53
55
|
fn: (ctx) => {
|
|
54
56
|
const context = ctx;
|
|
55
57
|
return context.itx.proposerFeeShare + context.itx.publisherFeeShare < 1e4;
|
|
56
58
|
}
|
|
57
|
-
}]));
|
|
59
|
+
}])));
|
|
58
60
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
59
61
|
from: "itx.rollup",
|
|
60
62
|
to: "rollupState",
|
|
61
63
|
status: "INVALID_ROLLUP",
|
|
62
64
|
table: "rollup"
|
|
63
65
|
}));
|
|
64
|
-
runner.use(
|
|
65
|
-
runner.use(
|
|
66
|
-
runner.use(
|
|
66
|
+
runner.use(require_protocols_rollup_bridge_v2.loadBridge);
|
|
67
|
+
runner.use(require_protocols_rollup_bridge_v2.rejectRollupV1IfDisabled("update_rollup"));
|
|
68
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_ensure_validator.default(true)));
|
|
69
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_status.default({ paused: false })));
|
|
70
|
+
runner.use((context, next) => {
|
|
71
|
+
if (!context.isBridgeV2) return next();
|
|
72
|
+
try {
|
|
73
|
+
_ocap_state.rollup.assertV1FieldsUnused(context.itx, "INVALID_ROLLUP_UPDATE");
|
|
74
|
+
context.bridgePlan = _ocap_state.rollup.planBridgePatch(context.bridgeBody, require_protocols_rollup_bridge_v2.readItxData(context.itx), context.txSec);
|
|
75
|
+
} catch (err) {
|
|
76
|
+
return next(new _ocap_util_lib_error.CustomError("INVALID_TX", err.message));
|
|
77
|
+
}
|
|
78
|
+
return next();
|
|
79
|
+
});
|
|
80
|
+
runner.use(async (context, next) => {
|
|
81
|
+
const plan = context.bridgePlan;
|
|
82
|
+
if (!context.isBridgeV2 || plan?.kind !== "propose-owner") return next();
|
|
83
|
+
const candidate = plan.body.pendingOwner?.address;
|
|
84
|
+
if (!await context.statedb.account.get(candidate, context)) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "The proposed owner has no account on this chain"));
|
|
85
|
+
return next();
|
|
86
|
+
});
|
|
87
|
+
runner.use(require_protocols_rollup_bridge_v2.ifV1(require_protocols_rollup_pipes_verify_signers.default({
|
|
67
88
|
signersKey: "tx.signaturesList",
|
|
68
89
|
allowSender: true
|
|
90
|
+
})));
|
|
91
|
+
runner.use(require_protocols_rollup_bridge_v2.VerifyBridgeAuthority((context) => {
|
|
92
|
+
const kind = context.bridgePlan?.kind;
|
|
93
|
+
if (kind === "propose-owner") return {
|
|
94
|
+
owner: "none",
|
|
95
|
+
quorum: "twoThirds"
|
|
96
|
+
};
|
|
97
|
+
if (kind === "cancel-owner-proposal") return {
|
|
98
|
+
owner: "alone",
|
|
99
|
+
quorum: "none"
|
|
100
|
+
};
|
|
101
|
+
return {
|
|
102
|
+
owner: "required",
|
|
103
|
+
quorum: "threshold"
|
|
104
|
+
};
|
|
69
105
|
}));
|
|
70
106
|
runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSigV2({ signersKey: "signers" }));
|
|
71
107
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
@@ -94,6 +130,17 @@ runner.use(require_pipes_ensure_cost.default({ attachSenderChanges: true }));
|
|
|
94
130
|
runner.use(_ocap_tx_pipeline.pipes.TakeStateSnapshot());
|
|
95
131
|
runner.use(async (context, next) => {
|
|
96
132
|
const { tx, itx, rollupState, statedb, senderState, senderUpdates, updateVaults } = context;
|
|
133
|
+
if (context.isBridgeV2) {
|
|
134
|
+
const updates = require_protocols_rollup_bridge_v2.bridgeUpdates(context, context.bridgePlan.body);
|
|
135
|
+
const [newSenderState$1, newRollupState$1] = await Promise.all([statedb.account.update(senderState.address, _ocap_state.account.update(senderState, {
|
|
136
|
+
nonce: tx.nonce,
|
|
137
|
+
...senderUpdates
|
|
138
|
+
}, context), context), statedb.rollup.update(itx.rollup, _ocap_state.rollup.updateBridge(context.rollupStateOrig, updates, context), context)]);
|
|
139
|
+
if (updateVaults) await updateVaults();
|
|
140
|
+
context.senderState = newSenderState$1;
|
|
141
|
+
context.rollupState = newRollupState$1;
|
|
142
|
+
return next();
|
|
143
|
+
}
|
|
97
144
|
const data = require_util.decodeAnySafe(itx.data ?? null);
|
|
98
145
|
const sanitizedItx = { ...itx };
|
|
99
146
|
delete sanitizedItx.reserves;
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { BridgeCtxMixin } from "./bridge-v2.cjs";
|
|
2
|
+
import { rollup } from "@ocap/state";
|
|
1
3
|
import { IReadyContext, IWithRollup, IWithSender, IWithSigners, TUpdateRollupTx } from "@ocap/types";
|
|
2
4
|
import { Runner } from "@ocap/tx-pipeline";
|
|
3
5
|
|
|
@@ -8,7 +10,9 @@ import { Runner } from "@ocap/tx-pipeline";
|
|
|
8
10
|
* Phase: IReadyContext (after TakeStateSnapshot)
|
|
9
11
|
* Mixins: IWithRollup (required), IWithSender (required), IWithSigners (required)
|
|
10
12
|
*/
|
|
11
|
-
type Context = IReadyContext<TUpdateRollupTx> & IWithRollup & IWithSender & IWithSigners
|
|
13
|
+
type Context = IReadyContext<TUpdateRollupTx> & IWithRollup & IWithSender & IWithSigners & BridgeCtxMixin & {
|
|
14
|
+
bridgePlan?: rollup.BridgePatchPlan;
|
|
15
|
+
};
|
|
12
16
|
declare const runner: Runner<Context>;
|
|
13
17
|
//#endregion
|
|
14
18
|
export { runner as default };
|
|
@@ -3,11 +3,12 @@ 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_stateless_prefix = require('../../stateless-prefix.cjs');
|
|
7
|
+
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
|
+
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
6
9
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
7
10
|
let _ocap_state = require("@ocap/state");
|
|
8
|
-
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
9
11
|
let _ocap_util = require("@ocap/util");
|
|
10
|
-
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
11
12
|
let lodash_cloneDeep = require("lodash/cloneDeep");
|
|
12
13
|
lodash_cloneDeep = require_rolldown_runtime.__toESM(lodash_cloneDeep);
|
|
13
14
|
let debug = require("debug");
|
|
@@ -71,6 +72,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
|
71
72
|
return (0, _arcblock_did_util.toTokenAddress)(itx, context.txEncoding) === context.itx.address;
|
|
72
73
|
}
|
|
73
74
|
}]));
|
|
75
|
+
require_stateless_prefix.markStatelessPrefix(runner);
|
|
74
76
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
75
77
|
from: "tx.from",
|
|
76
78
|
to: "senderState",
|
|
@@ -3,14 +3,15 @@ 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('../rollup/bridge-v2.cjs');
|
|
6
7
|
const require_protocols_rollup_pipes_verify_signers = require('../rollup/pipes/verify-signers.cjs');
|
|
7
8
|
const require_protocols_rollup_pipes_verify_status = require('../rollup/pipes/verify-status.cjs');
|
|
8
|
-
let _arcblock_did_util = require("@arcblock/did-util");
|
|
9
|
-
let _ocap_state = require("@ocap/state");
|
|
10
9
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
11
|
-
let _ocap_util = require("@ocap/util");
|
|
12
10
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
13
11
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
12
|
+
let _arcblock_did_util = require("@arcblock/did-util");
|
|
13
|
+
let _ocap_state = require("@ocap/state");
|
|
14
|
+
let _ocap_util = require("@ocap/util");
|
|
14
15
|
let debug = require("debug");
|
|
15
16
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
16
17
|
let _arcblock_validator = require("@arcblock/validator");
|
|
@@ -41,6 +42,7 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
41
42
|
status: "INVALID_ROLLUP",
|
|
42
43
|
table: "rollup"
|
|
43
44
|
}));
|
|
45
|
+
runner.use(require_protocols_rollup_bridge_v2.rejectBridgeV2("deposit_token_v2"));
|
|
44
46
|
runner.use((context, next) => {
|
|
45
47
|
const { tx, itx, rollupState } = context;
|
|
46
48
|
if (_ocap_state.rollup.getRollupTargetType(rollupState) === "EVM") {
|
|
@@ -3,13 +3,14 @@ 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('../rollup/bridge-v2.cjs');
|
|
6
7
|
const require_protocols_rollup_pipes_verify_status = require('../rollup/pipes/verify-status.cjs');
|
|
7
|
-
let _arcblock_did_util = require("@arcblock/did-util");
|
|
8
|
-
let _ocap_state = require("@ocap/state");
|
|
9
8
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
10
|
-
let _ocap_util = require("@ocap/util");
|
|
11
9
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
10
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
11
|
+
let _arcblock_did_util = require("@arcblock/did-util");
|
|
12
|
+
let _ocap_state = require("@ocap/state");
|
|
13
|
+
let _ocap_util = require("@ocap/util");
|
|
13
14
|
let debug = require("debug");
|
|
14
15
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
15
16
|
let _arcblock_validator = require("@arcblock/validator");
|
|
@@ -41,6 +42,7 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
41
42
|
status: "INVALID_ROLLUP",
|
|
42
43
|
table: "rollup"
|
|
43
44
|
}));
|
|
45
|
+
runner.use(require_protocols_rollup_bridge_v2.rejectBridgeV2("withdraw_token_v2"));
|
|
44
46
|
runner.use((context, next) => {
|
|
45
47
|
const { tx, itx, rollupState } = context;
|
|
46
48
|
if (_ocap_state.rollup.getRollupTargetType(rollupState) === "EVM") {
|
|
@@ -3,12 +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
|
+
const require_stateless_prefix = require('../../stateless-prefix.cjs');
|
|
6
7
|
const require_protocols_token_factory_pipes_calc_reserve = require('./pipes/calc-reserve.cjs');
|
|
7
|
-
let _ocap_state = require("@ocap/state");
|
|
8
8
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
9
|
-
let _ocap_util = require("@ocap/util");
|
|
10
9
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
11
10
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
11
|
+
let _ocap_state = require("@ocap/state");
|
|
12
|
+
let _ocap_util = require("@ocap/util");
|
|
12
13
|
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
13
14
|
let lodash_pick = require("lodash/pick");
|
|
14
15
|
lodash_pick = require_rolldown_runtime.__toESM(lodash_pick);
|
|
@@ -32,6 +33,7 @@ runner.use(({ itx }, next) => {
|
|
|
32
33
|
if (error) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`));
|
|
33
34
|
return next();
|
|
34
35
|
});
|
|
36
|
+
require_stateless_prefix.markStatelessPrefix(runner);
|
|
35
37
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
36
38
|
from: "itx.tokenFactory",
|
|
37
39
|
to: "tokenFactoryState",
|
|
@@ -3,16 +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
|
+
const require_stateless_prefix = require('../../stateless-prefix.cjs');
|
|
6
7
|
const require_protocols_token_factory_pipes_verify_ownership = require('./pipes/verify-ownership.cjs');
|
|
7
8
|
const require_protocols_token_factory_pipes_verify_url = require('./pipes/verify-url.cjs');
|
|
8
9
|
const require_index = require('../../node_modules/valibot/dist/index.cjs');
|
|
9
10
|
const require_protocols_token_factory_pipes_verify_icon = require('./pipes/verify-icon.cjs');
|
|
10
|
-
let _arcblock_did_util = require("@arcblock/did-util");
|
|
11
|
-
let _ocap_state = require("@ocap/state");
|
|
12
11
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
13
|
-
let _ocap_util = require("@ocap/util");
|
|
14
12
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
15
13
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
14
|
+
let _arcblock_did_util = require("@arcblock/did-util");
|
|
15
|
+
let _ocap_state = require("@ocap/state");
|
|
16
|
+
let _ocap_util = require("@ocap/util");
|
|
16
17
|
let lodash_cloneDeep = require("lodash/cloneDeep");
|
|
17
18
|
lodash_cloneDeep = require_rolldown_runtime.__toESM(lodash_cloneDeep);
|
|
18
19
|
let debug = require("debug");
|
|
@@ -66,7 +67,9 @@ runner.use((context, next) => {
|
|
|
66
67
|
if (context.itx.curve == null) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "Invalid itx: curve is required for non-CreditToken"));
|
|
67
68
|
const curveResult = require_index.safeParse(_ocap_state.tokenFactory.vCurveSchema, context.itx.curve);
|
|
68
69
|
if (!curveResult.success) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${curveResult.issues.map((i) => i.message).join("; ")}`));
|
|
69
|
-
|
|
70
|
+
const curveOutput = curveResult.output;
|
|
71
|
+
if (curveOutput.type === "quadratic" && !Number.isSafeInteger(curveOutput.constant)) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "Invalid itx: quadratic curve constant must be a safe integer"));
|
|
72
|
+
context.itx.curve = curveOutput;
|
|
70
73
|
}
|
|
71
74
|
const itxToken = context.itx.token;
|
|
72
75
|
if (itxToken.metadata) {
|
|
@@ -123,6 +126,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([
|
|
|
123
126
|
}
|
|
124
127
|
}
|
|
125
128
|
]));
|
|
129
|
+
require_stateless_prefix.markStatelessPrefix(runner);
|
|
126
130
|
runner.use(require_protocols_token_factory_pipes_verify_icon.default());
|
|
127
131
|
runner.use(require_protocols_token_factory_pipes_verify_url.default({ urlKeys: ["itx.token.website", "itx.token.metadata.value.communityUrl"] }));
|
|
128
132
|
runner.use(require_protocols_token_factory_pipes_verify_ownership.default({ tokenKey: "itx.token" }));
|
|
@@ -3,13 +3,14 @@ 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_stateless_prefix = require('../../stateless-prefix.cjs');
|
|
6
7
|
const require_index = require('../../node_modules/valibot/dist/index.cjs');
|
|
7
8
|
const require_protocols_token_factory_pipes_calc_reserve = require('./pipes/calc-reserve.cjs');
|
|
8
|
-
let _ocap_state = require("@ocap/state");
|
|
9
9
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
10
|
-
let _ocap_util = require("@ocap/util");
|
|
11
10
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
11
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
12
|
+
let _ocap_state = require("@ocap/state");
|
|
13
|
+
let _ocap_util = require("@ocap/util");
|
|
13
14
|
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
14
15
|
let lodash_pick = require("lodash/pick");
|
|
15
16
|
lodash_pick = require_rolldown_runtime.__toESM(lodash_pick);
|
|
@@ -32,6 +33,7 @@ runner.use(({ itx }, next) => {
|
|
|
32
33
|
if (error) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`));
|
|
33
34
|
return next();
|
|
34
35
|
});
|
|
36
|
+
require_stateless_prefix.markStatelessPrefix(runner);
|
|
35
37
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
36
38
|
from: "itx.tokenFactory",
|
|
37
39
|
to: "tokenFactoryState",
|
|
@@ -3,13 +3,14 @@ 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_stateless_prefix = require('../../stateless-prefix.cjs');
|
|
6
7
|
const require_protocols_token_factory_pipes_verify_ownership = require('./pipes/verify-ownership.cjs');
|
|
7
8
|
const require_protocols_token_factory_pipes_verify_url = require('./pipes/verify-url.cjs');
|
|
8
9
|
const require_protocols_token_factory_pipes_verify_icon = require('./pipes/verify-icon.cjs');
|
|
9
|
-
let _ocap_state = require("@ocap/state");
|
|
10
10
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
11
|
-
let _ocap_util = require("@ocap/util");
|
|
12
11
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
|
+
let _ocap_state = require("@ocap/state");
|
|
13
|
+
let _ocap_util = require("@ocap/util");
|
|
13
14
|
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
14
15
|
let debug = require("debug");
|
|
15
16
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
@@ -17,6 +18,15 @@ let _arcblock_validator = require("@arcblock/validator");
|
|
|
17
18
|
|
|
18
19
|
//#region src/protocols/token-factory/update.ts
|
|
19
20
|
const debug$1 = (0, debug.default)("@ocap/tx-protocols:update-token-factory");
|
|
21
|
+
/**
|
|
22
|
+
* Whether this tx changes the fee rate. `fee_rate` is a proto3 scalar, so an omitted value decodes to 0: a zero is
|
|
23
|
+
* only treated as "set the fee to 0" when it was explicit or when the tx carries nothing else to update.
|
|
24
|
+
*/
|
|
25
|
+
const shouldUpdateFeeRate = ({ tx, itx }) => {
|
|
26
|
+
const rawItx = tx?.itx || {};
|
|
27
|
+
const hasExplicitFeeRate = typeof rawItx.feeRate === "number" || rawItx.value && typeof rawItx.value === "object" && typeof rawItx.value.feeRate === "number" || !rawItx.typeUrl && !rawItx.type && typeof itx.feeRate === "number";
|
|
28
|
+
return Boolean(itx.feeRate) || itx.feeRate === 0 && (hasExplicitFeeRate || !itx.token && !itx.data);
|
|
29
|
+
};
|
|
20
30
|
const runner = new _ocap_tx_pipeline.Runner("update_token_factory");
|
|
21
31
|
const isTest = process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test" || process.env.CI;
|
|
22
32
|
runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSig(0));
|
|
@@ -52,6 +62,7 @@ runner.use((context, next) => {
|
|
|
52
62
|
}
|
|
53
63
|
return next();
|
|
54
64
|
});
|
|
65
|
+
require_stateless_prefix.markStatelessPrefix(runner);
|
|
55
66
|
runner.use(require_protocols_token_factory_pipes_verify_icon.default({ iconKey: "itx.token.icon" }));
|
|
56
67
|
runner.use(require_protocols_token_factory_pipes_verify_url.default({ urlKeys: ["itx.token.website", "itx.token.metadata.value.communityUrl"] }));
|
|
57
68
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
@@ -109,6 +120,12 @@ runner.use((context, next) => {
|
|
|
109
120
|
if (!(delegatorState ? (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(delegatorState) : tx.delegator ? [tx.delegator] : (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(senderState)).some((addr) => (0, _ocap_util.isSameDid)(addr, tokenFactoryState.owner))) return next(new _ocap_util_lib_error.CustomError("FORBIDDEN", "Token factory can only be updated by owner"));
|
|
110
121
|
return next();
|
|
111
122
|
});
|
|
123
|
+
runner.use((context, next) => {
|
|
124
|
+
const { itx, tokenFactoryState } = context;
|
|
125
|
+
const currentFeeRate = tokenFactoryState.feeRate;
|
|
126
|
+
if (shouldUpdateFeeRate(context) && itx.feeRate > currentFeeRate) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", `Token factory fee rate can only be decreased after creation: current ${currentFeeRate}, requested ${itx.feeRate}`));
|
|
127
|
+
return next();
|
|
128
|
+
});
|
|
112
129
|
runner.use(require_pipes_ensure_gas.default((context) => {
|
|
113
130
|
const result = {
|
|
114
131
|
create: 0,
|
|
@@ -127,9 +144,7 @@ runner.use(async (context, next) => {
|
|
|
127
144
|
const tokenStateValue = tokenState;
|
|
128
145
|
const { tokens: senderTokens = {} } = senderStateValue;
|
|
129
146
|
const senderUpdates = senderChange ? require_util.applyTokenChange({ tokens: senderTokens }, senderChange) : { tokens: senderTokens };
|
|
130
|
-
const
|
|
131
|
-
const hasExplicitFeeRate = typeof rawItx.feeRate === "number" || rawItx.value && typeof rawItx.value === "object" && typeof rawItx.value.feeRate === "number" || !rawItx.typeUrl && !rawItx.type && typeof itx.feeRate === "number";
|
|
132
|
-
const factoryUpdates = Boolean(itx.feeRate) || itx.feeRate === 0 && (hasExplicitFeeRate || !itx.token && !itx.data) ? { feeRate: itx.feeRate } : {};
|
|
147
|
+
const factoryUpdates = shouldUpdateFeeRate(context) ? { feeRate: itx.feeRate } : {};
|
|
133
148
|
const tokenUpdates = itx.token ? {
|
|
134
149
|
icon: itx.token.icon || tokenStateValue.icon,
|
|
135
150
|
website: itx.token.website || tokenStateValue.website,
|
|
@@ -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 _arcblock_did = require("@arcblock/did");
|
|
7
6
|
let _ocap_mcrypto = require("@ocap/mcrypto");
|
|
8
|
-
let _ocap_state = require("@ocap/state");
|
|
9
7
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
10
|
-
let _ocap_util = require("@ocap/util");
|
|
11
8
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
9
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
10
|
+
let _arcblock_did = require("@arcblock/did");
|
|
11
|
+
let _ocap_state = require("@ocap/state");
|
|
12
|
+
let _ocap_util = require("@ocap/util");
|
|
13
13
|
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
14
14
|
let debug = require("debug");
|
|
15
15
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
@@ -22,6 +22,72 @@ lodash_isEmpty = require_rolldown_runtime.__toESM(lodash_isEmpty);
|
|
|
22
22
|
//#region src/protocols/trade/exchange-v2.ts
|
|
23
23
|
const debug$1 = (0, debug.default)("@ocap/tx-protocols:exchange-v2");
|
|
24
24
|
const runner = new _ocap_tx_pipeline.Runner("exchange_v2");
|
|
25
|
+
/** Default implicit lifetime (30 days) for `exchange_v2` orders that omit `itx.expiredAt` (#1421). */
|
|
26
|
+
const DEFAULT_EXCHANGE_V2_TTL_SECONDS = 720 * 60 * 60;
|
|
27
|
+
/** Hard upper bound (10 years) on `transaction.exchangeV2.defaultTtlSeconds` to keep millisecond arithmetic safe. */
|
|
28
|
+
const MAX_EXCHANGE_V2_TTL_SECONDS = 31536e4;
|
|
29
|
+
function parseExchangeExpiredAtMs(rawExpiredAt) {
|
|
30
|
+
if (rawExpiredAt === void 0 || rawExpiredAt === null || rawExpiredAt === "") return {
|
|
31
|
+
isSet: false,
|
|
32
|
+
valid: true,
|
|
33
|
+
expiredAtMs: 0
|
|
34
|
+
};
|
|
35
|
+
if (typeof rawExpiredAt === "string") {
|
|
36
|
+
const ms = Date.parse(rawExpiredAt);
|
|
37
|
+
if (!Number.isFinite(ms)) return {
|
|
38
|
+
isSet: true,
|
|
39
|
+
valid: false,
|
|
40
|
+
expiredAtMs: NaN
|
|
41
|
+
};
|
|
42
|
+
return {
|
|
43
|
+
isSet: true,
|
|
44
|
+
valid: true,
|
|
45
|
+
expiredAtMs: ms
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
if (rawExpiredAt instanceof Date) {
|
|
49
|
+
const ms = rawExpiredAt.getTime();
|
|
50
|
+
return {
|
|
51
|
+
isSet: true,
|
|
52
|
+
valid: Number.isFinite(ms),
|
|
53
|
+
expiredAtMs: ms
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
if (typeof rawExpiredAt === "object" && !Array.isArray(rawExpiredAt)) {
|
|
57
|
+
const record = rawExpiredAt;
|
|
58
|
+
const keys = Object.keys(record);
|
|
59
|
+
if (keys.length === 0) return {
|
|
60
|
+
isSet: false,
|
|
61
|
+
valid: true,
|
|
62
|
+
expiredAtMs: 0
|
|
63
|
+
};
|
|
64
|
+
if (keys.some((k) => k !== "seconds" && k !== "nanos")) return {
|
|
65
|
+
isSet: true,
|
|
66
|
+
valid: false,
|
|
67
|
+
expiredAtMs: NaN
|
|
68
|
+
};
|
|
69
|
+
const rawSec = record.seconds;
|
|
70
|
+
const rawNanos = record.nanos;
|
|
71
|
+
const sec = rawSec === void 0 ? 0 : typeof rawSec === "number" ? rawSec : typeof rawSec === "string" && /^-?\d+$/.test(rawSec) ? Number(rawSec) : NaN;
|
|
72
|
+
const nanos = rawNanos === void 0 ? 0 : typeof rawNanos === "number" ? rawNanos : typeof rawNanos === "string" && /^-?\d+$/.test(rawNanos) ? Number(rawNanos) : NaN;
|
|
73
|
+
if (!Number.isFinite(sec) || !Number.isFinite(nanos)) return {
|
|
74
|
+
isSet: true,
|
|
75
|
+
valid: false,
|
|
76
|
+
expiredAtMs: NaN
|
|
77
|
+
};
|
|
78
|
+
const ms = sec * 1e3 + Math.trunc(nanos / 1e6);
|
|
79
|
+
return {
|
|
80
|
+
isSet: true,
|
|
81
|
+
valid: Number.isFinite(ms),
|
|
82
|
+
expiredAtMs: ms
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
return {
|
|
86
|
+
isSet: true,
|
|
87
|
+
valid: false,
|
|
88
|
+
expiredAtMs: NaN
|
|
89
|
+
};
|
|
90
|
+
}
|
|
25
91
|
const exchangeInfoSchema = _arcblock_validator.v.object({
|
|
26
92
|
value: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any())),
|
|
27
93
|
tokensList: _arcblock_validator.v.optional(_arcblock_validator.v.array(_arcblock_validator.schemas.tokenInput), []),
|
|
@@ -34,6 +100,7 @@ const schema = _arcblock_validator.v.pipe(_arcblock_validator.v.object({
|
|
|
34
100
|
to: _arcblock_validator.schemas.tokenHolder,
|
|
35
101
|
sender: exchangeInfoSchema,
|
|
36
102
|
receiver: exchangeInfoSchema,
|
|
103
|
+
expiredAt: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any())),
|
|
37
104
|
data: _arcblock_validator.v.optional(_arcblock_validator.v.nullable(_arcblock_validator.v.any()))
|
|
38
105
|
}), (0, _arcblock_validator.vStripUnknown)());
|
|
39
106
|
runner.use(({ itx }, next) => {
|
|
@@ -107,6 +174,24 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
|
107
174
|
return true;
|
|
108
175
|
}
|
|
109
176
|
}]));
|
|
177
|
+
runner.use((context, next) => {
|
|
178
|
+
const txTimeMs = context.txTime ? new Date(context.txTime).getTime() : NaN;
|
|
179
|
+
const nowMs = Number.isFinite(txTimeMs) ? txTimeMs : Date.now();
|
|
180
|
+
const nonceBn = _ocap_state.account.parseNonceBn(context.tx?.nonce);
|
|
181
|
+
const maxNonce = nowMs + _ocap_state.account.DELEGATED_NONCE_MAX_FUTURE_MS;
|
|
182
|
+
if (!nonceBn || nonceBn.lte(new _ocap_util.BN(0)) || nonceBn.gt(new _ocap_util.BN(String(maxNonce), 10))) return next(new _ocap_util_lib_error.CustomError("INVALID_NONCE", `tx.nonce of a exchange_v2 tx should not exceed the tx time in milliseconds plus 24 hours (max ${maxNonce}, got ${nonceBn ? nonceBn.toString(10) : String(context.tx?.nonce)})`));
|
|
183
|
+
const parsedExpiry = parseExchangeExpiredAtMs(context.itx?.expiredAt);
|
|
184
|
+
if (!parsedExpiry.valid) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "Invalid itx.expiredAt"));
|
|
185
|
+
if (parsedExpiry.isSet) {
|
|
186
|
+
if (parsedExpiry.expiredAtMs < nowMs) return next(new _ocap_util_lib_error.CustomError("EXPIRED_TX", `exchange_v2 transaction expired at ${new Date(parsedExpiry.expiredAtMs).toISOString()} (txTime: ${new Date(nowMs).toISOString()})`));
|
|
187
|
+
} else {
|
|
188
|
+
const configuredTtlSeconds = context.config?.transaction?.exchangeV2?.defaultTtlSeconds;
|
|
189
|
+
const ttlSeconds = typeof configuredTtlSeconds === "number" && Number.isFinite(configuredTtlSeconds) && configuredTtlSeconds >= 1 ? Math.min(Math.floor(configuredTtlSeconds), MAX_EXCHANGE_V2_TTL_SECONDS) : DEFAULT_EXCHANGE_V2_TTL_SECONDS;
|
|
190
|
+
const minImplicitNonce = Math.max(1, Math.trunc(nowMs - ttlSeconds * 1e3));
|
|
191
|
+
if (nonceBn.lt(new _ocap_util.BN(String(minImplicitNonce), 10))) return next(new _ocap_util_lib_error.CustomError("EXPIRED_TX", `exchange_v2 transaction without itx.expiredAt exceeded default TTL of ${ttlSeconds}s (min nonce ${minImplicitNonce}, got ${nonceBn.toString(10)}, txTime: ${new Date(nowMs).toISOString()})`));
|
|
192
|
+
}
|
|
193
|
+
return next();
|
|
194
|
+
});
|
|
110
195
|
runner.use(_ocap_tx_pipeline.pipes.VerifySigner({ signer: "itx.to" }));
|
|
111
196
|
runner.use(_ocap_tx_pipeline.pipes.VerifyListSize({ listKey: ["senderAssets", "receiverAssets"] }));
|
|
112
197
|
runner.use(_ocap_tx_pipeline.pipes.VerifyListSize({ listKey: ["senderTokens", "receiverTokens"] }));
|
|
@@ -354,4 +439,6 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyStateDiff());
|
|
|
354
439
|
var exchange_v2_default = runner;
|
|
355
440
|
|
|
356
441
|
//#endregion
|
|
442
|
+
exports.DEFAULT_EXCHANGE_V2_TTL_SECONDS = DEFAULT_EXCHANGE_V2_TTL_SECONDS;
|
|
443
|
+
exports.MAX_EXCHANGE_V2_TTL_SECONDS = MAX_EXCHANGE_V2_TTL_SECONDS;
|
|
357
444
|
exports.default = exchange_v2_default;
|
|
@@ -50,5 +50,9 @@ type Context = IReadyContext<TExchangeV2Tx> & IWithSender & IWithReceiver & Part
|
|
|
50
50
|
};
|
|
51
51
|
};
|
|
52
52
|
declare const runner: Runner<Context>;
|
|
53
|
+
/** Default implicit lifetime (30 days) for `exchange_v2` orders that omit `itx.expiredAt` (#1421). */
|
|
54
|
+
declare const DEFAULT_EXCHANGE_V2_TTL_SECONDS: number;
|
|
55
|
+
/** Hard upper bound (10 years) on `transaction.exchangeV2.defaultTtlSeconds` to keep millisecond arithmetic safe. */
|
|
56
|
+
declare const MAX_EXCHANGE_V2_TTL_SECONDS = 315360000;
|
|
53
57
|
//#endregion
|
|
54
|
-
export { TokenInput, runner as default };
|
|
58
|
+
export { DEFAULT_EXCHANGE_V2_TTL_SECONDS, MAX_EXCHANGE_V2_TTL_SECONDS, TokenInput, runner as default };
|
|
@@ -3,19 +3,21 @@ 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
|
-
|
|
7
|
-
let _arcblock_did_util = require("@arcblock/did-util");
|
|
6
|
+
const require_stateless_prefix = require('../../stateless-prefix.cjs');
|
|
8
7
|
let _ocap_mcrypto = require("@ocap/mcrypto");
|
|
9
|
-
let _ocap_state = require("@ocap/state");
|
|
10
8
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
11
|
-
let _ocap_util = require("@ocap/util");
|
|
12
9
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
13
10
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
11
|
+
let _arcblock_did = require("@arcblock/did");
|
|
12
|
+
let _arcblock_did_util = require("@arcblock/did-util");
|
|
13
|
+
let _ocap_state = require("@ocap/state");
|
|
14
|
+
let _ocap_util = require("@ocap/util");
|
|
14
15
|
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
15
16
|
let _ocap_message = require("@ocap/message");
|
|
16
17
|
let _arcblock_validator = require("@arcblock/validator");
|
|
17
18
|
let lodash_isEmpty = require("lodash/isEmpty");
|
|
18
19
|
lodash_isEmpty = require_rolldown_runtime.__toESM(lodash_isEmpty);
|
|
20
|
+
let _ocap_tx_pipeline_lib_helpers_bridge_withdraw = require("@ocap/tx-pipeline/lib/helpers/bridge-withdraw");
|
|
19
21
|
|
|
20
22
|
//#region src/protocols/trade/transfer-v2.ts
|
|
21
23
|
const runner = new _ocap_tx_pipeline.Runner("transfer_v2");
|
|
@@ -88,6 +90,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([
|
|
|
88
90
|
}
|
|
89
91
|
]));
|
|
90
92
|
runner.use(_ocap_tx_pipeline.pipes.VerifyListSize({ listKey: ["assets", "tokens"] }));
|
|
93
|
+
require_stateless_prefix.markStatelessPrefix(runner);
|
|
91
94
|
runner.use((context, next) => {
|
|
92
95
|
if (context.itx.value) {
|
|
93
96
|
const amount = new _ocap_util.BN((0, _ocap_message.decodeBigInt)(context.itx.value));
|
|
@@ -107,6 +110,14 @@ runner.use((context, next) => {
|
|
|
107
110
|
}
|
|
108
111
|
next();
|
|
109
112
|
});
|
|
113
|
+
runner.use(async (context, next) => {
|
|
114
|
+
if (!(0, _ocap_tx_pipeline.isBridgeReserveRole)(context.itx.to)) return next();
|
|
115
|
+
const bridge = await (0, _ocap_tx_pipeline.resolveBridgeForReserve)(context, context.itx.to);
|
|
116
|
+
if (!bridge) return next(new _ocap_util_lib_error.CustomError("BRIDGE_WITHDRAW_RESERVE", `${context.itx.to} has the bridge reserve role but is not the reserve of any bridge`));
|
|
117
|
+
const result = (0, _ocap_tx_pipeline_lib_helpers_bridge_withdraw.checkBridgeWithdraw)(context, bridge);
|
|
118
|
+
if ((0, _ocap_tx_pipeline_lib_helpers_bridge_withdraw.isBridgeWithdrawFailure)(result)) return next(new _ocap_util_lib_error.CustomError(result.code, result.message));
|
|
119
|
+
return next();
|
|
120
|
+
});
|
|
110
121
|
runner.use(require_pipes_ensure_gas.default((context) => {
|
|
111
122
|
const result = {
|
|
112
123
|
create: 0,
|
|
@@ -3,13 +3,14 @@ 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
|
-
|
|
6
|
+
const require_stateless_prefix = require('../../stateless-prefix.cjs');
|
|
7
7
|
let _ocap_mcrypto = require("@ocap/mcrypto");
|
|
8
|
-
let _ocap_state = require("@ocap/state");
|
|
9
8
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
10
|
-
let _ocap_util = require("@ocap/util");
|
|
11
9
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
10
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
11
|
+
let _arcblock_did = require("@arcblock/did");
|
|
12
|
+
let _ocap_state = require("@ocap/state");
|
|
13
|
+
let _ocap_util = require("@ocap/util");
|
|
13
14
|
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
14
15
|
let debug = require("debug");
|
|
15
16
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
@@ -111,6 +112,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([
|
|
|
111
112
|
}
|
|
112
113
|
}
|
|
113
114
|
]));
|
|
115
|
+
require_stateless_prefix.markStatelessPrefix(runner);
|
|
114
116
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
115
117
|
from: "inputTokens",
|
|
116
118
|
to: "tokenStates",
|