@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,20 +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
|
-
const require_index = require('../../node_modules/valibot/dist/index.cjs');
|
|
7
|
-
const require_protocols_token_factory_pipes_verify_icon = require('./pipes/verify-icon.cjs');
|
|
8
6
|
const require_protocols_token_factory_pipes_verify_ownership = require('./pipes/verify-ownership.cjs');
|
|
9
7
|
const require_protocols_token_factory_pipes_verify_url = require('./pipes/verify-url.cjs');
|
|
8
|
+
const require_index = require('../../node_modules/valibot/dist/index.cjs');
|
|
9
|
+
const require_protocols_token_factory_pipes_verify_icon = require('./pipes/verify-icon.cjs');
|
|
10
|
+
let _arcblock_did_util = require("@arcblock/did-util");
|
|
10
11
|
let _ocap_state = require("@ocap/state");
|
|
11
12
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
12
13
|
let _ocap_util = require("@ocap/util");
|
|
13
14
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
14
|
-
let _arcblock_did_util = require("@arcblock/did-util");
|
|
15
|
-
let debug = require("debug");
|
|
16
|
-
debug = require_rolldown_runtime.__toESM(debug);
|
|
17
15
|
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
18
16
|
let lodash_cloneDeep = require("lodash/cloneDeep");
|
|
19
17
|
lodash_cloneDeep = require_rolldown_runtime.__toESM(lodash_cloneDeep);
|
|
18
|
+
let debug = require("debug");
|
|
19
|
+
debug = require_rolldown_runtime.__toESM(debug);
|
|
20
20
|
let _arcblock_validator = require("@arcblock/validator");
|
|
21
21
|
let lodash_uniq = require("lodash/uniq");
|
|
22
22
|
lodash_uniq = require_rolldown_runtime.__toESM(lodash_uniq);
|
|
@@ -44,7 +44,7 @@ const schema = require_index.pipe(require_index.object({
|
|
|
44
44
|
description: require_index.pipe(require_index.string(), require_index.minLength(16), require_index.maxLength(128)),
|
|
45
45
|
symbol: require_index.pipe(require_index.string(), require_index.minLength(2), require_index.maxLength(6), require_index.toUpperCase()),
|
|
46
46
|
unit: require_index.pipe(require_index.string(), require_index.minLength(1), require_index.maxLength(6), require_index.toLowerCase()),
|
|
47
|
-
decimal: require_index.pipe(require_index.number(), require_index.minValue(2), require_index.maxValue(18)),
|
|
47
|
+
decimal: require_index.union([require_index.literal(0), require_index.pipe(require_index.number(), require_index.minValue(2), require_index.maxValue(18))]),
|
|
48
48
|
icon: require_index.optional(require_index.nullable(require_index.string())),
|
|
49
49
|
maxTotalSupply: require_index.optional(require_index.nullable(require_index.union([(0, _arcblock_validator.vBN)((0, _arcblock_validator.vBNGreater)(0)), require_index.literal("")]))),
|
|
50
50
|
website: require_index.optional(require_index.nullable(require_index.union([require_index.literal(""), require_index.pipe(require_index.string(), require_index.maxLength(256), require_index.check(isValidUrl, "Must be a valid URL"))]))),
|
|
@@ -59,6 +59,7 @@ runner.use((context, next) => {
|
|
|
59
59
|
const { error, value } = (0, _arcblock_validator.vValidate)(schema, context.itx);
|
|
60
60
|
if (error) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", `Invalid itx: ${error.message}`));
|
|
61
61
|
if (context.itx.token?.type === "CreditToken") {
|
|
62
|
+
if (context.itx.token?.decimal === 0) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "Invalid itx: CreditToken decimal must be between 2 and 18"));
|
|
62
63
|
if (context.itx.curve != null) return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "Invalid itx: Should not provide curve for CreditToken"));
|
|
63
64
|
context.itx.curve = value.curve;
|
|
64
65
|
} else {
|
|
@@ -184,6 +185,9 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
184
185
|
runner.use((context, next) => {
|
|
185
186
|
const { stakeState, config, itx } = context;
|
|
186
187
|
if (stakeState.revocable === false) return next(new _ocap_util_lib_error.CustomError("INVALID_STAKE_STATE", `Staking for token creating already locked: ${stakeState.address}`));
|
|
188
|
+
if (Array.isArray(stakeState.slashers) && stakeState.slashers.length > 0) return next(new _ocap_util_lib_error.CustomError("INVALID_STAKE_STATE", "Staking for token creation cannot have slashers"));
|
|
189
|
+
if (stakeState.revokedTokens && Object.values(stakeState.revokedTokens).some((v) => new _ocap_util.BN(String(v || "0")).gt(new _ocap_util.BN(0)))) return next(new _ocap_util_lib_error.CustomError("INVALID_STAKE_STATE", "Staking for token creation cannot have pending revoked tokens"));
|
|
190
|
+
if (Array.isArray(stakeState.assets) && stakeState.assets.length > 0 || Array.isArray(stakeState.revokedAssets) && stakeState.revokedAssets.length > 0) return next(new _ocap_util_lib_error.CustomError("INVALID_STAKE_STATE", "Staking for token creation cannot contain assets"));
|
|
187
191
|
const actualStake = new _ocap_util.BN(stakeState.tokens[config.token.address] || 0);
|
|
188
192
|
const requiredStake = (0, _ocap_util.fromTokenToUnit)(itx.token.type === "CreditToken" ? config.transaction.txStake.createCreditToken : config.transaction.txStake.createToken, config.token.decimal);
|
|
189
193
|
if (actualStake.lt(requiredStake)) return next(new _ocap_util_lib_error.CustomError("INVALID_STAKE_STATE", `Insufficient stake amount: required ${(0, _ocap_util.fromUnitToToken)(requiredStake, config.token.decimal)} ${config.token.symbol}`));
|
|
@@ -199,6 +203,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
|
199
203
|
stateKey: "delegatorState",
|
|
200
204
|
addressKey: "tx.delegator"
|
|
201
205
|
}));
|
|
206
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: ["delegatorState"] }));
|
|
202
207
|
runner.use(_ocap_tx_pipeline.pipes.VerifyDelegation({
|
|
203
208
|
type: "signature",
|
|
204
209
|
signerKey: "senderState",
|
|
@@ -228,19 +233,21 @@ runner.use(async (context, next) => {
|
|
|
228
233
|
const itxToken = itx.token;
|
|
229
234
|
const { tokens: senderTokens = {} } = senderState;
|
|
230
235
|
const senderUpdates = senderChange ? require_util.applyTokenChange({ tokens: senderTokens }, senderChange) : { tokens: senderTokens };
|
|
236
|
+
const initialTokenState = _ocap_state.token.create({
|
|
237
|
+
...(0, lodash_cloneDeep.default)(itxToken),
|
|
238
|
+
totalSupply: "0",
|
|
239
|
+
initialSupply: "0",
|
|
240
|
+
issuer: owner,
|
|
241
|
+
tokenFactoryAddress: itx.address
|
|
242
|
+
}, context);
|
|
243
|
+
const charterAsset = _ocap_state.token.buildTokenCharterAssetState(initialTokenState, context, owner);
|
|
231
244
|
const [newSenderState, newTokenState, newTokenFactoryState, newDelegationState, newStakeState] = await Promise.all([
|
|
232
245
|
statedb.account.update(senderState.address, _ocap_state.account.update(senderState, {
|
|
233
246
|
nonce: tx.nonce,
|
|
234
|
-
pk: tx.pk,
|
|
247
|
+
pk: tx.delegator ? senderState.pk : tx.pk,
|
|
235
248
|
...senderUpdates
|
|
236
249
|
}, context), context),
|
|
237
|
-
statedb.token.create(itxToken.address,
|
|
238
|
-
...(0, lodash_cloneDeep.default)(itxToken),
|
|
239
|
-
totalSupply: "0",
|
|
240
|
-
initialSupply: "0",
|
|
241
|
-
issuer: owner,
|
|
242
|
-
tokenFactoryAddress: itx.address
|
|
243
|
-
}, context), context),
|
|
250
|
+
statedb.token.create(itxToken.address, initialTokenState, context),
|
|
244
251
|
statedb.tokenFactory.create(itx.address, _ocap_state.tokenFactory.create({
|
|
245
252
|
...(0, lodash_cloneDeep.default)(itx),
|
|
246
253
|
owner,
|
|
@@ -250,8 +257,10 @@ runner.use(async (context, next) => {
|
|
|
250
257
|
context.isDelegationChanged ? statedb.delegation.update(delegationState.address, _ocap_state.delegation.update(delegationState, {}, context), context) : delegationState,
|
|
251
258
|
statedb.stake.update(stakeAddress, _ocap_state.stake.update(stakeState, {
|
|
252
259
|
revocable: false,
|
|
260
|
+
slashers: [],
|
|
253
261
|
revokeWaitingPeriod: config.transaction.txStake.createTokenLockPeriod
|
|
254
|
-
}, context), context)
|
|
262
|
+
}, context), context),
|
|
263
|
+
statedb.asset?.create ? Promise.resolve(statedb.asset.get?.(charterAsset.address, context)).then((existing) => existing && statedb.asset.update ? statedb.asset.update(charterAsset.address, charterAsset, context) : statedb.asset.create(charterAsset.address, charterAsset, context)) : null
|
|
255
264
|
]);
|
|
256
265
|
if (updateVaults) await updateVaults();
|
|
257
266
|
context.senderState = newSenderState;
|
|
@@ -9,9 +9,10 @@ let _ocap_state = require("@ocap/state");
|
|
|
9
9
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
10
10
|
let _ocap_util = require("@ocap/util");
|
|
11
11
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
|
+
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
13
|
+
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
12
14
|
let lodash_pick = require("lodash/pick");
|
|
13
15
|
lodash_pick = require_rolldown_runtime.__toESM(lodash_pick);
|
|
14
|
-
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
15
16
|
let _arcblock_validator = require("@arcblock/validator");
|
|
16
17
|
|
|
17
18
|
//#region src/protocols/token-factory/mint.ts
|
|
@@ -37,12 +38,22 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
37
38
|
status: "INVALID_TOKEN_FACTORY",
|
|
38
39
|
table: "tokenFactory"
|
|
39
40
|
}));
|
|
41
|
+
runner.use((context, next) => {
|
|
42
|
+
const { tokenFactoryState } = context;
|
|
43
|
+
if (tokenFactoryState?.status && tokenFactoryState.status !== "ACTIVE") return next(new _ocap_util_lib_error.CustomError("INVALID_TOKEN_FACTORY", `Token factory is ${tokenFactoryState.status} and cannot mint tokens`));
|
|
44
|
+
return next();
|
|
45
|
+
});
|
|
40
46
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
41
47
|
from: "tokenFactoryState.tokenAddress",
|
|
42
48
|
to: "tokenState",
|
|
43
49
|
status: "INVALID_TOKEN",
|
|
44
50
|
table: "token"
|
|
45
51
|
}));
|
|
52
|
+
runner.use((context, next) => {
|
|
53
|
+
const sigs = (0, _ocap_util_lib_get_list_field.getListField)(context.tx, "signatures");
|
|
54
|
+
if (sigs && sigs.length > 0) context.senders = [context.tx.from];
|
|
55
|
+
return next();
|
|
56
|
+
}, { shouldSkip: (ctx) => Boolean(ctx.tokenFactoryState?.curve) });
|
|
46
57
|
runner.use(_ocap_tx_pipeline.pipes.VerifyTxInput({
|
|
47
58
|
fieldKey: "itx.inputs",
|
|
48
59
|
inputsKey: "inputs",
|
|
@@ -56,7 +67,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyListSize({ listKey: [
|
|
|
56
67
|
"tokens",
|
|
57
68
|
"assets"
|
|
58
69
|
] }), { shouldSkip: (ctx) => !ctx.tokenFactoryState?.curve });
|
|
59
|
-
runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSigV2({ signersKey: "senders" }), { shouldSkip: (ctx) => !ctx.tokenFactoryState?.curve });
|
|
70
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyMultiSigV2({ signersKey: "senders" }), { shouldSkip: (ctx) => !ctx.tokenFactoryState?.curve && !ctx.senders?.length });
|
|
60
71
|
runner.use((context, next) => {
|
|
61
72
|
const { tokenFactoryState, inputs = [] } = context;
|
|
62
73
|
if (!inputs.every((input) => {
|
|
@@ -72,6 +83,10 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
72
83
|
status: "OK",
|
|
73
84
|
table: "account"
|
|
74
85
|
}));
|
|
86
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
87
|
+
stateKey: "senderState",
|
|
88
|
+
addressKey: "tx.from"
|
|
89
|
+
}));
|
|
75
90
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
76
91
|
from: "senders",
|
|
77
92
|
to: "signerStates",
|
|
@@ -93,7 +108,11 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
|
93
108
|
stateKey: "receiverState",
|
|
94
109
|
addressKey: "itx.receiver"
|
|
95
110
|
}));
|
|
96
|
-
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: [
|
|
111
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: [
|
|
112
|
+
"senderState",
|
|
113
|
+
"signerStates",
|
|
114
|
+
"receiverState"
|
|
115
|
+
] }));
|
|
97
116
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
98
117
|
from: "tokenFactoryState.owner",
|
|
99
118
|
to: "ownerState",
|
|
@@ -106,6 +125,15 @@ runner.use(_ocap_tx_pipeline.pipes.verifyTokenAccess({
|
|
|
106
125
|
accountKeys: ["senderState"],
|
|
107
126
|
errorMessage: "Account {address} is not allowed to mint token {tokenAddress}"
|
|
108
127
|
}));
|
|
128
|
+
runner.use((context, next) => {
|
|
129
|
+
const { tokenFactoryState, tokenState, senderState, ownerState, tx } = context;
|
|
130
|
+
if (!tokenFactoryState?.curve && (!tokenState?.minters || tokenState.minters.length === 0)) {
|
|
131
|
+
const senderAddrs = senderState ? (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(senderState) : [tx.from];
|
|
132
|
+
const ownerAddrs = ownerState ? (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(ownerState) : [tokenFactoryState.owner];
|
|
133
|
+
if (!senderAddrs.some((s) => ownerAddrs.some((o) => (0, _ocap_util.isSameDid)(s, o)))) return next(new _ocap_util_lib_error.CustomError("FORBIDDEN", `verify-token-access: Account ${senderState?.address || tx.from} is not allowed to mint token ${tokenState.address}`, { persist: true }));
|
|
134
|
+
}
|
|
135
|
+
return next();
|
|
136
|
+
});
|
|
109
137
|
runner.use(require_protocols_token_factory_pipes_calc_reserve.default({
|
|
110
138
|
tokenFactoryKey: "tokenFactoryState",
|
|
111
139
|
tokenStateKey: "tokenState",
|
|
@@ -113,9 +141,12 @@ runner.use(require_protocols_token_factory_pipes_calc_reserve.default({
|
|
|
113
141
|
amountKey: "itx.amount"
|
|
114
142
|
}), { shouldSkip: (ctx) => !ctx.tokenFactoryState?.curve });
|
|
115
143
|
runner.use((context, next) => {
|
|
116
|
-
const { tokenState, itx } = context;
|
|
144
|
+
const { tokenState, tokenFactoryState, itx } = context;
|
|
117
145
|
if (tokenState.maxTotalSupply) {
|
|
118
|
-
const
|
|
146
|
+
const factoryData = tokenFactoryState?.data || {};
|
|
147
|
+
const rawLpReserve = factoryData.lpReserveSupply ?? (factoryData.value && typeof factoryData.value === "object" ? factoryData.value.lpReserveSupply : void 0);
|
|
148
|
+
const lpReserveSupply = rawLpReserve ? new _ocap_util.BN(String(rawLpReserve)) : new _ocap_util.BN(0);
|
|
149
|
+
const availableSupply = new _ocap_util.BN(tokenState.maxTotalSupply).sub(lpReserveSupply).sub(new _ocap_util.BN(tokenState.totalSupply));
|
|
119
150
|
if (new _ocap_util.BN(itx.amount).gt(availableSupply)) return next(new _ocap_util_lib_error.CustomError("INVALID_TOKEN", `Maximum mintable tokens are ${(0, _ocap_util.fromUnitToToken)(availableSupply, tokenState.decimal)} ${tokenState.symbol}`));
|
|
120
151
|
}
|
|
121
152
|
next();
|
|
@@ -171,17 +202,18 @@ runner.use(async (context, next) => {
|
|
|
171
202
|
const { owner } = input;
|
|
172
203
|
const reserveTokenChange = (0, _ocap_util_lib_get_list_field.getListField)(input, "tokens").find((item) => item.address === reserveAddress);
|
|
173
204
|
if (!reserveTokenChange) return;
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
205
|
+
const reserveValue = new _ocap_util.BN(reserveTokenChange.value);
|
|
206
|
+
const remainingCost = _ocap_util.BN.max(new _ocap_util.BN(0), totalReserveCost.sub(currentReserveCost));
|
|
207
|
+
const actualSpend = reserveValue.gt(remainingCost) ? remainingCost : _ocap_util.BN.max(new _ocap_util.BN(0), reserveValue);
|
|
208
|
+
currentReserveCost = currentReserveCost.add(actualSpend);
|
|
209
|
+
accountUpdates[owner] = require_util.applyTokenUpdates([{
|
|
210
|
+
address: reserveAddress,
|
|
211
|
+
value: actualSpend.toString()
|
|
212
|
+
}], signerStates.find((s) => s.address === owner), "sub");
|
|
181
213
|
inputChanges.push({
|
|
182
214
|
address: owner,
|
|
183
215
|
token: reserveAddress,
|
|
184
|
-
delta:
|
|
216
|
+
delta: actualSpend.neg().toString()
|
|
185
217
|
});
|
|
186
218
|
});
|
|
187
219
|
if (!accountUpdates[tx.from]) accountUpdates[tx.from] = senderState || {};
|
|
@@ -197,6 +229,7 @@ runner.use(async (context, next) => {
|
|
|
197
229
|
delta: String(amount)
|
|
198
230
|
});
|
|
199
231
|
if (senderChange) accountUpdates[senderChange.address] = require_util.applyTokenChange(accountUpdates[senderChange.address] || senderState, senderChange);
|
|
232
|
+
const isSameAddr = (a, b) => Boolean(a && b && (a === b || (0, _ocap_util.toAddress)(a) === (0, _ocap_util.toAddress)(b)));
|
|
200
233
|
const [newAccountStates, newTokenFactoryState, newTokenState] = await Promise.all([
|
|
201
234
|
Promise.all(Object.entries(accountUpdates).map(([address, updates]) => {
|
|
202
235
|
const state = [
|
|
@@ -204,13 +237,13 @@ runner.use(async (context, next) => {
|
|
|
204
237
|
receiverState,
|
|
205
238
|
ownerState,
|
|
206
239
|
...signerStates
|
|
207
|
-
].find((x) => x?.address
|
|
240
|
+
].find((x) => isSameAddr(x?.address, address));
|
|
208
241
|
const actualUpdates = state ? (0, lodash_pick.default)(updates, ["tokens"]) : {
|
|
209
242
|
...updates,
|
|
210
243
|
address
|
|
211
244
|
};
|
|
212
|
-
if (address
|
|
213
|
-
actualUpdates.pk = tx.pk;
|
|
245
|
+
if (isSameAddr(address, tx.from)) {
|
|
246
|
+
actualUpdates.pk = tx.delegator ? state?.pk || tx.pk : tx.pk;
|
|
214
247
|
actualUpdates.nonce = tx.nonce;
|
|
215
248
|
}
|
|
216
249
|
return statedb.account.updateOrCreate(state ?? null, _ocap_state.account.updateOrCreate(state ?? null, actualUpdates, context), context);
|
|
@@ -221,10 +254,10 @@ runner.use(async (context, next) => {
|
|
|
221
254
|
}, context), context),
|
|
222
255
|
statedb.token.update(tokenAddress, _ocap_state.token.update(tokenState, { totalSupply: new _ocap_util.BN(tokenState.totalSupply).add(new _ocap_util.BN(amount)).toString() }), context)
|
|
223
256
|
]);
|
|
224
|
-
context.senderState = newAccountStates.find((x) => x.address
|
|
225
|
-
context.receiverState = newAccountStates.find((x) => x.address
|
|
226
|
-
context.ownerState = newAccountStates.find((x) => x.address
|
|
227
|
-
context.signerStates = newAccountStates.filter((x) => signerStates.find((s) => s.address
|
|
257
|
+
context.senderState = newAccountStates.find((x) => isSameAddr(x.address, tx.from));
|
|
258
|
+
context.receiverState = newAccountStates.find((x) => isSameAddr(x.address, receiver));
|
|
259
|
+
context.ownerState = newAccountStates.find((x) => isSameAddr(x.address, ownerState.address)) || ownerState;
|
|
260
|
+
context.signerStates = newAccountStates.filter((x) => signerStates.find((s) => isSameAddr(s.address, x.address)));
|
|
228
261
|
context.tokenFactoryState = newTokenFactoryState;
|
|
229
262
|
context.tokenState = newTokenState;
|
|
230
263
|
context.inputChanges = inputChanges;
|
|
@@ -3,9 +3,9 @@ const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs
|
|
|
3
3
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
4
4
|
let lodash_get = require("lodash/get");
|
|
5
5
|
lodash_get = require_rolldown_runtime.__toESM(lodash_get);
|
|
6
|
+
let _blocklet_xss = require("@blocklet/xss");
|
|
6
7
|
let lodash_set = require("lodash/set");
|
|
7
8
|
lodash_set = require_rolldown_runtime.__toESM(lodash_set);
|
|
8
|
-
let _blocklet_xss = require("@blocklet/xss");
|
|
9
9
|
|
|
10
10
|
//#region src/protocols/token-factory/pipes/verify-icon.ts
|
|
11
11
|
const verifyIcon = ({ iconKey = "itx.token.icon", size = 16 * 1024 } = {}) => (context, next) => {
|
|
@@ -3,12 +3,14 @@ const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
|
|
|
3
3
|
const require_util = require('../../util.cjs');
|
|
4
4
|
const require_pipes_ensure_cost = require('../../pipes/ensure-cost.cjs');
|
|
5
5
|
const require_pipes_ensure_gas = require('../../pipes/ensure-gas.cjs');
|
|
6
|
-
const require_protocols_token_factory_pipes_verify_icon = require('./pipes/verify-icon.cjs');
|
|
7
6
|
const require_protocols_token_factory_pipes_verify_ownership = require('./pipes/verify-ownership.cjs');
|
|
8
7
|
const require_protocols_token_factory_pipes_verify_url = require('./pipes/verify-url.cjs');
|
|
8
|
+
const require_protocols_token_factory_pipes_verify_icon = require('./pipes/verify-icon.cjs');
|
|
9
9
|
let _ocap_state = require("@ocap/state");
|
|
10
10
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
11
|
+
let _ocap_util = require("@ocap/util");
|
|
11
12
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
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");
|
|
@@ -95,6 +97,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
|
95
97
|
stateKey: "delegatorState",
|
|
96
98
|
addressKey: "tx.delegator"
|
|
97
99
|
}));
|
|
100
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: ["delegatorState"] }));
|
|
98
101
|
runner.use(_ocap_tx_pipeline.pipes.VerifyDelegation({
|
|
99
102
|
type: "signature",
|
|
100
103
|
signerKey: "senderState",
|
|
@@ -102,8 +105,8 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyDelegation({
|
|
|
102
105
|
getRequirements: require_util.getDelegationRequirements
|
|
103
106
|
}));
|
|
104
107
|
runner.use((context, next) => {
|
|
105
|
-
const { tokenFactoryState, delegatorState, senderState } = context;
|
|
106
|
-
if ((delegatorState ? delegatorState.
|
|
108
|
+
const { tx, tokenFactoryState, delegatorState, senderState } = context;
|
|
109
|
+
if (!(delegatorState ? (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(delegatorState) : tx.delegator ? [tx.delegator] : (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(senderState)).some((addr) => (0, _ocap_util.isSameDid)(addr, tokenFactoryState.owner))) return next(new _ocap_util_lib_error.CustomError("FORBIDDEN", "Token factory can only be updated by owner"));
|
|
107
110
|
return next();
|
|
108
111
|
});
|
|
109
112
|
runner.use(require_pipes_ensure_gas.default((context) => {
|
|
@@ -132,15 +135,22 @@ runner.use(async (context, next) => {
|
|
|
132
135
|
website: itx.token.website || tokenStateValue.website,
|
|
133
136
|
metadata: itx.token.metadata || tokenStateValue.metadata
|
|
134
137
|
} : null;
|
|
138
|
+
const nextTokenState = tokenUpdates ? _ocap_state.token.update(_ocap_state.token.normalizeLegacyTokenStateForUpdate(tokenStateValue), tokenUpdates) : tokenStateValue;
|
|
139
|
+
const charterAddress = tokenUpdates ? _ocap_state.token.toTokenCharterAssetAddress(tokenStateValue.address) : "";
|
|
135
140
|
const [newSenderState, newTokenFactoryState, newTokenState, newDelegationState] = await Promise.all([
|
|
136
141
|
statedb.account.update(senderStateValue.address, _ocap_state.account.update(senderStateValue, {
|
|
137
142
|
nonce: tx.nonce,
|
|
138
|
-
pk: tx.pk,
|
|
143
|
+
pk: tx.delegator ? senderStateValue.pk : tx.pk,
|
|
139
144
|
...senderUpdates
|
|
140
145
|
}, context), context),
|
|
141
146
|
statedb.tokenFactory.update(tokenFactoryStateValue.address, _ocap_state.tokenFactory.update(tokenFactoryStateValue, factoryUpdates, context), context),
|
|
142
|
-
tokenUpdates ? statedb.token.update(tokenStateValue.address,
|
|
143
|
-
context.isDelegationChanged && delegationState ? statedb.delegation.update(delegationState.address, _ocap_state.delegation.update(delegationState, {}, context), context) : delegationState
|
|
147
|
+
tokenUpdates ? statedb.token.update(tokenStateValue.address, nextTokenState, context) : tokenStateValue,
|
|
148
|
+
context.isDelegationChanged && delegationState ? statedb.delegation.update(delegationState.address, _ocap_state.delegation.update(delegationState, {}, context), context) : delegationState,
|
|
149
|
+
tokenUpdates && statedb.asset?.get ? Promise.resolve(statedb.asset.get(charterAddress, context)).then((existingCharter) => {
|
|
150
|
+
if (existingCharter && statedb.asset.update) return statedb.asset.update(charterAddress, _ocap_state.token.syncCharterAssetWithToken(existingCharter, nextTokenState, context, tokenFactoryStateValue.owner), context);
|
|
151
|
+
if (statedb.asset.create) return statedb.asset.create(charterAddress, _ocap_state.token.buildTokenCharterAssetState(nextTokenState, context, tokenFactoryStateValue.owner), context);
|
|
152
|
+
return null;
|
|
153
|
+
}) : null
|
|
144
154
|
]);
|
|
145
155
|
if (updateVaults) await updateVaults();
|
|
146
156
|
context.senderState = newSenderState;
|
|
@@ -3,14 +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
|
+
let _arcblock_did = require("@arcblock/did");
|
|
7
|
+
let _ocap_mcrypto = require("@ocap/mcrypto");
|
|
6
8
|
let _ocap_state = require("@ocap/state");
|
|
7
9
|
let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
|
|
8
10
|
let _ocap_util = require("@ocap/util");
|
|
9
11
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
12
|
+
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
13
|
+
let _ocap_util_lib_get_related_addr = require("@ocap/util/lib/get-related-addr");
|
|
10
14
|
let debug = require("debug");
|
|
11
15
|
debug = require_rolldown_runtime.__toESM(debug);
|
|
12
16
|
let _ocap_message = require("@ocap/message");
|
|
13
|
-
let _ocap_util_lib_get_list_field = require("@ocap/util/lib/get-list-field");
|
|
14
17
|
let _arcblock_validator = require("@arcblock/validator");
|
|
15
18
|
let _ocap_util_lib_create_sorted_list = require("@ocap/util/lib/create-sorted-list");
|
|
16
19
|
let lodash_isEmpty = require("lodash/isEmpty");
|
|
@@ -44,6 +47,24 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractReceiver({ from: [
|
|
|
44
47
|
"itx.to"
|
|
45
48
|
] }));
|
|
46
49
|
runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
50
|
+
error: "INVALID_TX",
|
|
51
|
+
message: "Can not exchange duplicate tokens or assets",
|
|
52
|
+
fn: (ctx) => {
|
|
53
|
+
const { itx } = ctx;
|
|
54
|
+
const senderAssets = (0, _ocap_util_lib_get_list_field.getListField)(itx, "sender.assets");
|
|
55
|
+
const receiverAssets = (0, _ocap_util_lib_get_list_field.getListField)(itx, "receiver.assets");
|
|
56
|
+
const senderTokens = (0, _ocap_util_lib_get_list_field.getListField)(itx, "sender.tokens");
|
|
57
|
+
const receiverTokens = (0, _ocap_util_lib_get_list_field.getListField)(itx, "receiver.tokens");
|
|
58
|
+
const senderTokenAddrs = senderTokens.map((x) => x.address);
|
|
59
|
+
const receiverTokenAddrs = receiverTokens.map((x) => x.address);
|
|
60
|
+
if (new Set(senderTokenAddrs).size !== senderTokenAddrs.length) return false;
|
|
61
|
+
if (new Set(receiverTokenAddrs).size !== receiverTokenAddrs.length) return false;
|
|
62
|
+
if (new Set(senderAssets).size !== senderAssets.length) return false;
|
|
63
|
+
if (new Set(receiverAssets).size !== receiverAssets.length) return false;
|
|
64
|
+
if (senderAssets.some((x) => receiverAssets.includes(x))) return false;
|
|
65
|
+
return true;
|
|
66
|
+
}
|
|
67
|
+
}, {
|
|
47
68
|
error: "INVALID_TX",
|
|
48
69
|
message: "Can not exchange without any token or assets",
|
|
49
70
|
fn: (ctx) => {
|
|
@@ -57,8 +78,11 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
|
57
78
|
const senderValue = itx.sender?.value;
|
|
58
79
|
const senderAmount = senderValue ? (0, _ocap_message.decodeBigInt)(senderValue) : 0;
|
|
59
80
|
if (new _ocap_util.BN(senderAmount).gt(zero)) {
|
|
60
|
-
|
|
61
|
-
|
|
81
|
+
const primaryTokenAddress = config.token.address;
|
|
82
|
+
const existing = senderTokensLocal.find((x) => x.address === primaryTokenAddress);
|
|
83
|
+
if (existing) existing.value = new _ocap_util.BN(existing.value).add(new _ocap_util.BN(senderAmount)).toString(10);
|
|
84
|
+
else senderTokensLocal.push({
|
|
85
|
+
address: primaryTokenAddress,
|
|
62
86
|
value: senderAmount
|
|
63
87
|
});
|
|
64
88
|
itx.sender.value = "0";
|
|
@@ -66,8 +90,11 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyInfo([{
|
|
|
66
90
|
const receiverValue = itx.receiver?.value;
|
|
67
91
|
const receiverAmount = receiverValue ? (0, _ocap_message.decodeBigInt)(receiverValue) : 0;
|
|
68
92
|
if (new _ocap_util.BN(receiverAmount).gt(zero)) {
|
|
69
|
-
|
|
70
|
-
|
|
93
|
+
const primaryTokenAddress = config.token.address;
|
|
94
|
+
const existing = receiverTokensLocal.find((x) => x.address === primaryTokenAddress);
|
|
95
|
+
if (existing) existing.value = new _ocap_util.BN(existing.value).add(new _ocap_util.BN(receiverAmount)).toString(10);
|
|
96
|
+
else receiverTokensLocal.push({
|
|
97
|
+
address: primaryTokenAddress,
|
|
71
98
|
value: receiverAmount
|
|
72
99
|
});
|
|
73
100
|
itx.receiver.value = "0";
|
|
@@ -89,12 +116,22 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
89
116
|
status: "INVALID_SENDER_STATE",
|
|
90
117
|
table: "account"
|
|
91
118
|
}));
|
|
119
|
+
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
120
|
+
from: "receiver",
|
|
121
|
+
to: "receiverState",
|
|
122
|
+
status: "INVALID_RECEIVER_STATE",
|
|
123
|
+
table: "account"
|
|
124
|
+
}));
|
|
92
125
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
93
126
|
from: "tx.delegator",
|
|
94
127
|
to: "delegatorState",
|
|
95
128
|
status: "OK",
|
|
96
129
|
table: "account"
|
|
97
130
|
}));
|
|
131
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
132
|
+
stateKey: "delegatorState",
|
|
133
|
+
addressKey: "tx.delegator"
|
|
134
|
+
}));
|
|
98
135
|
runner.use(_ocap_tx_pipeline.pipes.VerifyDelegation({
|
|
99
136
|
type: "signature",
|
|
100
137
|
signerKey: "senderState",
|
|
@@ -103,7 +140,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyDelegation({
|
|
|
103
140
|
const context = ctx;
|
|
104
141
|
const tokens = context.senderTokens || [];
|
|
105
142
|
const assets = context.senderAssets || [];
|
|
106
|
-
const toAddresses = context.receiver ? [context.receiver] : [context.itx.to];
|
|
143
|
+
const toAddresses = context.receiverState ? (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(context.receiverState) : context.receiver ? [context.receiver] : [context.itx.to];
|
|
107
144
|
return [...tokens.map((x) => ({
|
|
108
145
|
type: "token",
|
|
109
146
|
address: x.address,
|
|
@@ -129,7 +166,7 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyDelegation({
|
|
|
129
166
|
const context = ctx;
|
|
130
167
|
const tokens = context.receiverTokens || [];
|
|
131
168
|
const assets = context.receiverAssets || [];
|
|
132
|
-
const toAddresses = context.senderState ?
|
|
169
|
+
const toAddresses = context.senderState ? (0, _ocap_util_lib_get_related_addr.getRelatedAddresses)(context.senderState) : [context.tx.from];
|
|
133
170
|
return [...tokens.map((x) => ({
|
|
134
171
|
type: "token",
|
|
135
172
|
address: x.address,
|
|
@@ -148,17 +185,15 @@ runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
|
148
185
|
status: "INVALID_TOKEN",
|
|
149
186
|
table: "token"
|
|
150
187
|
}));
|
|
151
|
-
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
152
|
-
from: "receiver",
|
|
153
|
-
to: "receiverState",
|
|
154
|
-
status: "INVALID_RECEIVER_STATE",
|
|
155
|
-
table: "account"
|
|
156
|
-
}));
|
|
157
188
|
runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
158
189
|
signerKey: "signerStates",
|
|
159
190
|
stateKey: "senderState",
|
|
160
191
|
addressKey: "tx.from"
|
|
161
192
|
}));
|
|
193
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyAccountMigration({
|
|
194
|
+
stateKey: "receiverState",
|
|
195
|
+
addressKey: "receiver"
|
|
196
|
+
}));
|
|
162
197
|
runner.use((context, next) => {
|
|
163
198
|
context.senderTokenConditions = {
|
|
164
199
|
owner: context.senderState.address,
|
|
@@ -168,6 +203,8 @@ runner.use((context, next) => {
|
|
|
168
203
|
owner: context.receiverState.address,
|
|
169
204
|
tokens: context.receiverTokens || []
|
|
170
205
|
};
|
|
206
|
+
context.senderTokenStates = (context.tokenStates || []).filter((t) => (context.senderTokens || []).some((st) => st.address === t.address));
|
|
207
|
+
context.receiverTokenStates = (context.tokenStates || []).filter((t) => (context.receiverTokens || []).some((rt) => rt.address === t.address));
|
|
171
208
|
next();
|
|
172
209
|
});
|
|
173
210
|
runner.use(_ocap_tx_pipeline.pipes.VerifyTokenBalance({
|
|
@@ -182,13 +219,25 @@ runner.use(_ocap_tx_pipeline.pipes.AntiLandAttack({
|
|
|
182
219
|
senderState: "senderState",
|
|
183
220
|
receiverState: "receiverState"
|
|
184
221
|
}));
|
|
185
|
-
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: [
|
|
222
|
+
runner.use(_ocap_tx_pipeline.pipes.VerifyBlocked({ stateKeys: [
|
|
223
|
+
"senderState",
|
|
224
|
+
"receiverState",
|
|
225
|
+
"delegatorState",
|
|
226
|
+
"signerStates",
|
|
227
|
+
"delegatorStates"
|
|
228
|
+
] }));
|
|
186
229
|
runner.use(_ocap_tx_pipeline.pipes.verifyTokenAccess({
|
|
187
|
-
statesKey: "
|
|
230
|
+
statesKey: "senderTokenStates",
|
|
188
231
|
listFieldKey: "spenders",
|
|
189
232
|
accountKeys: ["senderState"],
|
|
190
233
|
errorMessage: "Account {address} is not allowed to exchange token {tokenAddress}"
|
|
191
234
|
}));
|
|
235
|
+
runner.use(_ocap_tx_pipeline.pipes.verifyTokenAccess({
|
|
236
|
+
statesKey: "receiverTokenStates",
|
|
237
|
+
listFieldKey: "spenders",
|
|
238
|
+
accountKeys: ["receiverState"],
|
|
239
|
+
errorMessage: "Account {address} is not allowed to exchange token {tokenAddress}"
|
|
240
|
+
}));
|
|
192
241
|
runner.use(_ocap_tx_pipeline.pipes.ExtractState({
|
|
193
242
|
from: "senderAssets",
|
|
194
243
|
to: "priv.senderAssets",
|
|
@@ -212,10 +261,16 @@ runner.use(_ocap_tx_pipeline.pipes.VerifyUpdater({
|
|
|
212
261
|
ownerKey: "receiverState"
|
|
213
262
|
}));
|
|
214
263
|
runner.use(async (context, next) => {
|
|
215
|
-
const { senderAssets = [], receiverAssets = [], senderState, receiverState } = context;
|
|
264
|
+
const { senderAssets = [], receiverAssets = [], senderState, receiverState, priv } = context;
|
|
216
265
|
const pendingOwners = {};
|
|
217
|
-
if (receiverState?.address)
|
|
218
|
-
|
|
266
|
+
if (receiverState?.address) {
|
|
267
|
+
if ((0, _arcblock_did.toTypeInfo)(receiverState.address).role === _ocap_mcrypto.types.RoleType.ROLE_ASSET && (priv?.senderAssets || []).some((st) => _ocap_state.token.isTokenCharterAsset(st))) return next(new _ocap_util_lib_error.CustomError("INVALID_OWNER", "Token Charter NFT cannot be owned by an asset", { persist: true }));
|
|
268
|
+
for (const addr of senderAssets) pendingOwners[addr] = receiverState.address;
|
|
269
|
+
}
|
|
270
|
+
if (senderState?.address) {
|
|
271
|
+
if ((0, _arcblock_did.toTypeInfo)(senderState.address).role === _ocap_mcrypto.types.RoleType.ROLE_ASSET && (priv?.receiverAssets || []).some((st) => _ocap_state.token.isTokenCharterAsset(st))) return next(new _ocap_util_lib_error.CustomError("INVALID_OWNER", "Token Charter NFT cannot be owned by an asset", { persist: true }));
|
|
272
|
+
for (const addr of receiverAssets) pendingOwners[addr] = senderState.address;
|
|
273
|
+
}
|
|
219
274
|
if (senderAssets.length && receiverState?.address) {
|
|
220
275
|
const err = await (0, _ocap_tx_pipeline.verifyAssetHierarchy)(senderAssets, receiverState.address, context, pendingOwners);
|
|
221
276
|
if (err) return next(err);
|
|
@@ -237,6 +292,7 @@ runner.use(require_pipes_ensure_gas.default((context) => {
|
|
|
237
292
|
return ops;
|
|
238
293
|
}));
|
|
239
294
|
runner.use(require_pipes_ensure_cost.default({ attachSenderChanges: true }));
|
|
295
|
+
runner.use(_ocap_tx_pipeline.pipes.TakeStateSnapshot());
|
|
240
296
|
runner.use(_ocap_tx_pipeline.pipes.UpdateOwner({
|
|
241
297
|
assets: "priv.senderAssets",
|
|
242
298
|
owner: "receiverState"
|
|
@@ -245,7 +301,6 @@ runner.use(_ocap_tx_pipeline.pipes.UpdateOwner({
|
|
|
245
301
|
assets: "priv.receiverAssets",
|
|
246
302
|
owner: "senderState"
|
|
247
303
|
}));
|
|
248
|
-
runner.use(_ocap_tx_pipeline.pipes.TakeStateSnapshot());
|
|
249
304
|
runner.use(async (context, next) => {
|
|
250
305
|
const { tx, itx, senderAssets = [], receiverAssets = [], senderTokens = [], receiverTokens = [], senderState, receiverState, senderChange, delegationState, delegationStates = [], updateVaults, statedb } = context;
|
|
251
306
|
const senderStateTokens = senderState?.tokens || {};
|
|
@@ -266,6 +321,7 @@ runner.use(async (context, next) => {
|
|
|
266
321
|
statedb.account.updateOrCreate(existingSenderState ?? null, _ocap_state.account.updateOrCreate(existingSenderState ?? null, {
|
|
267
322
|
address: senderState.address,
|
|
268
323
|
nonce: tx.nonce,
|
|
324
|
+
pk: tx.delegator ? senderState.pk : tx.pk,
|
|
269
325
|
...senderUpdates
|
|
270
326
|
}, context), context),
|
|
271
327
|
statedb.account.updateOrCreate(existingReceiverState ?? null, _ocap_state.account.updateOrCreate(existingReceiverState ?? null, {
|
|
@@ -273,7 +329,7 @@ runner.use(async (context, next) => {
|
|
|
273
329
|
tokens: receiverStateTokens
|
|
274
330
|
}, context), context),
|
|
275
331
|
context.isDelegationChanged && delegationState ? statedb.delegation.update(delegationState.address, _ocap_state.delegation.update(delegationState, {}, context), context) : delegationState,
|
|
276
|
-
context.isDelegationChanged && delegationStates.length ? Promise.all(delegationStates.map((d) => statedb.delegation.update(d.address, _ocap_state.delegation.update(d, {}, context), context))) : delegationStates
|
|
332
|
+
context.isDelegationChanged && delegationStates.length ? Promise.all(delegationStates.filter((d) => !delegationState || !(0, _ocap_util.isSameDid)(d.address, delegationState.address)).map((d) => statedb.delegation.update(d.address, _ocap_state.delegation.update(d, {}, context), context))) : delegationStates
|
|
277
333
|
]);
|
|
278
334
|
if (updateVaults) await updateVaults();
|
|
279
335
|
context.senderState = newSenderState;
|
|
@@ -35,6 +35,10 @@ type Context = IReadyContext<TExchangeV2Tx> & IWithSender & IWithReceiver & Part
|
|
|
35
35
|
};
|
|
36
36
|
/** Token states for exchanged tokens */
|
|
37
37
|
tokenStates?: ITokenState[];
|
|
38
|
+
/** Token states for sender's exchanged tokens */
|
|
39
|
+
senderTokenStates?: ITokenState[];
|
|
40
|
+
/** Token states for receiver's exchanged tokens */
|
|
41
|
+
receiverTokenStates?: ITokenState[];
|
|
38
42
|
/** Receiver address extracted from tx signatures or itx.to */
|
|
39
43
|
receiver?: string;
|
|
40
44
|
/** Multisig delegation states */
|