@ocap/tx-protocols 1.31.0 → 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 +5 -3
- package/esm/execute.mjs +593 -21
- package/esm/gas-security-guard.d.mts +7 -2
- package/esm/gas-security-guard.mjs +25 -16
- package/esm/index.d.mts +38 -19
- package/esm/index.mjs +7 -3
- package/esm/pipes/ensure-cost.mjs +36 -10
- 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 +35 -11
- package/esm/protocols/governance/return-stake.mjs +4 -2
- package/esm/protocols/governance/revoke-ledger.d.mts +34 -0
- package/esm/protocols/governance/revoke-ledger.mjs +179 -0
- package/esm/protocols/governance/revoke-stake.d.mts +7 -2
- package/esm/protocols/governance/revoke-stake.mjs +58 -29
- package/esm/protocols/governance/slash-stake.mjs +14 -4
- 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 +594 -19
- package/lib/execute.d.cts +4 -2
- package/lib/gas-security-guard.cjs +25 -16
- package/lib/gas-security-guard.d.cts +7 -2
- package/lib/index.cjs +10 -1
- package/lib/index.d.cts +37 -18
- package/lib/pipes/ensure-cost.cjs +37 -11
- 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 +35 -11
- package/lib/protocols/governance/return-stake.cjs +4 -2
- package/lib/protocols/governance/revoke-ledger.cjs +184 -0
- package/lib/protocols/governance/revoke-ledger.d.cts +34 -0
- package/lib/protocols/governance/revoke-stake.cjs +58 -29
- package/lib/protocols/governance/revoke-stake.d.cts +7 -2
- package/lib/protocols/governance/slash-stake.cjs +14 -4
- 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,10 +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
|
-
|
|
6
|
+
const require_stateless_prefix = require('../../stateless-prefix.cjs');
|
|
7
|
+
const require_protocols_governance_revoke_ledger = require('./revoke-ledger.cjs');
|
|
7
8
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
|
-
let _ocap_util = require("@ocap/util");
|
|
9
9
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
|
+
let _ocap_state = require("@ocap/state");
|
|
11
|
+
let _ocap_util = require("@ocap/util");
|
|
10
12
|
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
11
13
|
let debug = require("debug");
|
|
12
14
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
@@ -30,6 +32,7 @@ runner.use(({ itx }, next) => {
|
|
|
30
32
|
const { error } = (0, _arcblock_validator.vValidate)(schema, itx);
|
|
31
33
|
return next(error ? new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`) : void 0);
|
|
32
34
|
});
|
|
35
|
+
require_stateless_prefix.markStatelessPrefix(runner);
|
|
33
36
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
34
37
|
from: "tx.from",
|
|
35
38
|
to: "senderState",
|
|
@@ -104,10 +107,15 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([
|
|
|
104
107
|
error: "WITHIN_WAITING_PERIOD",
|
|
105
108
|
message: "You can not claim stake before waiting period ends",
|
|
106
109
|
fn: (ctx) => {
|
|
107
|
-
const { txState, stakeState, txTime } = ctx;
|
|
110
|
+
const { itx, txState, stakeState, txTime } = ctx;
|
|
108
111
|
const waitingMs = (stakeState.revokeWaitingPeriod || 0) * 1e3;
|
|
109
112
|
const txEnd = +new Date(txState.time) + waitingMs;
|
|
110
|
-
const
|
|
113
|
+
const revokes = require_protocols_governance_revoke_ledger.normalizeStakeRevokes(stakeState);
|
|
114
|
+
const evidenceHash = itx.evidence?.hash || "";
|
|
115
|
+
const trackedEntry = Object.hasOwn(revokes, evidenceHash) ? revokes[evidenceHash] : void 0;
|
|
116
|
+
const legacyEntry = Object.hasOwn(revokes, require_protocols_governance_revoke_ledger.LEGACY_REVOKE_KEY) ? revokes[require_protocols_governance_revoke_ledger.LEGACY_REVOKE_KEY] : void 0;
|
|
117
|
+
const baseTime = trackedEntry ? trackedEntry.txTime : legacyEntry?.txTime || stakeState.context?.renaissanceTime;
|
|
118
|
+
const stateEnd = baseTime ? +new Date(baseTime) + waitingMs : 0;
|
|
111
119
|
const end = Math.max(txEnd, stateEnd);
|
|
112
120
|
return +new Date(txTime) > end;
|
|
113
121
|
}
|
|
@@ -121,13 +129,20 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyTxInput({
|
|
|
121
129
|
assetsKey: "assets"
|
|
122
130
|
}));
|
|
123
131
|
runner.use((context, next) => {
|
|
124
|
-
const { outputs = [], stakeState } = context;
|
|
132
|
+
const { itx, outputs = [], stakeState } = context;
|
|
125
133
|
const ZERO = new _ocap_util.BN(0);
|
|
134
|
+
const revokes = require_protocols_governance_revoke_ledger.normalizeStakeRevokes(stakeState);
|
|
135
|
+
const evidenceHash = itx.evidence?.hash || "";
|
|
136
|
+
const targetBucket = Object.hasOwn(revokes, evidenceHash) ? revokes[evidenceHash] : Object.hasOwn(revokes, require_protocols_governance_revoke_ledger.LEGACY_REVOKE_KEY) ? revokes[require_protocols_governance_revoke_ledger.LEGACY_REVOKE_KEY] : void 0;
|
|
137
|
+
const bucketTokens = targetBucket?.tokens || {};
|
|
138
|
+
const bucketAssets = new Set(targetBucket?.assets || []);
|
|
126
139
|
const availableRevokedTokens = {};
|
|
127
140
|
Object.entries(stakeState.revokedTokens || {}).forEach(([addr, val]) => {
|
|
128
|
-
|
|
141
|
+
const totalAvail = new _ocap_util.BN(val || "0");
|
|
142
|
+
const bucketAvail = new _ocap_util.BN(bucketTokens[addr] || "0");
|
|
143
|
+
availableRevokedTokens[addr] = _ocap_util.BN.min(totalAvail, bucketAvail);
|
|
129
144
|
});
|
|
130
|
-
const availableRevokedAssets = new Set(stakeState.revokedAssets || []);
|
|
145
|
+
const availableRevokedAssets = new Set((stakeState.revokedAssets || []).filter((a) => bucketAssets.has(a)));
|
|
131
146
|
let hasClaimable = false;
|
|
132
147
|
const clampedOutputs = [];
|
|
133
148
|
outputs.forEach((output) => {
|
|
@@ -270,10 +285,19 @@ runner.use(async (context, next) => {
|
|
|
270
285
|
const [newSenderState, newReceiverStates, newStakeState, newAssetStates, newEvidenceState] = await Promise.all([
|
|
271
286
|
statedb.account.update(senderState.address, _ocap_state.account.update(senderState, Object.assign({ nonce: tx.nonce }, receiverUpdates[senderState.address] || (senderChange ? require_util.applyTokenChange(senderState, senderChange) : {})), context), context),
|
|
272
287
|
Promise.all((0, lodash_uniqBy.default)(receiverStates, "address").filter((x) => x.address !== senderState.address).map((x) => statedb.account.update(x.address, _ocap_state.account.update(x, receiverUpdates[x.address], context), context))),
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
288
|
+
(() => {
|
|
289
|
+
const nextRevokes = require_protocols_governance_revoke_ledger.consumeStakeRevoke(stakeState, itx.evidence.hash, outputs);
|
|
290
|
+
return statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState, {
|
|
291
|
+
...stakeUpdates,
|
|
292
|
+
context: {
|
|
293
|
+
...stakeState.context,
|
|
294
|
+
revokes: nextRevokes
|
|
295
|
+
}
|
|
296
|
+
}, Object.values(stakeUpdates.revokedTokens || {}).some((v$1) => new _ocap_util.BN(v$1 || "0").gt(new _ocap_util.BN(0))) || (stakeUpdates.revokedAssets || []).length > 0 ? {
|
|
297
|
+
...context,
|
|
298
|
+
txTime: stakeState.context?.renaissanceTime || context.txTime
|
|
299
|
+
} : context), context);
|
|
300
|
+
})(),
|
|
277
301
|
Promise.all(assetStates.map(async (x) => {
|
|
278
302
|
const nextOwner = assetUpdates[x.address]?.owner;
|
|
279
303
|
const updatedAsset = await statedb.asset.update(x.address, _ocap_state.asset.update(x, assetUpdates[x.address], context), context);
|
|
@@ -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
|
-
|
|
6
|
+
const require_stateless_prefix = require('../../stateless-prefix.cjs');
|
|
7
7
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
|
-
let _ocap_util = require("@ocap/util");
|
|
9
8
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
9
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
10
|
+
let _ocap_state = require("@ocap/state");
|
|
11
|
+
let _ocap_util = require("@ocap/util");
|
|
11
12
|
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
12
13
|
let debug = require("debug");
|
|
13
14
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
@@ -55,6 +56,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyListSize({ listKey: [
|
|
|
55
56
|
"tokens",
|
|
56
57
|
"assets"
|
|
57
58
|
] }));
|
|
59
|
+
require_stateless_prefix.markStatelessPrefix(runner);
|
|
58
60
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
59
61
|
from: "tx.from",
|
|
60
62
|
to: "senderState",
|
|
@@ -0,0 +1,184 @@
|
|
|
1
|
+
const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
|
|
2
|
+
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
3
|
+
let _ocap_util = require("@ocap/util");
|
|
4
|
+
|
|
5
|
+
//#region src/protocols/governance/revoke-ledger.ts
|
|
6
|
+
const LEGACY_REVOKE_KEY = "__legacy__";
|
|
7
|
+
const ZERO = new _ocap_util.BN(0);
|
|
8
|
+
function hasPositiveEntry(entry) {
|
|
9
|
+
if (!entry) return false;
|
|
10
|
+
const hasTokens = Object.values(entry.tokens || {}).some((v) => new _ocap_util.BN(String(v || "0")).gt(ZERO));
|
|
11
|
+
const hasAssets = Array.isArray(entry.assets) && entry.assets.length > 0;
|
|
12
|
+
return hasTokens || hasAssets;
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Normalizes `stakeState.context?.revokes` against aggregate `stakeState.revokedTokens` and `stakeState.revokedAssets`.
|
|
16
|
+
* Any unattributed aggregate revoked tokens/assets (e.g. from pre-upgrade legacy stakes) are placed into
|
|
17
|
+
* `revokes[LEGACY_REVOKE_KEY]` at the head of the FIFO queue with `renaissanceTime` as their unlock base.
|
|
18
|
+
*/
|
|
19
|
+
function normalizeStakeRevokes(stakeState) {
|
|
20
|
+
const aggTokens = stakeState.revokedTokens || {};
|
|
21
|
+
const aggAssets = Array.isArray(stakeState.revokedAssets) ? stakeState.revokedAssets : [];
|
|
22
|
+
const rawRevokes = stakeState.context?.revokes || {};
|
|
23
|
+
const orderedKeys = [...Object.hasOwn(rawRevokes, LEGACY_REVOKE_KEY) ? [LEGACY_REVOKE_KEY] : [], ...Object.keys(rawRevokes).filter((k) => k !== LEGACY_REVOKE_KEY)];
|
|
24
|
+
const remainingTokenCap = {};
|
|
25
|
+
for (const [tok, val] of Object.entries(aggTokens)) {
|
|
26
|
+
const bnVal = new _ocap_util.BN(String(val || "0"));
|
|
27
|
+
if (bnVal.gt(ZERO)) remainingTokenCap[tok] = bnVal;
|
|
28
|
+
}
|
|
29
|
+
const aggAssetSet = new Set(aggAssets);
|
|
30
|
+
const seenAssets = /* @__PURE__ */ new Set();
|
|
31
|
+
const normalized = {};
|
|
32
|
+
for (const key of orderedKeys) {
|
|
33
|
+
const raw = rawRevokes[key];
|
|
34
|
+
if (!raw || typeof raw !== "object") continue;
|
|
35
|
+
const clampedTokens = {};
|
|
36
|
+
for (const [tok, val] of Object.entries(raw.tokens || {})) {
|
|
37
|
+
const cap = remainingTokenCap[tok] || ZERO;
|
|
38
|
+
const entryBn = new _ocap_util.BN(String(val || "0"));
|
|
39
|
+
const actual = _ocap_util.BN.min(entryBn, cap);
|
|
40
|
+
if (actual.gt(ZERO)) {
|
|
41
|
+
clampedTokens[tok] = actual.toString(10);
|
|
42
|
+
remainingTokenCap[tok] = cap.sub(actual);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
const clampedAssets = (Array.isArray(raw.assets) ? raw.assets : []).filter((a) => {
|
|
46
|
+
if (aggAssetSet.has(a) && !seenAssets.has(a)) {
|
|
47
|
+
seenAssets.add(a);
|
|
48
|
+
return true;
|
|
49
|
+
}
|
|
50
|
+
return false;
|
|
51
|
+
});
|
|
52
|
+
normalized[key] = {
|
|
53
|
+
txTime: typeof raw.txTime === "string" ? raw.txTime : "",
|
|
54
|
+
tokens: clampedTokens,
|
|
55
|
+
assets: clampedAssets
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
const unattributedTokens = {};
|
|
59
|
+
for (const [tok, rem] of Object.entries(remainingTokenCap)) if (rem.gt(ZERO)) unattributedTokens[tok] = rem.toString(10);
|
|
60
|
+
const unattributedAssets = aggAssets.filter((a) => !seenAssets.has(a));
|
|
61
|
+
if (Object.keys(unattributedTokens).length > 0 || unattributedAssets.length > 0) {
|
|
62
|
+
const existingLegacy = normalized[LEGACY_REVOKE_KEY];
|
|
63
|
+
const mergedLegacyTokens = { ...existingLegacy?.tokens || {} };
|
|
64
|
+
for (const [tok, val] of Object.entries(unattributedTokens)) mergedLegacyTokens[tok] = new _ocap_util.BN(mergedLegacyTokens[tok] || "0").add(new _ocap_util.BN(val)).toString(10);
|
|
65
|
+
const mergedLegacyAssets = Array.from(new Set([...existingLegacy?.assets || [], ...unattributedAssets]));
|
|
66
|
+
const legacyEntry = {
|
|
67
|
+
txTime: existingLegacy?.txTime || stakeState.context?.renaissanceTime || stakeState.context?.genesisTime || "",
|
|
68
|
+
tokens: mergedLegacyTokens,
|
|
69
|
+
assets: mergedLegacyAssets
|
|
70
|
+
};
|
|
71
|
+
const reordered = { [LEGACY_REVOKE_KEY]: legacyEntry };
|
|
72
|
+
for (const [k, v] of Object.entries(normalized)) if (k !== LEGACY_REVOKE_KEY && hasPositiveEntry(v)) reordered[k] = v;
|
|
73
|
+
return reordered;
|
|
74
|
+
}
|
|
75
|
+
const result = {};
|
|
76
|
+
for (const [k, v] of Object.entries(normalized)) if (hasPositiveEntry(v)) result[k] = v;
|
|
77
|
+
return result;
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Records a new `revoke_stake` transaction's outputs into the per-revoke ledger under `txHash`.
|
|
81
|
+
*/
|
|
82
|
+
function recordStakeRevoke(stakeState, txHash, txTime, outputs) {
|
|
83
|
+
const revokes = normalizeStakeRevokes(stakeState);
|
|
84
|
+
const prev = Object.hasOwn(revokes, txHash) ? revokes[txHash] : void 0;
|
|
85
|
+
const mergedTokens = { ...prev?.tokens || {} };
|
|
86
|
+
const mergedAssets = new Set(prev?.assets || []);
|
|
87
|
+
for (const out of outputs || []) {
|
|
88
|
+
const tokensList = (0, _ocap_util_lib_get_list_field.getListField)(out, "tokens") || [];
|
|
89
|
+
const assetsList = (0, _ocap_util_lib_get_list_field.getListField)(out, "assets") || [];
|
|
90
|
+
for (const { address, value } of tokensList) {
|
|
91
|
+
const addBn = new _ocap_util.BN(String(value || "0"));
|
|
92
|
+
if (addBn.gt(ZERO)) mergedTokens[address] = new _ocap_util.BN(mergedTokens[address] || "0").add(addBn).toString(10);
|
|
93
|
+
}
|
|
94
|
+
for (const assetAddr of assetsList) mergedAssets.add(assetAddr);
|
|
95
|
+
}
|
|
96
|
+
const nextEntry = {
|
|
97
|
+
txTime: txTime || prev?.txTime || "",
|
|
98
|
+
tokens: mergedTokens,
|
|
99
|
+
assets: Array.from(mergedAssets)
|
|
100
|
+
};
|
|
101
|
+
if (hasPositiveEntry(nextEntry)) revokes[txHash] = nextEntry;
|
|
102
|
+
return revokes;
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
* Deducts slashed revoked tokens and assets from the per-revoke ledger in FIFO order (oldest first).
|
|
106
|
+
*/
|
|
107
|
+
function slashStakeRevokes(stakeState, nextRevokedTokens, nextRevokedAssets, slashTxTime) {
|
|
108
|
+
const revokes = normalizeStakeRevokes(stakeState);
|
|
109
|
+
const prevRevokedTokens = stakeState.revokedTokens || {};
|
|
110
|
+
const slashedTokens = {};
|
|
111
|
+
for (const [tok, prevVal] of Object.entries(prevRevokedTokens)) {
|
|
112
|
+
const prevBn = new _ocap_util.BN(String(prevVal || "0"));
|
|
113
|
+
const nextBn = new _ocap_util.BN(String(nextRevokedTokens?.[tok] || "0"));
|
|
114
|
+
const diff = prevBn.sub(nextBn);
|
|
115
|
+
if (diff.gt(ZERO)) slashedTokens[tok] = diff;
|
|
116
|
+
}
|
|
117
|
+
const nextAssetSet = new Set(nextRevokedAssets || []);
|
|
118
|
+
const result = {};
|
|
119
|
+
for (const [key, entry] of Object.entries(revokes)) {
|
|
120
|
+
let shrunk = false;
|
|
121
|
+
const updatedTokens = {};
|
|
122
|
+
for (const [tok, val] of Object.entries(entry.tokens || {})) {
|
|
123
|
+
const avail = new _ocap_util.BN(String(val || "0"));
|
|
124
|
+
const toSlash = slashedTokens[tok] || ZERO;
|
|
125
|
+
const deduct = _ocap_util.BN.min(avail, toSlash);
|
|
126
|
+
if (deduct.gt(ZERO)) {
|
|
127
|
+
shrunk = true;
|
|
128
|
+
slashedTokens[tok] = toSlash.sub(deduct);
|
|
129
|
+
}
|
|
130
|
+
const rem = avail.sub(deduct);
|
|
131
|
+
if (rem.gt(ZERO)) updatedTokens[tok] = rem.toString(10);
|
|
132
|
+
}
|
|
133
|
+
const prevAssets = entry.assets || [];
|
|
134
|
+
const updatedAssets = prevAssets.filter((a) => nextAssetSet.has(a));
|
|
135
|
+
if (updatedAssets.length < prevAssets.length) shrunk = true;
|
|
136
|
+
const updatedEntry = {
|
|
137
|
+
txTime: key === LEGACY_REVOKE_KEY && shrunk && slashTxTime ? slashTxTime : entry.txTime,
|
|
138
|
+
tokens: updatedTokens,
|
|
139
|
+
assets: updatedAssets
|
|
140
|
+
};
|
|
141
|
+
if (hasPositiveEntry(updatedEntry)) result[key] = updatedEntry;
|
|
142
|
+
}
|
|
143
|
+
return result;
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* Consumes claimed tokens and assets from the target revoke entry (`evidenceHash` or `LEGACY_REVOKE_KEY`).
|
|
147
|
+
*/
|
|
148
|
+
function consumeStakeRevoke(stakeState, evidenceHash, claimedOutputs) {
|
|
149
|
+
const revokes = normalizeStakeRevokes(stakeState);
|
|
150
|
+
const targetKey = evidenceHash && Object.hasOwn(revokes, evidenceHash) ? evidenceHash : LEGACY_REVOKE_KEY;
|
|
151
|
+
const target = Object.hasOwn(revokes, targetKey) ? revokes[targetKey] : void 0;
|
|
152
|
+
if (!target) return revokes;
|
|
153
|
+
const claimedTokens = {};
|
|
154
|
+
const claimedAssets = /* @__PURE__ */ new Set();
|
|
155
|
+
for (const out of claimedOutputs || []) {
|
|
156
|
+
const tokensList = out.tokens || out.tokensList || [];
|
|
157
|
+
const assetsList = out.assets || out.assetsList || [];
|
|
158
|
+
for (const { address, value } of tokensList) claimedTokens[address] = (claimedTokens[address] || ZERO).add(new _ocap_util.BN(String(value || "0")));
|
|
159
|
+
for (const assetAddr of assetsList) claimedAssets.add(assetAddr);
|
|
160
|
+
}
|
|
161
|
+
const remainingTokens = {};
|
|
162
|
+
for (const [tok, val] of Object.entries(target.tokens || {})) {
|
|
163
|
+
const avail = new _ocap_util.BN(String(val || "0"));
|
|
164
|
+
const deduct = _ocap_util.BN.min(avail, claimedTokens[tok] || ZERO);
|
|
165
|
+
const rem = avail.sub(deduct);
|
|
166
|
+
if (rem.gt(ZERO)) remainingTokens[tok] = rem.toString(10);
|
|
167
|
+
}
|
|
168
|
+
const remainingAssets = (target.assets || []).filter((a) => !claimedAssets.has(a));
|
|
169
|
+
const updatedTarget = {
|
|
170
|
+
txTime: target.txTime,
|
|
171
|
+
tokens: remainingTokens,
|
|
172
|
+
assets: remainingAssets
|
|
173
|
+
};
|
|
174
|
+
if (hasPositiveEntry(updatedTarget)) revokes[targetKey] = updatedTarget;
|
|
175
|
+
else delete revokes[targetKey];
|
|
176
|
+
return revokes;
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
//#endregion
|
|
180
|
+
exports.LEGACY_REVOKE_KEY = LEGACY_REVOKE_KEY;
|
|
181
|
+
exports.consumeStakeRevoke = consumeStakeRevoke;
|
|
182
|
+
exports.normalizeStakeRevokes = normalizeStakeRevokes;
|
|
183
|
+
exports.recordStakeRevoke = recordStakeRevoke;
|
|
184
|
+
exports.slashStakeRevokes = slashStakeRevokes;
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { IStakeRevokeEntry, IStakeState } from "@ocap/types";
|
|
2
|
+
|
|
3
|
+
//#region src/protocols/governance/revoke-ledger.d.ts
|
|
4
|
+
declare const LEGACY_REVOKE_KEY = "__legacy__";
|
|
5
|
+
interface TokenInputLike {
|
|
6
|
+
address: string;
|
|
7
|
+
value: string;
|
|
8
|
+
}
|
|
9
|
+
interface OutputLike {
|
|
10
|
+
tokensList?: TokenInputLike[];
|
|
11
|
+
tokens?: TokenInputLike[];
|
|
12
|
+
assetsList?: string[];
|
|
13
|
+
assets?: string[];
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Normalizes `stakeState.context?.revokes` against aggregate `stakeState.revokedTokens` and `stakeState.revokedAssets`.
|
|
17
|
+
* Any unattributed aggregate revoked tokens/assets (e.g. from pre-upgrade legacy stakes) are placed into
|
|
18
|
+
* `revokes[LEGACY_REVOKE_KEY]` at the head of the FIFO queue with `renaissanceTime` as their unlock base.
|
|
19
|
+
*/
|
|
20
|
+
declare function normalizeStakeRevokes(stakeState: IStakeState): Record<string, IStakeRevokeEntry>;
|
|
21
|
+
/**
|
|
22
|
+
* Records a new `revoke_stake` transaction's outputs into the per-revoke ledger under `txHash`.
|
|
23
|
+
*/
|
|
24
|
+
declare function recordStakeRevoke(stakeState: IStakeState, txHash: string, txTime: string, outputs: OutputLike[]): Record<string, IStakeRevokeEntry>;
|
|
25
|
+
/**
|
|
26
|
+
* Deducts slashed revoked tokens and assets from the per-revoke ledger in FIFO order (oldest first).
|
|
27
|
+
*/
|
|
28
|
+
declare function slashStakeRevokes(stakeState: IStakeState, nextRevokedTokens: Record<string, string>, nextRevokedAssets: string[], slashTxTime: string): Record<string, IStakeRevokeEntry>;
|
|
29
|
+
/**
|
|
30
|
+
* Consumes claimed tokens and assets from the target revoke entry (`evidenceHash` or `LEGACY_REVOKE_KEY`).
|
|
31
|
+
*/
|
|
32
|
+
declare function consumeStakeRevoke(stakeState: IStakeState, evidenceHash: string, claimedOutputs: OutputLike[]): Record<string, IStakeRevokeEntry>;
|
|
33
|
+
//#endregion
|
|
34
|
+
export { LEGACY_REVOKE_KEY, consumeStakeRevoke, normalizeStakeRevokes, recordStakeRevoke, slashStakeRevokes };
|
|
@@ -3,17 +3,20 @@ 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
|
+
const require_protocols_governance_revoke_ledger = require('./revoke-ledger.cjs');
|
|
7
8
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
|
-
let _ocap_util = require("@ocap/util");
|
|
9
9
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
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");
|
|
11
13
|
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
12
14
|
let debug = require("debug");
|
|
13
15
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
14
16
|
let _arcblock_validator = require("@arcblock/validator");
|
|
15
17
|
let lodash_isEmpty = require("lodash/isEmpty");
|
|
16
18
|
lodash_isEmpty = require_rolldown_runtime.__toESM(lodash_isEmpty);
|
|
19
|
+
let _ocap_tx_pipeline_lib_pipes_post_execution_invariant_gate = require("@ocap/tx-pipeline/lib/pipes/post-execution-invariant-gate");
|
|
17
20
|
|
|
18
21
|
//#region src/protocols/governance/revoke-stake.ts
|
|
19
22
|
const debug$1 = (0, debug.default)("@ocap/tx-protocols:revoke-stake");
|
|
@@ -52,6 +55,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyListSize({ listKey: [
|
|
|
52
55
|
"tokens",
|
|
53
56
|
"assets"
|
|
54
57
|
] }));
|
|
58
|
+
require_stateless_prefix.markStatelessPrefix(runner);
|
|
55
59
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
56
60
|
from: "tx.from",
|
|
57
61
|
to: "senderState",
|
|
@@ -79,31 +83,46 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
79
83
|
status: "INVALID_STAKE_STATE",
|
|
80
84
|
table: "stake"
|
|
81
85
|
}));
|
|
82
|
-
runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
return (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(context.senderState).includes(context.stakeState.sender);
|
|
89
|
-
}
|
|
90
|
-
},
|
|
91
|
-
{
|
|
92
|
-
error: "STAKE_NOT_REVOCABLE",
|
|
93
|
-
message: "This stake address is not revocable",
|
|
94
|
-
fn: (ctx) => {
|
|
95
|
-
return ctx.stakeState.revocable;
|
|
96
|
-
}
|
|
97
|
-
},
|
|
98
|
-
{
|
|
99
|
-
error: "INVALID_TX",
|
|
100
|
-
message: "Can not revoke assets that are not locked in the stake",
|
|
101
|
-
fn: (ctx) => {
|
|
102
|
-
const context = ctx;
|
|
103
|
-
return (context.assets || []).every((x) => (context.stakeState.assets || []).includes(x));
|
|
104
|
-
}
|
|
86
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
87
|
+
error: "SENDER_NOT_MATCH",
|
|
88
|
+
message: "You are not allowed to revoke stake from this address",
|
|
89
|
+
fn: (ctx) => {
|
|
90
|
+
const context = ctx;
|
|
91
|
+
return (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(context.senderState).includes(context.stakeState.sender);
|
|
105
92
|
}
|
|
106
|
-
]));
|
|
93
|
+
}]));
|
|
94
|
+
runner.use(async (context, next) => {
|
|
95
|
+
const { stakeState, senderState, statedb, config } = context;
|
|
96
|
+
if (stakeState.revocable !== false) return next();
|
|
97
|
+
const notRevocable = (reason = "") => next(new _ocap_util_lib_error.CustomError("STAKE_NOT_REVOCABLE", `This stake address is not revocable${reason ? `: ${reason}` : ""}`));
|
|
98
|
+
const officialToken = config.token?.address || "";
|
|
99
|
+
const symbol = stakeState.nonce;
|
|
100
|
+
if (!officialToken || typeof symbol !== "string" || !symbol || !(0, _ocap_util.isSameDid)(stakeState.receiver, officialToken)) return notRevocable();
|
|
101
|
+
const tokenAddress = await statedb.token.getAddressBySymbol(symbol.toUpperCase(), context);
|
|
102
|
+
const tokenState = tokenAddress ? await statedb.token.get(tokenAddress, context) : null;
|
|
103
|
+
if (!tokenState || !(0, _ocap_tx_pipeline_lib_pipes_post_execution_invariant_gate.isTokenIssuanceStakeOf)(stakeState, tokenState, officialToken)) return notRevocable();
|
|
104
|
+
const tokenFactoryState = await statedb.tokenFactory.get(tokenState.tokenFactoryAddress, context);
|
|
105
|
+
if (!tokenFactoryState) return notRevocable();
|
|
106
|
+
const label = `token ${tokenState.symbol} (${tokenState.address})`;
|
|
107
|
+
if (!(0, _ocap_tx_pipeline_lib_pipes_post_execution_invariant_gate.isTokenFullyRedeemed)(tokenState, tokenFactoryState)) return notRevocable(`the stake for ${label} stays locked until 100% of its supply is burned`);
|
|
108
|
+
const factoryStatus = tokenFactoryState.status || "ACTIVE";
|
|
109
|
+
if (factoryStatus === "ACTIVE") {
|
|
110
|
+
if (!(0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(senderState).some((x) => (0, _ocap_util.isSameDid)(x, tokenFactoryState.owner))) return notRevocable(`only the current owner of the token factory can retire ${label}`);
|
|
111
|
+
context.tokenStakeRelease = "retire";
|
|
112
|
+
} else if (factoryStatus === "RETIRED") context.tokenStakeRelease = "retired";
|
|
113
|
+
else return notRevocable(`token factory of ${label} is ${factoryStatus}`);
|
|
114
|
+
context.tokenState = tokenState;
|
|
115
|
+
context.tokenFactoryState = tokenFactoryState;
|
|
116
|
+
return next();
|
|
117
|
+
});
|
|
118
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
119
|
+
error: "INVALID_TX",
|
|
120
|
+
message: "Can not revoke assets that are not locked in the stake",
|
|
121
|
+
fn: (ctx) => {
|
|
122
|
+
const context = ctx;
|
|
123
|
+
return (context.assets || []).every((x) => (context.stakeState.assets || []).includes(x));
|
|
124
|
+
}
|
|
125
|
+
}]));
|
|
107
126
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
108
127
|
from: "tokens",
|
|
109
128
|
to: "tokenStates",
|
|
@@ -143,15 +162,16 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyUpdater({
|
|
|
143
162
|
assetKey: "assetStates",
|
|
144
163
|
ownerKey: "stakeState"
|
|
145
164
|
}));
|
|
146
|
-
runner.use(require_pipes_ensure_gas.default(() => ({
|
|
165
|
+
runner.use(require_pipes_ensure_gas.default((context) => ({
|
|
147
166
|
create: 0,
|
|
148
|
-
update: 2,
|
|
167
|
+
update: context.tokenStakeRelease === "retire" ? 3 : 2,
|
|
149
168
|
payment: 0
|
|
150
169
|
})));
|
|
151
170
|
runner.use(require_pipes_ensure_cost.default({ attachSenderChanges: true }));
|
|
152
171
|
runner.use(_ocap_tx_pipeline.pipes.TakeStateSnapshot());
|
|
153
172
|
runner.use(async (context, next) => {
|
|
154
173
|
const { tx, itx, outputs = [], statedb, senderState, senderUpdates, stakeState, updateVaults } = context;
|
|
174
|
+
const { tokenStakeRelease, tokenFactoryState } = context;
|
|
155
175
|
const stakeUpdates = {
|
|
156
176
|
tokens: stakeState.tokens || {},
|
|
157
177
|
assets: stakeState.assets || [],
|
|
@@ -166,14 +186,23 @@ runner.use(async (context, next) => {
|
|
|
166
186
|
stakeUpdates.revokedTokens = require_util.applyTokenUpdates(tokensList, { tokens: stakeUpdates.revokedTokens }, "add").tokens;
|
|
167
187
|
stakeUpdates.revokedAssets = stakeUpdates.revokedAssets.concat(...assetsList);
|
|
168
188
|
});
|
|
189
|
+
if (tokenStakeRelease === "retire") context.tokenFactoryState = await statedb.tokenFactory.update(tokenFactoryState.address, _ocap_state.tokenFactory.update(tokenFactoryState, { status: "RETIRED" }, context), context);
|
|
169
190
|
const [newSenderState, newStakeState] = await Promise.all([statedb.account.update(senderState.address, _ocap_state.account.update(senderState, {
|
|
170
191
|
nonce: tx.nonce,
|
|
171
192
|
...senderUpdates
|
|
172
193
|
}, context), context), (() => {
|
|
194
|
+
const nextRevokes = require_protocols_governance_revoke_ledger.recordStakeRevoke(stakeState, context.txHash, context.txTime, outputs);
|
|
173
195
|
const hasPendingRevokedTokens = Object.values(stakeState.revokedTokens || {}).some((v$1) => new _ocap_util.BN(String(v$1 || "0")).gt(new _ocap_util.BN(0)));
|
|
174
196
|
const hasPendingRevokedAssets = Array.isArray(stakeState.revokedAssets) && stakeState.revokedAssets.length > 0;
|
|
175
197
|
const preserveRenaissanceTime = (hasPendingRevokedTokens || hasPendingRevokedAssets) && stakeState.context?.renaissanceTime;
|
|
176
|
-
return statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState,
|
|
198
|
+
return statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState, {
|
|
199
|
+
...stakeUpdates,
|
|
200
|
+
...tokenStakeRelease ? { revocable: true } : {},
|
|
201
|
+
context: {
|
|
202
|
+
...stakeState.context,
|
|
203
|
+
revokes: nextRevokes
|
|
204
|
+
}
|
|
205
|
+
}, preserveRenaissanceTime ? {
|
|
177
206
|
...context,
|
|
178
207
|
txTime: preserveRenaissanceTime
|
|
179
208
|
} : context), context);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IReadyContext, IWithAssets, IWithReceivers, IWithSender, IWithStake, IWithTokens, TRevokeStakeTx } from "@ocap/types";
|
|
1
|
+
import { IReadyContext, IWithAssets, IWithReceivers, IWithSender, IWithStake, IWithToken, IWithTokenFactory, IWithTokens, TRevokeStakeTx } from "@ocap/types";
|
|
2
2
|
import { BN } from "@ocap/util";
|
|
3
3
|
import { Runner } from "@ocap/tx-pipeline";
|
|
4
4
|
|
|
@@ -29,7 +29,12 @@ interface TokenCondition {
|
|
|
29
29
|
* Phase: IReadyContext (after TakeStateSnapshot)
|
|
30
30
|
* Mixins: IWithSender, IWithStake, IWithReceivers, IWithTokens, IWithAssets
|
|
31
31
|
*/
|
|
32
|
-
type Context = IReadyContext<TRevokeStakeTx> & IWithSender & IWithStake & Partial<IWithReceivers> & Partial<IWithTokens> & Partial<IWithAssets> & {
|
|
32
|
+
type Context = IReadyContext<TRevokeStakeTx> & IWithSender & IWithStake & Partial<IWithReceivers> & Partial<IWithTokens> & Partial<IWithAssets> & Partial<Pick<IWithToken, 'tokenState'>> & Partial<IWithTokenFactory> & {
|
|
33
|
+
/**
|
|
34
|
+
* Set when a locked Stake-for-Token may be released (#1422): `retire` when this tx also retires the factory,
|
|
35
|
+
* `retired` when the factory was retired before.
|
|
36
|
+
*/
|
|
37
|
+
tokenStakeRelease?: 'retire' | 'retired';
|
|
33
38
|
/** Parsed outputs from itx */
|
|
34
39
|
outputs?: MultiOutput[];
|
|
35
40
|
/** Receiver addresses from outputs */
|
|
@@ -3,13 +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
|
-
|
|
6
|
+
const require_stateless_prefix = require('../../stateless-prefix.cjs');
|
|
7
|
+
const require_protocols_governance_revoke_ledger = require('./revoke-ledger.cjs');
|
|
7
8
|
let _ocap_mcrypto = require("@ocap/mcrypto");
|
|
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 _arcblock_did = require("@arcblock/did");
|
|
13
|
+
let _ocap_state = require("@ocap/state");
|
|
14
|
+
let _ocap_util = require("@ocap/util");
|
|
13
15
|
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
14
16
|
let debug = require("debug");
|
|
15
17
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
@@ -57,6 +59,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyListSize({ listKey: [
|
|
|
57
59
|
"tokens",
|
|
58
60
|
"assets"
|
|
59
61
|
] }));
|
|
62
|
+
require_stateless_prefix.markStatelessPrefix(runner);
|
|
60
63
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
61
64
|
from: "tx.from",
|
|
62
65
|
to: "senderState",
|
|
@@ -225,9 +228,16 @@ runner.use(async (context, next) => {
|
|
|
225
228
|
(() => {
|
|
226
229
|
const prevRevoked = stakeState.revokedTokens || {};
|
|
227
230
|
const nextRevoked = stakeUpdates.revokedTokens || {};
|
|
231
|
+
const nextRevokes = require_protocols_governance_revoke_ledger.slashStakeRevokes(stakeState, nextRevoked, stakeUpdates.revokedAssets || [], context.txTime);
|
|
228
232
|
const poolShrunk = Object.keys(prevRevoked).some((k) => new _ocap_util.BN(prevRevoked[k] || "0").gt(new _ocap_util.BN(nextRevoked[k] || "0"))) || (stakeUpdates.revokedAssets || []).length < (stakeState.revokedAssets || []).length;
|
|
229
233
|
const hasPending = Object.values(nextRevoked).some((v$1) => new _ocap_util.BN(v$1 || "0").gt(new _ocap_util.BN(0))) || (stakeUpdates.revokedAssets || []).length > 0;
|
|
230
|
-
return statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState,
|
|
234
|
+
return statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState, {
|
|
235
|
+
...stakeUpdates,
|
|
236
|
+
context: {
|
|
237
|
+
...stakeState.context,
|
|
238
|
+
revokes: nextRevokes
|
|
239
|
+
}
|
|
240
|
+
}, hasPending && !poolShrunk ? {
|
|
231
241
|
...context,
|
|
232
242
|
txTime: stakeState.context?.renaissanceTime || context.txTime
|
|
233
243
|
} : context), context);
|
|
@@ -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
|
-
|
|
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 lodash_pick = require("lodash/pick");
|
|
15
16
|
lodash_pick = require_rolldown_runtime.__toESM(lodash_pick);
|
|
16
17
|
let debug = require("debug");
|
|
@@ -99,6 +100,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyListSize({ listKey: [
|
|
|
99
100
|
"tokens",
|
|
100
101
|
"assets"
|
|
101
102
|
] }));
|
|
103
|
+
require_stateless_prefix.markStatelessPrefix(runner);
|
|
102
104
|
runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSigV2({ signersKey: "senders" }));
|
|
103
105
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
104
106
|
from: "itx.address",
|