@ocap/tx-protocols 1.30.25 → 1.31.0
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 +7 -0
- package/esm/execute.mjs +196 -71
- package/esm/gas-security-guard.d.mts +374 -0
- package/esm/gas-security-guard.mjs +1101 -0
- package/esm/index.d.mts +35 -5
- package/esm/index.mjs +3 -1
- package/esm/pipes/ensure-cost.mjs +314 -58
- package/esm/protocols/account/delegate.mjs +64 -16
- package/esm/protocols/account/migrate.d.mts +3 -0
- package/esm/protocols/account/migrate.mjs +235 -35
- package/esm/protocols/account/revoke-delegate.d.mts +3 -3
- package/esm/protocols/account/revoke-delegate.mjs +70 -38
- package/esm/protocols/asset/acquire-v2.mjs +29 -12
- package/esm/protocols/asset/acquire-v3.mjs +78 -22
- package/esm/protocols/asset/calls/transfer-token.mjs +2 -1
- package/esm/protocols/asset/calls/transfer.mjs +1 -0
- package/esm/protocols/asset/consume.mjs +12 -4
- package/esm/protocols/asset/create.mjs +18 -5
- package/esm/protocols/asset/mint.mjs +23 -1
- package/esm/protocols/asset/pipes/exec-mint-hook.d.mts +21 -1
- package/esm/protocols/asset/pipes/exec-mint-hook.mjs +115 -1
- package/esm/protocols/asset/pipes/extract-factory-tokens.mjs +14 -8
- package/esm/protocols/asset/pipes/verify-itx-address.mjs +9 -0
- package/esm/protocols/asset/pipes/verify-itx-assets.mjs +21 -5
- package/esm/protocols/asset/update.d.mts +13 -2
- package/esm/protocols/asset/update.mjs +133 -14
- package/esm/protocols/factory/create.mjs +14 -6
- package/esm/protocols/governance/claim-stake.mjs +92 -10
- package/esm/protocols/governance/return-stake.mjs +44 -12
- package/esm/protocols/governance/revoke-stake.mjs +17 -5
- package/esm/protocols/governance/slash-stake.mjs +64 -25
- package/esm/protocols/governance/stake.mjs +63 -13
- package/esm/protocols/rollup/claim-reward.mjs +39 -20
- package/esm/protocols/rollup/close.mjs +1 -1
- package/esm/protocols/rollup/create-block.mjs +8 -7
- package/esm/protocols/rollup/create.mjs +17 -6
- package/esm/protocols/rollup/join.mjs +3 -3
- package/esm/protocols/rollup/leave.mjs +1 -1
- package/esm/protocols/rollup/migrate.mjs +7 -4
- package/esm/protocols/rollup/pipes/verify-evidence.mjs +12 -4
- package/esm/protocols/rollup/update.mjs +6 -1
- package/esm/protocols/token/create.mjs +23 -12
- package/esm/protocols/token/deposit-v2.d.mts +5 -1
- package/esm/protocols/token/deposit-v2.mjs +81 -29
- package/esm/protocols/token/withdraw-v2.mjs +33 -16
- package/esm/protocols/token-factory/burn.mjs +43 -10
- package/esm/protocols/token-factory/create.mjs +23 -14
- package/esm/protocols/token-factory/mint.mjs +54 -21
- package/esm/protocols/token-factory/pipes/verify-icon.mjs +1 -1
- package/esm/protocols/token-factory/update.mjs +16 -6
- package/esm/protocols/trade/exchange-v2.d.mts +4 -0
- package/esm/protocols/trade/exchange-v2.mjs +78 -22
- package/esm/protocols/trade/transfer-v2.mjs +44 -13
- package/esm/protocols/trade/transfer-v3.mjs +72 -31
- package/esm/util.d.mts +3 -1
- package/esm/util.mjs +26 -17
- package/lib/execute.cjs +193 -67
- package/lib/execute.d.cts +7 -0
- package/lib/gas-security-guard.cjs +1140 -0
- package/lib/gas-security-guard.d.cts +374 -0
- package/lib/index.cjs +122 -1
- package/lib/index.d.cts +36 -6
- package/lib/pipes/ensure-cost.cjs +313 -57
- package/lib/protocols/account/delegate.cjs +64 -16
- package/lib/protocols/account/migrate.cjs +235 -35
- package/lib/protocols/account/migrate.d.cts +3 -0
- package/lib/protocols/account/revoke-delegate.cjs +71 -39
- package/lib/protocols/account/revoke-delegate.d.cts +3 -3
- package/lib/protocols/asset/acquire-v2.cjs +28 -11
- package/lib/protocols/asset/acquire-v3.cjs +77 -20
- package/lib/protocols/asset/calls/transfer-token.cjs +3 -2
- package/lib/protocols/asset/calls/transfer.cjs +1 -0
- package/lib/protocols/asset/consume.cjs +11 -3
- package/lib/protocols/asset/create.cjs +19 -6
- package/lib/protocols/asset/mint.cjs +23 -1
- package/lib/protocols/asset/pipes/exec-mint-hook.cjs +117 -1
- package/lib/protocols/asset/pipes/exec-mint-hook.d.cts +21 -1
- package/lib/protocols/asset/pipes/extract-factory-tokens.cjs +14 -9
- package/lib/protocols/asset/pipes/verify-itx-address.cjs +9 -0
- package/lib/protocols/asset/pipes/verify-itx-assets.cjs +21 -5
- package/lib/protocols/asset/update.cjs +131 -12
- package/lib/protocols/asset/update.d.cts +13 -2
- package/lib/protocols/factory/create.cjs +14 -6
- package/lib/protocols/governance/claim-stake.cjs +92 -9
- package/lib/protocols/governance/claim-stake.d.cts +1 -1
- package/lib/protocols/governance/return-stake.cjs +44 -11
- package/lib/protocols/governance/return-stake.d.cts +1 -1
- package/lib/protocols/governance/revoke-stake.cjs +17 -5
- package/lib/protocols/governance/revoke-stake.d.cts +1 -1
- package/lib/protocols/governance/slash-stake.cjs +64 -24
- package/lib/protocols/governance/slash-stake.d.cts +1 -1
- package/lib/protocols/governance/stake.cjs +65 -14
- package/lib/protocols/rollup/claim-reward.cjs +39 -20
- package/lib/protocols/rollup/close.cjs +1 -1
- package/lib/protocols/rollup/create-block.cjs +9 -8
- package/lib/protocols/rollup/create-block.d.cts +1 -1
- package/lib/protocols/rollup/create.cjs +18 -7
- package/lib/protocols/rollup/join.cjs +3 -3
- package/lib/protocols/rollup/leave.cjs +1 -1
- package/lib/protocols/rollup/migrate.cjs +7 -4
- package/lib/protocols/rollup/pipes/verify-evidence.cjs +11 -3
- package/lib/protocols/rollup/update.cjs +6 -1
- package/lib/protocols/token/create.cjs +24 -13
- package/lib/protocols/token/deposit-v2.cjs +80 -28
- package/lib/protocols/token/deposit-v2.d.cts +5 -1
- package/lib/protocols/token/withdraw-v2.cjs +32 -15
- package/lib/protocols/token-factory/burn.cjs +42 -9
- package/lib/protocols/token-factory/create.cjs +24 -15
- package/lib/protocols/token-factory/mint.cjs +53 -20
- package/lib/protocols/token-factory/pipes/verify-icon.cjs +1 -1
- package/lib/protocols/token-factory/update.cjs +16 -6
- package/lib/protocols/trade/exchange-v2.cjs +76 -20
- package/lib/protocols/trade/exchange-v2.d.cts +4 -0
- package/lib/protocols/trade/transfer-v2.cjs +45 -14
- package/lib/protocols/trade/transfer-v3.cjs +72 -30
- package/lib/util.cjs +26 -17
- package/lib/util.d.cts +4 -2
- package/package.json +16 -16
|
@@ -3,12 +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_protocols_token_factory_pipes_verify_ownership = require('../token-factory/pipes/verify-ownership.cjs');
|
|
7
|
+
const require_protocols_token_factory_pipes_verify_url = require('../token-factory/pipes/verify-url.cjs');
|
|
6
8
|
let _ocap_state = require("@ocap/state");
|
|
7
9
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
10
|
+
let _ocap_util = require("@ocap/util");
|
|
8
11
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
|
+
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
9
13
|
let debug = require("debug");
|
|
10
14
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
11
15
|
let _arcblock_validator = require("@arcblock/validator");
|
|
16
|
+
let _blocklet_xss = require("@blocklet/xss");
|
|
12
17
|
let deep_diff = require("deep-diff");
|
|
13
18
|
|
|
14
19
|
//#region src/protocols/asset/update.ts
|
|
@@ -54,11 +59,47 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
|
54
59
|
stateKey: "senderState",
|
|
55
60
|
addressKey: "tx.from"
|
|
56
61
|
}));
|
|
57
|
-
runner.use(_ocap_tx_pipeline.pipes.
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
62
|
+
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
63
|
+
from: "tx.delegator",
|
|
64
|
+
to: "delegatorState",
|
|
65
|
+
status: "OK",
|
|
66
|
+
table: "account"
|
|
61
67
|
}));
|
|
68
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
69
|
+
stateKey: "delegatorState",
|
|
70
|
+
addressKey: "tx.delegator"
|
|
71
|
+
}));
|
|
72
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyDelegation({
|
|
73
|
+
type: "signature",
|
|
74
|
+
signerKey: "senderState",
|
|
75
|
+
delegatorKey: "delegatorState",
|
|
76
|
+
getRequirements: (ctx) => [...require_util.getDelegationRequirements(ctx), ...ctx.itx?.address ? [{
|
|
77
|
+
type: "asset",
|
|
78
|
+
address: ctx.itx.address,
|
|
79
|
+
to: []
|
|
80
|
+
}] : []]
|
|
81
|
+
}));
|
|
82
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: [
|
|
83
|
+
"senderState",
|
|
84
|
+
"delegatorState",
|
|
85
|
+
"issuerState"
|
|
86
|
+
] }));
|
|
87
|
+
runner.use((context, next) => {
|
|
88
|
+
if (Boolean(context.isImplicitDelegation) && Boolean(context.assetState?.address) && ((0, _ocap_util.isSameDid)(context.tx.from, context.assetState.address) || (0, _ocap_util.isSameDid)(context.tx.from, context.assetState.owner) || Boolean(context.assetState.issuer) && (0, _ocap_util.isSameDid)(context.tx.from, context.assetState.issuer))) return next();
|
|
89
|
+
const senderRelated = context.senderState ? (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(context.senderState) : [];
|
|
90
|
+
const isSenderOwnerOrIssuer = senderRelated.some((a) => (0, _ocap_util.isSameDid)(a, context.assetState.owner)) || Boolean(context.assetState.issuer) && senderRelated.some((a) => (0, _ocap_util.isSameDid)(a, context.assetState.issuer));
|
|
91
|
+
if (context.tx?.delegator && !context.delegatorState) {
|
|
92
|
+
const isUndeclaredDelegatorOwnerOrIssuer = Boolean(context.assetState) && (context.assetState.owner && (0, _ocap_util.isSameDid)(context.tx.delegator, context.assetState.owner) || context.assetState.issuer && (0, _ocap_util.isSameDid)(context.tx.delegator, context.assetState.issuer));
|
|
93
|
+
if (isSenderOwnerOrIssuer || isUndeclaredDelegatorOwnerOrIssuer) return next();
|
|
94
|
+
return next(new _ocap_util_lib_error.CustomError("INVALID_OWNER", "Asset is not owned by the given owner", { persist: true }));
|
|
95
|
+
}
|
|
96
|
+
const ownerKey = isSenderOwnerOrIssuer ? "senderState" : context.delegatorState ? "delegatorState" : "senderState";
|
|
97
|
+
return _ocap_tx_pipeline.pipes.VerifyUpdater({
|
|
98
|
+
assetKey: "assetState",
|
|
99
|
+
ownerKey,
|
|
100
|
+
updaterKey: ["owner", "issuer"]
|
|
101
|
+
})(context, next);
|
|
102
|
+
});
|
|
62
103
|
runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
63
104
|
error: "READONLY_ASSET",
|
|
64
105
|
message: "Can not update a readonly asset",
|
|
@@ -73,15 +114,47 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
|
73
114
|
},
|
|
74
115
|
persist: true
|
|
75
116
|
}]));
|
|
76
|
-
runner.use((context, next) => {
|
|
77
|
-
const { itx, newData, senderState, assetState,
|
|
78
|
-
|
|
117
|
+
runner.use(async (context, next) => {
|
|
118
|
+
const { tx, itx, newData, senderState, delegatorState, assetState, statedb } = context;
|
|
119
|
+
const senderRelated = senderState ? (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(senderState) : [];
|
|
120
|
+
const actorState = senderRelated.some((a) => (0, _ocap_util.isSameDid)(a, assetState.owner)) || Boolean(assetState.issuer) && senderRelated.some((a) => (0, _ocap_util.isSameDid)(a, assetState.issuer)) ? senderState : delegatorState;
|
|
121
|
+
const isOwnerActor = (actorState ? (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(actorState) : [tx?.delegator || senderState.address]).some((a) => (0, _ocap_util.isSameDid)(a, assetState.owner)) || Boolean(context.isImplicitDelegation) && ((0, _ocap_util.isSameDid)(tx.from, assetState.address) || (0, _ocap_util.isSameDid)(tx.from, assetState.owner));
|
|
122
|
+
if (_ocap_state.token.isTokenCharterAsset(assetState)) {
|
|
123
|
+
if (!isOwnerActor) return next(new _ocap_util_lib_error.CustomError("FORBIDDEN", "Token charter asset can only be updated by owner"));
|
|
124
|
+
if (itx.consumed) return next(new _ocap_util_lib_error.CustomError("FORBIDDEN", "Token charter asset cannot be consumed"));
|
|
125
|
+
const incomingValue = newData && newData.type === "json" && newData.value && typeof newData.value === "object" ? newData.value : {};
|
|
126
|
+
if (typeof incomingValue.icon === "string" && incomingValue.icon.trim()) {
|
|
127
|
+
const rawIcon = incomingValue.icon.trim();
|
|
128
|
+
if (rawIcon.startsWith("<svg") || (0, _blocklet_xss.isSvgFile)(rawIcon)) {
|
|
129
|
+
if (!(0, _blocklet_xss.isSvgFile)(rawIcon)) return next(new _ocap_util_lib_error.CustomError("INVALID_ICON", "Token Icon is not a valid SVG file"));
|
|
130
|
+
if (Buffer.byteLength(rawIcon, "utf8") > 16 * 1024) return next(new _ocap_util_lib_error.CustomError("INVALID_ICON", "Token Icon must be less than 16k"));
|
|
131
|
+
incomingValue.icon = (0, _blocklet_xss.sanitizeSvg)(rawIcon, { preserveCase: true });
|
|
132
|
+
} else if (!_ocap_state.token.iconToNftDisplay(rawIcon)) return next(new _ocap_util_lib_error.CustomError("INVALID_ICON", "Token Icon must be a valid SVG, HTTPS URL, or safe image data URI"));
|
|
133
|
+
}
|
|
134
|
+
if (typeof incomingValue.website === "string" && incomingValue.website.trim()) context.charterWebsite = incomingValue.website.trim();
|
|
135
|
+
const incomingMeta = incomingValue.metadata;
|
|
136
|
+
if (incomingMeta && typeof incomingMeta === "object" && typeof incomingMeta.communityUrl === "string" && incomingMeta.communityUrl.trim()) context.charterCommunityUrl = incomingMeta.communityUrl.trim();
|
|
137
|
+
const targetTokenAddress = assetState.data?.value?.tokenAddress;
|
|
138
|
+
if (targetTokenAddress && statedb?.token?.get) {
|
|
139
|
+
const existingTokenState = await statedb.token.get(targetTokenAddress, context);
|
|
140
|
+
if (existingTokenState && context.charterWebsite && context.charterWebsite !== (existingTokenState.website || "")) context.tokenInfoForVerification = {
|
|
141
|
+
symbol: existingTokenState.symbol,
|
|
142
|
+
address: existingTokenState.address,
|
|
143
|
+
website: context.charterWebsite
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
return next();
|
|
147
|
+
}
|
|
148
|
+
if (!isOwnerActor) {
|
|
149
|
+
if (itx.consumed) return next(new _ocap_util_lib_error.CustomError("FORBIDDEN", "Asset can only be consumed by owner in update_asset"));
|
|
79
150
|
if (itx.moniker !== assetState.moniker) return next(new _ocap_util_lib_error.CustomError("FORBIDDEN", "Asset moniker can only be updated by owner"));
|
|
80
151
|
if (newData?.type !== assetState.data?.type) return next(new _ocap_util_lib_error.CustomError("FORBIDDEN", "Asset data type can only be updated by owner"));
|
|
81
152
|
if (((0, deep_diff.diff)(assetState.data?.value, newData?.value) || []).every((x) => x.kind === "N" || x.kind === "A" && x.item.kind === "N") === false) return next(new _ocap_util_lib_error.CustomError("APPEND_ONLY", "Asset data value can only be updated in append only mode"));
|
|
82
153
|
}
|
|
83
154
|
return next();
|
|
84
155
|
});
|
|
156
|
+
runner.use(require_protocols_token_factory_pipes_verify_url.default({ urlKeys: ["charterWebsite", "charterCommunityUrl"] }));
|
|
157
|
+
runner.use(require_protocols_token_factory_pipes_verify_ownership.default({ tokenKey: "tokenInfoForVerification" }));
|
|
85
158
|
runner.use(require_pipes_ensure_gas.default(() => ({
|
|
86
159
|
create: 0,
|
|
87
160
|
update: 2,
|
|
@@ -96,14 +169,60 @@ runner.use(async (context, next) => {
|
|
|
96
169
|
data: newData || assetState.data
|
|
97
170
|
};
|
|
98
171
|
if (itx.consumed && !assetState.consumedTime) updates.consumedTime = txTime;
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
172
|
+
let pendingTokenUpdate = null;
|
|
173
|
+
if (_ocap_state.token.isTokenCharterAsset(assetState) && statedb.token?.get) {
|
|
174
|
+
const targetTokenAddress = assetState.data?.value?.tokenAddress;
|
|
175
|
+
if (targetTokenAddress) {
|
|
176
|
+
const existingTokenState = await statedb.token.get(targetTokenAddress, context);
|
|
177
|
+
if (existingTokenState) {
|
|
178
|
+
const incomingValue = newData && newData.type === "json" && newData.value && typeof newData.value === "object" ? newData.value : {};
|
|
179
|
+
const mergedCandidate = {
|
|
180
|
+
...assetState,
|
|
181
|
+
moniker: itx.moniker || assetState.moniker,
|
|
182
|
+
data: {
|
|
183
|
+
type: "json",
|
|
184
|
+
value: {
|
|
185
|
+
...assetState.data?.value || {},
|
|
186
|
+
...incomingValue,
|
|
187
|
+
kind: _ocap_state.token.TOKEN_CHARTER_KIND,
|
|
188
|
+
tokenAddress: existingTokenState.address,
|
|
189
|
+
symbol: existingTokenState.symbol,
|
|
190
|
+
unit: existingTokenState.unit,
|
|
191
|
+
decimal: existingTokenState.decimal,
|
|
192
|
+
tokenFactoryAddress: existingTokenState.tokenFactoryAddress || ""
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
};
|
|
196
|
+
const tokenUpdates = _ocap_state.token.extractTokenUpdatesFromCharterAsset(existingTokenState, mergedCandidate);
|
|
197
|
+
const safeTokenBase = _ocap_state.token.normalizeLegacyTokenStateForUpdate(existingTokenState);
|
|
198
|
+
const nextTokenState = _ocap_state.token.update(safeTokenBase, tokenUpdates);
|
|
199
|
+
pendingTokenUpdate = {
|
|
200
|
+
address: existingTokenState.address,
|
|
201
|
+
state: nextTokenState
|
|
202
|
+
};
|
|
203
|
+
updates.moniker = _ocap_state.token.resolveCharterMoniker(nextTokenState);
|
|
204
|
+
updates.data = _ocap_state.token.buildTokenCharterAssetData(nextTokenState);
|
|
205
|
+
const display = _ocap_state.token.iconToNftDisplay(nextTokenState.icon);
|
|
206
|
+
const endpoint = _ocap_state.token.websiteToNftEndpoint(nextTokenState.website);
|
|
207
|
+
updates.display = display ?? void 0;
|
|
208
|
+
updates.endpoint = endpoint ?? void 0;
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
const [newSenderState, newAssetState, , newDelegationState] = await Promise.all([
|
|
213
|
+
statedb.account.update(senderState.address, _ocap_state.account.update(senderState, {
|
|
214
|
+
nonce: tx.nonce,
|
|
215
|
+
pk: tx.delegator ? senderState.pk : tx.pk,
|
|
216
|
+
...senderUpdates
|
|
217
|
+
}, context), context),
|
|
218
|
+
statedb.asset.update(itx.address, _ocap_state.asset.update(assetState, updates, context), context),
|
|
219
|
+
pendingTokenUpdate && statedb.token?.update ? statedb.token.update(pendingTokenUpdate.address, pendingTokenUpdate.state, context) : null,
|
|
220
|
+
context.isDelegationChanged && context.delegationState ? statedb.delegation.update(context.delegationState.address, _ocap_state.delegation.update(context.delegationState, {}, context), context) : context.delegationState
|
|
221
|
+
]);
|
|
104
222
|
if (updateVaults) await updateVaults();
|
|
105
223
|
context.senderState = newSenderState;
|
|
106
224
|
context.assetState = newAssetState;
|
|
225
|
+
if (newDelegationState) context.delegationState = newDelegationState;
|
|
107
226
|
debug$1("update", newAssetState);
|
|
108
227
|
next();
|
|
109
228
|
}, { persistError: true });
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IReadyContext, IWithAsset, IWithIssuer, IWithSender, TUpdateAssetTx } from "@ocap/types";
|
|
1
|
+
import { IReadyContext, IWithAsset, IWithDelegation, IWithDelegator, IWithIssuer, IWithSender, TUpdateAssetTx } from "@ocap/types";
|
|
2
2
|
import { Runner } from "@ocap/tx-pipeline";
|
|
3
3
|
import { AnyData } from "@ocap/message";
|
|
4
4
|
|
|
@@ -9,9 +9,20 @@ import { AnyData } from "@ocap/message";
|
|
|
9
9
|
* Phase: IReadyContext (after TakeStateSnapshot)
|
|
10
10
|
* Mixins: IWithAsset (required), IWithSender (required), IWithIssuer (optional)
|
|
11
11
|
*/
|
|
12
|
-
type Context = IReadyContext<TUpdateAssetTx> & IWithAsset & IWithSender & Partial<IWithIssuer> & {
|
|
12
|
+
type Context = IReadyContext<TUpdateAssetTx> & IWithAsset & IWithSender & Partial<IWithDelegator> & Partial<IWithDelegation> & Partial<IWithIssuer> & {
|
|
13
13
|
/** Decoded new data for asset update, null means no update */
|
|
14
14
|
newData: AnyData | null;
|
|
15
|
+
/** Whether delegation was changed */
|
|
16
|
+
isDelegationChanged?: boolean;
|
|
17
|
+
/** Token info for website ownership verification */
|
|
18
|
+
tokenInfoForVerification?: {
|
|
19
|
+
symbol: string;
|
|
20
|
+
address: string;
|
|
21
|
+
website?: string | null;
|
|
22
|
+
};
|
|
23
|
+
/** Incoming website/communityUrl for URL verification */
|
|
24
|
+
charterWebsite?: string;
|
|
25
|
+
charterCommunityUrl?: string;
|
|
15
26
|
};
|
|
16
27
|
declare const runner: Runner<Context>;
|
|
17
28
|
//#endregion
|
|
@@ -3,18 +3,18 @@ const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
|
|
|
3
3
|
const require_util = require('../../util.cjs');
|
|
4
4
|
const require_pipes_ensure_cost = require('../../pipes/ensure-cost.cjs');
|
|
5
5
|
const require_pipes_ensure_gas = require('../../pipes/ensure-gas.cjs');
|
|
6
|
+
let _arcblock_did_util = require("@arcblock/did-util");
|
|
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");
|
|
9
10
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
11
|
+
let lodash_cloneDeep = require("lodash/cloneDeep");
|
|
12
|
+
lodash_cloneDeep = require_rolldown_runtime.__toESM(lodash_cloneDeep);
|
|
10
13
|
let lodash_get = require("lodash/get");
|
|
11
14
|
lodash_get = require_rolldown_runtime.__toESM(lodash_get);
|
|
12
|
-
let _arcblock_did_util = require("@arcblock/did-util");
|
|
13
15
|
let debug = require("debug");
|
|
14
16
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
15
17
|
let _ocap_message = require("@ocap/message");
|
|
16
|
-
let lodash_cloneDeep = require("lodash/cloneDeep");
|
|
17
|
-
lodash_cloneDeep = require_rolldown_runtime.__toESM(lodash_cloneDeep);
|
|
18
18
|
let _ocap_asset = require("@ocap/asset");
|
|
19
19
|
let lodash_isEmpty = require("lodash/isEmpty");
|
|
20
20
|
lodash_isEmpty = require_rolldown_runtime.__toESM(lodash_isEmpty);
|
|
@@ -40,9 +40,11 @@ runner.use((context, next) => {
|
|
|
40
40
|
if (factoryTokenAddresses.length > maxListSize) return next(new _ocap_util_lib_error.CustomError("INVALID_FACTORY_INPUT", `input.tokens exceeded max allowed length: ${maxListSize}`));
|
|
41
41
|
if (factoryProps.input.assets.length > maxListSize) return next(new _ocap_util_lib_error.CustomError("INVALID_FACTORY_INPUT", `input.assets exceeded max allowed length: ${maxListSize}`));
|
|
42
42
|
if (new _ocap_util.BN(factoryProps.input.value || 0).gt(new _ocap_util.BN(0))) {
|
|
43
|
-
|
|
43
|
+
const primaryToken = context.config.token.address;
|
|
44
|
+
if (factoryTokenAddresses.includes(primaryToken)) return next(new _ocap_util_lib_error.CustomError("INVALID_FACTORY_PROPS", "Factory token input should not contain primary token when input.value is set"));
|
|
45
|
+
factoryTokenAddresses.push(primaryToken);
|
|
44
46
|
factoryProps.input.tokens.push({
|
|
45
|
-
address:
|
|
47
|
+
address: primaryToken,
|
|
46
48
|
value: factoryProps.input.value
|
|
47
49
|
});
|
|
48
50
|
factoryProps.input.value = "0";
|
|
@@ -110,6 +112,7 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
110
112
|
runner.use((context, next) => {
|
|
111
113
|
const { inputAssetStates = [], inputFactoryStates = [], factoryProps } = context;
|
|
112
114
|
if (inputAssetStates.some((x) => !!x.consumedTime)) return next(new _ocap_util_lib_error.CustomError("INVALID_FACTORY_INPUT", "Some of input.assets already consumed"));
|
|
115
|
+
if (inputAssetStates.some((x) => _ocap_state.token.isTokenCharterAsset(x))) return next(new _ocap_util_lib_error.CustomError("INVALID_FACTORY_INPUT", "Token charter asset cannot be used as factory input"));
|
|
113
116
|
if (inputAssetStates.length + inputFactoryStates.length === factoryProps.input.assets.length) return next();
|
|
114
117
|
return next(new _ocap_util_lib_error.CustomError("INVALID_FACTORY_INPUT", "Not all input.assets exist on chain"));
|
|
115
118
|
});
|
|
@@ -124,6 +127,11 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
|
124
127
|
stateKey: "issuerStates",
|
|
125
128
|
addressKey: "factoryProps.trustedIssuers"
|
|
126
129
|
}));
|
|
130
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: [
|
|
131
|
+
"senderState",
|
|
132
|
+
"delegatorState",
|
|
133
|
+
"issuerStates"
|
|
134
|
+
] }));
|
|
127
135
|
runner.use(require_pipes_ensure_gas.default(() => ({
|
|
128
136
|
create: 1,
|
|
129
137
|
update: 2,
|
|
@@ -138,7 +146,7 @@ runner.use(async (context, next) => {
|
|
|
138
146
|
const [newSenderState, factoryState, newDelegationState] = await Promise.all([
|
|
139
147
|
statedb.account.update(senderState.address, _ocap_state.account.update(senderState, {
|
|
140
148
|
nonce: tx.nonce,
|
|
141
|
-
pk: tx.pk,
|
|
149
|
+
pk: tx.delegator ? senderState.pk : tx.pk,
|
|
142
150
|
...senderUpdates
|
|
143
151
|
}, context), context),
|
|
144
152
|
statedb.factory.create(itx.address, _ocap_state.factory.create({
|
|
@@ -7,10 +7,12 @@ let _ocap_state = require("@ocap/state");
|
|
|
7
7
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
8
|
let _ocap_util = require("@ocap/util");
|
|
9
9
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
|
+
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
10
11
|
let debug = require("debug");
|
|
11
12
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
12
13
|
let _arcblock_validator = require("@arcblock/validator");
|
|
13
|
-
let
|
|
14
|
+
let lodash_uniqBy = require("lodash/uniqBy");
|
|
15
|
+
lodash_uniqBy = require_rolldown_runtime.__toESM(lodash_uniqBy);
|
|
14
16
|
|
|
15
17
|
//#region src/protocols/governance/claim-stake.ts
|
|
16
18
|
const debug$1 = (0, debug.default)("@ocap/tx-protocols:claim-stake");
|
|
@@ -44,6 +46,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
|
44
46
|
stateKey: "senderState",
|
|
45
47
|
addressKey: "tx.from"
|
|
46
48
|
}));
|
|
49
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: ["senderState", "delegatorState"] }));
|
|
47
50
|
runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
48
51
|
error: "SENDER_NOT_MATCH",
|
|
49
52
|
message: "You are not allowed to claim stake from this address",
|
|
@@ -102,7 +105,10 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([
|
|
|
102
105
|
message: "You can not claim stake before waiting period ends",
|
|
103
106
|
fn: (ctx) => {
|
|
104
107
|
const { txState, stakeState, txTime } = ctx;
|
|
105
|
-
const
|
|
108
|
+
const waitingMs = (stakeState.revokeWaitingPeriod || 0) * 1e3;
|
|
109
|
+
const txEnd = +new Date(txState.time) + waitingMs;
|
|
110
|
+
const stateEnd = stakeState.context?.renaissanceTime ? +new Date(stakeState.context.renaissanceTime) + waitingMs : 0;
|
|
111
|
+
const end = Math.max(txEnd, stateEnd);
|
|
106
112
|
return +new Date(txTime) > end;
|
|
107
113
|
}
|
|
108
114
|
}
|
|
@@ -114,12 +120,62 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyTxInput({
|
|
|
114
120
|
tokensKey: "tokens",
|
|
115
121
|
assetsKey: "assets"
|
|
116
122
|
}));
|
|
123
|
+
runner.use((context, next) => {
|
|
124
|
+
const { outputs = [], stakeState } = context;
|
|
125
|
+
const ZERO = new _ocap_util.BN(0);
|
|
126
|
+
const availableRevokedTokens = {};
|
|
127
|
+
Object.entries(stakeState.revokedTokens || {}).forEach(([addr, val]) => {
|
|
128
|
+
availableRevokedTokens[addr] = new _ocap_util.BN(val || "0");
|
|
129
|
+
});
|
|
130
|
+
const availableRevokedAssets = new Set(stakeState.revokedAssets || []);
|
|
131
|
+
let hasClaimable = false;
|
|
132
|
+
const clampedOutputs = [];
|
|
133
|
+
outputs.forEach((output) => {
|
|
134
|
+
const rawTokens = output.tokens || output.tokensList || [];
|
|
135
|
+
const clampedTokens = [];
|
|
136
|
+
rawTokens.forEach(({ address, value }) => {
|
|
137
|
+
const requested = new _ocap_util.BN(value || "0");
|
|
138
|
+
const available = availableRevokedTokens[address] || ZERO;
|
|
139
|
+
const actual = _ocap_util.BN.min(requested, available);
|
|
140
|
+
if (actual.gt(ZERO)) {
|
|
141
|
+
clampedTokens.push({
|
|
142
|
+
address,
|
|
143
|
+
value: actual.toString(10)
|
|
144
|
+
});
|
|
145
|
+
availableRevokedTokens[address] = available.sub(actual);
|
|
146
|
+
hasClaimable = true;
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
const clampedAssets = (output.assets || output.assetsList || []).filter((assetAddr) => {
|
|
150
|
+
if (availableRevokedAssets.has(assetAddr)) {
|
|
151
|
+
availableRevokedAssets.delete(assetAddr);
|
|
152
|
+
hasClaimable = true;
|
|
153
|
+
return true;
|
|
154
|
+
}
|
|
155
|
+
return false;
|
|
156
|
+
});
|
|
157
|
+
if (clampedTokens.length > 0 || clampedAssets.length > 0) clampedOutputs.push({
|
|
158
|
+
...output,
|
|
159
|
+
tokens: clampedTokens,
|
|
160
|
+
tokensList: clampedTokens,
|
|
161
|
+
assets: clampedAssets,
|
|
162
|
+
assetsList: clampedAssets
|
|
163
|
+
});
|
|
164
|
+
});
|
|
165
|
+
if (!hasClaimable) return next(new _ocap_util_lib_error.CustomError("INSUFFICIENT_FUND", "Account does not have enough token balance"));
|
|
166
|
+
context.outputs = clampedOutputs;
|
|
167
|
+
context.receivers = Array.from(new Set(clampedOutputs.map((o) => o.owner)));
|
|
168
|
+
context.tokens = Array.from(new Set(clampedOutputs.flatMap((o) => o.tokens.map((t) => t.address))));
|
|
169
|
+
context.assets = Array.from(new Set(clampedOutputs.flatMap((o) => o.assets)));
|
|
170
|
+
return next();
|
|
171
|
+
});
|
|
117
172
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
118
173
|
from: "receivers",
|
|
119
174
|
to: "receiverStates",
|
|
120
175
|
status: "INVALID_RECEIVER_STATE",
|
|
121
176
|
table: "account"
|
|
122
177
|
}));
|
|
178
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: ["receiverStates"] }));
|
|
123
179
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
124
180
|
from: "tokens",
|
|
125
181
|
to: "tokenStates",
|
|
@@ -152,10 +208,27 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyTokenBalance({
|
|
|
152
208
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
153
209
|
from: "assets",
|
|
154
210
|
to: "assetStates",
|
|
155
|
-
status: "
|
|
211
|
+
status: "INVALID_ASSET_STATE",
|
|
156
212
|
table: "asset"
|
|
157
213
|
}));
|
|
158
|
-
runner.use(_ocap_tx_pipeline.pipes.VerifyTransferrable({
|
|
214
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyTransferrable({
|
|
215
|
+
assets: "assetStates",
|
|
216
|
+
allowConsumed: true
|
|
217
|
+
}));
|
|
218
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
219
|
+
error: "UNTRANSFERRABLE_ASSET",
|
|
220
|
+
message: "Consumed assets can only be claimed back to the stake sender",
|
|
221
|
+
fn: (ctx) => {
|
|
222
|
+
const { outputs = [], assetStates = [], receiverStates = [], stakeState } = ctx;
|
|
223
|
+
const consumed = new Set(assetStates.filter((a) => a.consumedTime).map((a) => a.address));
|
|
224
|
+
if (consumed.size === 0) return true;
|
|
225
|
+
return outputs.every((o) => {
|
|
226
|
+
if (!(o.assets || o.assetsList || []).some((a) => consumed.has(a))) return true;
|
|
227
|
+
const rs = receiverStates.find((s) => (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(s).includes(o.owner));
|
|
228
|
+
return !!rs && (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(rs).includes(stakeState.sender);
|
|
229
|
+
});
|
|
230
|
+
}
|
|
231
|
+
}]));
|
|
159
232
|
runner.use(_ocap_tx_pipeline.pipes.VerifyUpdater({
|
|
160
233
|
assetKey: "assetStates",
|
|
161
234
|
ownerKey: "stakeState"
|
|
@@ -183,8 +256,10 @@ runner.use(async (context, next) => {
|
|
|
183
256
|
outputs.forEach((x) => {
|
|
184
257
|
const { owner, tokens, assets } = x;
|
|
185
258
|
const ownerState = receiverStates.find((s) => (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(s).includes(owner));
|
|
186
|
-
receiverUpdates[ownerState.address]
|
|
187
|
-
|
|
259
|
+
const alreadyUpdated = Boolean(receiverUpdates[ownerState.address]);
|
|
260
|
+
const baseState = receiverUpdates[ownerState.address] || ownerState;
|
|
261
|
+
receiverUpdates[ownerState.address] = require_util.applyTokenUpdates(tokens || [], baseState, "add");
|
|
262
|
+
if (!alreadyUpdated && senderChange && ownerState.address === senderChange.address) receiverUpdates[ownerState.address] = require_util.applyTokenChange(receiverUpdates[ownerState.address], senderChange);
|
|
188
263
|
(assets || []).forEach((a) => {
|
|
189
264
|
assetUpdates[a] = { owner: ownerState.address };
|
|
190
265
|
});
|
|
@@ -194,9 +269,17 @@ runner.use(async (context, next) => {
|
|
|
194
269
|
const isAlsoSigner = !!receiverUpdates[senderState.address];
|
|
195
270
|
const [newSenderState, newReceiverStates, newStakeState, newAssetStates, newEvidenceState] = await Promise.all([
|
|
196
271
|
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),
|
|
197
|
-
Promise.all(receiverStates.filter((x) => x.address !== senderState.address).map((x) => statedb.account.update(x.address, _ocap_state.account.update(x, receiverUpdates[x.address], context), context))),
|
|
198
|
-
statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState, stakeUpdates,
|
|
199
|
-
|
|
272
|
+
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
|
+
statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState, stakeUpdates, Object.values(stakeUpdates.revokedTokens || {}).some((v$1) => new _ocap_util.BN(v$1 || "0").gt(new _ocap_util.BN(0))) || (stakeUpdates.revokedAssets || []).length > 0 ? {
|
|
274
|
+
...context,
|
|
275
|
+
txTime: stakeState.context?.renaissanceTime || context.txTime
|
|
276
|
+
} : context), context),
|
|
277
|
+
Promise.all(assetStates.map(async (x) => {
|
|
278
|
+
const nextOwner = assetUpdates[x.address]?.owner;
|
|
279
|
+
const updatedAsset = await statedb.asset.update(x.address, _ocap_state.asset.update(x, assetUpdates[x.address], context), context);
|
|
280
|
+
if (nextOwner && _ocap_state.token.isTokenCharterAsset(x)) await _ocap_state.token.syncTokenCharterOwnership(x, nextOwner, statedb, context);
|
|
281
|
+
return updatedAsset;
|
|
282
|
+
})),
|
|
200
283
|
statedb.evidence.create(itx.evidence.hash, _ocap_state.evidence.create({
|
|
201
284
|
hash: itx.evidence.hash,
|
|
202
285
|
data: "claim-stake"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IReadyContext, ITxState, IWithAssets, IWithEvidence, IWithReceivers, IWithSender, IWithStake, IWithTokens, TClaimStakeTx } from "@ocap/types";
|
|
2
|
-
import { Runner } from "@ocap/tx-pipeline";
|
|
3
2
|
import { BN } from "@ocap/util";
|
|
3
|
+
import { Runner } from "@ocap/tx-pipeline";
|
|
4
4
|
|
|
5
5
|
//#region src/protocols/governance/claim-stake.d.ts
|
|
6
6
|
/** Token input type */
|
|
@@ -7,11 +7,13 @@ let _ocap_state = require("@ocap/state");
|
|
|
7
7
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
8
|
let _ocap_util = require("@ocap/util");
|
|
9
9
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
|
+
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
11
|
+
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
10
12
|
let debug = require("debug");
|
|
11
13
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
12
|
-
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
13
14
|
let _arcblock_validator = require("@arcblock/validator");
|
|
14
|
-
let
|
|
15
|
+
let lodash_uniqBy = require("lodash/uniqBy");
|
|
16
|
+
lodash_uniqBy = require_rolldown_runtime.__toESM(lodash_uniqBy);
|
|
15
17
|
let lodash_isEmpty = require("lodash/isEmpty");
|
|
16
18
|
lodash_isEmpty = require_rolldown_runtime.__toESM(lodash_isEmpty);
|
|
17
19
|
|
|
@@ -65,7 +67,11 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
65
67
|
status: "INVALID_RECEIVER_STATE",
|
|
66
68
|
table: "account"
|
|
67
69
|
}));
|
|
68
|
-
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: [
|
|
70
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: [
|
|
71
|
+
"senderState",
|
|
72
|
+
"delegatorState",
|
|
73
|
+
"receiverStates"
|
|
74
|
+
] }));
|
|
69
75
|
runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
70
76
|
stateKey: "senderState",
|
|
71
77
|
addressKey: "tx.from"
|
|
@@ -77,6 +83,14 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
77
83
|
table: "stake"
|
|
78
84
|
}));
|
|
79
85
|
runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([
|
|
86
|
+
{
|
|
87
|
+
error: "STAKE_NOT_REVOCABLE",
|
|
88
|
+
message: "This stake address is not revocable",
|
|
89
|
+
fn: (ctx) => {
|
|
90
|
+
const context = ctx;
|
|
91
|
+
return Boolean(context.stakeState.revocable);
|
|
92
|
+
}
|
|
93
|
+
},
|
|
80
94
|
{
|
|
81
95
|
error: "INVALID_TX",
|
|
82
96
|
message: "Can only return from none-self staking",
|
|
@@ -150,7 +164,10 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
150
164
|
status: "INVALID_ASSET_STATE",
|
|
151
165
|
table: "asset"
|
|
152
166
|
}));
|
|
153
|
-
runner.use(_ocap_tx_pipeline.pipes.VerifyTransferrable({
|
|
167
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyTransferrable({
|
|
168
|
+
assets: "assetStates",
|
|
169
|
+
allowConsumed: true
|
|
170
|
+
}));
|
|
154
171
|
runner.use(_ocap_tx_pipeline.pipes.VerifyUpdater({
|
|
155
172
|
assetKey: "assetStates",
|
|
156
173
|
ownerKey: "stakeState"
|
|
@@ -182,21 +199,37 @@ runner.use(async (context, next) => {
|
|
|
182
199
|
stakeUpdates.assets = stakeUpdates.assets.filter((a) => assetsList.includes(a) === false);
|
|
183
200
|
stakeUpdates.tokens = require_util.applyTokenUpdates(tokensList, { tokens: stakeUpdates.tokens }, "sub").tokens;
|
|
184
201
|
const ownerState = receiverStates.find((s) => (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(s).includes(owner));
|
|
185
|
-
receiverUpdates[ownerState.address]
|
|
186
|
-
|
|
202
|
+
const alreadyUpdated = Boolean(receiverUpdates[ownerState.address]);
|
|
203
|
+
const baseState = receiverUpdates[ownerState.address] || ownerState;
|
|
204
|
+
receiverUpdates[ownerState.address] = require_util.applyTokenUpdates(tokensList, baseState, "add");
|
|
205
|
+
if (!alreadyUpdated && senderChange && ownerState.address === senderChange.address) receiverUpdates[ownerState.address] = require_util.applyTokenChange(receiverUpdates[ownerState.address], senderChange);
|
|
187
206
|
assetsList.forEach((a) => {
|
|
188
207
|
assetUpdates[a] = { owner: ownerState.address };
|
|
189
208
|
});
|
|
190
209
|
});
|
|
210
|
+
const isAlsoSigner = !!receiverUpdates[senderState.address];
|
|
191
211
|
const [newSenderState, newReceiverStates, newStakeState, newAssetStates] = await Promise.all([
|
|
192
|
-
statedb.account.update(senderState.address, _ocap_state.account.update(senderState, Object.assign({ nonce: tx.nonce }, senderChange ? require_util.applyTokenChange(senderState, senderChange) : {}), context), context),
|
|
193
|
-
Promise.all(receiverStates.map((x) => statedb.account.update(x.address, _ocap_state.account.update(x, receiverUpdates[x.address], context), context))),
|
|
194
|
-
|
|
195
|
-
|
|
212
|
+
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),
|
|
213
|
+
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))),
|
|
214
|
+
(() => {
|
|
215
|
+
const hasPendingRevokedTokens = Object.values(stakeState.revokedTokens || {}).some((v$1) => new _ocap_util.BN(String(v$1 || "0")).gt(new _ocap_util.BN(0)));
|
|
216
|
+
const hasPendingRevokedAssets = Array.isArray(stakeState.revokedAssets) && stakeState.revokedAssets.length > 0;
|
|
217
|
+
const preserveRenaissanceTime = (hasPendingRevokedTokens || hasPendingRevokedAssets) && stakeState?.context?.renaissanceTime;
|
|
218
|
+
return statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState, stakeUpdates, preserveRenaissanceTime ? {
|
|
219
|
+
...context,
|
|
220
|
+
txTime: preserveRenaissanceTime
|
|
221
|
+
} : context), context);
|
|
222
|
+
})(),
|
|
223
|
+
Promise.all(assetStates.map(async (x) => {
|
|
224
|
+
const nextOwner = assetUpdates[x.address]?.owner;
|
|
225
|
+
const updatedAsset = await statedb.asset.update(x.address, _ocap_state.asset.update(x, assetUpdates[x.address], context), context);
|
|
226
|
+
if (nextOwner && _ocap_state.token.isTokenCharterAsset(x)) await _ocap_state.token.syncTokenCharterOwnership(x, nextOwner, statedb, context);
|
|
227
|
+
return updatedAsset;
|
|
228
|
+
}))
|
|
196
229
|
]);
|
|
197
230
|
if (updateVaults) await updateVaults();
|
|
198
231
|
context.senderState = newSenderState;
|
|
199
|
-
context.receiverStates = newReceiverStates;
|
|
232
|
+
context.receiverStates = isAlsoSigner ? newReceiverStates.concat(newSenderState) : newReceiverStates;
|
|
200
233
|
context.stakeState = newStakeState;
|
|
201
234
|
context.assetStates = newAssetStates;
|
|
202
235
|
debug$1("return-stake", {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IReadyContext, IWithAssets, IWithLocked, IWithReceivers, IWithSender, IWithStake, IWithTokens, TReturnStakeTx } from "@ocap/types";
|
|
2
|
-
import { Runner } from "@ocap/tx-pipeline";
|
|
3
2
|
import { BN } from "@ocap/util";
|
|
3
|
+
import { Runner } from "@ocap/tx-pipeline";
|
|
4
4
|
|
|
5
5
|
//#region src/protocols/governance/return-stake.d.ts
|
|
6
6
|
/** Token input type */
|
|
@@ -7,11 +7,11 @@ let _ocap_state = require("@ocap/state");
|
|
|
7
7
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
8
|
let _ocap_util = require("@ocap/util");
|
|
9
9
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
10
|
+
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
11
|
+
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
10
12
|
let debug = require("debug");
|
|
11
13
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
12
|
-
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
13
14
|
let _arcblock_validator = require("@arcblock/validator");
|
|
14
|
-
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
15
15
|
let lodash_isEmpty = require("lodash/isEmpty");
|
|
16
16
|
lodash_isEmpty = require_rolldown_runtime.__toESM(lodash_isEmpty);
|
|
17
17
|
|
|
@@ -64,7 +64,11 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
64
64
|
status: "INVALID_RECEIVER_STATE",
|
|
65
65
|
table: "account"
|
|
66
66
|
}));
|
|
67
|
-
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: [
|
|
67
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: [
|
|
68
|
+
"senderState",
|
|
69
|
+
"delegatorState",
|
|
70
|
+
"receiverStates"
|
|
71
|
+
] }));
|
|
68
72
|
runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
69
73
|
stateKey: "senderState",
|
|
70
74
|
addressKey: "tx.from"
|
|
@@ -131,7 +135,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyTokenBalance({
|
|
|
131
135
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
132
136
|
from: "assets",
|
|
133
137
|
to: "assetStates",
|
|
134
|
-
status: "
|
|
138
|
+
status: "INVALID_ASSET_STATE",
|
|
135
139
|
table: "asset"
|
|
136
140
|
}));
|
|
137
141
|
runner.use(_ocap_tx_pipeline.pipes.VerifyTransferrable({ assets: "assetStates" }));
|
|
@@ -165,7 +169,15 @@ runner.use(async (context, next) => {
|
|
|
165
169
|
const [newSenderState, newStakeState] = await Promise.all([statedb.account.update(senderState.address, _ocap_state.account.update(senderState, {
|
|
166
170
|
nonce: tx.nonce,
|
|
167
171
|
...senderUpdates
|
|
168
|
-
}, context), context),
|
|
172
|
+
}, context), context), (() => {
|
|
173
|
+
const hasPendingRevokedTokens = Object.values(stakeState.revokedTokens || {}).some((v$1) => new _ocap_util.BN(String(v$1 || "0")).gt(new _ocap_util.BN(0)));
|
|
174
|
+
const hasPendingRevokedAssets = Array.isArray(stakeState.revokedAssets) && stakeState.revokedAssets.length > 0;
|
|
175
|
+
const preserveRenaissanceTime = (hasPendingRevokedTokens || hasPendingRevokedAssets) && stakeState.context?.renaissanceTime;
|
|
176
|
+
return statedb.stake.update(stakeState.address, _ocap_state.stake.update(stakeState, stakeUpdates, preserveRenaissanceTime ? {
|
|
177
|
+
...context,
|
|
178
|
+
txTime: preserveRenaissanceTime
|
|
179
|
+
} : context), context);
|
|
180
|
+
})()]);
|
|
169
181
|
if (updateVaults) await updateVaults();
|
|
170
182
|
context.senderState = newSenderState;
|
|
171
183
|
context.stakeState = newStakeState;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IReadyContext, IWithAssets, IWithReceivers, IWithSender, IWithStake, IWithTokens, TRevokeStakeTx } from "@ocap/types";
|
|
2
|
-
import { Runner } from "@ocap/tx-pipeline";
|
|
3
2
|
import { BN } from "@ocap/util";
|
|
3
|
+
import { Runner } from "@ocap/tx-pipeline";
|
|
4
4
|
|
|
5
5
|
//#region src/protocols/governance/revoke-stake.d.ts
|
|
6
6
|
/** Token input type */
|