@ocap/tx-pipeline 1.31.0 → 1.31.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/bridge-release-keys.d.mts +33 -0
- package/esm/bridge-release-keys.mjs +81 -0
- package/esm/bridge-reserves.d.mts +107 -0
- package/esm/bridge-reserves.mjs +242 -0
- package/esm/helpers/bridge-withdraw.d.mts +86 -0
- package/esm/helpers/bridge-withdraw.mjs +123 -0
- package/esm/helpers/replay-guard.d.mts +19 -1
- package/esm/helpers/replay-guard.mjs +39 -1
- package/esm/index.d.mts +3 -1
- package/esm/index.mjs +8 -6
- package/esm/legacy-protocol-sunset.d.mts +2 -2
- package/esm/legacy-protocol-sunset.mjs +5 -5
- package/esm/legacy-rollup-archive.d.mts +67 -0
- package/esm/legacy-rollup-archive.mjs +199 -0
- package/esm/library.d.mts +4 -4
- package/esm/library.mjs +3 -3
- package/esm/native-abt-exchange.d.mts +3 -0
- package/esm/native-abt-exchange.mjs +93 -46
- package/esm/pipes/bridge-release-gate.d.mts +30 -0
- package/esm/pipes/bridge-release-gate.mjs +143 -0
- package/esm/pipes/bridge-reserve-v2-gate.d.mts +53 -0
- package/esm/pipes/bridge-reserve-v2-gate.mjs +264 -0
- package/esm/pipes/decode-itx.mjs +3 -0
- package/esm/pipes/decode-tx.mjs +32 -4
- package/esm/pipes/extract-signer.mjs +1 -1
- package/esm/pipes/extract-state.mjs +2 -2
- package/esm/pipes/post-execution-invariant-gate.d.mts +19 -2
- package/esm/pipes/post-execution-invariant-gate.mjs +121 -6
- package/esm/pipes/pre-flight-waf.d.mts +58 -2
- package/esm/pipes/pre-flight-waf.mjs +202 -14
- package/esm/pipes/update-owner.mjs +1 -1
- package/esm/pipes/verify-account-migration.mjs +1 -1
- package/esm/pipes/verify-delegation.mjs +49 -25
- package/esm/pipes/verify-multisig-v2.mjs +5 -4
- package/esm/pipes/verify-multisig.mjs +5 -4
- package/esm/pipes/verify-signature.d.mts +7 -1
- package/esm/pipes/verify-signature.mjs +119 -16
- package/esm/pipes/verify-signer.mjs +2 -2
- package/esm/pipes/verify-token-access.mjs +1 -1
- package/esm/pipes/verify-token-balance.mjs +1 -1
- package/esm/pipes/verify-tx-input.mjs +1 -1
- package/esm/pipes/verify-tx-size.mjs +1 -1
- package/esm/pipes/verify-tx.mjs +12 -5
- package/esm/super-suites-foundation.mjs +6 -6
- package/esm/transaction-block.d.mts +6 -2
- package/esm/transaction-block.mjs +282 -40
- package/esm/uniswap-router.d.mts +247 -1
- package/esm/uniswap-router.mjs +573 -2
- package/lib/bridge-release-keys.cjs +88 -0
- package/lib/bridge-release-keys.d.cts +33 -0
- package/lib/bridge-reserves.cjs +257 -0
- package/lib/bridge-reserves.d.cts +107 -0
- package/lib/helpers/bridge-withdraw.cjs +136 -0
- package/lib/helpers/bridge-withdraw.d.cts +86 -0
- package/lib/helpers/replay-guard.cjs +39 -0
- package/lib/helpers/replay-guard.d.cts +20 -2
- package/lib/index.cjs +25 -5
- package/lib/index.d.cts +3 -1
- package/lib/legacy-protocol-sunset.cjs +7 -7
- package/lib/legacy-protocol-sunset.d.cts +2 -2
- package/lib/legacy-rollup-archive.cjs +208 -0
- package/lib/legacy-rollup-archive.d.cts +67 -0
- package/lib/library.cjs +14 -68
- package/lib/library.d.cts +4 -4
- package/lib/native-abt-exchange.cjs +93 -46
- package/lib/native-abt-exchange.d.cts +3 -0
- package/lib/pipes/bridge-release-gate.cjs +145 -0
- package/lib/pipes/bridge-release-gate.d.cts +30 -0
- package/lib/pipes/bridge-reserve-v2-gate.cjs +273 -0
- package/lib/pipes/bridge-reserve-v2-gate.d.cts +53 -0
- package/lib/pipes/decode-itx.cjs +3 -0
- package/lib/pipes/decode-itx.d.cts +1 -1
- package/lib/pipes/decode-tx.cjs +31 -3
- package/lib/pipes/decode-tx.d.cts +1 -1
- package/lib/pipes/extract-signer.cjs +1 -1
- package/lib/pipes/extract-state.cjs +3 -3
- package/lib/pipes/post-execution-invariant-gate.cjs +121 -4
- package/lib/pipes/post-execution-invariant-gate.d.cts +19 -2
- package/lib/pipes/pre-flight-waf.cjs +209 -15
- package/lib/pipes/pre-flight-waf.d.cts +58 -2
- package/lib/pipes/update-owner.cjs +1 -1
- package/lib/pipes/update-owner.d.cts +1 -1
- package/lib/pipes/verify-account-migration.cjs +1 -1
- package/lib/pipes/verify-delegation.cjs +50 -26
- package/lib/pipes/verify-multisig-v2.cjs +5 -4
- package/lib/pipes/verify-multisig.cjs +5 -4
- package/lib/pipes/verify-service-fee.d.cts +1 -1
- package/lib/pipes/verify-signature.cjs +118 -14
- package/lib/pipes/verify-signature.d.cts +8 -2
- package/lib/pipes/verify-signer.cjs +2 -2
- package/lib/pipes/verify-token-access.cjs +1 -1
- package/lib/pipes/verify-token-balance.cjs +1 -1
- package/lib/pipes/verify-tx-input.cjs +1 -1
- package/lib/pipes/verify-tx-size.cjs +1 -1
- package/lib/pipes/verify-tx-size.d.cts +1 -1
- package/lib/pipes/verify-tx.cjs +11 -5
- package/lib/pipes/verify-tx.d.cts +1 -1
- package/lib/super-suites-foundation.cjs +6 -6
- package/lib/transaction-block.cjs +282 -40
- package/lib/transaction-block.d.cts +6 -2
- package/lib/uniswap-router.cjs +576 -1
- package/lib/uniswap-router.d.cts +247 -1
- package/package.json +10 -10
- package/esm/evm-simplified-bridge.d.mts +0 -1370
- package/esm/evm-simplified-bridge.mjs +0 -3875
- package/lib/evm-simplified-bridge.cjs +0 -3943
- package/lib/evm-simplified-bridge.d.cts +0 -1370
|
@@ -6,12 +6,12 @@ const require_transaction_block = require('./transaction-block.cjs');
|
|
|
6
6
|
let _ocap_mcrypto = require("@ocap/mcrypto");
|
|
7
7
|
let _ocap_util = require("@ocap/util");
|
|
8
8
|
let _ocap_util_lib_error = require("@ocap/util/lib/error");
|
|
9
|
+
let _arcblock_did = require("@arcblock/did");
|
|
10
|
+
let _arcblock_did_util = require("@arcblock/did-util");
|
|
9
11
|
let node_crypto = require("node:crypto");
|
|
10
12
|
let elliptic = require("elliptic");
|
|
11
13
|
elliptic = require_rolldown_runtime.__toESM(elliptic);
|
|
12
|
-
let _arcblock_did = require("@arcblock/did");
|
|
13
14
|
let _ocap_wallet = require("@ocap/wallet");
|
|
14
|
-
let _arcblock_did_util = require("@arcblock/did-util");
|
|
15
15
|
|
|
16
16
|
//#region src/native-abt-exchange.ts
|
|
17
17
|
const RawCustomError = _ocap_util_lib_error.CustomError;
|
|
@@ -2779,11 +2779,7 @@ var OcapNativeExchangeEngine = class {
|
|
|
2779
2779
|
await creditAccountAbt(listing.creatorDid, royaltyAbtBn);
|
|
2780
2780
|
await creditAccountAbt(this.policy.chainRevenueDid, protocolFeeAbtBn);
|
|
2781
2781
|
if (hasEligibleReferrer && uiReferrerDid) await creditAccountAbt(uiReferrerDid, referrerAbtBn);
|
|
2782
|
-
await overlay.asset.update(listing.assetDid,
|
|
2783
|
-
...assetState,
|
|
2784
|
-
owner: buyerDid,
|
|
2785
|
-
marketListing: null
|
|
2786
|
-
});
|
|
2782
|
+
await overlay.asset.update(listing.assetDid, this.buildTransferredAssetUpdateForMarketSale(assetState, buyerDid));
|
|
2787
2783
|
return { settledPriceAbt: settlementPriceBn.toString(10) };
|
|
2788
2784
|
}
|
|
2789
2785
|
});
|
|
@@ -3053,11 +3049,7 @@ var OcapNativeExchangeEngine = class {
|
|
|
3053
3049
|
const assetState = await overlay.asset.get(listing.assetDid);
|
|
3054
3050
|
if (!assetState || require_ofac_screening.normalizeScreeningAddress(assetState.owner || "") !== listing.sellerDid) throw createExchangeError("NFT_OWNERSHIP_CHANGED", "Seller no longer owns the listed NFT");
|
|
3055
3051
|
this.assertValueCardSecondaryMarketTransferrable(assetState, txTimestampSeconds, settlementPriceBn, settlementPriceBn.sub(referrerAbtBn));
|
|
3056
|
-
await overlay.asset.update(listing.assetDid,
|
|
3057
|
-
...assetState,
|
|
3058
|
-
owner: winnerDid,
|
|
3059
|
-
marketListing: null
|
|
3060
|
-
});
|
|
3052
|
+
await overlay.asset.update(listing.assetDid, this.buildTransferredAssetUpdateForMarketSale(assetState, winnerDid));
|
|
3061
3053
|
return {
|
|
3062
3054
|
winnerDid,
|
|
3063
3055
|
settlementPriceAbt: settlementPriceBn.toString(10)
|
|
@@ -3375,11 +3367,7 @@ var OcapNativeExchangeEngine = class {
|
|
|
3375
3367
|
const assetState = await overlay.asset.get(assetDid);
|
|
3376
3368
|
if (!assetState || require_ofac_screening.normalizeScreeningAddress(assetState.owner || "") !== sellerDid) throw createExchangeError("NFT_OWNERSHIP_CHANGED", "Seller no longer owns the NFT");
|
|
3377
3369
|
this.assertValueCardSecondaryMarketTransferrable(assetState, input.txTimestampSeconds, settlementPriceBn, settlementPriceBn.sub(referrerAbtBn));
|
|
3378
|
-
await overlay.asset.update(assetDid,
|
|
3379
|
-
...assetState,
|
|
3380
|
-
owner: offer.buyerDid,
|
|
3381
|
-
marketListing: null
|
|
3382
|
-
});
|
|
3370
|
+
await overlay.asset.update(assetDid, this.buildTransferredAssetUpdateForMarketSale(assetState, offer.buyerDid));
|
|
3383
3371
|
return {
|
|
3384
3372
|
offerId,
|
|
3385
3373
|
assetDid,
|
|
@@ -3490,6 +3478,29 @@ var OcapNativeExchangeEngine = class {
|
|
|
3490
3478
|
}
|
|
3491
3479
|
return null;
|
|
3492
3480
|
}
|
|
3481
|
+
buildTransferredAssetUpdateForMarketSale(assetState, newOwnerDidInput) {
|
|
3482
|
+
const newOwnerDid = require_ofac_screening.normalizeScreeningAddress(newOwnerDidInput);
|
|
3483
|
+
const dataObj = parseAssetStructuredData(assetState?.data);
|
|
3484
|
+
if (dataObj.valueCard && typeof dataObj.valueCard === "object") return {
|
|
3485
|
+
...assetState,
|
|
3486
|
+
owner: newOwnerDid,
|
|
3487
|
+
marketListing: null,
|
|
3488
|
+
data: {
|
|
3489
|
+
...dataObj,
|
|
3490
|
+
valueCard: {
|
|
3491
|
+
...dataObj.valueCard,
|
|
3492
|
+
holderDid: newOwnerDid,
|
|
3493
|
+
authorizedSpenderDid: void 0,
|
|
3494
|
+
authorizedByOwnerDid: void 0
|
|
3495
|
+
}
|
|
3496
|
+
}
|
|
3497
|
+
};
|
|
3498
|
+
return {
|
|
3499
|
+
...assetState,
|
|
3500
|
+
owner: newOwnerDid,
|
|
3501
|
+
marketListing: null
|
|
3502
|
+
};
|
|
3503
|
+
}
|
|
3493
3504
|
syncValueCardOwnershipAfterMarketSale(assetDidInput, newOwnerDidInput) {
|
|
3494
3505
|
const assetDid = require_ofac_screening.normalizeScreeningAddress(assetDidInput);
|
|
3495
3506
|
const newOwnerDid = require_ofac_screening.normalizeScreeningAddress(newOwnerDidInput);
|
|
@@ -4495,6 +4506,8 @@ var OcapNativeExchangeEngine = class {
|
|
|
4495
4506
|
if (redeemBn.gt(remBn)) throw createExchangeError("INSUFFICIENT_CARD_BALANCE", "Redeem amount exceeds remaining card balance");
|
|
4496
4507
|
const nextRemBn = remBn.sub(redeemBn);
|
|
4497
4508
|
const nextStatus = nextRemBn.isZero() ? "REDEEMED" : "ACTIVE";
|
|
4509
|
+
const prevPrimaryReserveBn = card.unspentPrimaryReserveAbt !== void 0 ? new _ocap_util.BN(card.unspentPrimaryReserveAbt, 10) : void 0;
|
|
4510
|
+
const nextPrimaryReserveStr = prevPrimaryReserveBn !== void 0 ? (prevPrimaryReserveBn.gt(redeemBn) ? prevPrimaryReserveBn.sub(redeemBn) : new _ocap_util.BN(0)).toString(10) : void 0;
|
|
4498
4511
|
const blockResult = await require_transaction_block.executeTransactionBlock({
|
|
4499
4512
|
from: holderDid,
|
|
4500
4513
|
enforceZeroSum: true,
|
|
@@ -4547,6 +4560,7 @@ var OcapNativeExchangeEngine = class {
|
|
|
4547
4560
|
...card,
|
|
4548
4561
|
holderDid,
|
|
4549
4562
|
remainingBalance: nextRemBn.toString(10),
|
|
4563
|
+
...nextPrimaryReserveStr !== void 0 ? { unspentPrimaryReserveAbt: nextPrimaryReserveStr } : {},
|
|
4550
4564
|
status: nextStatus
|
|
4551
4565
|
}
|
|
4552
4566
|
}
|
|
@@ -4560,6 +4574,7 @@ var OcapNativeExchangeEngine = class {
|
|
|
4560
4574
|
if (!blockResult.ok) throw blockResult.error || createExchangeError("REDEEM_VALUE_CARD_FAILED", "Failed to redeem value card");
|
|
4561
4575
|
card.holderDid = holderDid;
|
|
4562
4576
|
card.remainingBalance = nextRemBn.toString(10);
|
|
4577
|
+
if (nextPrimaryReserveStr !== void 0) card.unspentPrimaryReserveAbt = nextPrimaryReserveStr;
|
|
4563
4578
|
card.status = nextStatus;
|
|
4564
4579
|
return {
|
|
4565
4580
|
blockResult,
|
|
@@ -6218,11 +6233,15 @@ var OcapNativeExchangeEngine = class {
|
|
|
6218
6233
|
const totalLpBn = new _ocap_util.BN(pool.totalLpShares, 10);
|
|
6219
6234
|
if (resAbtBn.lte(new _ocap_util.BN(0)) || resTokBn.lte(new _ocap_util.BN(0)) || totalLpBn.lte(new _ocap_util.BN(0))) throw createExchangeError("EMPTY_AMM_POOL", `AMM Pool ${factoryAddress} has zero reserves`);
|
|
6220
6235
|
const pairedTokenBn = liquidityMode === "SINGLE_SIDED_ABT_UPPER_RANGE" ? new _ocap_util.BN(0) : releaseAbtBn.mul(resTokBn).div(resAbtBn);
|
|
6221
|
-
const mintedLockedLpBn = releaseAbtBn.mul(totalLpBn).div(resAbtBn);
|
|
6222
|
-
if (liquidityMode === "DUAL_SIDED_PROPORTIONAL" && pairedTokenBn.lte(new _ocap_util.BN(0)) || mintedLockedLpBn.lte(new _ocap_util.BN(0))) throw createExchangeError("INSUFFICIENT_POL_LIQUIDITY_MINT", "Computed pairedTokenAmount or mintedLockedLpShares is zero");
|
|
6236
|
+
const mintedLockedLpBn = liquidityMode === "SINGLE_SIDED_ABT_UPPER_RANGE" ? new _ocap_util.BN(0) : releaseAbtBn.mul(totalLpBn).div(resAbtBn);
|
|
6237
|
+
if (liquidityMode === "DUAL_SIDED_PROPORTIONAL" && (pairedTokenBn.lte(new _ocap_util.BN(0)) || mintedLockedLpBn.lte(new _ocap_util.BN(0)))) throw createExchangeError("INSUFFICIENT_POL_LIQUIDITY_MINT", "Computed pairedTokenAmount or mintedLockedLpShares is zero");
|
|
6223
6238
|
if (revAvailAbtBn.lt(releaseAbtBn) || revAvailTokBn.lt(pairedTokenBn)) throw createExchangeError("INSUFFICIENT_CHAIN_REVENUE_RESERVE", `chainRevenueDid (${revenueDid}) has insufficient official token or paired pool token for passive POL injection`);
|
|
6239
|
+
const prevUpperRangeAbtBn = new _ocap_util.BN(pool.upperRangePolReserveAbt || "0", 10);
|
|
6240
|
+
const nextUpperRangeAbtBn = liquidityMode === "SINGLE_SIDED_ABT_UPPER_RANGE" ? prevUpperRangeAbtBn.add(releaseAbtBn) : prevUpperRangeAbtBn;
|
|
6241
|
+
const nextHomogeneousReserveAbtBn = liquidityMode === "SINGLE_SIDED_ABT_UPPER_RANGE" ? resAbtBn : resAbtBn.add(releaseAbtBn);
|
|
6224
6242
|
const maxRevenueOutflowMap = { [tokenAddress]: releaseAbtBn.toString(10) };
|
|
6225
6243
|
if (pairedTokenBn.gt(new _ocap_util.BN(0))) maxRevenueOutflowMap[pool.tokenAddress] = pairedTokenBn.toString(10);
|
|
6244
|
+
const targetPolStakeAddress = liquidityMode === "SINGLE_SIDED_ABT_UPPER_RANGE" ? (0, _arcblock_did_util.toStakeAddress)(revenueDid, factoryAddress, "UPPER_RANGE_POL") : pool.poolStakeAddress;
|
|
6226
6245
|
const blockResult = await require_transaction_block.executeTransactionBlock({
|
|
6227
6246
|
from: revenueDid,
|
|
6228
6247
|
enforceZeroSum: true,
|
|
@@ -6235,7 +6254,7 @@ var OcapNativeExchangeEngine = class {
|
|
|
6235
6254
|
typeUrl: "fg:t:stake",
|
|
6236
6255
|
from: revenueDid,
|
|
6237
6256
|
itx: {
|
|
6238
|
-
stakeAddress:
|
|
6257
|
+
stakeAddress: targetPolStakeAddress,
|
|
6239
6258
|
factoryAddress,
|
|
6240
6259
|
purpose: "Stake-for-Liquidity-Programmatic-POL",
|
|
6241
6260
|
liquidityMode,
|
|
@@ -6264,22 +6283,43 @@ var OcapNativeExchangeEngine = class {
|
|
|
6264
6283
|
polEpochMaxReleaseBps: effectiveMaxEpochReleaseBps,
|
|
6265
6284
|
tokens: nextRevTokens
|
|
6266
6285
|
});
|
|
6267
|
-
|
|
6268
|
-
|
|
6269
|
-
|
|
6270
|
-
|
|
6271
|
-
|
|
6272
|
-
|
|
6273
|
-
|
|
6274
|
-
|
|
6275
|
-
|
|
6276
|
-
|
|
6277
|
-
tokens
|
|
6278
|
-
|
|
6279
|
-
|
|
6280
|
-
|
|
6281
|
-
|
|
6282
|
-
|
|
6286
|
+
if (liquidityMode === "SINGLE_SIDED_ABT_UPPER_RANGE") {
|
|
6287
|
+
const upperRangeStakeAddress = (0, _arcblock_did_util.toStakeAddress)(revenueDid, factoryAddress, "UPPER_RANGE_POL");
|
|
6288
|
+
const upperStake = await overlay.stake.get(upperRangeStakeAddress) || {
|
|
6289
|
+
address: upperRangeStakeAddress,
|
|
6290
|
+
sender: revenueDid,
|
|
6291
|
+
receiver: factoryAddress,
|
|
6292
|
+
purpose: "Stake-for-Liquidity",
|
|
6293
|
+
revocable: false,
|
|
6294
|
+
tokens: {}
|
|
6295
|
+
};
|
|
6296
|
+
const curUpperStakeAbtBn = new _ocap_util.BN(upperStake?.tokens?.[tokenAddress] ?? prevUpperRangeAbtBn.toString(10), 10);
|
|
6297
|
+
await overlay.stake.update(upperRangeStakeAddress, {
|
|
6298
|
+
...upperStake,
|
|
6299
|
+
liquidityMode: "SINGLE_SIDED_ABT_UPPER_RANGE",
|
|
6300
|
+
tokens: {
|
|
6301
|
+
...upperStake.tokens || {},
|
|
6302
|
+
[tokenAddress]: curUpperStakeAbtBn.add(releaseAbtBn).toString(10)
|
|
6303
|
+
}
|
|
6304
|
+
});
|
|
6305
|
+
} else {
|
|
6306
|
+
const poolStake = await overlay.stake.get(pool.poolStakeAddress) || {
|
|
6307
|
+
address: pool.poolStakeAddress,
|
|
6308
|
+
sender: pool.creatorDid,
|
|
6309
|
+
receiver: factoryAddress,
|
|
6310
|
+
purpose: "Stake-for-Liquidity",
|
|
6311
|
+
revocable: false,
|
|
6312
|
+
tokens: {}
|
|
6313
|
+
};
|
|
6314
|
+
await overlay.stake.update(pool.poolStakeAddress, {
|
|
6315
|
+
...poolStake,
|
|
6316
|
+
tokens: {
|
|
6317
|
+
...poolStake.tokens || {},
|
|
6318
|
+
[tokenAddress]: resAbtBn.add(releaseAbtBn).toString(10),
|
|
6319
|
+
[pool.tokenAddress]: resTokBn.add(pairedTokenBn).toString(10)
|
|
6320
|
+
}
|
|
6321
|
+
});
|
|
6322
|
+
}
|
|
6283
6323
|
const curFactory = await overlay.tokenFactory.get(factoryAddress) || {
|
|
6284
6324
|
address: factoryAddress,
|
|
6285
6325
|
poolTokenAddress: pool.tokenAddress,
|
|
@@ -6290,6 +6330,7 @@ var OcapNativeExchangeEngine = class {
|
|
|
6290
6330
|
};
|
|
6291
6331
|
await overlay.tokenFactory.update(factoryAddress, {
|
|
6292
6332
|
...curFactory,
|
|
6333
|
+
upperRangePolReserveAbt: nextUpperRangeAbtBn.toString(10),
|
|
6293
6334
|
polHighWaterMarkTwapUsdScaled: nextHwmBn.toString(10),
|
|
6294
6335
|
polLastAbtReleasePriceUsdScaled: nextLastReleaseBn.toString(10),
|
|
6295
6336
|
polMinAbtReleasePriceUsdScaled: nextMinReleaseBn.toString(10),
|
|
@@ -6306,11 +6347,14 @@ var OcapNativeExchangeEngine = class {
|
|
|
6306
6347
|
}
|
|
6307
6348
|
});
|
|
6308
6349
|
if (!blockResult.ok) throw blockResult.error || createExchangeError("PROGRAMMATIC_POL_REBALANCE_FAILED", "POL rebalance failed");
|
|
6309
|
-
pool.reserveAbt =
|
|
6350
|
+
pool.reserveAbt = nextHomogeneousReserveAbtBn.toString(10);
|
|
6351
|
+
pool.upperRangePolReserveAbt = nextUpperRangeAbtBn.toString(10);
|
|
6310
6352
|
pool.poolTokenBalance = resTokBn.add(pairedTokenBn).toString(10);
|
|
6311
|
-
|
|
6312
|
-
|
|
6313
|
-
|
|
6353
|
+
if (mintedLockedLpBn.gt(new _ocap_util.BN(0))) {
|
|
6354
|
+
pool.totalLpShares = totalLpBn.add(mintedLockedLpBn).toString(10);
|
|
6355
|
+
pool.lockedLpShares = new _ocap_util.BN(pool.lockedLpShares, 10).add(mintedLockedLpBn).toString(10);
|
|
6356
|
+
pool.lpBalances[this.policy.burnSinkDid] = new _ocap_util.BN(pool.lpBalances[this.policy.burnSinkDid] || "0", 10).add(mintedLockedLpBn).toString(10);
|
|
6357
|
+
}
|
|
6314
6358
|
this.polHighWaterMarkTwapByFactory.set(factoryAddress, nextHwmBn.toString(10));
|
|
6315
6359
|
this.polLastReleasePriceByFactory.set(factoryAddress, nextLastReleaseBn.toString(10));
|
|
6316
6360
|
this.polMinReleasePriceByFactory.set(factoryAddress, nextMinReleaseBn.toString(10));
|
|
@@ -6943,18 +6987,21 @@ var OcapNativeExchangeEngine = class {
|
|
|
6943
6987
|
}
|
|
6944
6988
|
if (!defectVerified) throw createExchangeError("FALSE_DEFECT_CHALLENGE_REJECTED", `Defect proof for order ${orderId} (${input.defectReason}) failed cryptographic verification; honest maker cannot be slashed`);
|
|
6945
6989
|
const availableStakeBn = new _ocap_util.BN((await statedb.stake.get(listing.qualityStakeAddress))?.tokens?.[this.abtTokenAddress] ?? listing.lockedQualityStakeAbt ?? "0", 10);
|
|
6990
|
+
const unchallengedOrdersCount = Math.max(1, Array.from(this.skuOrdersById.values()).filter((o) => o.factoryAddress === order.factoryAddress && !o.challenged && o.status === "SETTLED").length);
|
|
6991
|
+
const orderStakeShareBn = unchallengedOrdersCount > 1 ? availableStakeBn.div(new _ocap_util.BN(unchallengedOrdersCount)) : availableStakeBn;
|
|
6992
|
+
const remainingStakeBn = availableStakeBn.sub(orderStakeShareBn);
|
|
6946
6993
|
const grossOrderBn = new _ocap_util.BN(order.grossAbtPaid, 10);
|
|
6947
|
-
const stakeRefundBn =
|
|
6994
|
+
const stakeRefundBn = orderStakeShareBn.lt(grossOrderBn) ? orderStakeShareBn : grossOrderBn;
|
|
6948
6995
|
const refundShortfallBn = grossOrderBn.sub(stakeRefundBn);
|
|
6949
6996
|
const makerSettlementDid = order.shopPersonaDid || order.makerDid;
|
|
6950
6997
|
const curMakerSettlementBalBn = new _ocap_util.BN((await statedb.account.get(makerSettlementDid))?.tokens?.[this.abtTokenAddress] || "0", 10);
|
|
6951
6998
|
const maxClawbackCapBn = _ocap_util.BN.min(refundShortfallBn, new _ocap_util.BN(order.makerNetAbt, 10));
|
|
6952
6999
|
const makerClawbackBn = _ocap_util.BN.min(maxClawbackCapBn, curMakerSettlementBalBn);
|
|
6953
7000
|
const buyerRefundBn = stakeRefundBn.add(makerClawbackBn);
|
|
6954
|
-
const excessSlashedBn =
|
|
7001
|
+
const excessSlashedBn = orderStakeShareBn.sub(stakeRefundBn);
|
|
6955
7002
|
const fishermanBountyBn = excessSlashedBn.mul(new _ocap_util.BN(DEFAULT_FISHERMAN_DEFECT_BOUNTY_BPS)).div(new _ocap_util.BN(BPS_SCALE));
|
|
6956
7003
|
const treasurySlashBn = excessSlashedBn.sub(fishermanBountyBn);
|
|
6957
|
-
const totalSlashedAndClawedBackBn =
|
|
7004
|
+
const totalSlashedAndClawedBackBn = orderStakeShareBn.add(makerClawbackBn);
|
|
6958
7005
|
const blockResult = await require_transaction_block.executeTransactionBlock({
|
|
6959
7006
|
from: challengerDid,
|
|
6960
7007
|
enforceZeroSum: true,
|
|
@@ -6978,10 +7025,10 @@ var OcapNativeExchangeEngine = class {
|
|
|
6978
7025
|
const curStake = await overlay.stake.get(listing.qualityStakeAddress);
|
|
6979
7026
|
await overlay.stake.update(listing.qualityStakeAddress, {
|
|
6980
7027
|
...curStake || { address: listing.qualityStakeAddress },
|
|
6981
|
-
status: "SLASHED",
|
|
7028
|
+
status: remainingStakeBn.isZero() ? "SLASHED" : "PARTIALLY_SLASHED",
|
|
6982
7029
|
tokens: {
|
|
6983
7030
|
...curStake?.tokens || {},
|
|
6984
|
-
[this.abtTokenAddress]:
|
|
7031
|
+
[this.abtTokenAddress]: remainingStakeBn.toString(10)
|
|
6985
7032
|
}
|
|
6986
7033
|
});
|
|
6987
7034
|
if (makerClawbackBn.gt(new _ocap_util.BN(0))) {
|
|
@@ -7027,7 +7074,7 @@ var OcapNativeExchangeEngine = class {
|
|
|
7027
7074
|
if (!blockResult.ok) throw blockResult.error || createExchangeError("SLASH_DEFECTIVE_SKU_FAILED", "Failed to slash defective SKU");
|
|
7028
7075
|
order.challenged = true;
|
|
7029
7076
|
order.status = "SLASHED_REFUNDED";
|
|
7030
|
-
listing.lockedQualityStakeAbt =
|
|
7077
|
+
listing.lockedQualityStakeAbt = remainingStakeBn.toString(10);
|
|
7031
7078
|
listing.status = "SLASHED_DEFECTIVE";
|
|
7032
7079
|
return {
|
|
7033
7080
|
blockResult,
|
|
@@ -284,6 +284,8 @@ interface UnifiedAbtExchangePoolState {
|
|
|
284
284
|
totalLpShares: string;
|
|
285
285
|
/** Permanently locked LP shares (`>= 1000`, or `100%` of initial shares upon Curve graduation) */
|
|
286
286
|
lockedLpShares: string;
|
|
287
|
+
/** Optional single-sided upper-range POL ABT reserve tracked separately from active x*y=k reserveAbt (#1441) */
|
|
288
|
+
upperRangePolReserveAbt?: string;
|
|
287
289
|
/** Map of `lpHolderDid -> lpShares` */
|
|
288
290
|
lpBalances: Record<string, string>;
|
|
289
291
|
/** Whether this AMM pool graduated in-place from a `BONDING_CURVE` factory (#1282) */
|
|
@@ -1531,6 +1533,7 @@ declare class OcapNativeExchangeEngine {
|
|
|
1531
1533
|
* Stateless / cold-start hydration of `MaturingCardSettlementRecord` from `statedb.stake` when `this.maturingSettlementsById` is cold.
|
|
1532
1534
|
*/
|
|
1533
1535
|
private resolveMaturingSettlementRecord;
|
|
1536
|
+
private buildTransferredAssetUpdateForMarketSale;
|
|
1534
1537
|
private syncValueCardOwnershipAfterMarketSale;
|
|
1535
1538
|
getValueCardRecord(cardAssetDid: string): ValueCardRecord | null;
|
|
1536
1539
|
getMaturingCardSettlementRecord(settlementId: string): MaturingCardSettlementRecord | null;
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
|
|
2
|
+
const require_bridge_release_keys = require('../bridge-release-keys.cjs');
|
|
3
|
+
const require_bridge_reserves = require('../bridge-reserves.cjs');
|
|
4
|
+
let _ocap_util = require("@ocap/util");
|
|
5
|
+
let lodash_isEqual = require("lodash/isEqual");
|
|
6
|
+
lodash_isEqual = require_rolldown_runtime.__toESM(lodash_isEqual);
|
|
7
|
+
|
|
8
|
+
//#region src/pipes/bridge-release-gate.ts
|
|
9
|
+
/**
|
|
10
|
+
* Gate rules of the release primitive (#1466, bridge/docs/ocap-protocols.md §3 and §v2.4): R4 and the ownership of the
|
|
11
|
+
* release-window buckets. R1-R3 and R5 for the reserves themselves live in `bridge-reserve-v2-gate.ts`; this file only
|
|
12
|
+
* adds what is specific to `release_bridge_token`.
|
|
13
|
+
*
|
|
14
|
+
* - **Ownership.** A bucket row (two rings of 24 hourly slots per bridge, in the evidence table) may be written only by
|
|
15
|
+
* `release_bridge_token`. A row is recognised by what it says about itself (`identifyBucketRow`: its data names the
|
|
16
|
+
* bridge, ring and slot, and its key is the key recomputed from them), so no global list of bridges is needed.
|
|
17
|
+
* - **R4, accounting.** A release debits exactly the reserve it is entitled to (the reserve of `itx.bridge`; for a REFUND
|
|
18
|
+
* of a migrated bridge the reserve that holds the funds now) by exactly `itx.amount` of the bridge token, and credits
|
|
19
|
+
* exactly one account, `itx.to`, by the same amount. The only other balance movement is the gas: the vaults gain it and
|
|
20
|
+
* the sender (`tx.from`) pays it, to the unit.
|
|
21
|
+
* - **Records.** A release creates its tombstone and writes exactly one bucket of the ring of its kind, for its own
|
|
22
|
+
* bridge. It writes no stake / token / asset / factory / delegation / rollup-block record, and no balance row directly.
|
|
23
|
+
* The one rollup row it may write is the refund ledger: a REFUND that draws on the reserve of a successor lowers
|
|
24
|
+
* `body.migratedAmount` of every migrated bridge on the way, by exactly `amount`, and changes nothing else in it.
|
|
25
|
+
*/
|
|
26
|
+
const ZERO = new _ocap_util.BN(0);
|
|
27
|
+
const CANONICAL_UINT = /^(?:0|[1-9]\d*)$/;
|
|
28
|
+
const bodyOf = (row) => {
|
|
29
|
+
const v = (row?.data)?.value;
|
|
30
|
+
return v && typeof v === "object" ? v : null;
|
|
31
|
+
};
|
|
32
|
+
function assertBridgeReleaseProtected(input) {
|
|
33
|
+
const { txType, itx, norm, createGateError } = input;
|
|
34
|
+
const violation = (code, message) => createGateError(code, `Post-Execution Invariant Gate: ${message}`);
|
|
35
|
+
const writtenEvidence = input.written("evidence") ?? /* @__PURE__ */ new Set();
|
|
36
|
+
if (txType !== "release_bridge_token") {
|
|
37
|
+
for (const key of writtenEvidence) {
|
|
38
|
+
const row = input.after.get("evidence")?.get(key) ?? input.before.get("evidence")?.get(key) ?? null;
|
|
39
|
+
const prior = input.before.get("evidence")?.get(key) ?? null;
|
|
40
|
+
if (require_bridge_release_keys.identifyBucketRow(row) || require_bridge_release_keys.identifyBucketRow(prior)) throw violation("BRIDGE_RELEASE_BUCKET_FORBIDDEN", `release-window bucket ${key} may only be written by release_bridge_token, not a ${txType || "unknown"} tx`);
|
|
41
|
+
}
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
const R4 = (message) => violation("BRIDGE_RELEASE_ACCOUNTING_VIOLATION", message);
|
|
45
|
+
const release = input.resolution?.release ?? null;
|
|
46
|
+
if (!release) throw R4("release_bridge_token names no existing bridge (itx.bridge)");
|
|
47
|
+
const kind = Number(itx.kind);
|
|
48
|
+
if (![
|
|
49
|
+
1,
|
|
50
|
+
2,
|
|
51
|
+
3
|
|
52
|
+
].includes(kind)) throw R4("release_bridge_token has an unknown kind");
|
|
53
|
+
if (typeof itx.amount !== "string" || !CANONICAL_UINT.test(itx.amount)) throw R4("release_bridge_token amount must be a canonical decimal string");
|
|
54
|
+
const amount = new _ocap_util.BN(itx.amount, 10);
|
|
55
|
+
if (amount.isZero()) throw R4("release_bridge_token amount must be positive");
|
|
56
|
+
const toKey = norm(itx.to);
|
|
57
|
+
if (!toKey || input.isReserveAddress(toKey)) throw R4("release_bridge_token recipient must not be a bridge reserve");
|
|
58
|
+
if (input.vaults.has(toKey)) throw R4("release_bridge_token recipient must not be a vault");
|
|
59
|
+
const expectedReserve = norm(kind === 2 ? release.fundsReserve : release.reserve);
|
|
60
|
+
const owner = release.debitable.get(require_bridge_reserves.bareAddress(kind === 2 ? release.fundsReserve : release.reserve));
|
|
61
|
+
if (!owner) throw R4("release_bridge_token does not resolve the reserve it must debit");
|
|
62
|
+
const tokenKey = norm(owner.token);
|
|
63
|
+
if (!tokenKey) throw R4("release_bridge_token has no bridge token");
|
|
64
|
+
for (const table of [
|
|
65
|
+
"stake",
|
|
66
|
+
"token",
|
|
67
|
+
"tokenFactory",
|
|
68
|
+
"asset",
|
|
69
|
+
"factory",
|
|
70
|
+
"delegation",
|
|
71
|
+
"rollupBlock"
|
|
72
|
+
]) if ((input.written(table)?.size || 0) > 0) throw R4(`release_bridge_token must not write ${table} records`);
|
|
73
|
+
if (input.directBalanceWrites.length > 0 || (input.written("balance")?.size || 0) > 0) throw R4("release_bridge_token must not write the balance table directly");
|
|
74
|
+
const officialKey = input.officialToken;
|
|
75
|
+
const beforeAccounts = input.before.get("account") ?? /* @__PURE__ */ new Map();
|
|
76
|
+
const afterAccounts = input.after.get("account") ?? /* @__PURE__ */ new Map();
|
|
77
|
+
const actual = /* @__PURE__ */ new Map();
|
|
78
|
+
for (const [addr, afterAcc] of afterAccounts.entries()) {
|
|
79
|
+
const pre = input.tokenBalances(beforeAccounts.get(addr)?.tokens, `beforeAccount[${addr}].tokens`);
|
|
80
|
+
const post = input.tokenBalances(afterAcc.tokens, `afterAccount[${addr}].tokens`);
|
|
81
|
+
for (const tok of new Set([...Object.keys(pre), ...Object.keys(post)])) {
|
|
82
|
+
const d = (post[tok] || ZERO).sub(pre[tok] || ZERO);
|
|
83
|
+
if (d.isZero()) continue;
|
|
84
|
+
if (!actual.has(addr)) actual.set(addr, /* @__PURE__ */ new Map());
|
|
85
|
+
actual.get(addr)?.set(tok, d);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
const deltaOf = (addr, tok) => actual.get(addr)?.get(tok) ?? ZERO;
|
|
89
|
+
let gas = ZERO;
|
|
90
|
+
for (const vault of input.vaults) for (const [tok, d] of actual.get(vault) ?? []) {
|
|
91
|
+
if (tok !== officialKey || d.isNeg()) throw R4(`release_bridge_token may only credit vault ${vault} with the gas`);
|
|
92
|
+
gas = gas.add(d);
|
|
93
|
+
}
|
|
94
|
+
const expected = /* @__PURE__ */ new Map();
|
|
95
|
+
const expect = (addr, tok, d) => {
|
|
96
|
+
if (!expected.has(addr)) expected.set(addr, /* @__PURE__ */ new Map());
|
|
97
|
+
expected.get(addr)?.set(tok, (expected.get(addr)?.get(tok) ?? ZERO).add(d));
|
|
98
|
+
};
|
|
99
|
+
expect(expectedReserve, tokenKey, amount.neg());
|
|
100
|
+
expect(toKey, tokenKey, amount);
|
|
101
|
+
if (!gas.isZero()) expect(input.payer, officialKey, gas.neg());
|
|
102
|
+
const accounts = new Set([...actual.keys(), ...expected.keys()]);
|
|
103
|
+
for (const addr of accounts) {
|
|
104
|
+
if (input.vaults.has(addr)) continue;
|
|
105
|
+
for (const tok of new Set([...actual.get(addr)?.keys() ?? [], ...expected.get(addr)?.keys() ?? []])) {
|
|
106
|
+
const want = expected.get(addr)?.get(tok) ?? ZERO;
|
|
107
|
+
if (!deltaOf(addr, tok).eq(want)) throw R4(`release_bridge_token moved ${deltaOf(addr, tok).toString(10)} of ${tok} for ${addr}, expected ${want.toString(10)} (reserve -${amount.toString(10)}, recipient +${amount.toString(10)}, sender -gas)`);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
const tombstone = require_bridge_release_keys.getReleaseTombstoneKey(String(itx.bridge), kind, String(itx.evidence || ""), Number(itx.ordinal));
|
|
111
|
+
if (!writtenEvidence.has(tombstone) || input.before.get("evidence")?.get(tombstone)) throw R4("release_bridge_token must create its tombstone");
|
|
112
|
+
const ring = kind === 2 ? "refund" : "deposit";
|
|
113
|
+
const buckets = [...writtenEvidence].filter((k) => require_bridge_release_keys.identifyBucketRow(input.after.get("evidence")?.get(k)) !== null);
|
|
114
|
+
const bucket = buckets.length === 1 ? require_bridge_release_keys.identifyBucketRow(input.after.get("evidence")?.get(buckets[0])) : null;
|
|
115
|
+
if (!bucket || bucket.bridge !== String(itx.bridge) || bucket.ring !== ring) throw R4(`release_bridge_token must write exactly one ${ring} release-window bucket of bridge ${String(itx.bridge)}, wrote ${buckets.length}`);
|
|
116
|
+
const ledgerBridges = kind === 2 ? [...release.debitable.values()].filter((b) => b.reserve !== release.fundsReserve).map((b) => b.address) : [];
|
|
117
|
+
const writtenRollups = [...input.written("rollup") ?? []];
|
|
118
|
+
const expectedRows = new Set(ledgerBridges.map((a) => require_bridge_reserves.bareAddress(a)));
|
|
119
|
+
if (writtenRollups.length !== expectedRows.size || writtenRollups.some((k) => !expectedRows.has(require_bridge_reserves.bareAddress(k)))) throw R4("release_bridge_token may write only the refund ledger of the migrated bridges it draws through");
|
|
120
|
+
for (const key of writtenRollups) {
|
|
121
|
+
const prior = [...input.before.get("rollup")?.entries() ?? []].find(([k]) => require_bridge_reserves.bareAddress(k) === require_bridge_reserves.bareAddress(key));
|
|
122
|
+
const next = [...input.after.get("rollup")?.entries() ?? []].find(([k]) => require_bridge_reserves.bareAddress(k) === require_bridge_reserves.bareAddress(key));
|
|
123
|
+
const pb = bodyOf(prior?.[1]);
|
|
124
|
+
const nb = bodyOf(next?.[1]);
|
|
125
|
+
const oldAmount = pb?.migratedAmount;
|
|
126
|
+
const newAmount = nb?.migratedAmount;
|
|
127
|
+
if (!pb || !nb || typeof oldAmount !== "string" || typeof newAmount !== "string") throw R4(`release_bridge_token needs a recorded refund ledger (migratedAmount) on migrated bridge ${key}`);
|
|
128
|
+
if (!CANONICAL_UINT.test(oldAmount) || !CANONICAL_UINT.test(newAmount) || !new _ocap_util.BN(oldAmount, 10).sub(amount).eq(new _ocap_util.BN(newAmount, 10)) || new _ocap_util.BN(oldAmount, 10).lt(amount)) throw R4(`release_bridge_token must lower the refund ledger of ${key} by exactly ${amount.toString(10)}`);
|
|
129
|
+
const strip = (row) => {
|
|
130
|
+
const { context: _context, data, ...rest } = row ?? {};
|
|
131
|
+
const { migratedAmount: _ma, ...body } = bodyOf(row) ?? {};
|
|
132
|
+
return {
|
|
133
|
+
...rest,
|
|
134
|
+
data: {
|
|
135
|
+
...data ?? {},
|
|
136
|
+
value: body
|
|
137
|
+
}
|
|
138
|
+
};
|
|
139
|
+
};
|
|
140
|
+
if (!(0, lodash_isEqual.default)(strip(prior?.[1]), strip(next?.[1]))) throw R4(`release_bridge_token may change only the refund ledger of bridge ${key}`);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
//#endregion
|
|
145
|
+
exports.assertBridgeReleaseProtected = assertBridgeReleaseProtected;
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { BridgeReserveResolution } from "../bridge-reserves.cjs";
|
|
2
|
+
import { BN } from "@ocap/util";
|
|
3
|
+
|
|
4
|
+
//#region src/pipes/bridge-release-gate.d.ts
|
|
5
|
+
|
|
6
|
+
type Rec = Record<string, unknown>;
|
|
7
|
+
type Bn = InstanceType<typeof BN>;
|
|
8
|
+
interface BridgeReleaseGateInput {
|
|
9
|
+
txType: string;
|
|
10
|
+
itx: Rec;
|
|
11
|
+
/** `tx.from`, canonical */
|
|
12
|
+
payer: string;
|
|
13
|
+
norm: (raw: unknown) => string;
|
|
14
|
+
isReserveAddress: (key: string) => boolean;
|
|
15
|
+
createGateError: (code: string, message: string) => Error;
|
|
16
|
+
tokenBalances: (tokens: unknown, label: string) => Record<string, Bn>;
|
|
17
|
+
before: Map<string, Map<string, Rec | null>>;
|
|
18
|
+
after: Map<string, Map<string, Rec>>;
|
|
19
|
+
/** keys the write tracker saw written, per table (reads are not writes) */
|
|
20
|
+
written: (table: string) => Set<string> | undefined;
|
|
21
|
+
directBalanceWrites: string[];
|
|
22
|
+
/** the official token of the chain (gas is paid in it), canonical */
|
|
23
|
+
officialToken: string;
|
|
24
|
+
/** gas / fee / slash vaults of the chain config, canonical */
|
|
25
|
+
vaults: Set<string>;
|
|
26
|
+
resolution?: BridgeReserveResolution | null;
|
|
27
|
+
}
|
|
28
|
+
declare function assertBridgeReleaseProtected(input: BridgeReleaseGateInput): void;
|
|
29
|
+
//#endregion
|
|
30
|
+
export { BridgeReleaseGateInput, assertBridgeReleaseProtected };
|