@ocap/tx-protocols 1.31.0 → 1.31.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/execute.d.mts +4 -2
- package/esm/execute.mjs +537 -18
- package/esm/gas-security-guard.d.mts +1 -0
- package/esm/gas-security-guard.mjs +9 -7
- package/esm/index.d.mts +2 -2
- package/esm/index.mjs +2 -2
- package/esm/pipes/ensure-cost.mjs +29 -9
- package/esm/protocols/governance/claim-stake.mjs +31 -9
- 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.mjs +9 -1
- package/esm/protocols/governance/slash-stake.mjs +9 -1
- package/lib/execute.cjs +536 -14
- package/lib/execute.d.cts +4 -2
- package/lib/gas-security-guard.cjs +9 -7
- package/lib/gas-security-guard.d.cts +1 -0
- package/lib/index.cjs +2 -0
- package/lib/index.d.cts +2 -2
- package/lib/pipes/ensure-cost.cjs +30 -10
- package/lib/protocols/governance/claim-stake.cjs +31 -9
- 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 +9 -1
- package/lib/protocols/governance/slash-stake.cjs +9 -1
- package/package.json +16 -16
|
@@ -466,14 +466,16 @@ function verifyAndConsumeUnlinkableGasPass(params) {
|
|
|
466
466
|
reason: "GAS_PASS_NULLIFIER_ALREADY_SPENT"
|
|
467
467
|
};
|
|
468
468
|
}
|
|
469
|
-
if (
|
|
470
|
-
|
|
471
|
-
|
|
469
|
+
if (params.consumeNullifier !== false) {
|
|
470
|
+
if (nullifierMap.size >= MAX_NULLIFIERS_PER_STAKE) {
|
|
471
|
+
const oldest = nullifierMap.keys().next().value;
|
|
472
|
+
if (oldest) nullifierMap.delete(oldest);
|
|
473
|
+
}
|
|
474
|
+
nullifierMap.set(nullifier, {
|
|
475
|
+
epoch,
|
|
476
|
+
txHash
|
|
477
|
+
});
|
|
472
478
|
}
|
|
473
|
-
nullifierMap.set(nullifier, {
|
|
474
|
-
epoch,
|
|
475
|
-
txHash
|
|
476
|
-
});
|
|
477
479
|
return {
|
|
478
480
|
valid: true,
|
|
479
481
|
stakeId
|
package/lib/index.cjs
CHANGED
|
@@ -137,6 +137,7 @@ Object.defineProperty(exports, 'MAX_PREFLIGHT_JSON_KEYS', {
|
|
|
137
137
|
return _ocap_tx_pipeline.MAX_PREFLIGHT_JSON_KEYS;
|
|
138
138
|
}
|
|
139
139
|
});
|
|
140
|
+
exports.PREFLIGHT_VERIFIED_SNAPSHOT_SYMBOL = require_execute.PREFLIGHT_VERIFIED_SNAPSHOT_SYMBOL;
|
|
140
141
|
Object.defineProperty(exports, 'PostExecutionInvariantGate', {
|
|
141
142
|
enumerable: true,
|
|
142
143
|
get: function () {
|
|
@@ -230,5 +231,6 @@ Object.defineProperty(exports, 'scanItxPayloadAnomalies', {
|
|
|
230
231
|
});
|
|
231
232
|
exports.setTxSecurityWarningForHash = require_gas_security_guard.setTxSecurityWarningForHash;
|
|
232
233
|
exports.toUnsignedEvidenceKey = require_execute.toUnsignedEvidenceKey;
|
|
234
|
+
exports.tryApplyPreFlightVerifiedSnapshot = require_execute.tryApplyPreFlightVerifiedSnapshot;
|
|
233
235
|
exports.verifyAndConsumeUnlinkableGasPass = require_gas_security_guard.verifyAndConsumeUnlinkableGasPass;
|
|
234
236
|
exports.verifyPaymasterConstraints = require_gas_security_guard.verifyPaymasterConstraints;
|
package/lib/index.d.cts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DEFAULT_BASE_BURST_ALLOWANCE, DEFAULT_BURST_REJECT_MULTIPLE, DEFAULT_BURST_WINDOW_MS, DEFAULT_FISHERMAN_BOUNTY_BPS, DEFAULT_GAS_PASS_EPOCH_SECONDS, DEFAULT_MAX_FREE_GAS_STATE_OPS, DEFAULT_MAX_FREE_GAS_TX_SIZE, DEFAULT_SLASH_STRIKE_THRESHOLD, DEFAULT_STRIKE_WINDOW_MS, DEFAULT_THROTTLE_COOLDOWN_MS, DEFAULT_THROTTLE_STRIKE_THRESHOLD, DEFAULT_WARNING_STRIKE_THRESHOLD, DIRECT_GAS_REQUIRED_TX_TYPES, FREE_GAS_ELIGIBLE_TX_TYPES, IAbuseSlashEvidence, IGasSecurityConfig, IPaymasterDecodedClaims, IStakeForGasEligibilityResult, ITxGasQuotaTelemetry, ITxSecurityWarning, IUnlinkableGasPass, SecurityStrikeTier, StrikeReasonCategory, assertTxAdmission, classifyErrorStrikeCategory, computeActorTier, computeUnlinkableGasPassCommitment, computeUnlinkableGasPassSecretHash, evaluateBurstQuota, evaluateStakeForGasEligibility, executeAutoGasStakeSlash, extractTransactionTargets, getActorSecurityStatus, getGasSecurityRegistry, getTxSecurityWarningByHash, normalizeActorAddress, normalizeShortTxType, recordActorSecurityStrike, resetGasSecurityState, resolveGasSecurityConfig, resolveVerifiedStrikeActors, setTxSecurityWarningForHash, verifyAndConsumeUnlinkableGasPass, verifyPaymasterConstraints } from "./gas-security-guard.cjs";
|
|
2
2
|
import { COUNTER_NAMES, CounterName, QueueState, STAGE_LABELS, StageLabel, TxMeta, TxStatus, TxTimer, TxTimerSummaryV2 } from "./tx-timer.cjs";
|
|
3
|
-
import { UNSIGNED_TX_EVIDENCE_DATA_PREFIX, toUnsignedEvidenceKey } from "./execute.cjs";
|
|
3
|
+
import { PREFLIGHT_VERIFIED_SNAPSHOT_SYMBOL, UNSIGNED_TX_EVIDENCE_DATA_PREFIX, toUnsignedEvidenceKey, tryApplyPreFlightVerifiedSnapshot } from "./execute.cjs";
|
|
4
4
|
import { TokenInput } from "./protocols/trade/transfer-v2.cjs";
|
|
5
5
|
import { MultiInput } from "./protocols/trade/transfer-v3.cjs";
|
|
6
6
|
import { TokenInput as TokenInput$1 } from "./protocols/trade/exchange-v2.cjs";
|
|
@@ -810,4 +810,4 @@ declare const defaultExecutor: {
|
|
|
810
810
|
};
|
|
811
811
|
declare const execute: (context: unknown, done?: (err: Error | null, res?: unknown) => void) => any;
|
|
812
812
|
//#endregion
|
|
813
|
-
export { COUNTER_NAMES, type CounterName, DEFAULT_BASE_BURST_ALLOWANCE, DEFAULT_BURST_REJECT_MULTIPLE, DEFAULT_BURST_WINDOW_MS, DEFAULT_FISHERMAN_BOUNTY_BPS, DEFAULT_GAS_PASS_EPOCH_SECONDS, DEFAULT_MAX_FREE_GAS_STATE_OPS, DEFAULT_MAX_FREE_GAS_TX_SIZE, DEFAULT_SLASH_STRIKE_THRESHOLD, DEFAULT_STRIKE_WINDOW_MS, DEFAULT_THROTTLE_COOLDOWN_MS, DEFAULT_THROTTLE_STRIKE_THRESHOLD, DEFAULT_WARNING_STRIKE_THRESHOLD, DIRECT_GAS_REQUIRED_TX_TYPES, FREE_GAS_ELIGIBLE_TX_TYPES, type IAbuseSlashEvidence, type IGasSecurityConfig, type IPaymasterDecodedClaims, type IStakeForGasEligibilityResult, type ITxGasQuotaTelemetry, type ITxSecurityWarning, type IUnlinkableGasPass, MAX_POST_EXECUTION_WRITE_SET_ENTRIES, MAX_PREFLIGHT_JSON_DEPTH, MAX_PREFLIGHT_JSON_KEYS, PostExecutionInvariantGate, PreFlightWaf, type QueueState, STAGE_LABELS, type SecurityStrikeTier, type StageLabel, type StrikeReasonCategory, TRACKED_STATE_TABLES, type TxMeta, type TxStatus, TxTimer, type TxTimerSummaryV2, UNSIGNED_TX_EVIDENCE_DATA_PREFIX, WriteLedger, assertKnownItxFields, assertRawWireEnvelope, assertTxAdmission, classifyErrorStrikeCategory, computeActorTier, computeUnlinkableGasPassCommitment, computeUnlinkableGasPassSecretHash, createExecutor, defaultExecutor as default, evaluateBurstQuota, evaluateStakeForGasEligibility, execute, executeAutoGasStakeSlash, extractTransactionTargets, getActorSecurityStatus, getGasSecurityRegistry, getTxSecurityWarningByHash, inspectPostExecutionInvariants, inspectTransactionPreFlight, installStateWriteInterceptor, normalizeActorAddress, normalizeEntityKey, normalizeShortTxType, recordActorSecurityStrike, resetGasSecurityState, resolveGasSecurityConfig, resolveVerifiedStrikeActors, rollbackTrackedStateWrites, scanItxPayloadAnomalies, setTxSecurityWarningForHash, toUnsignedEvidenceKey, verifyAndConsumeUnlinkableGasPass, verifyPaymasterConstraints };
|
|
813
|
+
export { COUNTER_NAMES, type CounterName, DEFAULT_BASE_BURST_ALLOWANCE, DEFAULT_BURST_REJECT_MULTIPLE, DEFAULT_BURST_WINDOW_MS, DEFAULT_FISHERMAN_BOUNTY_BPS, DEFAULT_GAS_PASS_EPOCH_SECONDS, DEFAULT_MAX_FREE_GAS_STATE_OPS, DEFAULT_MAX_FREE_GAS_TX_SIZE, DEFAULT_SLASH_STRIKE_THRESHOLD, DEFAULT_STRIKE_WINDOW_MS, DEFAULT_THROTTLE_COOLDOWN_MS, DEFAULT_THROTTLE_STRIKE_THRESHOLD, DEFAULT_WARNING_STRIKE_THRESHOLD, DIRECT_GAS_REQUIRED_TX_TYPES, FREE_GAS_ELIGIBLE_TX_TYPES, type IAbuseSlashEvidence, type IGasSecurityConfig, type IPaymasterDecodedClaims, type IStakeForGasEligibilityResult, type ITxGasQuotaTelemetry, type ITxSecurityWarning, type IUnlinkableGasPass, MAX_POST_EXECUTION_WRITE_SET_ENTRIES, MAX_PREFLIGHT_JSON_DEPTH, MAX_PREFLIGHT_JSON_KEYS, PREFLIGHT_VERIFIED_SNAPSHOT_SYMBOL, PostExecutionInvariantGate, PreFlightWaf, type QueueState, STAGE_LABELS, type SecurityStrikeTier, type StageLabel, type StrikeReasonCategory, TRACKED_STATE_TABLES, type TxMeta, type TxStatus, TxTimer, type TxTimerSummaryV2, UNSIGNED_TX_EVIDENCE_DATA_PREFIX, WriteLedger, assertKnownItxFields, assertRawWireEnvelope, assertTxAdmission, classifyErrorStrikeCategory, computeActorTier, computeUnlinkableGasPassCommitment, computeUnlinkableGasPassSecretHash, createExecutor, defaultExecutor as default, evaluateBurstQuota, evaluateStakeForGasEligibility, execute, executeAutoGasStakeSlash, extractTransactionTargets, getActorSecurityStatus, getGasSecurityRegistry, getTxSecurityWarningByHash, inspectPostExecutionInvariants, inspectTransactionPreFlight, installStateWriteInterceptor, normalizeActorAddress, normalizeEntityKey, normalizeShortTxType, recordActorSecurityStrike, resetGasSecurityState, resolveGasSecurityConfig, resolveVerifiedStrikeActors, rollbackTrackedStateWrites, scanItxPayloadAnomalies, setTxSecurityWarningForHash, toUnsignedEvidenceKey, tryApplyPreFlightVerifiedSnapshot, verifyAndConsumeUnlinkableGasPass, verifyPaymasterConstraints };
|
|
@@ -4,12 +4,12 @@ const require_gas_security_guard = require('../gas-security-guard.cjs');
|
|
|
4
4
|
const require_util = require('../util.cjs');
|
|
5
5
|
let _arcblock_did = require("@arcblock/did");
|
|
6
6
|
let _arcblock_did_util = require("@arcblock/did-util");
|
|
7
|
+
let _arcblock_jwt = require("@arcblock/jwt");
|
|
8
|
+
_arcblock_jwt = require_rolldown_runtime.__toESM(_arcblock_jwt);
|
|
7
9
|
let _ocap_state = require("@ocap/state");
|
|
8
10
|
let _ocap_util = require("@ocap/util");
|
|
9
11
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
12
|
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
11
|
-
let _arcblock_jwt = require("@arcblock/jwt");
|
|
12
|
-
_arcblock_jwt = require_rolldown_runtime.__toESM(_arcblock_jwt);
|
|
13
13
|
let lodash_noop = require("lodash/noop");
|
|
14
14
|
lodash_noop = require_rolldown_runtime.__toESM(lodash_noop);
|
|
15
15
|
let debug = require("debug");
|
|
@@ -32,6 +32,8 @@ function isMatchingAccountPublicKey(onChainPk, headerPk) {
|
|
|
32
32
|
const { config } = context;
|
|
33
33
|
const { tx, extra = {}, txHash = "", txTime } = context;
|
|
34
34
|
const isFailedTxGasCharge = Boolean(context.isFailedTxGasCharge);
|
|
35
|
+
const canChargeSenderDirectly = Boolean(senderState);
|
|
36
|
+
const txSize = context._baseTxSize ?? context.txSize;
|
|
35
37
|
const nowMs = txTime ? +new Date(txTime) : Date.now();
|
|
36
38
|
const { token, pk } = extra.gasStakeHeaders || {};
|
|
37
39
|
const rawGasPass = extra.gasPass || extra.txExtra?.gasPass;
|
|
@@ -70,7 +72,7 @@ function isMatchingAccountPublicKey(onChainPk, headerPk) {
|
|
|
70
72
|
};
|
|
71
73
|
};
|
|
72
74
|
let isThirdPartyGasPass = false;
|
|
73
|
-
if (!isFailedTxGasCharge && rawGasPass) {
|
|
75
|
+
if ((!isFailedTxGasCharge || !canChargeSenderDirectly) && rawGasPass) {
|
|
74
76
|
const passStakeState = rawGasPass.stakeId ? await statedb.stake?.get?.(rawGasPass.stakeId, context) : null;
|
|
75
77
|
const passResult = require_gas_security_guard.verifyAndConsumeUnlinkableGasPass({
|
|
76
78
|
gasPass: rawGasPass,
|
|
@@ -88,7 +90,16 @@ function isMatchingAccountPublicKey(onChainPk, headerPk) {
|
|
|
88
90
|
const passOwner = passStakeState?.sender || rawGasPass.stakeId;
|
|
89
91
|
isThirdPartyGasPass = Boolean(passOwner && (!tx?.from || !(0, _ocap_util.isSameDid)(passOwner, tx.from)) && (!tx?.delegator || !(0, _ocap_util.isSameDid)(passOwner, tx.delegator)));
|
|
90
92
|
const selfStakeInfo = isThirdPartyGasPass ? await resolveSignerSelfGasStake() : null;
|
|
91
|
-
|
|
93
|
+
const selfStakeEligible = Boolean(selfStakeInfo?.valid) && require_gas_security_guard.evaluateStakeForGasEligibility({
|
|
94
|
+
txType,
|
|
95
|
+
txSize,
|
|
96
|
+
gasEstimate,
|
|
97
|
+
isFailedTxGasCharge: isFailedTxGasCharge && canChargeSenderDirectly,
|
|
98
|
+
isThirdPartySponsor: false,
|
|
99
|
+
enforceSponsor3DEligibility: false,
|
|
100
|
+
config
|
|
101
|
+
}).eligible;
|
|
102
|
+
if (selfStakeInfo?.valid && selfStakeEligible) {
|
|
92
103
|
gasStake.owner = selfStakeInfo.owner;
|
|
93
104
|
gasStake.stakeId = selfStakeInfo.stakeId;
|
|
94
105
|
gasStake.state = selfStakeInfo.state;
|
|
@@ -98,7 +109,7 @@ function isMatchingAccountPublicKey(onChainPk, headerPk) {
|
|
|
98
109
|
gasStake.stakeId = passResult.stakeId;
|
|
99
110
|
gasStake.state = passStakeState;
|
|
100
111
|
}
|
|
101
|
-
} else if (!isFailedTxGasCharge && token && pk) {
|
|
112
|
+
} else if ((!isFailedTxGasCharge || !canChargeSenderDirectly) && token && pk) {
|
|
102
113
|
const decoded = _arcblock_jwt.decode(token) || {};
|
|
103
114
|
const sponsorAddress = (0, _arcblock_did.toAddress)(decoded.iss || "");
|
|
104
115
|
if (!sponsorAddress || !(0, _arcblock_did.isFromPublicKey)(sponsorAddress, pk)) {
|
|
@@ -143,7 +154,7 @@ function isMatchingAccountPublicKey(onChainPk, headerPk) {
|
|
|
143
154
|
}
|
|
144
155
|
if (!isSponsorMigrated && !isSponsorBlocked) {
|
|
145
156
|
const sponsorStakeId = (0, _arcblock_did_util.toStakeAddress)(sponsorAddress, sponsorAddress);
|
|
146
|
-
const isDirectMode = decoded.mode === "paymaster";
|
|
157
|
+
const isDirectMode = decoded.mode === "paymaster" || decoded.chargeSponsorBalance === true;
|
|
147
158
|
const sponsorStakeState = !isDirectMode ? await statedb.stake?.get?.(sponsorStakeId, context) : null;
|
|
148
159
|
const officialTok = config.token?.address || "";
|
|
149
160
|
const sponsorIsBacked = isDirectMode ? Boolean(sponsorState && officialTok && new _ocap_util.BN(sponsorState.tokens?.[officialTok] || 0).gte((totalGas ?? ZERO).gt(ZERO) ? totalGas ?? ZERO : new _ocap_util.BN(1))) : require_util.isGasStakeValid(sponsorStakeState, config);
|
|
@@ -178,7 +189,16 @@ function isMatchingAccountPublicKey(onChainPk, headerPk) {
|
|
|
178
189
|
}
|
|
179
190
|
}
|
|
180
191
|
const selfStakeInfo = await resolveSignerSelfGasStake();
|
|
181
|
-
|
|
192
|
+
const selfStakeEligible = Boolean(selfStakeInfo.valid) && require_gas_security_guard.evaluateStakeForGasEligibility({
|
|
193
|
+
txType,
|
|
194
|
+
txSize,
|
|
195
|
+
gasEstimate,
|
|
196
|
+
isFailedTxGasCharge: isFailedTxGasCharge && canChargeSenderDirectly,
|
|
197
|
+
isThirdPartySponsor: false,
|
|
198
|
+
enforceSponsor3DEligibility: false,
|
|
199
|
+
config
|
|
200
|
+
}).eligible;
|
|
201
|
+
if (selfStakeInfo.valid && selfStakeEligible) {
|
|
182
202
|
gasStake.owner = selfStakeInfo.owner;
|
|
183
203
|
gasStake.stakeId = selfStakeInfo.stakeId;
|
|
184
204
|
gasStake.state = selfStakeInfo.state;
|
|
@@ -204,9 +224,9 @@ function isMatchingAccountPublicKey(onChainPk, headerPk) {
|
|
|
204
224
|
if (!gasStake.state && gasStake.stakeId) gasStake.state = await statedb.stake.get(gasStake.stakeId, context);
|
|
205
225
|
const eligibility = require_gas_security_guard.evaluateStakeForGasEligibility({
|
|
206
226
|
txType,
|
|
207
|
-
txSize
|
|
227
|
+
txSize,
|
|
208
228
|
gasEstimate,
|
|
209
|
-
isFailedTxGasCharge,
|
|
229
|
+
isFailedTxGasCharge: isFailedTxGasCharge && canChargeSenderDirectly,
|
|
210
230
|
isThirdPartySponsor,
|
|
211
231
|
enforceSponsor3DEligibility,
|
|
212
232
|
config
|
|
@@ -251,7 +271,7 @@ function isMatchingAccountPublicKey(onChainPk, headerPk) {
|
|
|
251
271
|
value: totalGasBN.toString(10)
|
|
252
272
|
};
|
|
253
273
|
context.gasVaultChange = changes.gas;
|
|
254
|
-
if (isPaymasterDirectCharge && !isFailedTxGasCharge) sponsorGasCost = totalGasBN;
|
|
274
|
+
if (isPaymasterDirectCharge && (!isFailedTxGasCharge || !canChargeSenderDirectly)) sponsorGasCost = totalGasBN;
|
|
255
275
|
else txCost = txCost.add(totalGasBN);
|
|
256
276
|
}
|
|
257
277
|
if (changes.fee) if (config.vaults.txFees?.length) {
|
|
@@ -3,6 +3,7 @@ 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_governance_revoke_ledger = require('./revoke-ledger.cjs');
|
|
6
7
|
let _ocap_state = require("@ocap/state");
|
|
7
8
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
9
|
let _ocap_util = require("@ocap/util");
|
|
@@ -104,10 +105,15 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([
|
|
|
104
105
|
error: "WITHIN_WAITING_PERIOD",
|
|
105
106
|
message: "You can not claim stake before waiting period ends",
|
|
106
107
|
fn: (ctx) => {
|
|
107
|
-
const { txState, stakeState, txTime } = ctx;
|
|
108
|
+
const { itx, txState, stakeState, txTime } = ctx;
|
|
108
109
|
const waitingMs = (stakeState.revokeWaitingPeriod || 0) * 1e3;
|
|
109
110
|
const txEnd = +new Date(txState.time) + waitingMs;
|
|
110
|
-
const
|
|
111
|
+
const revokes = require_protocols_governance_revoke_ledger.normalizeStakeRevokes(stakeState);
|
|
112
|
+
const evidenceHash = itx.evidence?.hash || "";
|
|
113
|
+
const trackedEntry = Object.hasOwn(revokes, evidenceHash) ? revokes[evidenceHash] : void 0;
|
|
114
|
+
const legacyEntry = Object.hasOwn(revokes, require_protocols_governance_revoke_ledger.LEGACY_REVOKE_KEY) ? revokes[require_protocols_governance_revoke_ledger.LEGACY_REVOKE_KEY] : void 0;
|
|
115
|
+
const baseTime = trackedEntry ? trackedEntry.txTime : legacyEntry?.txTime || stakeState.context?.renaissanceTime;
|
|
116
|
+
const stateEnd = baseTime ? +new Date(baseTime) + waitingMs : 0;
|
|
111
117
|
const end = Math.max(txEnd, stateEnd);
|
|
112
118
|
return +new Date(txTime) > end;
|
|
113
119
|
}
|
|
@@ -121,13 +127,20 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyTxInput({
|
|
|
121
127
|
assetsKey: "assets"
|
|
122
128
|
}));
|
|
123
129
|
runner.use((context, next) => {
|
|
124
|
-
const { outputs = [], stakeState } = context;
|
|
130
|
+
const { itx, outputs = [], stakeState } = context;
|
|
125
131
|
const ZERO = new _ocap_util.BN(0);
|
|
132
|
+
const revokes = require_protocols_governance_revoke_ledger.normalizeStakeRevokes(stakeState);
|
|
133
|
+
const evidenceHash = itx.evidence?.hash || "";
|
|
134
|
+
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;
|
|
135
|
+
const bucketTokens = targetBucket?.tokens || {};
|
|
136
|
+
const bucketAssets = new Set(targetBucket?.assets || []);
|
|
126
137
|
const availableRevokedTokens = {};
|
|
127
138
|
Object.entries(stakeState.revokedTokens || {}).forEach(([addr, val]) => {
|
|
128
|
-
|
|
139
|
+
const totalAvail = new _ocap_util.BN(val || "0");
|
|
140
|
+
const bucketAvail = new _ocap_util.BN(bucketTokens[addr] || "0");
|
|
141
|
+
availableRevokedTokens[addr] = _ocap_util.BN.min(totalAvail, bucketAvail);
|
|
129
142
|
});
|
|
130
|
-
const availableRevokedAssets = new Set(stakeState.revokedAssets || []);
|
|
143
|
+
const availableRevokedAssets = new Set((stakeState.revokedAssets || []).filter((a) => bucketAssets.has(a)));
|
|
131
144
|
let hasClaimable = false;
|
|
132
145
|
const clampedOutputs = [];
|
|
133
146
|
outputs.forEach((output) => {
|
|
@@ -270,10 +283,19 @@ runner.use(async (context, next) => {
|
|
|
270
283
|
const [newSenderState, newReceiverStates, newStakeState, newAssetStates, newEvidenceState] = await Promise.all([
|
|
271
284
|
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
285
|
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
|
-
|
|
286
|
+
(() => {
|
|
287
|
+
const nextRevokes = require_protocols_governance_revoke_ledger.consumeStakeRevoke(stakeState, itx.evidence.hash, outputs);
|
|
288
|
+
return statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState, {
|
|
289
|
+
...stakeUpdates,
|
|
290
|
+
context: {
|
|
291
|
+
...stakeState.context,
|
|
292
|
+
revokes: nextRevokes
|
|
293
|
+
}
|
|
294
|
+
}, Object.values(stakeUpdates.revokedTokens || {}).some((v$1) => new _ocap_util.BN(v$1 || "0").gt(new _ocap_util.BN(0))) || (stakeUpdates.revokedAssets || []).length > 0 ? {
|
|
295
|
+
...context,
|
|
296
|
+
txTime: stakeState.context?.renaissanceTime || context.txTime
|
|
297
|
+
} : context), context);
|
|
298
|
+
})(),
|
|
277
299
|
Promise.all(assetStates.map(async (x) => {
|
|
278
300
|
const nextOwner = assetUpdates[x.address]?.owner;
|
|
279
301
|
const updatedAsset = await statedb.asset.update(x.address, _ocap_state.asset.update(x, assetUpdates[x.address], context), context);
|
|
@@ -0,0 +1,184 @@
|
|
|
1
|
+
const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
|
|
2
|
+
let _ocap_util = require("@ocap/util");
|
|
3
|
+
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
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,6 +3,7 @@ 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_governance_revoke_ledger = require('./revoke-ledger.cjs');
|
|
6
7
|
let _ocap_state = require("@ocap/state");
|
|
7
8
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
9
|
let _ocap_util = require("@ocap/util");
|
|
@@ -170,10 +171,17 @@ runner.use(async (context, next) => {
|
|
|
170
171
|
nonce: tx.nonce,
|
|
171
172
|
...senderUpdates
|
|
172
173
|
}, context), context), (() => {
|
|
174
|
+
const nextRevokes = require_protocols_governance_revoke_ledger.recordStakeRevoke(stakeState, context.txHash, context.txTime, outputs);
|
|
173
175
|
const hasPendingRevokedTokens = Object.values(stakeState.revokedTokens || {}).some((v$1) => new _ocap_util.BN(String(v$1 || "0")).gt(new _ocap_util.BN(0)));
|
|
174
176
|
const hasPendingRevokedAssets = Array.isArray(stakeState.revokedAssets) && stakeState.revokedAssets.length > 0;
|
|
175
177
|
const preserveRenaissanceTime = (hasPendingRevokedTokens || hasPendingRevokedAssets) && stakeState.context?.renaissanceTime;
|
|
176
|
-
return statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState,
|
|
178
|
+
return statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState, {
|
|
179
|
+
...stakeUpdates,
|
|
180
|
+
context: {
|
|
181
|
+
...stakeState.context,
|
|
182
|
+
revokes: nextRevokes
|
|
183
|
+
}
|
|
184
|
+
}, preserveRenaissanceTime ? {
|
|
177
185
|
...context,
|
|
178
186
|
txTime: preserveRenaissanceTime
|
|
179
187
|
} : context), context);
|
|
@@ -3,6 +3,7 @@ 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_governance_revoke_ledger = require('./revoke-ledger.cjs');
|
|
6
7
|
let _arcblock_did = require("@arcblock/did");
|
|
7
8
|
let _ocap_mcrypto = require("@ocap/mcrypto");
|
|
8
9
|
let _ocap_state = require("@ocap/state");
|
|
@@ -225,9 +226,16 @@ runner.use(async (context, next) => {
|
|
|
225
226
|
(() => {
|
|
226
227
|
const prevRevoked = stakeState.revokedTokens || {};
|
|
227
228
|
const nextRevoked = stakeUpdates.revokedTokens || {};
|
|
229
|
+
const nextRevokes = require_protocols_governance_revoke_ledger.slashStakeRevokes(stakeState, nextRevoked, stakeUpdates.revokedAssets || [], context.txTime);
|
|
228
230
|
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
231
|
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,
|
|
232
|
+
return statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState, {
|
|
233
|
+
...stakeUpdates,
|
|
234
|
+
context: {
|
|
235
|
+
...stakeState.context,
|
|
236
|
+
revokes: nextRevokes
|
|
237
|
+
}
|
|
238
|
+
}, hasPending && !poolShrunk ? {
|
|
231
239
|
...context,
|
|
232
240
|
txTime: stakeState.context?.renaissanceTime || context.txTime
|
|
233
241
|
} : context), context);
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"publishConfig": {
|
|
4
4
|
"access": "public"
|
|
5
5
|
},
|
|
6
|
-
"version": "1.31.
|
|
6
|
+
"version": "1.31.1",
|
|
7
7
|
"description": "Predefined tx pipeline sets to execute certain type of transactions",
|
|
8
8
|
"type": "module",
|
|
9
9
|
"main": "./lib/index.cjs",
|
|
@@ -46,22 +46,22 @@
|
|
|
46
46
|
"author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
|
|
47
47
|
"license": "MIT",
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@arcblock/did": "1.31.
|
|
50
|
-
"@arcblock/did-util": "1.31.
|
|
51
|
-
"@arcblock/jwt": "1.31.
|
|
52
|
-
"@arcblock/validator": "1.31.
|
|
53
|
-
"@arcblock/vc": "1.31.
|
|
49
|
+
"@arcblock/did": "1.31.1",
|
|
50
|
+
"@arcblock/did-util": "1.31.1",
|
|
51
|
+
"@arcblock/jwt": "1.31.1",
|
|
52
|
+
"@arcblock/validator": "1.31.1",
|
|
53
|
+
"@arcblock/vc": "1.31.1",
|
|
54
54
|
"@blocklet/xss": "^0.3.7",
|
|
55
|
-
"@ocap/asset": "1.31.
|
|
56
|
-
"@ocap/client": "1.31.
|
|
57
|
-
"@ocap/mcrypto": "1.31.
|
|
58
|
-
"@ocap/merkle-tree": "1.31.
|
|
59
|
-
"@ocap/message": "1.31.
|
|
60
|
-
"@ocap/state": "1.31.
|
|
61
|
-
"@ocap/tx-pipeline": "1.31.
|
|
62
|
-
"@ocap/types": "1.31.
|
|
63
|
-
"@ocap/util": "1.31.
|
|
64
|
-
"@ocap/wallet": "1.31.
|
|
55
|
+
"@ocap/asset": "1.31.1",
|
|
56
|
+
"@ocap/client": "1.31.1",
|
|
57
|
+
"@ocap/mcrypto": "1.31.1",
|
|
58
|
+
"@ocap/merkle-tree": "1.31.1",
|
|
59
|
+
"@ocap/message": "1.31.1",
|
|
60
|
+
"@ocap/state": "1.31.1",
|
|
61
|
+
"@ocap/tx-pipeline": "1.31.1",
|
|
62
|
+
"@ocap/types": "1.31.1",
|
|
63
|
+
"@ocap/util": "1.31.1",
|
|
64
|
+
"@ocap/wallet": "1.31.1",
|
|
65
65
|
"debug": "^4.4.3",
|
|
66
66
|
"deep-diff": "^1.0.2",
|
|
67
67
|
"lodash": "^4.17.23",
|