@elmntl/vaults-v2 1.4.5 → 1.5.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/README.md +40 -0
- package/dist/accounts/index.d.ts +2 -0
- package/dist/accounts/index.d.ts.map +1 -1
- package/dist/accounts/index.js +3 -1
- package/dist/accounts/index.js.map +1 -1
- package/dist/accounts/poolExt.d.ts +101 -0
- package/dist/accounts/poolExt.d.ts.map +1 -0
- package/dist/accounts/poolExt.js +211 -0
- package/dist/accounts/poolExt.js.map +1 -0
- package/dist/accounts/position.d.ts +8 -0
- package/dist/accounts/position.d.ts.map +1 -1
- package/dist/accounts/position.js +22 -0
- package/dist/accounts/position.js.map +1 -1
- package/dist/accounts/ticket.d.ts +8 -0
- package/dist/accounts/ticket.d.ts.map +1 -1
- package/dist/accounts/ticket.js +17 -0
- package/dist/accounts/ticket.js.map +1 -1
- package/dist/generated/idl/elemental_vault_v2.json +1204 -65
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +11 -1
- package/dist/index.js.map +1 -1
- package/dist/programs/elemental.d.ts +32 -1
- package/dist/programs/elemental.d.ts.map +1 -1
- package/dist/programs/elemental.js +166 -0
- package/dist/programs/elemental.js.map +1 -1
- package/dist/types.d.ts +53 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +25 -2
- package/dist/types.js.map +1 -1
- package/package.json +1 -1
- package/src/accounts/index.ts +2 -0
- package/src/accounts/poolExt.ts +272 -0
- package/src/accounts/position.ts +22 -0
- package/src/accounts/ticket.ts +20 -0
- package/src/generated/idl/elemental_vault_v2.json +1204 -65
- package/src/index.ts +12 -1
- package/src/programs/elemental.ts +198 -1
- package/src/types.ts +64 -1
package/README.md
CHANGED
|
@@ -101,6 +101,46 @@ Wrapper for position account data.
|
|
|
101
101
|
- `unstakingAmount` - Amount in cooldown
|
|
102
102
|
- `canDeposit`, `canUnstake`, `canWithdraw`, `canClaim` - Action availability
|
|
103
103
|
|
|
104
|
+
### Dual-token edges (PoolExt) — ELE7 `ele7-rwa-v1`+ (SDK 1.5.0)
|
|
105
|
+
|
|
106
|
+
A pool may carry a `PoolExt`: a second token ("alt") it accepts at deposit and
|
|
107
|
+
pays at exit, converted at the on-chain NAV (Kamino Scope). The pool's unit of
|
|
108
|
+
account, APR and tickets stay in its `vault_mint`. Two directions:
|
|
109
|
+
|
|
110
|
+
- RWA pool + USDC alt (`ext.altIsUsdc`): ONyc X1, nOPAL X1 — USDC in/out, fee on the USDC exit.
|
|
111
|
+
- USDC pool + RWA alt: USDC O1 with ONyc — ONyc in/out, claim stays in USDC.
|
|
112
|
+
|
|
113
|
+
```typescript
|
|
114
|
+
const ctx = new ElementalV2Context(provider, ELE7_PROGRAM_ID);
|
|
115
|
+
const pool = await ctx.loadPool(poolAddress);
|
|
116
|
+
const ext = await ctx.loadPoolExt(pool); // null = single-token pool
|
|
117
|
+
if (ext) {
|
|
118
|
+
const nav = await ext.readNav(connection); // { navDecimal, ageSeconds, isStale }
|
|
119
|
+
const q = await ext.quoteDeposit(connection, "10500"); // alt in -> vault credit, program-exact
|
|
120
|
+
await ctx.depositAlt(position, ext, "10500", 10); // min_credit from the quote, 10 bps slippage
|
|
121
|
+
await ctx.createTicketAlt(position, ext, "0"); // "0" = yield only; locks NAV + fee on the ticket
|
|
122
|
+
const tickets = await ctx.loadTickets(pool);
|
|
123
|
+
for (const t of tickets.filter((t) => t.isAltPayout && t.isRedeemable)) {
|
|
124
|
+
const preview = ext.quoteExit(t.totalAmountRaw, t.navLocked, t.feeBpsLocked); // gross/fee/net
|
|
125
|
+
await ctx.redeemTicketAlt(t, position, ext); // fails InsufficientFaucet until the alt faucet covers net
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
```
|
|
129
|
+
|
|
130
|
+
- `loadPoolExt(pool)`, `loadPoolExts(pools)`, `findPoolExtAddress`, `findExtAuthority`
|
|
131
|
+
- `depositAltInstructions(position, ext, amount, slippageBps?)` → `{ instructions, quote }`
|
|
132
|
+
- `createTicketAltInstructions(position, ext, amount)`, `redeemTicketAltInstructions(ticket, position, ext)`
|
|
133
|
+
- `flushAltToManagerInstruction(pool, ext)` (permissionless ops sweep)
|
|
134
|
+
- `PoolExt`: `altMintAddress`, `altDecimals`, `altIsUsdc`, `altDepositsEnabled`, `altExitsEnabled`,
|
|
135
|
+
`exitFeeBps`, `usesScope`, `navOracle`, `readNav()`, `quoteDeposit()`, `quoteExit()`,
|
|
136
|
+
static `altToVaultAt` / `vaultToAltGrossAt` / `feeOn` (byte-for-byte the program's math)
|
|
137
|
+
- `WithdrawalTicket`: `payoutMint`, `isAltPayout`, `navLocked`, `feeBpsLocked`
|
|
138
|
+
- `Position`: `altDepositedRaw`, `vaultDeposited`, `altWithdrawnRaw`, `vaultWithdrawn` (zero on pre-upgrade positions)
|
|
139
|
+
- Constants: `SCOPE_PRICES`, `SCOPE_INDEX` ({ ONYC: 350, NOPAL: 505, AUTO: 451 }), `NAV_ONE`, `USDC_MINT`
|
|
140
|
+
|
|
141
|
+
Only ELE7 has these instructions; on ELE6 `loadPoolExt` returns null for every pool.
|
|
142
|
+
Existing methods and wire formats are unchanged (additive release).
|
|
143
|
+
|
|
104
144
|
## Program
|
|
105
145
|
|
|
106
146
|
- **Program ID**: `ELE6rYCZUaegWxVhWM4ef9pXZBAgGUVaVKkTbDvX6BMU`
|
package/dist/accounts/index.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export { Pool } from "./pool";
|
|
2
2
|
export { Position } from "./position";
|
|
3
3
|
export { WithdrawalTicket } from "./ticket";
|
|
4
|
+
export { PoolExt } from "./poolExt";
|
|
5
|
+
export type { NavReading, AltDepositQuote, AltExitQuote } from "./poolExt";
|
|
4
6
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/accounts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/accounts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,YAAY,EAAE,UAAU,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC"}
|
package/dist/accounts/index.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.WithdrawalTicket = exports.Position = exports.Pool = void 0;
|
|
3
|
+
exports.PoolExt = exports.WithdrawalTicket = exports.Position = exports.Pool = void 0;
|
|
4
4
|
var pool_1 = require("./pool");
|
|
5
5
|
Object.defineProperty(exports, "Pool", { enumerable: true, get: function () { return pool_1.Pool; } });
|
|
6
6
|
var position_1 = require("./position");
|
|
7
7
|
Object.defineProperty(exports, "Position", { enumerable: true, get: function () { return position_1.Position; } });
|
|
8
8
|
var ticket_1 = require("./ticket");
|
|
9
9
|
Object.defineProperty(exports, "WithdrawalTicket", { enumerable: true, get: function () { return ticket_1.WithdrawalTicket; } });
|
|
10
|
+
var poolExt_1 = require("./poolExt");
|
|
11
|
+
Object.defineProperty(exports, "PoolExt", { enumerable: true, get: function () { return poolExt_1.PoolExt; } });
|
|
10
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/accounts/index.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,mCAA4C;AAAnC,0GAAA,gBAAgB,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/accounts/index.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,mCAA4C;AAAnC,0GAAA,gBAAgB,OAAA;AACzB,qCAAoC;AAA3B,kGAAA,OAAO,OAAA"}
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
import BN from "bn.js";
|
|
2
|
+
import { Connection, PublicKey } from "@solana/web3.js";
|
|
3
|
+
import { PoolExtData } from "../types";
|
|
4
|
+
import { Pool } from "./pool";
|
|
5
|
+
/** A NAV reading: USDC per 1 RWA, 1e9-scaled, plus freshness. */
|
|
6
|
+
export interface NavReading {
|
|
7
|
+
/** 1e9-scaled (1.05 USDC per RWA == 1_050_000_000) */
|
|
8
|
+
nav: BN;
|
|
9
|
+
/** human-readable, e.g. "1.16748395" */
|
|
10
|
+
navDecimal: string;
|
|
11
|
+
/** unix seconds of the reading (oracle entry timestamp, or PoolExt.nav_updated_at) */
|
|
12
|
+
updatedAt: number;
|
|
13
|
+
ageSeconds: number;
|
|
14
|
+
/** true when the program would reject a conversion with PoolExtNavStale */
|
|
15
|
+
isStale: boolean;
|
|
16
|
+
source: "scope" | "posted";
|
|
17
|
+
}
|
|
18
|
+
export interface AltDepositQuote {
|
|
19
|
+
/** alt tokens in (raw) */
|
|
20
|
+
altIn: BN;
|
|
21
|
+
/** vault units credited (raw), floored exactly like the program */
|
|
22
|
+
credit: BN;
|
|
23
|
+
/** human-readable credit in vault tokens */
|
|
24
|
+
creditDecimal: string;
|
|
25
|
+
nav: NavReading;
|
|
26
|
+
}
|
|
27
|
+
export interface AltExitQuote {
|
|
28
|
+
/** vault units leaving (raw): ticket capital + reward */
|
|
29
|
+
vaultTotal: BN;
|
|
30
|
+
gross: BN;
|
|
31
|
+
fee: BN;
|
|
32
|
+
net: BN;
|
|
33
|
+
grossDecimal: string;
|
|
34
|
+
feeDecimal: string;
|
|
35
|
+
netDecimal: string;
|
|
36
|
+
nav: BN;
|
|
37
|
+
feeBps: number;
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* PoolExt — a second token ("alt") at a pool's edges (ELE7 ele7-rwa-v1+).
|
|
41
|
+
*
|
|
42
|
+
* - `altIsUsdc`: the pool is RWA-denominated and the alt is USDC (ONyc X1, nOPAL X1).
|
|
43
|
+
* - `!altIsUsdc`: the pool is USDC-denominated and the alt is the RWA (USDC O1 + ONyc).
|
|
44
|
+
*
|
|
45
|
+
* NAV is always USDC per 1 RWA (1e9); the direction decides how it is applied.
|
|
46
|
+
* The ledger, APR and ticket queue stay in the pool's vault_mint.
|
|
47
|
+
*/
|
|
48
|
+
export declare class PoolExt {
|
|
49
|
+
readonly pool: Pool;
|
|
50
|
+
readonly address: PublicKey;
|
|
51
|
+
readonly data: PoolExtData;
|
|
52
|
+
constructor(pool: Pool, address: PublicKey, data: PoolExtData);
|
|
53
|
+
static findAddress(poolAddress: PublicKey, programId: PublicKey): PublicKey;
|
|
54
|
+
/** Owner of alt_holder and alt_faucet. Never the pool authority. */
|
|
55
|
+
static findAuthority(poolAddress: PublicKey, programId: PublicKey): PublicKey;
|
|
56
|
+
get authorityAddress(): PublicKey;
|
|
57
|
+
get altMintAddress(): PublicKey;
|
|
58
|
+
get altHolderAddress(): PublicKey;
|
|
59
|
+
get altFaucetAddress(): PublicKey;
|
|
60
|
+
/** Zero pubkey = fee stays in the faucet. */
|
|
61
|
+
get feeDestination(): PublicKey | null;
|
|
62
|
+
get altDecimals(): number;
|
|
63
|
+
get altMultiplier(): number;
|
|
64
|
+
get altIsUsdc(): boolean;
|
|
65
|
+
get altDepositsEnabled(): boolean;
|
|
66
|
+
get altExitsEnabled(): boolean;
|
|
67
|
+
get exitFeeBps(): number;
|
|
68
|
+
get usesScope(): boolean;
|
|
69
|
+
get navOracle(): PublicKey | null;
|
|
70
|
+
get navOracleIndex(): number;
|
|
71
|
+
get navMaxAge(): number;
|
|
72
|
+
/**
|
|
73
|
+
* Read the NAV the program will use at the next conversion: the pinned Scope
|
|
74
|
+
* entry (rescaled to 1e9) or the posted value. Mirrors PoolExt::resolve_nav.
|
|
75
|
+
*/
|
|
76
|
+
readNav(connection: Connection, now?: number): Promise<NavReading>;
|
|
77
|
+
/** Decode one Scope `DatedPrice` entry and rescale it to the program's 1e9 NAV. */
|
|
78
|
+
static readScopeEntry(data: Buffer, index: number, navMaxAge: number, now: number): NavReading;
|
|
79
|
+
static navToDecimal(nav: BN): string;
|
|
80
|
+
/** Alt (raw) → vault (raw), floored. Mirrors PoolExt::alt_to_vault_at. */
|
|
81
|
+
static altToVaultAt(altAmount: BN, nav: BN, altDecimals: number, perTokenAmount: BN, altIsUsdc: boolean): BN;
|
|
82
|
+
/** Vault (raw) → alt (raw) gross of fee, floored. Mirrors PoolExt::vault_to_alt_gross_at. */
|
|
83
|
+
static vaultToAltGrossAt(vaultAmount: BN, nav: BN, altDecimals: number, perTokenAmount: BN, altIsUsdc: boolean): BN;
|
|
84
|
+
/** Fee on a gross alt amount, rounded UP. Mirrors PoolExt::fee_on. */
|
|
85
|
+
static feeOn(gross: BN, feeBps: number): BN;
|
|
86
|
+
altToVault(altAmount: BN, nav: BN): BN;
|
|
87
|
+
vaultToAltGross(vaultAmount: BN, nav: BN): BN;
|
|
88
|
+
/** Quote an alt deposit: `altAmount` in human alt tokens (e.g. "10500" USDC). */
|
|
89
|
+
quoteDeposit(connection: Connection, altAmount: number | string): Promise<AltDepositQuote>;
|
|
90
|
+
/**
|
|
91
|
+
* Quote an alt exit for `vaultTotal` raw vault units at `nav` and `feeBps`.
|
|
92
|
+
* For an existing alt ticket pass its `navLocked` / `feeBpsLocked`; for a
|
|
93
|
+
* preview pass the current reading and `exitFeeBps`.
|
|
94
|
+
*/
|
|
95
|
+
quoteExit(vaultTotal: BN, nav: BN, feeBps?: number): AltExitQuote;
|
|
96
|
+
/** Alt faucet balance (raw). Alt tickets redeem only when this covers their net. */
|
|
97
|
+
getFaucetBalanceRaw(connection: Connection): Promise<BN>;
|
|
98
|
+
getFaucetBalance(connection: Connection): Promise<string>;
|
|
99
|
+
getHolderBalance(connection: Connection): Promise<string>;
|
|
100
|
+
}
|
|
101
|
+
//# sourceMappingURL=poolExt.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"poolExt.d.ts","sourceRoot":"","sources":["../../src/accounts/poolExt.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,211 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.PoolExt = void 0;
|
|
7
|
+
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
8
|
+
const bn_js_1 = __importDefault(require("bn.js"));
|
|
9
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
10
|
+
const types_1 = require("../types");
|
|
11
|
+
/**
|
|
12
|
+
* PoolExt — a second token ("alt") at a pool's edges (ELE7 ele7-rwa-v1+).
|
|
13
|
+
*
|
|
14
|
+
* - `altIsUsdc`: the pool is RWA-denominated and the alt is USDC (ONyc X1, nOPAL X1).
|
|
15
|
+
* - `!altIsUsdc`: the pool is USDC-denominated and the alt is the RWA (USDC O1 + ONyc).
|
|
16
|
+
*
|
|
17
|
+
* NAV is always USDC per 1 RWA (1e9); the direction decides how it is applied.
|
|
18
|
+
* The ledger, APR and ticket queue stay in the pool's vault_mint.
|
|
19
|
+
*/
|
|
20
|
+
class PoolExt {
|
|
21
|
+
constructor(pool, address, data) {
|
|
22
|
+
this.pool = pool;
|
|
23
|
+
this.address = address;
|
|
24
|
+
this.data = data;
|
|
25
|
+
}
|
|
26
|
+
static findAddress(poolAddress, programId) {
|
|
27
|
+
return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("ext"), poolAddress.toBuffer()], programId)[0];
|
|
28
|
+
}
|
|
29
|
+
/** Owner of alt_holder and alt_faucet. Never the pool authority. */
|
|
30
|
+
static findAuthority(poolAddress, programId) {
|
|
31
|
+
return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("ext_authority"), poolAddress.toBuffer()], programId)[0];
|
|
32
|
+
}
|
|
33
|
+
get authorityAddress() {
|
|
34
|
+
return PoolExt.findAuthority(this.pool.address, this.pool.programId);
|
|
35
|
+
}
|
|
36
|
+
get altMintAddress() {
|
|
37
|
+
return this.data.altMint;
|
|
38
|
+
}
|
|
39
|
+
get altHolderAddress() {
|
|
40
|
+
return this.data.altHolder;
|
|
41
|
+
}
|
|
42
|
+
get altFaucetAddress() {
|
|
43
|
+
return this.data.altFaucet;
|
|
44
|
+
}
|
|
45
|
+
/** Zero pubkey = fee stays in the faucet. */
|
|
46
|
+
get feeDestination() {
|
|
47
|
+
return this.data.feeDestination.equals(web3_js_1.PublicKey.default)
|
|
48
|
+
? null
|
|
49
|
+
: this.data.feeDestination;
|
|
50
|
+
}
|
|
51
|
+
get altDecimals() {
|
|
52
|
+
return this.data.altDecimals;
|
|
53
|
+
}
|
|
54
|
+
get altMultiplier() {
|
|
55
|
+
return Math.pow(10, this.data.altDecimals);
|
|
56
|
+
}
|
|
57
|
+
get altIsUsdc() {
|
|
58
|
+
return this.data.altIsUsdc !== 0;
|
|
59
|
+
}
|
|
60
|
+
get altDepositsEnabled() {
|
|
61
|
+
return (this.data.flags & types_1.POOL_EXT_FLAG_ALT_DEPOSITS) !== 0;
|
|
62
|
+
}
|
|
63
|
+
get altExitsEnabled() {
|
|
64
|
+
return (this.data.flags & types_1.POOL_EXT_FLAG_ALT_EXITS) !== 0;
|
|
65
|
+
}
|
|
66
|
+
get exitFeeBps() {
|
|
67
|
+
return this.data.exitFeeBps;
|
|
68
|
+
}
|
|
69
|
+
get usesScope() {
|
|
70
|
+
return this.data.conversionSource === types_1.CONVERSION_SOURCE_SCOPE;
|
|
71
|
+
}
|
|
72
|
+
get navOracle() {
|
|
73
|
+
return this.usesScope ? this.data.navOracle : null;
|
|
74
|
+
}
|
|
75
|
+
get navOracleIndex() {
|
|
76
|
+
return this.data.navOracleIndex;
|
|
77
|
+
}
|
|
78
|
+
get navMaxAge() {
|
|
79
|
+
return this.data.navMaxAge;
|
|
80
|
+
}
|
|
81
|
+
// ---------------------------------------------------------------------------
|
|
82
|
+
// NAV
|
|
83
|
+
// ---------------------------------------------------------------------------
|
|
84
|
+
/**
|
|
85
|
+
* Read the NAV the program will use at the next conversion: the pinned Scope
|
|
86
|
+
* entry (rescaled to 1e9) or the posted value. Mirrors PoolExt::resolve_nav.
|
|
87
|
+
*/
|
|
88
|
+
async readNav(connection, now = Math.floor(Date.now() / 1000)) {
|
|
89
|
+
if (!this.usesScope) {
|
|
90
|
+
const updatedAt = this.data.navUpdatedAt.toNumber();
|
|
91
|
+
const age = now - updatedAt;
|
|
92
|
+
return {
|
|
93
|
+
nav: this.data.nav,
|
|
94
|
+
navDecimal: PoolExt.navToDecimal(this.data.nav),
|
|
95
|
+
updatedAt,
|
|
96
|
+
ageSeconds: age,
|
|
97
|
+
isStale: this.data.nav.isZero() || (this.data.navMaxAge > 0 && (age > this.data.navMaxAge || age < 0)),
|
|
98
|
+
source: "posted",
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
const info = await connection.getAccountInfo(this.data.navOracle);
|
|
102
|
+
if (!info)
|
|
103
|
+
throw new Error("NAV oracle account not found");
|
|
104
|
+
if (!info.owner.equals(types_1.SCOPE_PROGRAM_ID) || info.data.length !== types_1.SCOPE_PRICES_LEN) {
|
|
105
|
+
throw new Error("NAV oracle is not a Scope OraclePrices account");
|
|
106
|
+
}
|
|
107
|
+
return PoolExt.readScopeEntry(Buffer.from(info.data), this.data.navOracleIndex, this.data.navMaxAge, now);
|
|
108
|
+
}
|
|
109
|
+
/** Decode one Scope `DatedPrice` entry and rescale it to the program's 1e9 NAV. */
|
|
110
|
+
static readScopeEntry(data, index, navMaxAge, now) {
|
|
111
|
+
const off = types_1.SCOPE_ENTRIES_OFFSET + index * types_1.SCOPE_ENTRY_SIZE;
|
|
112
|
+
const value = new bn_js_1.default(data.readBigUInt64LE(off).toString());
|
|
113
|
+
const exp = Number(data.readBigUInt64LE(off + 8));
|
|
114
|
+
const updatedAt = Number(data.readBigUInt64LE(off + 24));
|
|
115
|
+
if (exp > 18)
|
|
116
|
+
throw new Error("Scope exponent out of range");
|
|
117
|
+
const nav = value.mul(types_1.NAV_ONE).div(new bn_js_1.default(10).pow(new bn_js_1.default(exp)));
|
|
118
|
+
const age = now - updatedAt;
|
|
119
|
+
return {
|
|
120
|
+
nav,
|
|
121
|
+
navDecimal: PoolExt.navToDecimal(nav),
|
|
122
|
+
updatedAt,
|
|
123
|
+
ageSeconds: age,
|
|
124
|
+
isStale: nav.isZero() || (navMaxAge > 0 && (age > navMaxAge || age < 0)),
|
|
125
|
+
source: "scope",
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
static navToDecimal(nav) {
|
|
129
|
+
return new decimal_js_1.default(nav.toString()).div(types_1.NAV_ONE.toString()).toFixed();
|
|
130
|
+
}
|
|
131
|
+
// ---------------------------------------------------------------------------
|
|
132
|
+
// Conversion math — byte-for-byte the program's (floor on credit/gross, ceil on fee)
|
|
133
|
+
// ---------------------------------------------------------------------------
|
|
134
|
+
/** Alt (raw) → vault (raw), floored. Mirrors PoolExt::alt_to_vault_at. */
|
|
135
|
+
static altToVaultAt(altAmount, nav, altDecimals, perTokenAmount, altIsUsdc) {
|
|
136
|
+
const altUnit = new bn_js_1.default(10).pow(new bn_js_1.default(altDecimals));
|
|
137
|
+
if (altIsUsdc) {
|
|
138
|
+
return altAmount.mul(perTokenAmount).mul(types_1.NAV_ONE).div(nav.mul(altUnit));
|
|
139
|
+
}
|
|
140
|
+
return altAmount.mul(nav).mul(perTokenAmount).div(types_1.NAV_ONE.mul(altUnit));
|
|
141
|
+
}
|
|
142
|
+
/** Vault (raw) → alt (raw) gross of fee, floored. Mirrors PoolExt::vault_to_alt_gross_at. */
|
|
143
|
+
static vaultToAltGrossAt(vaultAmount, nav, altDecimals, perTokenAmount, altIsUsdc) {
|
|
144
|
+
const altUnit = new bn_js_1.default(10).pow(new bn_js_1.default(altDecimals));
|
|
145
|
+
if (altIsUsdc) {
|
|
146
|
+
return vaultAmount.mul(nav).mul(altUnit).div(types_1.NAV_ONE.mul(perTokenAmount));
|
|
147
|
+
}
|
|
148
|
+
return vaultAmount.mul(types_1.NAV_ONE).mul(altUnit).div(nav.mul(perTokenAmount));
|
|
149
|
+
}
|
|
150
|
+
/** Fee on a gross alt amount, rounded UP. Mirrors PoolExt::fee_on. */
|
|
151
|
+
static feeOn(gross, feeBps) {
|
|
152
|
+
if (feeBps === 0 || gross.isZero())
|
|
153
|
+
return new bn_js_1.default(0);
|
|
154
|
+
return gross.muln(feeBps).addn(9999).divn(10000);
|
|
155
|
+
}
|
|
156
|
+
altToVault(altAmount, nav) {
|
|
157
|
+
return PoolExt.altToVaultAt(altAmount, nav, this.altDecimals, this.pool.data.perTokenAmount, this.altIsUsdc);
|
|
158
|
+
}
|
|
159
|
+
vaultToAltGross(vaultAmount, nav) {
|
|
160
|
+
return PoolExt.vaultToAltGrossAt(vaultAmount, nav, this.altDecimals, this.pool.data.perTokenAmount, this.altIsUsdc);
|
|
161
|
+
}
|
|
162
|
+
/** Quote an alt deposit: `altAmount` in human alt tokens (e.g. "10500" USDC). */
|
|
163
|
+
async quoteDeposit(connection, altAmount) {
|
|
164
|
+
const nav = await this.readNav(connection);
|
|
165
|
+
const altIn = new bn_js_1.default(new decimal_js_1.default(altAmount.toString()).mul(this.altMultiplier).toFixed(0));
|
|
166
|
+
const credit = this.altToVault(altIn, nav.nav);
|
|
167
|
+
return {
|
|
168
|
+
altIn,
|
|
169
|
+
credit,
|
|
170
|
+
creditDecimal: new decimal_js_1.default(credit.toString()).div(this.pool.vaultMultiplier).toFixed(),
|
|
171
|
+
nav,
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
/**
|
|
175
|
+
* Quote an alt exit for `vaultTotal` raw vault units at `nav` and `feeBps`.
|
|
176
|
+
* For an existing alt ticket pass its `navLocked` / `feeBpsLocked`; for a
|
|
177
|
+
* preview pass the current reading and `exitFeeBps`.
|
|
178
|
+
*/
|
|
179
|
+
quoteExit(vaultTotal, nav, feeBps = this.exitFeeBps) {
|
|
180
|
+
const gross = this.vaultToAltGross(vaultTotal, nav);
|
|
181
|
+
const fee = PoolExt.feeOn(gross, feeBps);
|
|
182
|
+
const net = gross.sub(fee);
|
|
183
|
+
const d = (v) => new decimal_js_1.default(v.toString()).div(this.altMultiplier).toFixed();
|
|
184
|
+
return { vaultTotal, gross, fee, net, grossDecimal: d(gross), feeDecimal: d(fee), netDecimal: d(net), nav, feeBps };
|
|
185
|
+
}
|
|
186
|
+
/** Alt faucet balance (raw). Alt tickets redeem only when this covers their net. */
|
|
187
|
+
async getFaucetBalanceRaw(connection) {
|
|
188
|
+
try {
|
|
189
|
+
const b = await connection.getTokenAccountBalance(this.data.altFaucet);
|
|
190
|
+
return new bn_js_1.default(b.value.amount);
|
|
191
|
+
}
|
|
192
|
+
catch {
|
|
193
|
+
return new bn_js_1.default(0);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
async getFaucetBalance(connection) {
|
|
197
|
+
const raw = await this.getFaucetBalanceRaw(connection);
|
|
198
|
+
return new decimal_js_1.default(raw.toString()).div(this.altMultiplier).toFixed();
|
|
199
|
+
}
|
|
200
|
+
async getHolderBalance(connection) {
|
|
201
|
+
try {
|
|
202
|
+
const b = await connection.getTokenAccountBalance(this.data.altHolder);
|
|
203
|
+
return new decimal_js_1.default(b.value.amount).div(this.altMultiplier).toFixed();
|
|
204
|
+
}
|
|
205
|
+
catch {
|
|
206
|
+
return "0";
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
exports.PoolExt = PoolExt;
|
|
211
|
+
//# sourceMappingURL=poolExt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"poolExt.js","sourceRoot":"","sources":["../../src/accounts/poolExt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import BN from "bn.js";
|
|
1
2
|
import { PublicKey } from "@solana/web3.js";
|
|
2
3
|
import { PositionData, PositionStatus } from "../types";
|
|
3
4
|
import { Pool } from "./pool";
|
|
@@ -19,6 +20,13 @@ export declare class Position {
|
|
|
19
20
|
get lastUpdatedEpochIndex(): number;
|
|
20
21
|
get ticketMode(): number;
|
|
21
22
|
get ticketCount(): number;
|
|
23
|
+
get altDepositedRaw(): BN;
|
|
24
|
+
get vaultDepositedRaw(): BN;
|
|
25
|
+
get altWithdrawnRaw(): BN;
|
|
26
|
+
get vaultWithdrawnRaw(): BN;
|
|
27
|
+
/** vault_mint deposited through `deposit` / `deposit_vault_mint` / same-asset migration, human-readable */
|
|
28
|
+
get vaultDeposited(): string;
|
|
29
|
+
get vaultWithdrawn(): string;
|
|
22
30
|
get isTicketMode(): boolean;
|
|
23
31
|
get exists(): boolean;
|
|
24
32
|
get status(): PositionStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["../../src/accounts/position.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["../../src/accounts/position.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAa,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,qBAAa,QAAQ;IACnB,SAAgB,IAAI,EAAE,IAAI,CAAC;IAC3B,SAAgB,OAAO,EAAE,SAAS,CAAC;IACnC,SAAgB,IAAI,EAAE,YAAY,CAAC;gBAEvB,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY;IAM9D,IAAI,KAAK,IAAI,SAAS,CAErB;IAGD,IAAI,MAAM,IAAI,MAAM,CAInB;IAGD,IAAI,KAAK,IAAI,MAAM,CAElB;IAGD,IAAI,gBAAgB,IAAI,MAAM,CAM7B;IAGD,IAAI,eAAe,IAAI,MAAM,CAe5B;IAGD,IAAI,aAAa,IAAI,MAAM,CAI1B;IAGD,IAAI,kBAAkB,IAAI,MAAM,CAQ/B;IAGD,IAAI,eAAe,IAAI,MAAM,CAM5B;IAED,IAAI,kBAAkB,IAAI,MAAM,CAI/B;IAED,IAAI,cAAc,IAAI,MAAM,CAI3B;IAED,IAAI,qBAAqB,IAAI,MAAM,CAElC;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAID,IAAI,eAAe,IAAI,EAAE,CAExB;IACD,IAAI,iBAAiB,IAAI,EAAE,CAE1B;IACD,IAAI,eAAe,IAAI,EAAE,CAExB;IACD,IAAI,iBAAiB,IAAI,EAAE,CAE1B;IACD,2GAA2G;IAC3G,IAAI,cAAc,IAAI,MAAM,CAE3B;IACD,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,IAAI,YAAY,IAAI,OAAO,CAE1B;IAGD,IAAI,MAAM,IAAI,OAAO,CAEpB;IAGD,IAAI,MAAM,IAAI,cAAc,CAuB3B;IAGD,IAAI,QAAQ,IAAI,IAAI,CA2BnB;IAGD,IAAI,mBAAmB,IAAI,MAAM,CAQhC;IAGD,IAAI,UAAU,IAAI,OAAO,CAMxB;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;CACF"}
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Position = void 0;
|
|
7
7
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
8
|
+
const bn_js_1 = __importDefault(require("bn.js"));
|
|
8
9
|
const types_1 = require("../types");
|
|
9
10
|
class Position {
|
|
10
11
|
constructor(pool, address, data) {
|
|
@@ -91,6 +92,27 @@ class Position {
|
|
|
91
92
|
get ticketCount() {
|
|
92
93
|
return this.data.ticketCount;
|
|
93
94
|
}
|
|
95
|
+
// Cumulative counters (ele7-rwa-v1). Zero on positions that predate the upgrade,
|
|
96
|
+
// so do not derive principal from them for old positions: `amount` stays the truth.
|
|
97
|
+
get altDepositedRaw() {
|
|
98
|
+
return this.data.altDeposited ?? new bn_js_1.default(0);
|
|
99
|
+
}
|
|
100
|
+
get vaultDepositedRaw() {
|
|
101
|
+
return this.data.vaultDeposited ?? new bn_js_1.default(0);
|
|
102
|
+
}
|
|
103
|
+
get altWithdrawnRaw() {
|
|
104
|
+
return this.data.altWithdrawn ?? new bn_js_1.default(0);
|
|
105
|
+
}
|
|
106
|
+
get vaultWithdrawnRaw() {
|
|
107
|
+
return this.data.vaultWithdrawn ?? new bn_js_1.default(0);
|
|
108
|
+
}
|
|
109
|
+
/** vault_mint deposited through `deposit` / `deposit_vault_mint` / same-asset migration, human-readable */
|
|
110
|
+
get vaultDeposited() {
|
|
111
|
+
return new decimal_js_1.default(this.vaultDepositedRaw.toString()).div(this.pool.vaultMultiplier).toFixed();
|
|
112
|
+
}
|
|
113
|
+
get vaultWithdrawn() {
|
|
114
|
+
return new decimal_js_1.default(this.vaultWithdrawnRaw.toString()).div(this.pool.vaultMultiplier).toFixed();
|
|
115
|
+
}
|
|
94
116
|
get isTicketMode() {
|
|
95
117
|
return this.data.ticketMode !== 0;
|
|
96
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"position.js","sourceRoot":"","sources":["../../src/accounts/position.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAiC;
|
|
1
|
+
{"version":3,"file":"position.js","sourceRoot":"","sources":["../../src/accounts/position.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,5 +16,13 @@ export declare class WithdrawalTicket {
|
|
|
16
16
|
get ticketIndex(): number;
|
|
17
17
|
/** Whether the ticket can be redeemed (2 full epochs have passed). */
|
|
18
18
|
get isRedeemable(): boolean;
|
|
19
|
+
/** 0 = vault token (redeem_ticket), 1 = alt token (redeem_ticket_alt). Tickets from before ele7-rwa-v1 read 0. */
|
|
20
|
+
get payoutMint(): number;
|
|
21
|
+
/** True when this ticket pays the pool's alt token and must go through `redeemTicketAlt`. */
|
|
22
|
+
get isAltPayout(): boolean;
|
|
23
|
+
/** NAV locked at creation (USDC per 1 RWA, 1e9-scaled). Zero for vault-token tickets. */
|
|
24
|
+
get navLocked(): BN;
|
|
25
|
+
/** Exit fee locked at creation (bps). Zero for vault-token tickets. */
|
|
26
|
+
get feeBpsLocked(): number;
|
|
19
27
|
}
|
|
20
28
|
//# sourceMappingURL=ticket.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ticket.d.ts","sourceRoot":"","sources":["../../src/accounts/ticket.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAG9B,qBAAa,gBAAgB;IAEzB,QAAQ,CAAC,IAAI,EAAE,IAAI;IACnB,QAAQ,CAAC,OAAO,EAAE,SAAS;IAC3B,QAAQ,CAAC,IAAI,EAAE,oBAAoB;gBAF1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,SAAS,EAClB,IAAI,EAAE,oBAAoB;IAGrC,MAAM,CAAC,WAAW,CAChB,YAAY,EAAE,SAAS,EACvB,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,SAAS,GACpB,SAAS;IAcZ,IAAI,MAAM,IAAI,MAAM,CAInB;IAED,IAAI,YAAY,IAAI,MAAM,CAIzB;IAED,IAAI,WAAW,IAAI,MAAM,CAMxB;IAED,IAAI,cAAc,IAAI,EAAE,CAEvB;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,sEAAsE;IACtE,IAAI,YAAY,IAAI,OAAO,CAE1B;CACF"}
|
|
1
|
+
{"version":3,"file":"ticket.d.ts","sourceRoot":"","sources":["../../src/accounts/ticket.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAG9B,qBAAa,gBAAgB;IAEzB,QAAQ,CAAC,IAAI,EAAE,IAAI;IACnB,QAAQ,CAAC,OAAO,EAAE,SAAS;IAC3B,QAAQ,CAAC,IAAI,EAAE,oBAAoB;gBAF1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,SAAS,EAClB,IAAI,EAAE,oBAAoB;IAGrC,MAAM,CAAC,WAAW,CAChB,YAAY,EAAE,SAAS,EACvB,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,SAAS,GACpB,SAAS;IAcZ,IAAI,MAAM,IAAI,MAAM,CAInB;IAED,IAAI,YAAY,IAAI,MAAM,CAIzB;IAED,IAAI,WAAW,IAAI,MAAM,CAMxB;IAED,IAAI,cAAc,IAAI,EAAE,CAEvB;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,sEAAsE;IACtE,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,kHAAkH;IAClH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,6FAA6F;IAC7F,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,yFAAyF;IACzF,IAAI,SAAS,IAAI,EAAE,CAElB;IAED,uEAAuE;IACvE,IAAI,YAAY,IAAI,MAAM,CAEzB;CACF"}
|
package/dist/accounts/ticket.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.WithdrawalTicket = void 0;
|
|
7
7
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
8
|
+
const bn_js_1 = __importDefault(require("bn.js"));
|
|
8
9
|
const web3_js_1 = require("@solana/web3.js");
|
|
9
10
|
const programs_1 = require("../programs");
|
|
10
11
|
class WithdrawalTicket {
|
|
@@ -51,6 +52,22 @@ class WithdrawalTicket {
|
|
|
51
52
|
get isRedeemable() {
|
|
52
53
|
return this.pool.epochIndex > this.data.createdEpochIndex + 1;
|
|
53
54
|
}
|
|
55
|
+
/** 0 = vault token (redeem_ticket), 1 = alt token (redeem_ticket_alt). Tickets from before ele7-rwa-v1 read 0. */
|
|
56
|
+
get payoutMint() {
|
|
57
|
+
return this.data.payoutMint ?? 0;
|
|
58
|
+
}
|
|
59
|
+
/** True when this ticket pays the pool's alt token and must go through `redeemTicketAlt`. */
|
|
60
|
+
get isAltPayout() {
|
|
61
|
+
return this.payoutMint === 1;
|
|
62
|
+
}
|
|
63
|
+
/** NAV locked at creation (USDC per 1 RWA, 1e9-scaled). Zero for vault-token tickets. */
|
|
64
|
+
get navLocked() {
|
|
65
|
+
return this.data.navLocked ?? new bn_js_1.default(0);
|
|
66
|
+
}
|
|
67
|
+
/** Exit fee locked at creation (bps). Zero for vault-token tickets. */
|
|
68
|
+
get feeBpsLocked() {
|
|
69
|
+
return this.data.feeBpsLocked ?? 0;
|
|
70
|
+
}
|
|
54
71
|
}
|
|
55
72
|
exports.WithdrawalTicket = WithdrawalTicket;
|
|
56
73
|
//# sourceMappingURL=ticket.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ticket.js","sourceRoot":"","sources":["../../src/accounts/ticket.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAiC;
|
|
1
|
+
{"version":3,"file":"ticket.js","sourceRoot":"","sources":["../../src/accounts/ticket.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAiC;AACjC,kDAAuB;AACvB,6CAA4C;AAG5C,0CAA+C;AAE/C,MAAa,gBAAgB;IAC3B,YACW,IAAU,EACV,OAAkB,EAClB,IAA0B;QAF1B,SAAI,GAAJ,IAAI,CAAM;QACV,YAAO,GAAP,OAAO,CAAW;QAClB,SAAI,GAAJ,IAAI,CAAsB;IAClC,CAAC;IAEJ,MAAM,CAAC,WAAW,CAChB,YAAuB,EACvB,WAAsB,EACtB,WAAmB,EACnB,SAAqB;QAErB,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjC,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QACpC,OAAO,mBAAS,CAAC,sBAAsB,CACrC;YACE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;YACrB,YAAY,CAAC,QAAQ,EAAE;YACvB,WAAW,CAAC,QAAQ,EAAE;YACtB,QAAQ;SACT,EACD,SAAS,IAAI,2BAAgB,CAC9B,CAAC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,oBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;aAC5C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;aAC9B,OAAO,EAAE,CAAC;IACf,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,oBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;aAClD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;aAC9B,OAAO,EAAE,CAAC;IACf,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,oBAAO,CAChB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CACxD;aACE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;aAC9B,OAAO,EAAE,CAAC;IACf,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC;IACrC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;IAC/B,CAAC;IAED,sEAAsE;IACtE,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;IAChE,CAAC;IAED,kHAAkH;IAClH,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,6FAA6F;IAC7F,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,UAAU,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,yFAAyF;IACzF,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,eAAE,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,uEAAuE;IACvE,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC;IACrC,CAAC;CACF;AAlFD,4CAkFC"}
|