@elmntl/vaults-v2 1.5.1 → 1.6.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 +11 -7
- package/dist/accounts/pool.d.ts +4 -3
- package/dist/accounts/pool.d.ts.map +1 -1
- package/dist/accounts/pool.js +5 -4
- package/dist/accounts/pool.js.map +1 -1
- package/dist/accounts/poolExt.d.ts +12 -8
- package/dist/accounts/poolExt.d.ts.map +1 -1
- package/dist/accounts/poolExt.js +17 -12
- package/dist/accounts/poolExt.js.map +1 -1
- package/dist/accounts/ticket.d.ts +2 -2
- package/dist/accounts/ticket.d.ts.map +1 -1
- package/dist/accounts/ticket.js +5 -5
- package/dist/accounts/ticket.js.map +1 -1
- package/dist/generated/idl/elemental_vault_v2.json +18 -18
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/programs/elemental.d.ts +2 -2
- package/dist/programs/elemental.d.ts.map +1 -1
- package/dist/programs/elemental.js +3 -3
- package/dist/programs/elemental.js.map +1 -1
- package/dist/types.d.ts +9 -5
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +7 -1
- package/dist/types.js.map +1 -1
- package/package.json +1 -1
- package/src/accounts/pool.ts +5 -4
- package/src/accounts/poolExt.ts +20 -13
- package/src/accounts/ticket.ts +5 -5
- package/src/generated/idl/elemental_vault_v2.json +18 -18
- package/src/index.ts +3 -0
- package/src/programs/elemental.ts +3 -3
- package/src/types.ts +9 -5
package/README.md
CHANGED
|
@@ -121,7 +121,7 @@ if (ext) {
|
|
|
121
121
|
await ctx.createTicketAlt(position, ext, "0"); // "0" = yield only; locks NAV + fee on the ticket
|
|
122
122
|
const tickets = await ctx.loadTickets(pool);
|
|
123
123
|
for (const t of tickets.filter((t) => t.isAltPayout && t.isRedeemable)) {
|
|
124
|
-
const preview = ext.quoteExit(t.totalAmountRaw, t.navLocked, t.
|
|
124
|
+
const preview = ext.quoteExit(t.totalAmountRaw, t.navLocked, t.feeDbpsLocked); // gross/fee/net
|
|
125
125
|
await ctx.redeemTicketAlt(t, position, ext); // fails InsufficientFaucet until the alt faucet covers net
|
|
126
126
|
}
|
|
127
127
|
}
|
|
@@ -132,18 +132,22 @@ if (ext) {
|
|
|
132
132
|
- `createTicketAltInstructions(position, ext, amount)`, `redeemTicketAltInstructions(ticket, position, ext)`
|
|
133
133
|
- `flushAltToManagerInstruction(pool, ext)` (permissionless ops sweep)
|
|
134
134
|
- `PoolExt`: `altMintAddress`, `altDecimals`, `altIsUsdc`, `altDepositsEnabled`, `altExitsEnabled`,
|
|
135
|
-
`
|
|
135
|
+
`exitFeeDbps`, `usesScope`, `navOracle`, `readNav()`, `quoteDeposit()`, `quoteExit()`,
|
|
136
136
|
static `altToVaultAt` / `vaultToAltGrossAt` / `feeOn` (byte-for-byte the program's math)
|
|
137
|
-
- `WithdrawalTicket`: `payoutMint`, `isAltPayout`, `navLocked`, `
|
|
137
|
+
- `WithdrawalTicket`: `payoutMint`, `isAltPayout`, `navLocked`, `feeDbpsLocked`
|
|
138
138
|
- `Position`: `altDepositedRaw`, `vaultDeposited`, `altWithdrawnRaw`, `vaultWithdrawn` (zero on pre-upgrade positions)
|
|
139
139
|
- Constants: `SCOPE_PRICES`, `SCOPE_INDEX` ({ ONYC: 350, NOPAL: 505, AUTO: 451 }), `NAV_ONE`, `USDC_MINT`
|
|
140
140
|
|
|
141
|
-
**Fee
|
|
141
|
+
**Fee unit (1.6.0, program `ele7-rwa-v1.2`): TENTHS of a basis point.** `exitFeeDbps`,
|
|
142
|
+
`vaultExitFeeDbps` and `feeDbpsLocked` are all in dbps: 10 = 1 bps, 15 = 1.5 bps (Nest),
|
|
143
|
+
250 = 25 bps (OnRe), 1_000 = 1%. `dbpsToPercent` / `dbpsToBps` convert for display.
|
|
144
|
+
|
|
145
|
+
**Fee rule: the USDC leg always pays.** Exits paid
|
|
142
146
|
in USDC carry a fee, exits paid in the RWA are free, on every pool:
|
|
143
|
-
- RWA pool (X1, nOPAL X1): `ext.
|
|
144
|
-
- USDC pool (O1): `pool.
|
|
147
|
+
- RWA pool (X1, nOPAL X1): `ext.exitFeeDbps` on the USDC alt exit → `ext.quoteExit(...)`.
|
|
148
|
+
- USDC pool (O1): `pool.vaultExitFeeDbps` on the USDC vault exit → `ticket.vaultNet`,
|
|
145
149
|
`ticket.vaultFeeRaw`; the ONyc alt exit is free. Admin: `setVaultExitFeeInstruction`.
|
|
146
|
-
Both rates are locked onto the ticket at request (`ticket.
|
|
150
|
+
Both rates are locked onto the ticket at request (`ticket.feeDbpsLocked`).
|
|
147
151
|
|
|
148
152
|
Only ELE7 has these instructions; on ELE6 `loadPoolExt` returns null for every pool.
|
|
149
153
|
Existing methods and wire formats are unchanged (additive release).
|
package/dist/accounts/pool.d.ts
CHANGED
|
@@ -44,11 +44,12 @@ export declare class Pool {
|
|
|
44
44
|
get minDepositAmount(): string;
|
|
45
45
|
get minDepositAmountAlt(): string;
|
|
46
46
|
/**
|
|
47
|
-
* Fee
|
|
48
|
-
* at creation. On a USDC-denominated
|
|
47
|
+
* Fee charged on exits paid in the vault token, in TENTHS of a basis point
|
|
48
|
+
* (10 = 1 bps), locked onto each ticket at creation. On a USDC-denominated
|
|
49
|
+
* pool this is the USDC leg (e.g. O1: 250 = 25 bps).
|
|
49
50
|
* Zero on ELE6 and on pools that have not set it.
|
|
50
51
|
*/
|
|
51
|
-
get
|
|
52
|
+
get vaultExitFeeDbps(): number;
|
|
52
53
|
get apr(): string;
|
|
53
54
|
get aprPercent(): string;
|
|
54
55
|
get deactivatingAmountN0(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/accounts/pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAiC,MAAM,UAAU,CAAC;AAGhF,qBAAa,IAAI;IACf,SAAgB,OAAO,EAAE,SAAS,CAAC;IACnC,SAAgB,SAAS,EAAE,SAAS,CAAC;IACrC,OAAO,CAAC,KAAK,CAAC,CAAW;IACzB,OAAO,CAAC,gBAAgB,CAAa;IACrC,OAAO,CAAC,cAAc,CAAa;gBAEvB,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,SAAS;IAQxH,IAAI,IAAI,IAAI,QAAQ,CAGnB;IAED,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,eAAe,IAAI,MAAM,CAE5B;IAGD,IAAI,gBAAgB,IAAI,SAAS,CAKhC;IAED,IAAI,YAAY,IAAI,SAAS,CAE5B;IAED,IAAI,mBAAmB,IAAI,SAAS,GAAG,IAAI,CAE1C;IAGD,IAAI,kBAAkB,IAAI,SAAS,CAElC;IAED,IAAI,gBAAgB,IAAI,SAAS,CAEhC;IAED,IAAI,sBAAsB,IAAI,SAAS,CAEtC;IAGD,IAAI,sBAAsB,IAAI,SAAS,CAOtC;IAGD,IAAI,WAAW,IAAI,WAAW,CAO7B;IAED,IAAI,aAAa,IAAI,OAAO,CAE3B;IAGD,IAAI,gBAAgB,IAAI,SAAS,GAAG,IAAI,CAIvC;IAID,IAAI,SAAS,IAAI,MAAM,CAItB;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,MAAM,CAI1B;IAED;;;OAGG;IACH,IAAI,UAAU,IAAI,MAAM,CAIvB;IAED;;;;OAIG;IACH,IAAI,GAAG,IAAI,MAAM,CAEhB;IAGD,IAAI,gBAAgB,IAAI,MAAM,CAI7B;IAED,IAAI,gBAAgB,IAAI,MAAM,CAI7B;IAID,IAAI,mBAAmB,IAAI,MAAM,CAMhC;IAED
|
|
1
|
+
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/accounts/pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAiC,MAAM,UAAU,CAAC;AAGhF,qBAAa,IAAI;IACf,SAAgB,OAAO,EAAE,SAAS,CAAC;IACnC,SAAgB,SAAS,EAAE,SAAS,CAAC;IACrC,OAAO,CAAC,KAAK,CAAC,CAAW;IACzB,OAAO,CAAC,gBAAgB,CAAa;IACrC,OAAO,CAAC,cAAc,CAAa;gBAEvB,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,SAAS;IAQxH,IAAI,IAAI,IAAI,QAAQ,CAGnB;IAED,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,eAAe,IAAI,MAAM,CAE5B;IAGD,IAAI,gBAAgB,IAAI,SAAS,CAKhC;IAED,IAAI,YAAY,IAAI,SAAS,CAE5B;IAED,IAAI,mBAAmB,IAAI,SAAS,GAAG,IAAI,CAE1C;IAGD,IAAI,kBAAkB,IAAI,SAAS,CAElC;IAED,IAAI,gBAAgB,IAAI,SAAS,CAEhC;IAED,IAAI,sBAAsB,IAAI,SAAS,CAEtC;IAGD,IAAI,sBAAsB,IAAI,SAAS,CAOtC;IAGD,IAAI,WAAW,IAAI,WAAW,CAO7B;IAED,IAAI,aAAa,IAAI,OAAO,CAE3B;IAGD,IAAI,gBAAgB,IAAI,SAAS,GAAG,IAAI,CAIvC;IAID,IAAI,SAAS,IAAI,MAAM,CAItB;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,MAAM,CAI1B;IAED;;;OAGG;IACH,IAAI,UAAU,IAAI,MAAM,CAIvB;IAED;;;;OAIG;IACH,IAAI,GAAG,IAAI,MAAM,CAEhB;IAGD,IAAI,gBAAgB,IAAI,MAAM,CAI7B;IAED,IAAI,gBAAgB,IAAI,MAAM,CAI7B;IAID,IAAI,mBAAmB,IAAI,MAAM,CAMhC;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAGD,IAAI,GAAG,IAAI,MAAM,CAIhB;IAGD,IAAI,UAAU,IAAI,MAAM,CAKvB;IAGD,IAAI,oBAAoB,IAAI,MAAM,CAIjC;IAED,IAAI,gBAAgB,IAAI,MAAM,CAI7B;IAED,IAAI,oBAAoB,IAAI,MAAM,CAIjC;IAED,IAAI,gBAAgB,IAAI,MAAM,CAI7B;IAED,IAAI,aAAa,IAAI,MAAM,CAI1B;IAGD,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,oBAAoB,IAAI,MAAM,CAEjC;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,cAAc,IAAI,IAAI,CAEzB;IAED,IAAI,aAAa,IAAI,IAAI,CAWxB;IAED,IAAI,qBAAqB,IAAI,MAAM,CAIlC;IAED,IAAI,YAAY,IAAI,OAAO,CAE1B;IAGK,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAYzD,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAYzD,sBAAsB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;CAatE"}
|
package/dist/accounts/pool.js
CHANGED
|
@@ -146,12 +146,13 @@ class Pool {
|
|
|
146
146
|
.toFixed();
|
|
147
147
|
}
|
|
148
148
|
/**
|
|
149
|
-
* Fee
|
|
150
|
-
* at creation. On a USDC-denominated
|
|
149
|
+
* Fee charged on exits paid in the vault token, in TENTHS of a basis point
|
|
150
|
+
* (10 = 1 bps), locked onto each ticket at creation. On a USDC-denominated
|
|
151
|
+
* pool this is the USDC leg (e.g. O1: 250 = 25 bps).
|
|
151
152
|
* Zero on ELE6 and on pools that have not set it.
|
|
152
153
|
*/
|
|
153
|
-
get
|
|
154
|
-
return this.data.
|
|
154
|
+
get vaultExitFeeDbps() {
|
|
155
|
+
return this.data.vaultExitFeeDbps ?? 0;
|
|
155
156
|
}
|
|
156
157
|
// APR as decimal string (e.g., "0.10" for 10%)
|
|
157
158
|
get apr() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/accounts/pool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/accounts/pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,8 @@ export interface AltExitQuote {
|
|
|
34
34
|
feeDecimal: string;
|
|
35
35
|
netDecimal: string;
|
|
36
36
|
nav: BN;
|
|
37
|
-
|
|
37
|
+
/** tenths of a bps */
|
|
38
|
+
feeDbps: number;
|
|
38
39
|
}
|
|
39
40
|
/**
|
|
40
41
|
* PoolExt — a second token ("alt") at a pool's edges (ELE7 ele7-rwa-v1+).
|
|
@@ -64,7 +65,10 @@ export declare class PoolExt {
|
|
|
64
65
|
get altIsUsdc(): boolean;
|
|
65
66
|
get altDepositsEnabled(): boolean;
|
|
66
67
|
get altExitsEnabled(): boolean;
|
|
67
|
-
|
|
68
|
+
/** Exit fee on the alt leg, in tenths of a bps (10 = 1 bps). */
|
|
69
|
+
get exitFeeDbps(): number;
|
|
70
|
+
/** The same fee as a percentage, e.g. 0.25 for 25 bps. */
|
|
71
|
+
get exitFeePercent(): number;
|
|
68
72
|
get usesScope(): boolean;
|
|
69
73
|
get navOracle(): PublicKey | null;
|
|
70
74
|
get navOracleIndex(): number;
|
|
@@ -81,18 +85,18 @@ export declare class PoolExt {
|
|
|
81
85
|
static altToVaultAt(altAmount: BN, nav: BN, altDecimals: number, perTokenAmount: BN, altIsUsdc: boolean): BN;
|
|
82
86
|
/** Vault (raw) → alt (raw) gross of fee, floored. Mirrors PoolExt::vault_to_alt_gross_at. */
|
|
83
87
|
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,
|
|
88
|
+
/** Fee on a gross alt amount, rounded UP. Mirrors PoolExt::fee_on. `feeDbps` is in tenths of a bps (10 = 1 bps). */
|
|
89
|
+
static feeOn(gross: BN, feeDbps: number): BN;
|
|
86
90
|
altToVault(altAmount: BN, nav: BN): BN;
|
|
87
91
|
vaultToAltGross(vaultAmount: BN, nav: BN): BN;
|
|
88
92
|
/** Quote an alt deposit: `altAmount` in human alt tokens (e.g. "10500" USDC). */
|
|
89
93
|
quoteDeposit(connection: Connection, altAmount: number | string): Promise<AltDepositQuote>;
|
|
90
94
|
/**
|
|
91
|
-
* Quote an alt exit for `vaultTotal` raw vault units at `nav` and `
|
|
92
|
-
* For an existing alt ticket pass its `navLocked` / `
|
|
93
|
-
* preview pass the current reading and `
|
|
95
|
+
* Quote an alt exit for `vaultTotal` raw vault units at `nav` and `feeDbps` (tenths of a bps).
|
|
96
|
+
* For an existing alt ticket pass its `navLocked` / `feeDbpsLocked`; for a
|
|
97
|
+
* preview pass the current reading and `exitFeeDbps`.
|
|
94
98
|
*/
|
|
95
|
-
quoteExit(vaultTotal: BN, nav: BN,
|
|
99
|
+
quoteExit(vaultTotal: BN, nav: BN, feeDbps?: number): AltExitQuote;
|
|
96
100
|
/** Alt faucet balance (raw). Alt tickets redeem only when this covers their net. */
|
|
97
101
|
getFaucetBalanceRaw(connection: Connection): Promise<BN>;
|
|
98
102
|
getFaucetBalance(connection: Connection): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poolExt.d.ts","sourceRoot":"","sources":["../../src/accounts/poolExt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EACL,WAAW,
|
|
1
|
+
{"version":3,"file":"poolExt.d.ts","sourceRoot":"","sources":["../../src/accounts/poolExt.ts"],"names":[],"mappings":"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"}
|
package/dist/accounts/poolExt.js
CHANGED
|
@@ -63,8 +63,13 @@ class PoolExt {
|
|
|
63
63
|
get altExitsEnabled() {
|
|
64
64
|
return (this.data.flags & types_1.POOL_EXT_FLAG_ALT_EXITS) !== 0;
|
|
65
65
|
}
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
/** Exit fee on the alt leg, in tenths of a bps (10 = 1 bps). */
|
|
67
|
+
get exitFeeDbps() {
|
|
68
|
+
return this.data.exitFeeDbps;
|
|
69
|
+
}
|
|
70
|
+
/** The same fee as a percentage, e.g. 0.25 for 25 bps. */
|
|
71
|
+
get exitFeePercent() {
|
|
72
|
+
return this.data.exitFeeDbps / 1000;
|
|
68
73
|
}
|
|
69
74
|
get usesScope() {
|
|
70
75
|
return this.data.conversionSource === types_1.CONVERSION_SOURCE_SCOPE;
|
|
@@ -147,11 +152,11 @@ class PoolExt {
|
|
|
147
152
|
}
|
|
148
153
|
return vaultAmount.mul(types_1.NAV_ONE).mul(altUnit).div(nav.mul(perTokenAmount));
|
|
149
154
|
}
|
|
150
|
-
/** Fee on a gross alt amount, rounded UP. Mirrors PoolExt::fee_on. */
|
|
151
|
-
static feeOn(gross,
|
|
152
|
-
if (
|
|
155
|
+
/** Fee on a gross alt amount, rounded UP. Mirrors PoolExt::fee_on. `feeDbps` is in tenths of a bps (10 = 1 bps). */
|
|
156
|
+
static feeOn(gross, feeDbps) {
|
|
157
|
+
if (feeDbps === 0 || gross.isZero())
|
|
153
158
|
return new bn_js_1.default(0);
|
|
154
|
-
return gross.muln(
|
|
159
|
+
return gross.muln(feeDbps).addn(types_1.FEE_DENOMINATOR - 1).divn(types_1.FEE_DENOMINATOR);
|
|
155
160
|
}
|
|
156
161
|
altToVault(altAmount, nav) {
|
|
157
162
|
return PoolExt.altToVaultAt(altAmount, nav, this.altDecimals, this.pool.data.perTokenAmount, this.altIsUsdc);
|
|
@@ -172,16 +177,16 @@ class PoolExt {
|
|
|
172
177
|
};
|
|
173
178
|
}
|
|
174
179
|
/**
|
|
175
|
-
* Quote an alt exit for `vaultTotal` raw vault units at `nav` and `
|
|
176
|
-
* For an existing alt ticket pass its `navLocked` / `
|
|
177
|
-
* preview pass the current reading and `
|
|
180
|
+
* Quote an alt exit for `vaultTotal` raw vault units at `nav` and `feeDbps` (tenths of a bps).
|
|
181
|
+
* For an existing alt ticket pass its `navLocked` / `feeDbpsLocked`; for a
|
|
182
|
+
* preview pass the current reading and `exitFeeDbps`.
|
|
178
183
|
*/
|
|
179
|
-
quoteExit(vaultTotal, nav,
|
|
184
|
+
quoteExit(vaultTotal, nav, feeDbps = this.exitFeeDbps) {
|
|
180
185
|
const gross = this.vaultToAltGross(vaultTotal, nav);
|
|
181
|
-
const fee = PoolExt.feeOn(gross,
|
|
186
|
+
const fee = PoolExt.feeOn(gross, feeDbps);
|
|
182
187
|
const net = gross.sub(fee);
|
|
183
188
|
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,
|
|
189
|
+
return { vaultTotal, gross, fee, net, grossDecimal: d(gross), feeDecimal: d(fee), netDecimal: d(net), nav, feeDbps };
|
|
185
190
|
}
|
|
186
191
|
/** Alt faucet balance (raw). Alt tickets redeem only when this covers their net. */
|
|
187
192
|
async getFaucetBalanceRaw(connection) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poolExt.js","sourceRoot":"","sources":["../../src/accounts/poolExt.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAiC;AACjC,kDAAuB;AACvB,6CAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"poolExt.js","sourceRoot":"","sources":["../../src/accounts/poolExt.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,8 +22,8 @@ export declare class WithdrawalTicket {
|
|
|
22
22
|
get isAltPayout(): boolean;
|
|
23
23
|
/** NAV locked at creation (USDC per 1 RWA, 1e9-scaled). Zero for vault-token tickets. */
|
|
24
24
|
get navLocked(): BN;
|
|
25
|
-
/** Exit fee locked at creation (bps): the alt fee on alt tickets, the pool's vault exit fee on vault tickets. */
|
|
26
|
-
get
|
|
25
|
+
/** Exit fee locked at creation, in tenths of a bps (10 = 1 bps): the alt fee on alt tickets, the pool's vault exit fee on vault tickets. */
|
|
26
|
+
get feeDbpsLocked(): number;
|
|
27
27
|
/** Fee withheld on a VAULT-token ticket at redemption (raw), rounded up like the program. Zero for alt tickets (use PoolExt.quoteExit). */
|
|
28
28
|
get vaultFeeRaw(): BN;
|
|
29
29
|
/** What a VAULT-token ticket pays out (raw): total − fee. */
|
|
@@ -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;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,
|
|
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,4IAA4I;IAC5I,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,2IAA2I;IAC3I,IAAI,WAAW,IAAI,EAAE,CAGpB;IAED,6DAA6D;IAC7D,IAAI,WAAW,IAAI,EAAE,CAEpB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;CACF"}
|
package/dist/accounts/ticket.js
CHANGED
|
@@ -64,15 +64,15 @@ class WithdrawalTicket {
|
|
|
64
64
|
get navLocked() {
|
|
65
65
|
return this.data.navLocked ?? new bn_js_1.default(0);
|
|
66
66
|
}
|
|
67
|
-
/** Exit fee locked at creation (bps): the alt fee on alt tickets, the pool's vault exit fee on vault tickets. */
|
|
68
|
-
get
|
|
69
|
-
return this.data.
|
|
67
|
+
/** Exit fee locked at creation, in tenths of a bps (10 = 1 bps): the alt fee on alt tickets, the pool's vault exit fee on vault tickets. */
|
|
68
|
+
get feeDbpsLocked() {
|
|
69
|
+
return this.data.feeDbpsLocked ?? 0;
|
|
70
70
|
}
|
|
71
71
|
/** Fee withheld on a VAULT-token ticket at redemption (raw), rounded up like the program. Zero for alt tickets (use PoolExt.quoteExit). */
|
|
72
72
|
get vaultFeeRaw() {
|
|
73
|
-
if (this.isAltPayout || this.
|
|
73
|
+
if (this.isAltPayout || this.feeDbpsLocked === 0)
|
|
74
74
|
return new bn_js_1.default(0);
|
|
75
|
-
return this.totalAmountRaw.muln(this.
|
|
75
|
+
return this.totalAmountRaw.muln(this.feeDbpsLocked).addn(99999).divn(100000);
|
|
76
76
|
}
|
|
77
77
|
/** What a VAULT-token ticket pays out (raw): total − fee. */
|
|
78
78
|
get vaultNetRaw() {
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,4IAA4I;IAC5I,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,2IAA2I;IAC3I,IAAI,WAAW;QACb,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,aAAa,KAAK,CAAC;YAAE,OAAO,IAAI,eAAE,CAAC,CAAC,CAAC,CAAC;QACnE,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,KAAM,CAAC,CAAC,IAAI,CAAC,MAAO,CAAC,CAAC;IACjF,CAAC;IAED,6DAA6D;IAC7D,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,oBAAO,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,CAAC;IAC3F,CAAC;CACF;AAjGD,4CAiGC"}
|
|
@@ -889,7 +889,7 @@
|
|
|
889
889
|
"type": "u32"
|
|
890
890
|
},
|
|
891
891
|
{
|
|
892
|
-
"name": "
|
|
892
|
+
"name": "exit_fee_dbps",
|
|
893
893
|
"type": "u16"
|
|
894
894
|
},
|
|
895
895
|
{
|
|
@@ -1309,7 +1309,7 @@
|
|
|
1309
1309
|
{
|
|
1310
1310
|
"name": "set_vault_exit_fee",
|
|
1311
1311
|
"docs": [
|
|
1312
|
-
"Admin-only: fee (bps) on exits paid in the pool's vault token — the USDC leg of a",
|
|
1312
|
+
"Admin-only: fee in TENTHS of a basis point (10 = 1 bps) on exits paid in the pool's vault token — the USDC leg of a",
|
|
1313
1313
|
"USDC-denominated pool. Locked onto tickets at creation; legacy `withdraw` applies",
|
|
1314
1314
|
"the current rate. The fee stays in the liquidity faucet. Cap 10%."
|
|
1315
1315
|
],
|
|
@@ -1335,7 +1335,7 @@
|
|
|
1335
1335
|
],
|
|
1336
1336
|
"args": [
|
|
1337
1337
|
{
|
|
1338
|
-
"name": "
|
|
1338
|
+
"name": "fee_dbps",
|
|
1339
1339
|
"type": "u16"
|
|
1340
1340
|
}
|
|
1341
1341
|
]
|
|
@@ -2317,7 +2317,7 @@
|
|
|
2317
2317
|
"type": "u64"
|
|
2318
2318
|
},
|
|
2319
2319
|
{
|
|
2320
|
-
"name": "
|
|
2320
|
+
"name": "fee_dbps_locked",
|
|
2321
2321
|
"type": "u16"
|
|
2322
2322
|
},
|
|
2323
2323
|
{
|
|
@@ -2369,7 +2369,7 @@
|
|
|
2369
2369
|
"type": "u64"
|
|
2370
2370
|
},
|
|
2371
2371
|
{
|
|
2372
|
-
"name": "
|
|
2372
|
+
"name": "fee_dbps_locked",
|
|
2373
2373
|
"type": "u16"
|
|
2374
2374
|
},
|
|
2375
2375
|
{
|
|
@@ -2874,11 +2874,11 @@
|
|
|
2874
2874
|
"type": "u64"
|
|
2875
2875
|
},
|
|
2876
2876
|
{
|
|
2877
|
-
"name": "
|
|
2877
|
+
"name": "vault_exit_fee_dbps",
|
|
2878
2878
|
"docs": [
|
|
2879
|
-
"Fee on exits paid in the pool's own vault token, basis
|
|
2879
|
+
"Fee on exits paid in the pool's own vault token, in TENTHS of a basis point (10 = 1 bps; ele7-rwa-v1.2).",
|
|
2880
2880
|
"Live pools read 0. Set by `set_vault_exit_fee`; locked onto each ticket at",
|
|
2881
|
-
"creation (`WithdrawalTicket.
|
|
2881
|
+
"creation (`WithdrawalTicket.fee_dbps_locked`, payout_mint 0) and applied at",
|
|
2882
2882
|
"`redeem_ticket`; applied at the current rate by the legacy `withdraw`.",
|
|
2883
2883
|
"The fee stays in the liquidity faucet. Carved from the former reserved bytes."
|
|
2884
2884
|
],
|
|
@@ -2981,9 +2981,9 @@
|
|
|
2981
2981
|
"type": "u32"
|
|
2982
2982
|
},
|
|
2983
2983
|
{
|
|
2984
|
-
"name": "
|
|
2984
|
+
"name": "exit_fee_dbps",
|
|
2985
2985
|
"docs": [
|
|
2986
|
-
"Fee on alt exits, basis
|
|
2986
|
+
"Fee on alt exits, in TENTHS of a basis point (10 = 1 bps), applied on the conversion"
|
|
2987
2987
|
],
|
|
2988
2988
|
"type": "u16"
|
|
2989
2989
|
},
|
|
@@ -3101,7 +3101,7 @@
|
|
|
3101
3101
|
"type": "u64"
|
|
3102
3102
|
},
|
|
3103
3103
|
{
|
|
3104
|
-
"name": "
|
|
3104
|
+
"name": "exit_fee_dbps",
|
|
3105
3105
|
"type": "u16"
|
|
3106
3106
|
},
|
|
3107
3107
|
{
|
|
@@ -3137,7 +3137,7 @@
|
|
|
3137
3137
|
}
|
|
3138
3138
|
},
|
|
3139
3139
|
{
|
|
3140
|
-
"name": "
|
|
3140
|
+
"name": "exit_fee_dbps",
|
|
3141
3141
|
"type": {
|
|
3142
3142
|
"option": "u16"
|
|
3143
3143
|
}
|
|
@@ -3527,7 +3527,7 @@
|
|
|
3527
3527
|
}
|
|
3528
3528
|
},
|
|
3529
3529
|
{
|
|
3530
|
-
"name": "
|
|
3530
|
+
"name": "exit_fee_dbps",
|
|
3531
3531
|
"type": {
|
|
3532
3532
|
"option": "u16"
|
|
3533
3533
|
}
|
|
@@ -3579,7 +3579,7 @@
|
|
|
3579
3579
|
"type": "pubkey"
|
|
3580
3580
|
},
|
|
3581
3581
|
{
|
|
3582
|
-
"name": "
|
|
3582
|
+
"name": "fee_dbps",
|
|
3583
3583
|
"type": "u16"
|
|
3584
3584
|
}
|
|
3585
3585
|
]
|
|
@@ -3607,7 +3607,7 @@
|
|
|
3607
3607
|
"type": "u64"
|
|
3608
3608
|
},
|
|
3609
3609
|
{
|
|
3610
|
-
"name": "
|
|
3610
|
+
"name": "fee_dbps_locked",
|
|
3611
3611
|
"type": "u16"
|
|
3612
3612
|
},
|
|
3613
3613
|
{
|
|
@@ -3643,7 +3643,7 @@
|
|
|
3643
3643
|
"type": "u64"
|
|
3644
3644
|
},
|
|
3645
3645
|
{
|
|
3646
|
-
"name": "
|
|
3646
|
+
"name": "fee_dbps_locked",
|
|
3647
3647
|
"type": "u16"
|
|
3648
3648
|
},
|
|
3649
3649
|
{
|
|
@@ -3721,9 +3721,9 @@
|
|
|
3721
3721
|
"type": "u64"
|
|
3722
3722
|
},
|
|
3723
3723
|
{
|
|
3724
|
-
"name": "
|
|
3724
|
+
"name": "fee_dbps_locked",
|
|
3725
3725
|
"docs": [
|
|
3726
|
-
"Exit fee
|
|
3726
|
+
"Exit fee (tenths of a bps) locked when the ticket was created: the alt fee on alt tickets, the vault exit fee on vault tickets"
|
|
3727
3727
|
],
|
|
3728
3728
|
"type": "u16"
|
|
3729
3729
|
}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { ElementalV2Context, VAULT_PROGRAM_ID, ELE6_PROGRAM_ID, ELE7_PROGRAM_ID, MIGRATION_TARGET_PROGRAM_ID, } from "./programs";
|
|
2
2
|
export { Pool, Position, WithdrawalTicket, PoolExt } from "./accounts";
|
|
3
3
|
export type { NavReading, AltDepositQuote, AltExitQuote } from "./accounts";
|
|
4
|
-
export { PoolData, PositionData, WithdrawalTicketData, PositionStatus, SwapAdapter, FIXED_ONE, ONRE_PROGRAM_ID, ONRE_STATE, POOL_FAUCET_CONFIG, PoolExtData, POOL_EXT_FLAG_ALT_DEPOSITS, POOL_EXT_FLAG_ALT_EXITS, CONVERSION_SOURCE_POSTED, CONVERSION_SOURCE_SCOPE, NAV_ONE, SCOPE_PROGRAM_ID, SCOPE_PRICES, SCOPE_INDEX, USDC_MINT, } from "./types";
|
|
4
|
+
export { PoolData, PositionData, WithdrawalTicketData, PositionStatus, SwapAdapter, FIXED_ONE, ONRE_PROGRAM_ID, ONRE_STATE, POOL_FAUCET_CONFIG, PoolExtData, POOL_EXT_FLAG_ALT_DEPOSITS, POOL_EXT_FLAG_ALT_EXITS, CONVERSION_SOURCE_POSTED, CONVERSION_SOURCE_SCOPE, NAV_ONE, FEE_DENOMINATOR, dbpsToPercent, dbpsToBps, SCOPE_PROGRAM_ID, SCOPE_PRICES, SCOPE_INDEX, USDC_MINT, } from "./types";
|
|
5
5
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,2BAA2B,GAC5B,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACvE,YAAY,EAAE,UAAU,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC5E,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,oBAAoB,EACpB,cAAc,EACd,WAAW,EACX,SAAS,EACT,eAAe,EACf,UAAU,EACV,kBAAkB,EAClB,WAAW,EACX,0BAA0B,EAC1B,uBAAuB,EACvB,wBAAwB,EACxB,uBAAuB,EACvB,OAAO,EACP,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,SAAS,GACV,MAAM,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,2BAA2B,GAC5B,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACvE,YAAY,EAAE,UAAU,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC5E,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,oBAAoB,EACpB,cAAc,EACd,WAAW,EACX,SAAS,EACT,eAAe,EACf,UAAU,EACV,kBAAkB,EAClB,WAAW,EACX,0BAA0B,EAC1B,uBAAuB,EACvB,wBAAwB,EACxB,uBAAuB,EACvB,OAAO,EACP,eAAe,EACf,aAAa,EACb,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,SAAS,GACV,MAAM,SAAS,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.USDC_MINT = exports.SCOPE_INDEX = exports.SCOPE_PRICES = exports.SCOPE_PROGRAM_ID = exports.NAV_ONE = exports.CONVERSION_SOURCE_SCOPE = exports.CONVERSION_SOURCE_POSTED = exports.POOL_EXT_FLAG_ALT_EXITS = exports.POOL_EXT_FLAG_ALT_DEPOSITS = exports.POOL_FAUCET_CONFIG = exports.ONRE_STATE = exports.ONRE_PROGRAM_ID = exports.FIXED_ONE = exports.SwapAdapter = exports.PoolExt = exports.WithdrawalTicket = exports.Position = exports.Pool = exports.MIGRATION_TARGET_PROGRAM_ID = exports.ELE7_PROGRAM_ID = exports.ELE6_PROGRAM_ID = exports.VAULT_PROGRAM_ID = exports.ElementalV2Context = void 0;
|
|
3
|
+
exports.USDC_MINT = exports.SCOPE_INDEX = exports.SCOPE_PRICES = exports.SCOPE_PROGRAM_ID = exports.dbpsToBps = exports.dbpsToPercent = exports.FEE_DENOMINATOR = exports.NAV_ONE = exports.CONVERSION_SOURCE_SCOPE = exports.CONVERSION_SOURCE_POSTED = exports.POOL_EXT_FLAG_ALT_EXITS = exports.POOL_EXT_FLAG_ALT_DEPOSITS = exports.POOL_FAUCET_CONFIG = exports.ONRE_STATE = exports.ONRE_PROGRAM_ID = exports.FIXED_ONE = exports.SwapAdapter = exports.PoolExt = exports.WithdrawalTicket = exports.Position = exports.Pool = exports.MIGRATION_TARGET_PROGRAM_ID = exports.ELE7_PROGRAM_ID = exports.ELE6_PROGRAM_ID = exports.VAULT_PROGRAM_ID = exports.ElementalV2Context = void 0;
|
|
4
4
|
// Main exports
|
|
5
5
|
var programs_1 = require("./programs");
|
|
6
6
|
Object.defineProperty(exports, "ElementalV2Context", { enumerable: true, get: function () { return programs_1.ElementalV2Context; } });
|
|
@@ -24,6 +24,9 @@ Object.defineProperty(exports, "POOL_EXT_FLAG_ALT_EXITS", { enumerable: true, ge
|
|
|
24
24
|
Object.defineProperty(exports, "CONVERSION_SOURCE_POSTED", { enumerable: true, get: function () { return types_1.CONVERSION_SOURCE_POSTED; } });
|
|
25
25
|
Object.defineProperty(exports, "CONVERSION_SOURCE_SCOPE", { enumerable: true, get: function () { return types_1.CONVERSION_SOURCE_SCOPE; } });
|
|
26
26
|
Object.defineProperty(exports, "NAV_ONE", { enumerable: true, get: function () { return types_1.NAV_ONE; } });
|
|
27
|
+
Object.defineProperty(exports, "FEE_DENOMINATOR", { enumerable: true, get: function () { return types_1.FEE_DENOMINATOR; } });
|
|
28
|
+
Object.defineProperty(exports, "dbpsToPercent", { enumerable: true, get: function () { return types_1.dbpsToPercent; } });
|
|
29
|
+
Object.defineProperty(exports, "dbpsToBps", { enumerable: true, get: function () { return types_1.dbpsToBps; } });
|
|
27
30
|
Object.defineProperty(exports, "SCOPE_PROGRAM_ID", { enumerable: true, get: function () { return types_1.SCOPE_PROGRAM_ID; } });
|
|
28
31
|
Object.defineProperty(exports, "SCOPE_PRICES", { enumerable: true, get: function () { return types_1.SCOPE_PRICES; } });
|
|
29
32
|
Object.defineProperty(exports, "SCOPE_INDEX", { enumerable: true, get: function () { return types_1.SCOPE_INDEX; } });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,eAAe;AACf,uCAMoB;AALlB,8GAAA,kBAAkB,OAAA;AAClB,4GAAA,gBAAgB,OAAA;AAChB,2GAAA,eAAe,OAAA;AACf,2GAAA,eAAe,OAAA;AACf,uHAAA,2BAA2B,OAAA;AAE7B,uCAAuE;AAA9D,gGAAA,IAAI,OAAA;AAAE,oGAAA,QAAQ,OAAA;AAAE,4GAAA,gBAAgB,OAAA;AAAE,mGAAA,OAAO,OAAA;AAElD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,eAAe;AACf,uCAMoB;AALlB,8GAAA,kBAAkB,OAAA;AAClB,4GAAA,gBAAgB,OAAA;AAChB,2GAAA,eAAe,OAAA;AACf,2GAAA,eAAe,OAAA;AACf,uHAAA,2BAA2B,OAAA;AAE7B,uCAAuE;AAA9D,gGAAA,IAAI,OAAA;AAAE,oGAAA,QAAQ,OAAA;AAAE,4GAAA,gBAAgB,OAAA;AAAE,mGAAA,OAAO,OAAA;AAElD,iCAuBiB;AAlBf,oGAAA,WAAW,OAAA;AACX,kGAAA,SAAS,OAAA;AACT,wGAAA,eAAe,OAAA;AACf,mGAAA,UAAU,OAAA;AACV,2GAAA,kBAAkB,OAAA;AAElB,mHAAA,0BAA0B,OAAA;AAC1B,gHAAA,uBAAuB,OAAA;AACvB,iHAAA,wBAAwB,OAAA;AACxB,gHAAA,uBAAuB,OAAA;AACvB,gGAAA,OAAO,OAAA;AACP,wGAAA,eAAe,OAAA;AACf,sGAAA,aAAa,OAAA;AACb,kGAAA,SAAS,OAAA;AACT,yGAAA,gBAAgB,OAAA;AAChB,qGAAA,YAAY,OAAA;AACZ,oGAAA,WAAW,OAAA;AACX,kGAAA,SAAS,OAAA"}
|
|
@@ -91,8 +91,8 @@ export declare class ElementalV2Context {
|
|
|
91
91
|
createTicketAltInstructions(position: Position, ext: PoolExt, amount: number | string): Promise<TransactionInstruction[]>;
|
|
92
92
|
/** Redeem a matured alt ticket from the alt faucet. Creates the user's alt ATA if needed. */
|
|
93
93
|
redeemTicketAltInstructions(ticket: WithdrawalTicket, position: Position, ext: PoolExt): Promise<TransactionInstruction[]>;
|
|
94
|
-
/** Admin: set the fee
|
|
95
|
-
setVaultExitFeeInstruction(pool: Pool,
|
|
94
|
+
/** Admin: set the fee on exits paid in the vault token, in tenths of a bps (10 = 1 bps, cap 10_000 = 10%). Locked onto tickets at creation. */
|
|
95
|
+
setVaultExitFeeInstruction(pool: Pool, feeDbps: number, admin?: PublicKey): Promise<TransactionInstruction>;
|
|
96
96
|
/** Permissionless: sweep the alt holder to the pool's manager wallet (ops). */
|
|
97
97
|
flushAltToManagerInstruction(pool: Pool, ext: PoolExt): Promise<TransactionInstruction>;
|
|
98
98
|
createPositionInstruction(pool: Pool, ownerAddress?: PublicKey): Promise<TransactionInstruction>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"elemental.d.ts","sourceRoot":"","sources":["../../src/programs/elemental.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"elemental.d.ts","sourceRoot":"","sources":["../../src/programs/elemental.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,OAAO,EAAE,cAAc,EAAO,MAAM,mBAAmB,CAAC;AACjE,OAAO,EACL,SAAS,EACT,OAAO,EAEP,sBAAsB,EACtB,oBAAoB,EACpB,UAAU,EAIX,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EACL,QAAQ,EACR,YAAY,EAOb,MAAM,UAAU,CAAC;AAGlB;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,gBAAgB,WAE5B,CAAC;AAEF,2EAA2E;AAC3E,eAAO,MAAM,eAAe,WAAmB,CAAC;AAEhD,6FAA6F;AAC7F,eAAO,MAAM,eAAe,WAE3B,CAAC;AAEF,wFAAwF;AACxF,eAAO,MAAM,2BAA2B,WAAkB,CAAC;AAE3D,qBAAa,kBAAkB;IAC7B,SAAgB,QAAQ,EAAE,cAAc,CAAC;IACzC,SAAgB,OAAO,EAAE,OAAO,CAAC;IACjC,OAAO,CAAC,SAAS,CAAgB;gBAErB,QAAQ,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,SAAS;IAU3D,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED,IAAI,aAAa,IAAI,SAAS,CAE7B;IAMD,iBAAiB,CAAC,WAAW,EAAE,SAAS,GAAG,SAAS;IAOpD,mBAAmB,CACjB,WAAW,EAAE,SAAS,EACtB,YAAY,CAAC,EAAE,SAAS,GACvB,SAAS;IAWZ,iBAAiB,CACf,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,SAAS,GACvB,SAAS;IASZ,kBAAkB,CAAC,WAAW,EAAE,SAAS,GAAG,SAAS;IAIrD,gBAAgB,CAAC,WAAW,EAAE,SAAS,GAAG,SAAS;IAQ7C,QAAQ,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBjD;;;;;;;;;;;;;;;;;;OAkBG;IACG,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IA0CzD,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IA6BlD,uBAAuB,CAAC,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBhE,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;IAYrE,aAAa,CACjB,KAAK,EAAE,IAAI,EAAE,EACb,YAAY,CAAC,EAAE,SAAS,GACvB,OAAO,CAAC,QAAQ,EAAE,CAAC;IAiBtB,OAAO,CAAC,mBAAmB;IA4B3B,0DAA0D;IACpD,WAAW,CACf,IAAI,EAAE,IAAI,EACV,YAAY,CAAC,EAAE,SAAS,GACvB,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAgB9B,uCAAuC;IACjC,UAAU,CACd,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,SAAS,GACvB,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAqBnC,8GAA8G;IACxG,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAOtD,yEAAyE;IACnE,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;YAQhD,oBAAoB;IAalC,OAAO,CAAC,kBAAkB;IAK1B;;;;;OAKG;IACG,sBAAsB,CAC1B,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,WAAW,SAAK,GACf,OAAO,CAAC;QAAE,YAAY,EAAE,sBAAsB,EAAE,CAAC;QAAC,KAAK,EAAE,OAAO,aAAa,EAAE,eAAe,CAAA;KAAE,CAAC;IA8BpG;;;;OAIG;IACG,2BAA2B,CAC/B,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GAAG,MAAM,GACtB,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAmBpC,6FAA6F;IACvF,2BAA2B,CAC/B,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAkCpC,+IAA+I;IACzI,0BAA0B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,GAAE,SAA8B,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAOrI,+EAA+E;IACzE,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAsBvF,yBAAyB,CAC7B,IAAI,EAAE,IAAI,EACV,YAAY,CAAC,EAAE,SAAS,GACvB,OAAO,CAAC,sBAAsB,CAAC;IAe5B,mBAAmB,CACvB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,sBAAsB,EAAE,CAAC;IA+HpC;;;;;;;;OAQG;YACW,wBAAwB;IAkHhC,4BAA4B,CAChC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GAAG,MAAM,GACtB,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAyC9B,sBAAsB,CAC1B,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GAAG,MAAM,GACtB,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAoBpC;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACG,sBAAsB,CAC1B,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,SAAS,EACrB,aAAa,GAAE,SAAuC,GACrD,OAAO,CAAC,sBAAsB,EAAE,CAAC;IA+B9B,iBAAiB,CACrB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAa9B,oBAAoB,CACxB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAgD9B,sBAAsB,CAC1B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GAAG,MAAM,GACtB,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAiCpC;;;;;;OAMG;IACG,wBAAwB,CAC5B,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAuB9B,wBAAwB,CAC5B,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,sBAAsB,EAAE,CAAC;IA+C9B,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAOnE,wBAAwB,CAC5B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;QACN,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACnC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACnC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACnC,mBAAmB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACtC,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,GACA,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAuD9B,eAAe,CACnB,YAAY,EAAE,sBAAsB,EAAE,EACtC,OAAO,GAAE,OAAO,EAAO,GACtB,OAAO,CAAC,oBAAoB,CAAC;IAM1B,OAAO,CACX,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,oBAAoB,CAAC;IAS1B,gBAAgB,CACpB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GAAG,MAAM,GACtB,OAAO,CAAC,oBAAoB,CAAC;IAQ1B,UAAU,CACd,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GAAG,MAAM,GACtB,OAAO,CAAC,oBAAoB,CAAC;IAK1B,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAKxD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAK3D,YAAY,CAChB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,oBAAoB,CAAC;IAK1B,YAAY,CAChB,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,oBAAoB,CAAC;IAK1B,UAAU,CACd,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,oBAAoB,CAAC;IAK1B,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAIzG,eAAe,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAI1G,UAAU,CACd,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GAAG,MAAM,GACtB,OAAO,CAAC,oBAAoB,CAAC;IAK1B,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAKtD,YAAY,CAChB,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;QACN,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACnC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACnC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACnC,mBAAmB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACtC,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,GACA,OAAO,CAAC,oBAAoB,CAAC;IAShC,2BAA2B,CACzB,QAAQ,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;KAAE,KAAK,IAAI,GACxE,IAAI;IAWP,+BAA+B,CAC7B,QAAQ,EAAE,CAAC,KAAK,EAAE;QAChB,MAAM,EAAE,SAAS,CAAC;QAClB,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;KAC7B,KAAK,IAAI,GACT,IAAI;IAWP,mBAAmB,IAAI,IAAI;CAM5B"}
|
|
@@ -358,10 +358,10 @@ class ElementalV2Context {
|
|
|
358
358
|
.instruction());
|
|
359
359
|
return instructions;
|
|
360
360
|
}
|
|
361
|
-
/** Admin: set the fee
|
|
362
|
-
async setVaultExitFeeInstruction(pool,
|
|
361
|
+
/** Admin: set the fee on exits paid in the vault token, in tenths of a bps (10 = 1 bps, cap 10_000 = 10%). Locked onto tickets at creation. */
|
|
362
|
+
async setVaultExitFeeInstruction(pool, feeDbps, admin = this.walletAddress) {
|
|
363
363
|
return await this.program.methods
|
|
364
|
-
.setVaultExitFee(
|
|
364
|
+
.setVaultExitFee(feeDbps)
|
|
365
365
|
.accounts({ admin, pool: pool.address })
|
|
366
366
|
.instruction();
|
|
367
367
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"elemental.js","sourceRoot":"","sources":["../../src/programs/elemental.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAiC;AACjC,kDAAuB;AACvB,8CAAiE;AACjE,6CAUyB;AACzB,iDAQ2B;AAC3B,0CAAwE;AACxE,oCASkB;AAClB,uGAA2D;AAE3D;;;;;;;;;;;;;;GAcG;AACU,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,8CAA8C,CAC/C,CAAC;AAEF,2EAA2E;AAC9D,QAAA,eAAe,GAAG,wBAAgB,CAAC;AAEhD,6FAA6F;AAChF,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,8CAA8C,CAC/C,CAAC;AAEF,wFAAwF;AAC3E,QAAA,2BAA2B,GAAG,uBAAe,CAAC;AAE3D,MAAa,kBAAkB;IAK7B,YAAY,QAAwB,EAAE,SAAqB;QAFnD,cAAS,GAAa,EAAE,CAAC;QAG/B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,0EAA0E;QAC1E,0EAA0E;QAC1E,4BAA4B;QAC5B,MAAM,MAAM,GAAG,SAAS,IAAI,wBAAgB,CAAC;QAC7C,MAAM,SAAS,GAAG,EAAE,GAAG,iCAAG,EAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;QACzD,IAAI,CAAC,OAAO,GAAG,IAAI,gBAAO,CAAC,SAAgB,EAAE,QAAQ,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;IAClC,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;IACxC,CAAC;IAED,+EAA+E;IAC/E,cAAc;IACd,+EAA+E;IAE/E,iBAAiB,CAAC,WAAsB;QACtC,OAAO,mBAAS,CAAC,sBAAsB,CACrC,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,EACvD,IAAI,CAAC,OAAO,CAAC,SAAS,CACvB,CAAC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,mBAAmB,CACjB,WAAsB,EACtB,YAAwB;QAExB,OAAO,mBAAS,CAAC,sBAAsB,CACrC;YACE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;YACvB,CAAC,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;YAC/C,WAAW,CAAC,QAAQ,EAAE;SACvB,EACD,IAAI,CAAC,OAAO,CAAC,SAAS,CACvB,CAAC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,iBAAiB,CACf,WAAsB,EACtB,WAAmB,EACnB,YAAwB;QAExB,OAAO,2BAAgB,CAAC,WAAW,CACjC,YAAY,IAAI,IAAI,CAAC,aAAa,EAClC,WAAW,EACX,WAAW,EACX,IAAI,CAAC,OAAO,CAAC,SAAS,CACvB,CAAC;IACJ,CAAC;IAED,kBAAkB,CAAC,WAAsB;QACvC,OAAO,kBAAO,CAAC,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClE,CAAC;IAED,gBAAgB,CAAC,WAAsB;QACrC,OAAO,kBAAO,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpE,CAAC;IAED,+EAA+E;IAC/E,kBAAkB;IAClB,+EAA+E;IAE/E,KAAK,CAAC,QAAQ,CAAC,OAAkB;QAC/B,MAAM,IAAI,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACrE,MAAM,QAAQ,GAAG,IAAgB,CAAC;QAElC,sBAAsB;QACtB,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACzD,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC;YAC1D,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC;SACzD,CAAC,CAAC;QAEH,MAAM,eAAe,GAClB,eAAe,CAAC,KAAK,EAAE,IAAY,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,IAAI,CAAC,CAAC;QACpE,MAAM,aAAa,GAChB,aAAa,CAAC,KAAK,EAAE,IAAY,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,IAAI,CAAC,CAAC;QAElE,OAAO,IAAI,eAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7F,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,KAAK,CAAC,gBAAgB,CAAC,SAAsB;QAC3C,MAAM,QAAQ,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe,CAAC,IAAI,CAAC,aAAa,CACrE,SAAS,CACV,CAAC;QAEF,uEAAuE;QACvE,MAAM,WAAW,GAAG,IAAI,GAAG,EAAqB,CAAC;QACjD,KAAK,MAAM,CAAC,IAAI,QAA+B,EAAE,CAAC;YAChD,IAAI,CAAC,CAAC;gBAAE,SAAS;YACjB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;YACzD,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,QAAQ,GAAG,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3C,MAAM,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAC;QACjD,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,iCAAiC;QACpD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC;YAChD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC;YAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;YACrE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;gBAC9B,MAAM,CAAC,GAAI,IAAI,EAAE,IAAY,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC;gBACtD,IAAI,OAAO,CAAC,KAAK,QAAQ;oBAAE,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;YACxE,CAAC,CAAC,CAAC;QACL,CAAC;QAED,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAoB,CAAC;YAC5C,IAAI,IAAI,EAAE,CAAC;gBACT,2EAA2E;gBAC3E,MAAM,eAAe,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;gBAC7E,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;gBACzE,KAAK,CAAC,IAAI,CACR,IAAI,eAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CACrF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,eAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YAC9F,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,SAAsB;QACpC,MAAM,QAAQ,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe,CAAC,IAAI,CAAC,aAAa,CACrE,SAAS,CACV,CAAC;QAEF,yDAAyD;QACzD,+DAA+D;QAC/D,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAoB,CAAC;YAC5C,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBACzD,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC;oBACtD,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC;iBACrD,CAAC,CAAC;gBACH,MAAM,eAAe,GAClB,eAAe,CAAC,KAAK,EAAE,IAAY,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,IAAI,CAAC,CAAC;gBACpE,MAAM,aAAa,GAChB,aAAa,CAAC,KAAK,EAAE,IAAY,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,IAAI,CAAC,CAAC;gBAClE,KAAK,CAAC,IAAI,CACR,IAAI,eAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CACrF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,eAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YAC9F,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,WAAsB;QAClD,MAAM,SAAS,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe,CAAC,QAAQ,CAAC,GAAG,CAAC;YACjE;gBACE,MAAM,EAAE;oBACN,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,WAAW,CAAC,QAAQ,EAAE;iBAC9B;aACF;SACF,CAAC,CAAC;QACH,OAAO,SAAS,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED,+EAA+E;IAC/E,sBAAsB;IACtB,+EAA+E;IAE/E,KAAK,CAAC,YAAY,CAAC,IAAU,EAAE,YAAwB;QACrD,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe,CAAC,QAAQ,CAAC,aAAa,CACrE,OAAO,CACR,CAAC;QACF,OAAO,IAAI,mBAAQ,CACjB,IAAI,EACJ,OAAO,EACP,IAAI,IAAI,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,CACrD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,KAAa,EACb,YAAwB;QAExB,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACnC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CACrD,CAAC;QACF,MAAM,QAAQ,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe,CAAC,QAAQ,CAAC,aAAa,CACzE,SAAS,CACV,CAAC;QACF,OAAO,QAAQ,CAAC,GAAG,CACjB,CAAC,IAAyB,EAAE,KAAa,EAAE,EAAE,CAC3C,IAAI,mBAAQ,CACV,KAAK,CAAC,KAAK,CAAC,EACZ,SAAS,CAAC,KAAK,CAAC,EAChB,IAAI,IAAI,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC,CAC7D,CACJ,CAAC;IACJ,CAAC;IAEO,mBAAmB,CACzB,IAAU,EACV,YAAwB;QAExB,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,OAAO;YAClB,KAAK,EAAE,YAAY,IAAI,IAAI,CAAC,aAAa;YACzC,mBAAmB,EAAE,IAAI,eAAE,CAAC,CAAC,CAAC;YAC9B,YAAY,EAAE,IAAI,eAAE,CAAC,CAAC,CAAC;YACvB,aAAa,EAAE,IAAI,eAAE,CAAC,CAAC,CAAC;YACxB,MAAM,EAAE,IAAI,eAAE,CAAC,CAAC,CAAC;YACjB,kBAAkB,EAAE,IAAI,eAAE,CAAC,CAAC,CAAC;YAC7B,cAAc,EAAE,IAAI,eAAE,CAAC,CAAC,CAAC;YACzB,qBAAqB,EAAE,CAAC,CAAC;YACzB,IAAI,EAAE,CAAC;YACP,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,IAAI,eAAE,CAAC,CAAC,CAAC;YACvB,cAAc,EAAE,IAAI,eAAE,CAAC,CAAC,CAAC;YACzB,YAAY,EAAE,IAAI,eAAE,CAAC,CAAC,CAAC;YACvB,cAAc,EAAE,IAAI,eAAE,CAAC,CAAC,CAAC;SAC1B,CAAC;IACJ,CAAC;IAED,+EAA+E;IAC/E,oBAAoB;IACpB,+EAA+E;IAE/E,0DAA0D;IAC1D,KAAK,CAAC,WAAW,CACf,IAAU,EACV,YAAwB;QAExB,MAAM,KAAK,GAAG,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC;QACjD,MAAM,QAAQ,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe,CAAC,gBAAgB,CAAC,GAAG,CAAC;YACxE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,EAAE;YACzD,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,EAAE;SACpD,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,GAAG,CACjB,CAAC,GAAQ,EAAE,EAAE,CACX,IAAI,2BAAgB,CAClB,IAAI,EACJ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,OAA+B,CACpC,CACJ,CAAC;IACJ,CAAC;IAED,uCAAuC;IACvC,KAAK,CAAC,UAAU,CACd,IAAU,EACV,WAAmB,EACnB,YAAwB;QAExB,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CACpC,IAAI,CAAC,OAAO,EACZ,WAAW,EACX,YAAY,CACb,CAAC;QACF,MAAM,IAAI,GAAG,MACX,IAAI,CAAC,OAAO,CAAC,OACd,CAAC,gBAAgB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QACvB,OAAO,IAAI,2BAAgB,CACzB,IAAI,EACJ,OAAO,EACP,IAA4B,CAC7B,CAAC;IACJ,CAAC;IAED,+EAA+E;IAC/E,iDAAiD;IACjD,+EAA+E;IAE/E,8GAA8G;IAC9G,KAAK,CAAC,WAAW,CAAC,IAAU;QAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAChF,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QACvB,OAAO,IAAI,kBAAO,CAAC,IAAI,EAAE,OAAO,EAAE,IAAmB,CAAC,CAAC;IACzD,CAAC;IAED,yEAAyE;IACzE,KAAK,CAAC,YAAY,CAAC,KAAa;QAC9B,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACtF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAwB,EAAE,CAAS,EAAE,EAAE,CAC1D,IAAI,CAAC,CAAC,CAAC,IAAI,kBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CACxD,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,IAAe,EAAE,KAAgB;QAClE,MAAM,GAAG,GAAG,IAAA,yCAA6B,EAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC;YACH,MAAM,IAAA,sBAAU,EAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACvC,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,qCAAyB,EAAE,CAAC;gBAC7C,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,IAAA,mDAAuC,EAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;YACpG,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAEO,kBAAkB,CAAC,GAAY;QACrC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC;QAC7B,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChF,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,sBAAsB,CAC1B,QAAkB,EAClB,GAAY,EACZ,MAAuB,EACvB,WAAW,GAAG,EAAE;QAEhB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACvH,IAAI,CAAC,GAAG,CAAC,kBAAkB;YAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACvF,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC9D,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,KAAK,CAAC,GAAG,CAAC,UAAU,OAAO,GAAG,CAAC,SAAS,IAAI,CAAC,CAAC;QACtG,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAM,GAAG,WAAW,CAAC,CAAC,IAAI,CAAC,KAAM,CAAC,CAAC;QAEvE,MAAM,YAAY,GAA6B,EAAE,CAAC;QAClD,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,YAAY,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7F,MAAM,cAAc,GAAG,IAAA,yCAA6B,EAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACnG,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC7E,MAAM,YAAY,GAAG,WAAW,EAAE,KAAK,IAAI,4BAAgB,CAAC;QAE5D,YAAY,CAAC,IAAI,CACf,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aAChC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC;aAClC,QAAQ,CAAC;YACR,aAAa,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE;YACrG,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,cAAc;YACd,SAAS,EAAE,GAAG,CAAC,gBAAgB;YAC/B,OAAO,EAAE,GAAG,CAAC,cAAc;YAC3B,YAAY;SACb,CAAC;aACD,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;aAC/C,WAAW,EAAE,CACjB,CAAC;QACF,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,2BAA2B,CAC/B,QAAkB,EAClB,GAAY,EACZ,MAAuB;QAEvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACvH,IAAI,CAAC,GAAG,CAAC,eAAe;YAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACjF,MAAM,QAAQ,GAAG,IAAI,eAAE,CAAC,IAAI,oBAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACtG,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC1F,MAAM,EAAE,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aAC3C,eAAe,CAAC,QAAQ,CAAC;aACzB,QAAQ,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,aAAa;YACzB,aAAa,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE;YACrG,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,MAAM,EAAE,aAAa;YACrB,aAAa,EAAE,uBAAa,CAAC,SAAS;SACvC,CAAC;aACD,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;aAC/C,WAAW,EAAE,CAAC;QACjB,OAAO,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAED,6FAA6F;IAC7F,KAAK,CAAC,2BAA2B,CAC/B,MAAwB,EACxB,QAAkB,EAClB,GAAY;QAEZ,IAAI,CAAC,MAAM,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;QACtG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACvH,MAAM,YAAY,GAA6B,EAAE,CAAC;QAClD,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACvH,IAAI,SAAS;YAAE,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC7E,MAAM,YAAY,GAAG,WAAW,EAAE,KAAK,IAAI,4BAAgB,CAAC;QAC5D,gEAAgE;QAChE,MAAM,qBAAqB,GAAG,GAAG,CAAC,cAAc;YAC9C,CAAC,CAAC,IAAA,yCAA6B,EAAC,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC;YAC7E,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;QAE3B,YAAY,CAAC,IAAI,CACf,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aAChC,eAAe,EAAE;aACjB,QAAQ,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,aAAa;YACzB,MAAM,EAAE,MAAM,CAAC,OAAO;YACtB,QAAQ,EAAE,QAAQ,CAAC,OAAO;YAC1B,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO;YAC3B,YAAY,EAAE,GAAG,CAAC,gBAAgB;YAClC,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,SAAS,EAAE,GAAG,CAAC,gBAAgB;YAC/B,cAAc;YACd,qBAAqB;YACrB,OAAO,EAAE,GAAG,CAAC,cAAc;YAC3B,YAAY;SACb,CAAC;aACD,WAAW,EAAE,CACjB,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,4GAA4G;IAC5G,KAAK,CAAC,0BAA0B,CAAC,IAAU,EAAE,GAAW,EAAE,QAAmB,IAAI,CAAC,aAAa;QAC7F,OAAO,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aACvC,eAAe,CAAC,GAAG,CAAC;aACpB,QAAQ,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;aACvC,WAAW,EAAE,CAAC;IACnB,CAAC;IAED,+EAA+E;IAC/E,KAAK,CAAC,4BAA4B,CAAC,IAAU,EAAE,GAAY;QACzD,MAAM,iBAAiB,GAAG,IAAA,yCAA6B,EAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC3G,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC7E,MAAM,YAAY,GAAG,WAAW,EAAE,KAAK,IAAI,4BAAgB,CAAC;QAC5D,OAAO,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aACvC,iBAAiB,EAAE;aACnB,QAAQ,CAAC;YACR,IAAI,EAAE,IAAI,CAAC,OAAO;YAClB,YAAY,EAAE,GAAG,CAAC,gBAAgB;YAClC,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,SAAS,EAAE,GAAG,CAAC,gBAAgB;YAC/B,iBAAiB;YACjB,OAAO,EAAE,GAAG,CAAC,cAAc;YAC3B,YAAY;SACb,CAAC;aACD,WAAW,EAAE,CAAC;IACnB,CAAC;IAED,+EAA+E;IAC/E,uBAAuB;IACvB,+EAA+E;IAE/E,KAAK,CAAC,yBAAyB,CAC7B,IAAU,EACV,YAAwB;QAExB,MAAM,KAAK,GAAG,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC;QACjD,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAEtE,OAAO,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aACvC,cAAc,CAAC,KAAK,CAAC;aACrB,QAAQ,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,aAAa;YACzB,IAAI,EAAE,IAAI,CAAC,OAAO;YAClB,QAAQ,EAAE,eAAe;YACzB,aAAa,EAAE,uBAAa,CAAC,SAAS;SACvC,CAAC;aACD,WAAW,EAAE,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,QAAkB,EAClB,MAAuB,EACvB,SAA2B;QAE3B,MAAM,YAAY,GAA6B,EAAE,CAAC;QAElD,sCAAsC;QACtC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,YAAY,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAE5C,6EAA6E;QAC7E,oDAAoD;QACpD,8BAA8B;QAC9B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAChE,IAAI,CAAC,kBAAkB,CACxB,CAAC;QACF,MAAM,eAAe,GAClB,eAAe,CAAC,KAAK,EAAE,IAAY,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,IAAI,CAAC,CAAC;QACpE,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,IAAI,eAAE,CACrB,IAAI,oBAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CACjE,CAAC;QAEF,MAAM,WAAW,GAAG,SAAS;YAC3B,CAAC,CAAC,IAAI,eAAE,CACJ,IAAI,oBAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;iBAC9B,GAAG,CAAC,IAAI,oBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;iBACrD,OAAO,CAAC,CAAC,CAAC,CACd;YACH,CAAC,CAAC,IAAI,CAAC;QAET,MAAM,gBAAgB,GAAG,IAAA,yCAA6B,EACpD,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,aAAa,EAClB,IAAI,CACL,CAAC;QAEF,gCAAgC;QAChC,yDAAyD;QACzD,oDAAoD;QACpD,yDAAyD;QACzD,IAAI,IAAI,CAAC,WAAW,KAAK,mBAAW,CAAC,IAAI,EAAE,CAAC;YAC1C,MAAM,oBAAoB,GAAG,IAAA,yCAA6B,EACxD,IAAI,CAAC,kBAAkB,EACvB,aAAa,EACb,IAAI,CACL,CAAC;YAEF,iDAAiD;YACjD,IAAI,CAAC;gBACH,MAAM,IAAA,sBAAU,EAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;YAC1D,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,GAAG,YAAY,qCAAyB,EAAE,CAAC;oBAC7C,YAAY,CAAC,IAAI,CACf,IAAA,mDAAuC,EACrC,IAAI,CAAC,aAAa,EAClB,oBAAoB,EACpB,aAAa,EACb,IAAI,CAAC,kBAAkB,CACxB,CACF,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,GAAG,CAAC;gBACZ,CAAC;YACH,CAAC;YAED,iDAAiD;YACjD,YAAY,CAAC,IAAI,CACf,IAAA,qCAAyB,EACvB,gBAAgB,EAChB,oBAAoB,EACpB,IAAI,CAAC,aAAa,EAClB,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAC5B,CACF,CAAC;YAEF,wCAAwC;YACxC,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAC3D,IAAI,EACJ,oBAAoB,CACrB,CAAC;YAEF,4BAA4B;YAC5B,MAAM,SAAS,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;iBAClD,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC;iBAC9B,QAAQ,CAAC;gBACR,aAAa,EAAE;oBACb,KAAK,EAAE,IAAI,CAAC,aAAa;oBACzB,QAAQ,EAAE,QAAQ,CAAC,OAAO;oBAC1B,IAAI,EAAE,IAAI,CAAC,OAAO;iBACnB;gBACD,gBAAgB,EAAE,mDAAmD;gBACrE,eAAe,EAAE,IAAI,CAAC,sBAAsB;gBAC5C,WAAW,EAAE,IAAI,CAAC,kBAAkB;gBACpC,SAAS,EAAE,IAAI,CAAC,gBAAgB;gBAChC,YAAY,EAAE,4BAAgB;aAC/B,CAAC;iBACD,iBAAiB,CAAC,iBAAiB,CAAC;iBACpC,WAAW,EAAE,CAAC;YAEjB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,+BAA+B;YAC/B,MAAM,SAAS,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;iBAClD,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC;iBAC9B,QAAQ,CAAC;gBACR,aAAa,EAAE;oBACb,KAAK,EAAE,IAAI,CAAC,aAAa;oBACzB,QAAQ,EAAE,QAAQ,CAAC,OAAO;oBAC1B,IAAI,EAAE,IAAI,CAAC,OAAO;iBACnB;gBACD,gBAAgB;gBAChB,eAAe,EAAE,IAAI,CAAC,sBAAsB;gBAC5C,WAAW,EAAE,IAAI,CAAC,kBAAkB;gBACpC,SAAS,EAAE,IAAI,CAAC,gBAAgB;gBAChC,YAAY,EAAE,4BAAgB;aAC/B,CAAC;iBACD,WAAW,EAAE,CAAC;YAEjB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAED;;;;;;;;OAQG;IACK,KAAK,CAAC,wBAAwB,CACpC,IAAU,EACV,oBAA+B;QAE/B,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACxC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAE7D,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAE5C,mBAAmB;QACnB,MAAM,CAAC,aAAa,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACtD,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,EACtC,uBAAe,CAChB,CAAC;QAEF,MAAM,CAAC,kBAAkB,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC3D,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,EACjC,uBAAe,CAChB,CAAC;QAEF,MAAM,CAAC,aAAa,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACtD,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAC/B,uBAAe,CAChB,CAAC;QAEF,iBAAiB;QACjB,MAAM,CAAC,SAAS,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAClD,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EACtB,uBAAe,CAChB,CAAC;QAEF,2CAA2C;QAC3C,MAAM,CAAC,YAAY,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACrD;YACE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;YACpB,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE;YAClC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE;SACjC,EACD,uBAAe,CAChB,CAAC;QAEF,yDAAyD;QACzD,MAAM,IAAI,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;QAE3E,4DAA4D;QAC5D,MAAM,oBAAoB,GAAG,IAAA,yCAA6B,EACxD,IAAI,CAAC,kBAAkB,EACvB,aAAa,EACb,IAAI,CACL,CAAC;QACF,MAAM,oBAAoB,GAAG,IAAA,yCAA6B,EACxD,IAAI,CAAC,gBAAgB,EACrB,aAAa,EACb,IAAI,CACL,CAAC;QAEF,gCAAgC;QAChC,MAAM,WAAW,GAAG,IAAA,yCAA6B,EAC/C,IAAI,CAAC,kBAAkB,EACvB,kBAAkB,EAClB,IAAI,CACL,CAAC;QACF,MAAM,YAAY,GAAG,IAAA,yCAA6B,EAChD,IAAI,CAAC,gBAAgB,EACrB,kBAAkB,EAClB,IAAI,CACL,CAAC;QAEF,qBAAqB;QACrB,MAAM,WAAW,GAAG,IAAA,yCAA6B,EAC/C,IAAI,CAAC,kBAAkB,EACvB,IAAI,EACJ,IAAI,CACL,CAAC;QAEF,4CAA4C;QAC5C,OAAO;YACL,EAAE,MAAM,EAAE,uBAAe,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,kBAAkB;YACnF,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,WAAW;YACxE,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,WAAW;YACtE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,UAAU;YAChE,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,qBAAqB;YACpF,EAAE,MAAM,EAAE,oBAAoB,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,4BAA4B;YACjG,EAAE,MAAM,EAAE,oBAAoB,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,6BAA6B;YAClG,EAAE,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,8BAA8B;YAClG,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,qCAAqC;YACjG,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,sCAAsC;YACnG,EAAE,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,oBAAoB;YAC5F,EAAE,MAAM,EAAE,4BAAgB,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,uBAAuB;YACzF,EAAE,MAAM,EAAE,IAAI,CAAC,gBAAgB,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,qBAAqB;YAC3F,EAAE,MAAM,EAAE,4BAAgB,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,wBAAwB;YAC1F,EAAE,MAAM,EAAE,oBAAoB,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,oDAAoD;YACzH;gBACE,MAAM,EAAE,IAAI,CAAC,sBAAsB;gBACnC,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,IAAI;aACjB,EAAE,wDAAwD;YAC3D,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,4BAA4B;YACxF,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,qBAAqB;YACpF;gBACE,MAAM,EAAE,oCAA0B;gBAClC,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,KAAK;aAClB,EAAE,0BAA0B;YAC7B,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,2CAA2C;YACzG;gBACE,MAAM,EAAE,uCAA2B;gBACnC,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,KAAK;aAClB,EAAE,+BAA+B;YAClC,EAAE,MAAM,EAAE,uBAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,qBAAqB;SAC/F,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,4BAA4B,CAChC,QAAkB,EAClB,MAAuB;QAEvB,MAAM,YAAY,GAA6B,EAAE,CAAC;QAElD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,YAAY,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAE3B,6DAA6D;QAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAEzD,MAAM,QAAQ,GAAG,IAAI,eAAE,CACrB,IAAI,oBAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAC/D,CAAC;QAEF,MAAM,gBAAgB,GAAG,IAAA,yCAA6B,EACpD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,EAClB,IAAI,CACL,CAAC;QAEF,MAAM,SAAS,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aAClD,gBAAgB,CAAC,QAAQ,CAAC;aAC1B,QAAQ,CAAC;YACR,aAAa,EAAE;gBACb,KAAK,EAAE,IAAI,CAAC,aAAa;gBACzB,QAAQ,EAAE,QAAQ,CAAC,OAAO;gBAC1B,IAAI,EAAE,IAAI,CAAC,OAAO;aACnB;YACD,gBAAgB;YAChB,eAAe,EAAE,IAAI,CAAC,sBAAsB;YAC5C,SAAS,EAAE,IAAI,CAAC,gBAAgB;YAChC,YAAY,EAAE,4BAAgB;SAC/B,CAAC;aACD,WAAW,EAAE,CAAC;QAEjB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,QAAkB,EAClB,MAAuB;QAEvB,MAAM,QAAQ,GAAG,IAAI,eAAE,CACrB,IAAI,oBAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;aAC3B,GAAG,CAAC,IAAI,oBAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;aAC9D,OAAO,CAAC,CAAC,CAAC,CACd,CAAC;QAEF,MAAM,EAAE,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aAC3C,UAAU,CAAC,QAAQ,CAAC;aACpB,QAAQ,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,aAAa;YACzB,QAAQ,EAAE,QAAQ,CAAC,OAAO;YAC1B,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO;SAC5B,CAAC;aACD,WAAW,EAAE,CAAC;QAEjB,OAAO,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAGD;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,KAAK,CAAC,sBAAsB,CAC1B,QAAkB,EAClB,UAAqB,EACrB,gBAA2B,mCAA2B;QAEtD,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpE,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC;QAEjC,sDAAsD;QACtD,MAAM,CAAC,YAAY,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACrD,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,EAC3E,aAAa,CACd,CAAC;QACF,MAAM,CAAC,cAAc,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACvD,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,EAClE,aAAa,CACd,CAAC;QAEF,MAAM,EAAE,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aAC3C,UAAU,EAAE;aACZ,QAAQ,CAAC;YACR,KAAK;YACL,QAAQ,EAAE,QAAQ,CAAC,OAAO;YAC1B,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO;YAC3B,aAAa;YACb,aAAa;YACb,YAAY;YACZ,UAAU;YACV,cAAc;SACf,CAAC;aACD,WAAW,EAAE,CAAC;QAEjB,OAAO,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,QAAkB;QAElB,MAAM,EAAE,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aAC3C,KAAK,EAAE;aACP,QAAQ,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,aAAa;YACzB,QAAQ,EAAE,QAAQ,CAAC,OAAO;YAC1B,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO;SAC5B,CAAC;aACD,WAAW,EAAE,CAAC;QAEjB,OAAO,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,QAAkB;QAElB,MAAM,YAAY,GAA6B,EAAE,CAAC;QAClD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAE3B,MAAM,qBAAqB,GAAG,IAAA,yCAA6B,EACzD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,EAClB,IAAI,CACL,CAAC;QAEF,6CAA6C;QAC7C,IAAI,CAAC;YACH,MAAM,IAAA,sBAAU,EAAC,IAAI,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,qCAAyB,EAAE,CAAC;gBAC7C,YAAY,CAAC,IAAI,CACf,IAAA,mDAAuC,EACrC,IAAI,CAAC,aAAa,EAClB,qBAAqB,EACrB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,gBAAgB,CACtB,CACF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC;QAED,MAAM,EAAE,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aAC3C,QAAQ,EAAE;aACV,QAAQ,CAAC;YACR,aAAa,EAAE;gBACb,KAAK,EAAE,IAAI,CAAC,aAAa;gBACzB,QAAQ,EAAE,QAAQ,CAAC,OAAO;gBAC1B,IAAI,EAAE,IAAI,CAAC,OAAO;aACnB;YACD,aAAa,EAAE,IAAI,CAAC,gBAAgB;YACpC,eAAe,EAAE,IAAI,CAAC,sBAAsB;YAC5C,qBAAqB;YACrB,SAAS,EAAE,IAAI,CAAC,gBAAgB;YAChC,YAAY,EAAE,4BAAgB;SAC/B,CAAC;aACD,WAAW,EAAE,CAAC;QAEjB,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtB,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,IAAU,EACV,MAAuB;QAEvB,MAAM,QAAQ,GAAG,IAAI,eAAE,CACrB,IAAI,oBAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;aAC3B,GAAG,CAAC,IAAI,oBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;aACrD,OAAO,CAAC,CAAC,CAAC,CACd,CAAC;QAEF,MAAM,gBAAgB,GAAG,IAAA,yCAA6B,EACpD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,EAClB,IAAI,CACL,CAAC;QAEF,MAAM,EAAE,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aAC3C,UAAU,CAAC,QAAQ,CAAC;aACpB,QAAQ,CAAC;YACR,MAAM,EAAE,IAAI,CAAC,aAAa;YAC1B,IAAI,EAAE,IAAI,CAAC,OAAO;YAClB,aAAa,EAAE,IAAI,CAAC,gBAAgB;YACpC,kBAAkB,EAAE,gBAAgB;YACpC,eAAe,EAAE,IAAI,CAAC,sBAAsB;YAC5C,SAAS,EAAE,IAAI,CAAC,gBAAgB;YAChC,YAAY,EAAE,4BAAgB;SAC/B,CAAC;aACD,WAAW,EAAE,CAAC;QAEjB,OAAO,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAED,+EAA+E;IAC/E,8BAA8B;IAC9B,+EAA+E;IAE/E;;;;;;OAMG;IACH,KAAK,CAAC,wBAAwB,CAC5B,QAAkB,EAClB,MAAU;QAEV,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAC1C,QAAQ,CAAC,IAAI,CAAC,OAAO,EACrB,QAAQ,CAAC,WAAW,CACrB,CAAC;QAEF,MAAM,EAAE,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aAC3C,YAAY,CAAC,MAAM,CAAC;aACpB,QAAQ,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,aAAa;YACzB,aAAa,EAAE;gBACb,KAAK,EAAE,IAAI,CAAC,aAAa;gBACzB,QAAQ,EAAE,QAAQ,CAAC,OAAO;gBAC1B,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO;aAC5B;YACD,MAAM,EAAE,aAAa;YACrB,aAAa,EAAE,uBAAa,CAAC,SAAS;SACvC,CAAC;aACD,WAAW,EAAE,CAAC;QAEjB,OAAO,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,MAAwB,EACxB,QAAkB;QAElB,MAAM,YAAY,GAA6B,EAAE,CAAC;QAClD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAE3B,MAAM,qBAAqB,GAAG,IAAA,yCAA6B,EACzD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,EAClB,IAAI,CACL,CAAC;QAEF,uBAAuB;QACvB,IAAI,CAAC;YACH,MAAM,IAAA,sBAAU,EAAC,IAAI,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,qCAAyB,EAAE,CAAC;gBAC7C,YAAY,CAAC,IAAI,CACf,IAAA,mDAAuC,EACrC,IAAI,CAAC,aAAa,EAClB,qBAAqB,EACrB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,gBAAgB,CACtB,CACF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC;QAED,MAAM,EAAE,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aAC3C,YAAY,EAAE;aACd,QAAQ,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,aAAa;YACzB,MAAM,EAAE,MAAM,CAAC,OAAO;YACtB,QAAQ,EAAE,QAAQ,CAAC,OAAO;YAC1B,IAAI,EAAE,IAAI,CAAC,OAAO;YAClB,aAAa,EAAE,IAAI,CAAC,gBAAgB;YACpC,eAAe,EAAE,IAAI,CAAC,sBAAsB;YAC5C,qBAAqB;YACrB,SAAS,EAAE,IAAI,CAAC,gBAAgB;YAChC,YAAY,EAAE,4BAAgB;SAC/B,CAAC;aACD,WAAW,EAAE,CAAC;QAEjB,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtB,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAAU;QACrC,OAAO,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aACvC,WAAW,EAAE;aACb,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;aAChC,WAAW,EAAE,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,IAAU,EACV,MAOC;QAED,MAAM,YAAY,GAAG;YACnB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;gBACvC,CAAC,CAAC,IAAI,eAAE,CACJ,IAAI,oBAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;qBAC5C,GAAG,CAAC,iBAAS,CAAC,QAAQ,EAAE,CAAC;qBACzB,OAAO,CAAC,CAAC,CAAC,CACd;gBACH,CAAC,CAAC,IAAI;YACR,SAAS,EAAE,MAAM,CAAC,SAAS;gBACzB,CAAC,CAAC,IAAI,eAAE,CACJ,IAAI,oBAAO,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;qBACrC,GAAG,CAAC,IAAI,oBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;qBACrD,OAAO,CAAC,CAAC,CAAC,CACd;gBACH,CAAC,CAAC,IAAI;YACR,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;gBACvC,CAAC,CAAC,IAAI,eAAE,CACJ,IAAI,oBAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;qBAC5C,GAAG,CAAC,IAAI,oBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;qBACrD,OAAO,CAAC,CAAC,CAAC,CACd;gBACH,CAAC,CAAC,IAAI;YACR,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;gBACvC,CAAC,CAAC,IAAI,eAAE,CACJ,IAAI,oBAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;qBAC5C,GAAG,CAAC,IAAI,oBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;qBACrD,OAAO,CAAC,CAAC,CAAC,CACd;gBACH,CAAC,CAAC,IAAI;YACR,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;gBAC7C,CAAC,CAAC,IAAI,eAAE,CACJ,IAAI,oBAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC;qBAC/C,GAAG,CAAC,IAAI,oBAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;qBAC/D,OAAO,CAAC,CAAC,CAAC,CACd;gBACH,CAAC,CAAC,IAAI;YACR,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,IAAI;SAC9C,CAAC;QAEF,MAAM,EAAE,GAAG,MAAO,IAAI,CAAC,OAAO,CAAC,OAAe;aAC3C,YAAY,CAAC,YAAY,CAAC;aAC1B,QAAQ,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,aAAa;YACzB,IAAI,EAAE,IAAI,CAAC,OAAO;SACnB,CAAC;aACD,WAAW,EAAE,CAAC;QAEjB,OAAO,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAED,+EAA+E;IAC/E,wBAAwB;IACxB,+EAA+E;IAE/E,KAAK,CAAC,eAAe,CACnB,YAAsC,EACtC,UAAqB,EAAE;QAEvB,MAAM,EAAE,GAAG,IAAI,qBAAW,EAAE,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC;QAClD,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,0CAA0C;IAC1C,KAAK,CAAC,OAAO,CACX,QAAkB,EAClB,MAAuB,EACvB,SAA2B;QAE3B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CACjD,QAAQ,EACR,MAAM,EACN,SAAS,CACV,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,QAAkB,EAClB,MAAuB;QAEvB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAC1D,QAAQ,EACR,MAAM,CACP,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,UAAU,CACd,QAAkB,EAClB,MAAuB;QAEvB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACzE,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAAkB;QAC5B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAC5D,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAkB;QAC/B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAC/D,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,QAAkB,EAClB,MAAU;QAEV,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC3E,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAwB,EACxB,QAAkB;QAElB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC3E,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,UAAU,CACd,QAAkB,EAClB,GAAY,EACZ,MAAuB,EACvB,WAAoB;QAEpB,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;QAC/F,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAAkB,EAAE,GAAY,EAAE,MAAuB;QAC7E,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,IAAI,CAAC,2BAA2B,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IACnG,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAwB,EAAE,QAAkB,EAAE,GAAY;QAC9E,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IACnG,CAAC;IAED,KAAK,CAAC,UAAU,CACd,IAAU,EACV,MAAuB;QAEvB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACrE,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAU;QAC1B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACnD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,IAAU,EACV,MAOC;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACvE,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,+EAA+E;IAC/E,kBAAkB;IAClB,+EAA+E;IAE/E,2BAA2B,CACzB,QAAyE;QAEzE,IAAI,CAAC,SAAS,CAAC,IAAI,CACjB,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAC3B,kBAAkB,EAClB,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;YAC1B,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC,CACF,CACF,CAAC;IACJ,CAAC;IAED,+BAA+B,CAC7B,QAGU;QAEV,IAAI,CAAC,SAAS,CAAC,IAAI,CACjB,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAC3B,sBAAsB,EACtB,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;YAC1B,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC,CACF,CACF,CAAC;IACJ,CAAC;IAED,mBAAmB;QACjB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAClC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;CACF;AAtwCD,gDAswCC"}
|
|
1
|
+
{"version":3,"file":"elemental.js","sourceRoot":"","sources":["../../src/programs/elemental.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -44,8 +44,8 @@ export interface PoolData {
|
|
|
44
44
|
};
|
|
45
45
|
managerWallet: PublicKey;
|
|
46
46
|
minDepositAmountAlt: BN;
|
|
47
|
-
/** Fee
|
|
48
|
-
|
|
47
|
+
/** Fee on exits paid in the vault token, in TENTHS of a basis point (10 = 1 bps; ele7-rwa-v1.2). Zero on pools that predate it. */
|
|
48
|
+
vaultExitFeeDbps?: number;
|
|
49
49
|
}
|
|
50
50
|
export interface PositionData {
|
|
51
51
|
pool: PublicKey;
|
|
@@ -81,8 +81,8 @@ export interface WithdrawalTicketData {
|
|
|
81
81
|
payoutMint: number;
|
|
82
82
|
/** NAV (USDC per 1 RWA, 1e9-scaled) locked when an alt ticket was created; 0 otherwise. */
|
|
83
83
|
navLocked: BN;
|
|
84
|
-
/** Exit fee (bps)
|
|
85
|
-
|
|
84
|
+
/** Exit fee locked at creation, in tenths of a bps (10 = 1 bps): the alt fee on alt tickets, the vault exit fee on vault tickets. */
|
|
85
|
+
feeDbpsLocked: number;
|
|
86
86
|
}
|
|
87
87
|
/**
|
|
88
88
|
* Raw PoolExt data (ELE7 ele7-rwa-v1+): a second token at a pool's edges.
|
|
@@ -97,7 +97,7 @@ export interface PoolExtData {
|
|
|
97
97
|
nav: BN;
|
|
98
98
|
navUpdatedAt: BN;
|
|
99
99
|
navMaxAge: number;
|
|
100
|
-
|
|
100
|
+
exitFeeDbps: number;
|
|
101
101
|
altDecimals: number;
|
|
102
102
|
flags: number;
|
|
103
103
|
conversionSource: number;
|
|
@@ -115,6 +115,10 @@ export declare const CONVERSION_SOURCE_POSTED = 0;
|
|
|
115
115
|
export declare const CONVERSION_SOURCE_SCOPE = 1;
|
|
116
116
|
/** NAV scale: USDC per 1 RWA × 1e9 */
|
|
117
117
|
export declare const NAV_ONE: BN;
|
|
118
|
+
/** Fee unit: tenths of a basis point. fee = ceil(gross × dbps / FEE_DENOMINATOR). 10 dbps = 1 bps, 1_000 = 1%. */
|
|
119
|
+
export declare const FEE_DENOMINATOR = 100000;
|
|
120
|
+
export declare const dbpsToPercent: (dbps: number) => number;
|
|
121
|
+
export declare const dbpsToBps: (dbps: number) => number;
|
|
118
122
|
export declare const SCOPE_PROGRAM_ID: PublicKey;
|
|
119
123
|
export declare const SCOPE_PRICES: PublicKey;
|
|
120
124
|
export declare const SCOPE_PRICES_LEN = 28712;
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,OAAO,CAAC;AAGvB,eAAO,MAAM,SAAS,IAAwB,CAAC;AAG/C,oBAAY,WAAW;IACrB,MAAM,IAAI;IACV,IAAI,IAAI;IACR,OAAO,IAAI;IACX,QAAQ,IAAI;CACb;AAGD,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,SAAS,CAAC;IAC3B,cAAc,EAAE,EAAE,CAAC;IACnB,gBAAgB,EAAE,EAAE,CAAC;IACrB,gBAAgB,EAAE,EAAE,CAAC;IACrB,SAAS,EAAE,EAAE,CAAC;IACd,aAAa,EAAE,EAAE,CAAC;IAClB,UAAU,EAAE,EAAE,CAAC;IACf,cAAc,EAAE,EAAE,CAAC;IACnB,gBAAgB,EAAE,EAAE,CAAC;IACrB,oBAAoB,EAAE,EAAE,CAAC;IACzB,gBAAgB,EAAE,EAAE,CAAC;IACrB,oBAAoB,EAAE,EAAE,CAAC;IACzB,gBAAgB,EAAE,EAAE,CAAC;IACrB,aAAa,EAAE,EAAE,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,SAAS,CAAC;IACjB,YAAY,EAAE,SAAS,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE;QACb,OAAO,EAAE;YAAE,MAAM,CAAC,EAAE,EAAE,CAAA;SAAE,GAAG;YAAE,IAAI,CAAC,EAAE,EAAE,CAAA;SAAE,GAAG;YAAE,OAAO,CAAC,EAAE,EAAE,CAAA;SAAE,GAAG;YAAE,QAAQ,CAAC,EAAE,EAAE,CAAA;SAAE,CAAC;QAChF,IAAI,EAAE,MAAM,EAAE,CAAC;KAChB,CAAC;IACF,aAAa,EAAE,SAAS,CAAC;IACzB,mBAAmB,EAAE,EAAE,CAAC;IACxB,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/dist/types.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.POOL_FAUCET_CONFIG = exports.ONRE_STATE = exports.ONRE_PROGRAM_ID = exports.USDC_MINT = exports.SCOPE_INDEX = exports.SCOPE_ENTRY_SIZE = exports.SCOPE_ENTRIES_OFFSET = exports.SCOPE_PRICES_LEN = exports.SCOPE_PRICES = exports.SCOPE_PROGRAM_ID = exports.NAV_ONE = exports.CONVERSION_SOURCE_SCOPE = exports.CONVERSION_SOURCE_POSTED = exports.POOL_EXT_FLAG_ALT_EXITS = exports.POOL_EXT_FLAG_ALT_DEPOSITS = exports.SwapAdapter = exports.FIXED_ONE = void 0;
|
|
6
|
+
exports.POOL_FAUCET_CONFIG = exports.ONRE_STATE = exports.ONRE_PROGRAM_ID = exports.USDC_MINT = exports.SCOPE_INDEX = exports.SCOPE_ENTRY_SIZE = exports.SCOPE_ENTRIES_OFFSET = exports.SCOPE_PRICES_LEN = exports.SCOPE_PRICES = exports.SCOPE_PROGRAM_ID = exports.dbpsToBps = exports.dbpsToPercent = exports.FEE_DENOMINATOR = exports.NAV_ONE = exports.CONVERSION_SOURCE_SCOPE = exports.CONVERSION_SOURCE_POSTED = exports.POOL_EXT_FLAG_ALT_EXITS = exports.POOL_EXT_FLAG_ALT_DEPOSITS = exports.SwapAdapter = exports.FIXED_ONE = void 0;
|
|
7
7
|
const web3_js_1 = require("@solana/web3.js");
|
|
8
8
|
const bn_js_1 = __importDefault(require("bn.js"));
|
|
9
9
|
// Fixed-point math constant (1e9)
|
|
@@ -24,6 +24,12 @@ exports.CONVERSION_SOURCE_POSTED = 0;
|
|
|
24
24
|
exports.CONVERSION_SOURCE_SCOPE = 1;
|
|
25
25
|
/** NAV scale: USDC per 1 RWA × 1e9 */
|
|
26
26
|
exports.NAV_ONE = new bn_js_1.default(1000000000);
|
|
27
|
+
/** Fee unit: tenths of a basis point. fee = ceil(gross × dbps / FEE_DENOMINATOR). 10 dbps = 1 bps, 1_000 = 1%. */
|
|
28
|
+
exports.FEE_DENOMINATOR = 100000;
|
|
29
|
+
const dbpsToPercent = (dbps) => dbps / 1000;
|
|
30
|
+
exports.dbpsToPercent = dbpsToPercent;
|
|
31
|
+
const dbpsToBps = (dbps) => dbps / 10;
|
|
32
|
+
exports.dbpsToBps = dbpsToBps;
|
|
27
33
|
// Kamino Scope oracle (mainnet) — the on-chain NAV source for every RWA pool
|
|
28
34
|
exports.SCOPE_PROGRAM_ID = new web3_js_1.PublicKey("HFn8GnPADiny6XqUoWE8uRPPxb29ikn4yTuPa9MF2fWJ");
|
|
29
35
|
exports.SCOPE_PRICES = new web3_js_1.PublicKey("3t4JZcueEzTbVP6kLxXrL3VpWx45jDer4eqysweBchNH");
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA4C;AAC5C,kDAAuB;AAEvB,kCAAkC;AACrB,QAAA,SAAS,GAAG,IAAI,eAAE,CAAC,UAAa,CAAC,CAAC;AAE/C,qBAAqB;AACrB,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,iDAAU,CAAA;IACV,6CAAQ,CAAA;IACR,mDAAW,CAAA;IACX,qDAAY,CAAA;AACd,CAAC,EALW,WAAW,2BAAX,WAAW,QAKtB;AAqGD,yBAAyB;AACZ,QAAA,0BAA0B,GAAG,CAAC,CAAC;AAC/B,QAAA,uBAAuB,GAAG,CAAC,CAAC;AACzC,uCAAuC;AAC1B,QAAA,wBAAwB,GAAG,CAAC,CAAC;AAC7B,QAAA,uBAAuB,GAAG,CAAC,CAAC;AACzC,sCAAsC;AACzB,QAAA,OAAO,GAAG,IAAI,eAAE,CAAC,UAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA4C;AAC5C,kDAAuB;AAEvB,kCAAkC;AACrB,QAAA,SAAS,GAAG,IAAI,eAAE,CAAC,UAAa,CAAC,CAAC;AAE/C,qBAAqB;AACrB,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,iDAAU,CAAA;IACV,6CAAQ,CAAA;IACR,mDAAW,CAAA;IACX,qDAAY,CAAA;AACd,CAAC,EALW,WAAW,2BAAX,WAAW,QAKtB;AAqGD,yBAAyB;AACZ,QAAA,0BAA0B,GAAG,CAAC,CAAC;AAC/B,QAAA,uBAAuB,GAAG,CAAC,CAAC;AACzC,uCAAuC;AAC1B,QAAA,wBAAwB,GAAG,CAAC,CAAC;AAC7B,QAAA,uBAAuB,GAAG,CAAC,CAAC;AACzC,sCAAsC;AACzB,QAAA,OAAO,GAAG,IAAI,eAAE,CAAC,UAAa,CAAC,CAAC;AAC7C,kHAAkH;AACrG,QAAA,eAAe,GAAG,MAAO,CAAC;AAChC,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,GAAG,IAAK,CAAC;AAA/C,QAAA,aAAa,iBAAkC;AACrD,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC;AAAxC,QAAA,SAAS,aAA+B;AAErD,6EAA6E;AAChE,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AACjF,QAAA,YAAY,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAC7E,QAAA,gBAAgB,GAAG,KAAM,CAAC;AAC1B,QAAA,oBAAoB,GAAG,EAAE,CAAC;AAC1B,QAAA,gBAAgB,GAAG,EAAE,CAAC;AACnC,gFAAgF;AACnE,QAAA,WAAW,GAA2B;IACjD,IAAI,EAAE,GAAG;IACT,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,GAAG;CACV,CAAC;AACW,QAAA,SAAS,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAYvF,yBAAyB;AACZ,QAAA,eAAe,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AAC/E,QAAA,UAAU,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAExF,gEAAgE;AACnD,QAAA,kBAAkB,GAA2B;IACxD,sDAAsD;IACtD,8CAA8C,EAAE,8CAA8C;IAC9F,yDAAyD;IACzD,8CAA8C,EAAE,8CAA8C;IAC9F,qDAAqD;IACrD,8CAA8C,EAAE,8CAA8C;IAC9F,6EAA6E;IAC7E,6CAA6C,EAAE,8CAA8C;IAC7F,0EAA0E;IAC1E,8CAA8C,EAAE,8CAA8C;IAC9F,sFAAsF;IACtF,8CAA8C,EAAE,8CAA8C;IAC9F,uFAAuF;IACvF,8CAA8C,EAAE,8CAA8C;IAC9F,6EAA6E;IAC7E,8CAA8C,EAAE,8CAA8C;IAC9F,kFAAkF;IAClF,8CAA8C,EAAE,8CAA8C;IAC9F,sFAAsF;IACtF,8CAA8C,EAAE,8CAA8C;IAC9F,8GAA8G;IAC9G,8CAA8C,EAAE,8CAA8C;IAC9F,sIAAsI;IACtI,8CAA8C,EAAE,8CAA8C;IAC9F,2GAA2G;IAC3G,8CAA8C,EAAE,8CAA8C;IAC9F,2GAA2G;IAC3G,8CAA8C,EAAE,8CAA8C;IAC9F,4FAA4F;IAC5F,8CAA8C,EAAE,8CAA8C;CAC/F,CAAC"}
|
package/package.json
CHANGED
package/src/accounts/pool.ts
CHANGED
|
@@ -163,12 +163,13 @@ export class Pool {
|
|
|
163
163
|
}
|
|
164
164
|
|
|
165
165
|
/**
|
|
166
|
-
* Fee
|
|
167
|
-
* at creation. On a USDC-denominated
|
|
166
|
+
* Fee charged on exits paid in the vault token, in TENTHS of a basis point
|
|
167
|
+
* (10 = 1 bps), locked onto each ticket at creation. On a USDC-denominated
|
|
168
|
+
* pool this is the USDC leg (e.g. O1: 250 = 25 bps).
|
|
168
169
|
* Zero on ELE6 and on pools that have not set it.
|
|
169
170
|
*/
|
|
170
|
-
get
|
|
171
|
-
return this.data.
|
|
171
|
+
get vaultExitFeeDbps(): number {
|
|
172
|
+
return this.data.vaultExitFeeDbps ?? 0;
|
|
172
173
|
}
|
|
173
174
|
|
|
174
175
|
// APR as decimal string (e.g., "0.10" for 10%)
|
package/src/accounts/poolExt.ts
CHANGED
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
POOL_EXT_FLAG_ALT_EXITS,
|
|
8
8
|
CONVERSION_SOURCE_SCOPE,
|
|
9
9
|
NAV_ONE,
|
|
10
|
+
FEE_DENOMINATOR,
|
|
10
11
|
SCOPE_PROGRAM_ID,
|
|
11
12
|
SCOPE_PRICES_LEN,
|
|
12
13
|
SCOPE_ENTRIES_OFFSET,
|
|
@@ -48,7 +49,8 @@ export interface AltExitQuote {
|
|
|
48
49
|
feeDecimal: string;
|
|
49
50
|
netDecimal: string;
|
|
50
51
|
nav: BN;
|
|
51
|
-
|
|
52
|
+
/** tenths of a bps */
|
|
53
|
+
feeDbps: number;
|
|
52
54
|
}
|
|
53
55
|
|
|
54
56
|
/**
|
|
@@ -116,8 +118,13 @@ export class PoolExt {
|
|
|
116
118
|
get altExitsEnabled(): boolean {
|
|
117
119
|
return (this.data.flags & POOL_EXT_FLAG_ALT_EXITS) !== 0;
|
|
118
120
|
}
|
|
119
|
-
|
|
120
|
-
|
|
121
|
+
/** Exit fee on the alt leg, in tenths of a bps (10 = 1 bps). */
|
|
122
|
+
get exitFeeDbps(): number {
|
|
123
|
+
return this.data.exitFeeDbps;
|
|
124
|
+
}
|
|
125
|
+
/** The same fee as a percentage, e.g. 0.25 for 25 bps. */
|
|
126
|
+
get exitFeePercent(): number {
|
|
127
|
+
return this.data.exitFeeDbps / 1_000;
|
|
121
128
|
}
|
|
122
129
|
get usesScope(): boolean {
|
|
123
130
|
return this.data.conversionSource === CONVERSION_SOURCE_SCOPE;
|
|
@@ -206,10 +213,10 @@ export class PoolExt {
|
|
|
206
213
|
return vaultAmount.mul(NAV_ONE).mul(altUnit).div(nav.mul(perTokenAmount));
|
|
207
214
|
}
|
|
208
215
|
|
|
209
|
-
/** Fee on a gross alt amount, rounded UP. Mirrors PoolExt::fee_on. */
|
|
210
|
-
static feeOn(gross: BN,
|
|
211
|
-
if (
|
|
212
|
-
return gross.muln(
|
|
216
|
+
/** Fee on a gross alt amount, rounded UP. Mirrors PoolExt::fee_on. `feeDbps` is in tenths of a bps (10 = 1 bps). */
|
|
217
|
+
static feeOn(gross: BN, feeDbps: number): BN {
|
|
218
|
+
if (feeDbps === 0 || gross.isZero()) return new BN(0);
|
|
219
|
+
return gross.muln(feeDbps).addn(FEE_DENOMINATOR - 1).divn(FEE_DENOMINATOR);
|
|
213
220
|
}
|
|
214
221
|
|
|
215
222
|
altToVault(altAmount: BN, nav: BN): BN {
|
|
@@ -234,16 +241,16 @@ export class PoolExt {
|
|
|
234
241
|
}
|
|
235
242
|
|
|
236
243
|
/**
|
|
237
|
-
* Quote an alt exit for `vaultTotal` raw vault units at `nav` and `
|
|
238
|
-
* For an existing alt ticket pass its `navLocked` / `
|
|
239
|
-
* preview pass the current reading and `
|
|
244
|
+
* Quote an alt exit for `vaultTotal` raw vault units at `nav` and `feeDbps` (tenths of a bps).
|
|
245
|
+
* For an existing alt ticket pass its `navLocked` / `feeDbpsLocked`; for a
|
|
246
|
+
* preview pass the current reading and `exitFeeDbps`.
|
|
240
247
|
*/
|
|
241
|
-
quoteExit(vaultTotal: BN, nav: BN,
|
|
248
|
+
quoteExit(vaultTotal: BN, nav: BN, feeDbps: number = this.exitFeeDbps): AltExitQuote {
|
|
242
249
|
const gross = this.vaultToAltGross(vaultTotal, nav);
|
|
243
|
-
const fee = PoolExt.feeOn(gross,
|
|
250
|
+
const fee = PoolExt.feeOn(gross, feeDbps);
|
|
244
251
|
const net = gross.sub(fee);
|
|
245
252
|
const d = (v: BN) => new Decimal(v.toString()).div(this.altMultiplier).toFixed();
|
|
246
|
-
return { vaultTotal, gross, fee, net, grossDecimal: d(gross), feeDecimal: d(fee), netDecimal: d(net), nav,
|
|
253
|
+
return { vaultTotal, gross, fee, net, grossDecimal: d(gross), feeDecimal: d(fee), netDecimal: d(net), nav, feeDbps };
|
|
247
254
|
}
|
|
248
255
|
|
|
249
256
|
/** Alt faucet balance (raw). Alt tickets redeem only when this covers their net. */
|
package/src/accounts/ticket.ts
CHANGED
|
@@ -83,15 +83,15 @@ export class WithdrawalTicket {
|
|
|
83
83
|
return this.data.navLocked ?? new BN(0);
|
|
84
84
|
}
|
|
85
85
|
|
|
86
|
-
/** Exit fee locked at creation (bps): the alt fee on alt tickets, the pool's vault exit fee on vault tickets. */
|
|
87
|
-
get
|
|
88
|
-
return this.data.
|
|
86
|
+
/** Exit fee locked at creation, in tenths of a bps (10 = 1 bps): the alt fee on alt tickets, the pool's vault exit fee on vault tickets. */
|
|
87
|
+
get feeDbpsLocked(): number {
|
|
88
|
+
return this.data.feeDbpsLocked ?? 0;
|
|
89
89
|
}
|
|
90
90
|
|
|
91
91
|
/** Fee withheld on a VAULT-token ticket at redemption (raw), rounded up like the program. Zero for alt tickets (use PoolExt.quoteExit). */
|
|
92
92
|
get vaultFeeRaw(): BN {
|
|
93
|
-
if (this.isAltPayout || this.
|
|
94
|
-
return this.totalAmountRaw.muln(this.
|
|
93
|
+
if (this.isAltPayout || this.feeDbpsLocked === 0) return new BN(0);
|
|
94
|
+
return this.totalAmountRaw.muln(this.feeDbpsLocked).addn(99_999).divn(100_000);
|
|
95
95
|
}
|
|
96
96
|
|
|
97
97
|
/** What a VAULT-token ticket pays out (raw): total − fee. */
|
|
@@ -889,7 +889,7 @@
|
|
|
889
889
|
"type": "u32"
|
|
890
890
|
},
|
|
891
891
|
{
|
|
892
|
-
"name": "
|
|
892
|
+
"name": "exit_fee_dbps",
|
|
893
893
|
"type": "u16"
|
|
894
894
|
},
|
|
895
895
|
{
|
|
@@ -1309,7 +1309,7 @@
|
|
|
1309
1309
|
{
|
|
1310
1310
|
"name": "set_vault_exit_fee",
|
|
1311
1311
|
"docs": [
|
|
1312
|
-
"Admin-only: fee (bps) on exits paid in the pool's vault token — the USDC leg of a",
|
|
1312
|
+
"Admin-only: fee in TENTHS of a basis point (10 = 1 bps) on exits paid in the pool's vault token — the USDC leg of a",
|
|
1313
1313
|
"USDC-denominated pool. Locked onto tickets at creation; legacy `withdraw` applies",
|
|
1314
1314
|
"the current rate. The fee stays in the liquidity faucet. Cap 10%."
|
|
1315
1315
|
],
|
|
@@ -1335,7 +1335,7 @@
|
|
|
1335
1335
|
],
|
|
1336
1336
|
"args": [
|
|
1337
1337
|
{
|
|
1338
|
-
"name": "
|
|
1338
|
+
"name": "fee_dbps",
|
|
1339
1339
|
"type": "u16"
|
|
1340
1340
|
}
|
|
1341
1341
|
]
|
|
@@ -2317,7 +2317,7 @@
|
|
|
2317
2317
|
"type": "u64"
|
|
2318
2318
|
},
|
|
2319
2319
|
{
|
|
2320
|
-
"name": "
|
|
2320
|
+
"name": "fee_dbps_locked",
|
|
2321
2321
|
"type": "u16"
|
|
2322
2322
|
},
|
|
2323
2323
|
{
|
|
@@ -2369,7 +2369,7 @@
|
|
|
2369
2369
|
"type": "u64"
|
|
2370
2370
|
},
|
|
2371
2371
|
{
|
|
2372
|
-
"name": "
|
|
2372
|
+
"name": "fee_dbps_locked",
|
|
2373
2373
|
"type": "u16"
|
|
2374
2374
|
},
|
|
2375
2375
|
{
|
|
@@ -2874,11 +2874,11 @@
|
|
|
2874
2874
|
"type": "u64"
|
|
2875
2875
|
},
|
|
2876
2876
|
{
|
|
2877
|
-
"name": "
|
|
2877
|
+
"name": "vault_exit_fee_dbps",
|
|
2878
2878
|
"docs": [
|
|
2879
|
-
"Fee on exits paid in the pool's own vault token, basis
|
|
2879
|
+
"Fee on exits paid in the pool's own vault token, in TENTHS of a basis point (10 = 1 bps; ele7-rwa-v1.2).",
|
|
2880
2880
|
"Live pools read 0. Set by `set_vault_exit_fee`; locked onto each ticket at",
|
|
2881
|
-
"creation (`WithdrawalTicket.
|
|
2881
|
+
"creation (`WithdrawalTicket.fee_dbps_locked`, payout_mint 0) and applied at",
|
|
2882
2882
|
"`redeem_ticket`; applied at the current rate by the legacy `withdraw`.",
|
|
2883
2883
|
"The fee stays in the liquidity faucet. Carved from the former reserved bytes."
|
|
2884
2884
|
],
|
|
@@ -2981,9 +2981,9 @@
|
|
|
2981
2981
|
"type": "u32"
|
|
2982
2982
|
},
|
|
2983
2983
|
{
|
|
2984
|
-
"name": "
|
|
2984
|
+
"name": "exit_fee_dbps",
|
|
2985
2985
|
"docs": [
|
|
2986
|
-
"Fee on alt exits, basis
|
|
2986
|
+
"Fee on alt exits, in TENTHS of a basis point (10 = 1 bps), applied on the conversion"
|
|
2987
2987
|
],
|
|
2988
2988
|
"type": "u16"
|
|
2989
2989
|
},
|
|
@@ -3101,7 +3101,7 @@
|
|
|
3101
3101
|
"type": "u64"
|
|
3102
3102
|
},
|
|
3103
3103
|
{
|
|
3104
|
-
"name": "
|
|
3104
|
+
"name": "exit_fee_dbps",
|
|
3105
3105
|
"type": "u16"
|
|
3106
3106
|
},
|
|
3107
3107
|
{
|
|
@@ -3137,7 +3137,7 @@
|
|
|
3137
3137
|
}
|
|
3138
3138
|
},
|
|
3139
3139
|
{
|
|
3140
|
-
"name": "
|
|
3140
|
+
"name": "exit_fee_dbps",
|
|
3141
3141
|
"type": {
|
|
3142
3142
|
"option": "u16"
|
|
3143
3143
|
}
|
|
@@ -3527,7 +3527,7 @@
|
|
|
3527
3527
|
}
|
|
3528
3528
|
},
|
|
3529
3529
|
{
|
|
3530
|
-
"name": "
|
|
3530
|
+
"name": "exit_fee_dbps",
|
|
3531
3531
|
"type": {
|
|
3532
3532
|
"option": "u16"
|
|
3533
3533
|
}
|
|
@@ -3579,7 +3579,7 @@
|
|
|
3579
3579
|
"type": "pubkey"
|
|
3580
3580
|
},
|
|
3581
3581
|
{
|
|
3582
|
-
"name": "
|
|
3582
|
+
"name": "fee_dbps",
|
|
3583
3583
|
"type": "u16"
|
|
3584
3584
|
}
|
|
3585
3585
|
]
|
|
@@ -3607,7 +3607,7 @@
|
|
|
3607
3607
|
"type": "u64"
|
|
3608
3608
|
},
|
|
3609
3609
|
{
|
|
3610
|
-
"name": "
|
|
3610
|
+
"name": "fee_dbps_locked",
|
|
3611
3611
|
"type": "u16"
|
|
3612
3612
|
},
|
|
3613
3613
|
{
|
|
@@ -3643,7 +3643,7 @@
|
|
|
3643
3643
|
"type": "u64"
|
|
3644
3644
|
},
|
|
3645
3645
|
{
|
|
3646
|
-
"name": "
|
|
3646
|
+
"name": "fee_dbps_locked",
|
|
3647
3647
|
"type": "u16"
|
|
3648
3648
|
},
|
|
3649
3649
|
{
|
|
@@ -3721,9 +3721,9 @@
|
|
|
3721
3721
|
"type": "u64"
|
|
3722
3722
|
},
|
|
3723
3723
|
{
|
|
3724
|
-
"name": "
|
|
3724
|
+
"name": "fee_dbps_locked",
|
|
3725
3725
|
"docs": [
|
|
3726
|
-
"Exit fee
|
|
3726
|
+
"Exit fee (tenths of a bps) locked when the ticket was created: the alt fee on alt tickets, the vault exit fee on vault tickets"
|
|
3727
3727
|
],
|
|
3728
3728
|
"type": "u16"
|
|
3729
3729
|
}
|
package/src/index.ts
CHANGED
|
@@ -510,10 +510,10 @@ export class ElementalV2Context {
|
|
|
510
510
|
return instructions;
|
|
511
511
|
}
|
|
512
512
|
|
|
513
|
-
/** Admin: set the fee
|
|
514
|
-
async setVaultExitFeeInstruction(pool: Pool,
|
|
513
|
+
/** Admin: set the fee on exits paid in the vault token, in tenths of a bps (10 = 1 bps, cap 10_000 = 10%). Locked onto tickets at creation. */
|
|
514
|
+
async setVaultExitFeeInstruction(pool: Pool, feeDbps: number, admin: PublicKey = this.walletAddress): Promise<TransactionInstruction> {
|
|
515
515
|
return await (this.program.methods as any)
|
|
516
|
-
.setVaultExitFee(
|
|
516
|
+
.setVaultExitFee(feeDbps)
|
|
517
517
|
.accounts({ admin, pool: pool.address })
|
|
518
518
|
.instruction();
|
|
519
519
|
}
|
package/src/types.ts
CHANGED
|
@@ -42,8 +42,8 @@ export interface PoolData {
|
|
|
42
42
|
};
|
|
43
43
|
managerWallet: PublicKey;
|
|
44
44
|
minDepositAmountAlt: BN;
|
|
45
|
-
/** Fee
|
|
46
|
-
|
|
45
|
+
/** Fee on exits paid in the vault token, in TENTHS of a basis point (10 = 1 bps; ele7-rwa-v1.2). Zero on pools that predate it. */
|
|
46
|
+
vaultExitFeeDbps?: number;
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
// Raw position data from on-chain account
|
|
@@ -83,8 +83,8 @@ export interface WithdrawalTicketData {
|
|
|
83
83
|
payoutMint: number;
|
|
84
84
|
/** NAV (USDC per 1 RWA, 1e9-scaled) locked when an alt ticket was created; 0 otherwise. */
|
|
85
85
|
navLocked: BN;
|
|
86
|
-
/** Exit fee (bps)
|
|
87
|
-
|
|
86
|
+
/** Exit fee locked at creation, in tenths of a bps (10 = 1 bps): the alt fee on alt tickets, the vault exit fee on vault tickets. */
|
|
87
|
+
feeDbpsLocked: number;
|
|
88
88
|
}
|
|
89
89
|
|
|
90
90
|
/**
|
|
@@ -100,7 +100,7 @@ export interface PoolExtData {
|
|
|
100
100
|
nav: BN;
|
|
101
101
|
navUpdatedAt: BN;
|
|
102
102
|
navMaxAge: number;
|
|
103
|
-
|
|
103
|
+
exitFeeDbps: number;
|
|
104
104
|
altDecimals: number;
|
|
105
105
|
flags: number;
|
|
106
106
|
conversionSource: number;
|
|
@@ -119,6 +119,10 @@ export const CONVERSION_SOURCE_POSTED = 0;
|
|
|
119
119
|
export const CONVERSION_SOURCE_SCOPE = 1;
|
|
120
120
|
/** NAV scale: USDC per 1 RWA × 1e9 */
|
|
121
121
|
export const NAV_ONE = new BN(1_000_000_000);
|
|
122
|
+
/** Fee unit: tenths of a basis point. fee = ceil(gross × dbps / FEE_DENOMINATOR). 10 dbps = 1 bps, 1_000 = 1%. */
|
|
123
|
+
export const FEE_DENOMINATOR = 100_000;
|
|
124
|
+
export const dbpsToPercent = (dbps: number) => dbps / 1_000;
|
|
125
|
+
export const dbpsToBps = (dbps: number) => dbps / 10;
|
|
122
126
|
|
|
123
127
|
// Kamino Scope oracle (mainnet) — the on-chain NAV source for every RWA pool
|
|
124
128
|
export const SCOPE_PROGRAM_ID = new PublicKey("HFn8GnPADiny6XqUoWE8uRPPxb29ikn4yTuPa9MF2fWJ");
|