@elmntl/vaults-v2 1.0.11 → 1.2.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/dist/accounts/index.d.ts +1 -0
- package/dist/accounts/index.d.ts.map +1 -1
- package/dist/accounts/index.js +3 -1
- package/dist/accounts/index.js.map +1 -1
- package/dist/accounts/pool.d.ts +2 -1
- package/dist/accounts/pool.d.ts.map +1 -1
- package/dist/accounts/pool.js +3 -2
- package/dist/accounts/pool.js.map +1 -1
- package/dist/accounts/position.d.ts +3 -0
- package/dist/accounts/position.d.ts.map +1 -1
- package/dist/accounts/position.js +9 -0
- package/dist/accounts/position.js.map +1 -1
- package/dist/accounts/ticket.d.ts +20 -0
- package/dist/accounts/ticket.d.ts.map +1 -0
- package/dist/accounts/ticket.js +56 -0
- package/dist/accounts/ticket.js.map +1 -0
- package/dist/generated/idl/elemental_vault_v2.json +211 -8
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/programs/elemental.d.ts +19 -2
- package/dist/programs/elemental.d.ts.map +1 -1
- package/dist/programs/elemental.js +106 -7
- package/dist/programs/elemental.js.map +1 -1
- package/dist/types.d.ts +11 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/package.json +1 -1
- package/src/accounts/index.ts +1 -0
- package/src/accounts/pool.ts +4 -2
- package/src/accounts/position.ts +12 -0
- package/src/accounts/ticket.ts +70 -0
- package/src/generated/idl/elemental_vault_v2.json +211 -8
- package/src/index.ts +2 -1
- package/src/programs/elemental.ts +178 -8
- package/src/types.ts +13 -0
package/dist/accounts/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/accounts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/accounts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC"}
|
package/dist/accounts/index.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Position = exports.Pool = void 0;
|
|
3
|
+
exports.WithdrawalTicket = exports.Position = exports.Pool = void 0;
|
|
4
4
|
var pool_1 = require("./pool");
|
|
5
5
|
Object.defineProperty(exports, "Pool", { enumerable: true, get: function () { return pool_1.Pool; } });
|
|
6
6
|
var position_1 = require("./position");
|
|
7
7
|
Object.defineProperty(exports, "Position", { enumerable: true, get: function () { return position_1.Position; } });
|
|
8
|
+
var ticket_1 = require("./ticket");
|
|
9
|
+
Object.defineProperty(exports, "WithdrawalTicket", { enumerable: true, get: function () { return ticket_1.WithdrawalTicket; } });
|
|
8
10
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/accounts/index.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/accounts/index.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,mCAA4C;AAAnC,0GAAA,gBAAgB,OAAA"}
|
package/dist/accounts/pool.d.ts
CHANGED
|
@@ -2,10 +2,11 @@ import { PublicKey, Connection } from "@solana/web3.js";
|
|
|
2
2
|
import { PoolData, SwapAdapter } from "../types";
|
|
3
3
|
export declare class Pool {
|
|
4
4
|
readonly address: PublicKey;
|
|
5
|
+
readonly programId: PublicKey;
|
|
5
6
|
private _data?;
|
|
6
7
|
private _depositDecimals;
|
|
7
8
|
private _vaultDecimals;
|
|
8
|
-
constructor(address: PublicKey, data?: PoolData, depositDecimals?: number, vaultDecimals?: number);
|
|
9
|
+
constructor(address: PublicKey, data?: PoolData, depositDecimals?: number, vaultDecimals?: number, programId?: PublicKey);
|
|
9
10
|
get data(): PoolData;
|
|
10
11
|
get depositDecimals(): number;
|
|
11
12
|
get vaultDecimals(): number;
|
|
@@ -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,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;
|
|
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;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
|
@@ -10,10 +10,11 @@ const web3_js_1 = require("@solana/web3.js");
|
|
|
10
10
|
const types_1 = require("../types");
|
|
11
11
|
const programs_1 = require("../programs");
|
|
12
12
|
class Pool {
|
|
13
|
-
constructor(address, data, depositDecimals, vaultDecimals) {
|
|
13
|
+
constructor(address, data, depositDecimals, vaultDecimals, programId) {
|
|
14
14
|
this._depositDecimals = 6; // Default to USDC-like
|
|
15
15
|
this._vaultDecimals = 9; // Default to ONYC-like
|
|
16
16
|
this.address = address;
|
|
17
|
+
this.programId = programId || programs_1.VAULT_PROGRAM_ID;
|
|
17
18
|
this._data = data;
|
|
18
19
|
if (depositDecimals !== undefined)
|
|
19
20
|
this._depositDecimals = depositDecimals;
|
|
@@ -39,7 +40,7 @@ class Pool {
|
|
|
39
40
|
}
|
|
40
41
|
// PDA for pool authority
|
|
41
42
|
get authorityAddress() {
|
|
42
|
-
return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("pool_authority"), this.address.toBuffer()],
|
|
43
|
+
return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("pool_authority"), this.address.toBuffer()], this.programId)[0];
|
|
43
44
|
}
|
|
44
45
|
get adminAddress() {
|
|
45
46
|
return this.data.admin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/accounts/pool.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAiC;AACjC,kDAAuB;AACvB,6CAAwD;AAExD,oCAAgF;AAChF,0CAA+C;AAE/C,MAAa,IAAI;
|
|
1
|
+
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/accounts/pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,9 @@ export declare class Position {
|
|
|
17
17
|
get deactivatingAmount(): string;
|
|
18
18
|
get claimingAmount(): string;
|
|
19
19
|
get lastUpdatedEpochIndex(): number;
|
|
20
|
+
get ticketMode(): number;
|
|
21
|
+
get ticketCount(): number;
|
|
22
|
+
get isTicketMode(): boolean;
|
|
20
23
|
get exists(): boolean;
|
|
21
24
|
get status(): PositionStatus;
|
|
22
25
|
get nextDate(): Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["../../src/accounts/position.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAa,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,qBAAa,QAAQ;IACnB,SAAgB,IAAI,EAAE,IAAI,CAAC;IAC3B,SAAgB,OAAO,EAAE,SAAS,CAAC;IACnC,SAAgB,IAAI,EAAE,YAAY,CAAC;gBAEvB,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY;IAM9D,IAAI,KAAK,IAAI,SAAS,CAErB;IAGD,IAAI,MAAM,IAAI,MAAM,CAInB;IAGD,IAAI,KAAK,IAAI,MAAM,CAElB;IAGD,IAAI,gBAAgB,IAAI,MAAM,CAM7B;IAGD,IAAI,eAAe,IAAI,MAAM,CAe5B;IAGD,IAAI,aAAa,IAAI,MAAM,CAI1B;IAGD,IAAI,kBAAkB,IAAI,MAAM,CAQ/B;IAGD,IAAI,eAAe,IAAI,MAAM,CAM5B;IAED,IAAI,kBAAkB,IAAI,MAAM,CAI/B;IAED,IAAI,cAAc,IAAI,MAAM,CAI3B;IAED,IAAI,qBAAqB,IAAI,MAAM,CAElC;IAGD,IAAI,MAAM,IAAI,OAAO,CAEpB;IAGD,IAAI,MAAM,IAAI,cAAc,CAuB3B;IAGD,IAAI,QAAQ,IAAI,IAAI,CA2BnB;IAGD,IAAI,mBAAmB,IAAI,MAAM,CAQhC;IAGD,IAAI,UAAU,IAAI,OAAO,CAMxB;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;CACF"}
|
|
1
|
+
{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["../../src/accounts/position.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAa,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,qBAAa,QAAQ;IACnB,SAAgB,IAAI,EAAE,IAAI,CAAC;IAC3B,SAAgB,OAAO,EAAE,SAAS,CAAC;IACnC,SAAgB,IAAI,EAAE,YAAY,CAAC;gBAEvB,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY;IAM9D,IAAI,KAAK,IAAI,SAAS,CAErB;IAGD,IAAI,MAAM,IAAI,MAAM,CAInB;IAGD,IAAI,KAAK,IAAI,MAAM,CAElB;IAGD,IAAI,gBAAgB,IAAI,MAAM,CAM7B;IAGD,IAAI,eAAe,IAAI,MAAM,CAe5B;IAGD,IAAI,aAAa,IAAI,MAAM,CAI1B;IAGD,IAAI,kBAAkB,IAAI,MAAM,CAQ/B;IAGD,IAAI,eAAe,IAAI,MAAM,CAM5B;IAED,IAAI,kBAAkB,IAAI,MAAM,CAI/B;IAED,IAAI,cAAc,IAAI,MAAM,CAI3B;IAED,IAAI,qBAAqB,IAAI,MAAM,CAElC;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,YAAY,IAAI,OAAO,CAE1B;IAGD,IAAI,MAAM,IAAI,OAAO,CAEpB;IAGD,IAAI,MAAM,IAAI,cAAc,CAuB3B;IAGD,IAAI,QAAQ,IAAI,IAAI,CA2BnB;IAGD,IAAI,mBAAmB,IAAI,MAAM,CAQhC;IAGD,IAAI,UAAU,IAAI,OAAO,CAMxB;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;CACF"}
|
|
@@ -85,6 +85,15 @@ class Position {
|
|
|
85
85
|
get lastUpdatedEpochIndex() {
|
|
86
86
|
return this.data.lastUpdatedEpochIndex;
|
|
87
87
|
}
|
|
88
|
+
get ticketMode() {
|
|
89
|
+
return this.data.ticketMode;
|
|
90
|
+
}
|
|
91
|
+
get ticketCount() {
|
|
92
|
+
return this.data.ticketCount;
|
|
93
|
+
}
|
|
94
|
+
get isTicketMode() {
|
|
95
|
+
return this.data.ticketMode !== 0;
|
|
96
|
+
}
|
|
88
97
|
// Check if position exists on-chain
|
|
89
98
|
get exists() {
|
|
90
99
|
return this.data.lastUpdatedEpochIndex >= 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"position.js","sourceRoot":"","sources":["../../src/accounts/position.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"position.js","sourceRoot":"","sources":["../../src/accounts/position.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import BN from "bn.js";
|
|
2
|
+
import { PublicKey } from "@solana/web3.js";
|
|
3
|
+
import { WithdrawalTicketData } from "../types";
|
|
4
|
+
import { Pool } from "./pool";
|
|
5
|
+
export declare class WithdrawalTicket {
|
|
6
|
+
readonly pool: Pool;
|
|
7
|
+
readonly address: PublicKey;
|
|
8
|
+
readonly data: WithdrawalTicketData;
|
|
9
|
+
constructor(pool: Pool, address: PublicKey, data: WithdrawalTicketData);
|
|
10
|
+
static findAddress(ownerAddress: PublicKey, poolAddress: PublicKey, ticketIndex: number, programId?: PublicKey): PublicKey;
|
|
11
|
+
get amount(): string;
|
|
12
|
+
get rewardAmount(): string;
|
|
13
|
+
get totalAmount(): string;
|
|
14
|
+
get totalAmountRaw(): BN;
|
|
15
|
+
get createdEpochIndex(): number;
|
|
16
|
+
get ticketIndex(): number;
|
|
17
|
+
/** Whether the ticket can be redeemed (2 full epochs have passed). */
|
|
18
|
+
get isRedeemable(): boolean;
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=ticket.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ticket.d.ts","sourceRoot":"","sources":["../../src/accounts/ticket.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAG9B,qBAAa,gBAAgB;IAEzB,QAAQ,CAAC,IAAI,EAAE,IAAI;IACnB,QAAQ,CAAC,OAAO,EAAE,SAAS;IAC3B,QAAQ,CAAC,IAAI,EAAE,oBAAoB;gBAF1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,SAAS,EAClB,IAAI,EAAE,oBAAoB;IAGrC,MAAM,CAAC,WAAW,CAChB,YAAY,EAAE,SAAS,EACvB,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,SAAS,GACpB,SAAS;IAcZ,IAAI,MAAM,IAAI,MAAM,CAInB;IAED,IAAI,YAAY,IAAI,MAAM,CAIzB;IAED,IAAI,WAAW,IAAI,MAAM,CAMxB;IAED,IAAI,cAAc,IAAI,EAAE,CAEvB;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,sEAAsE;IACtE,IAAI,YAAY,IAAI,OAAO,CAE1B;CACF"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.WithdrawalTicket = void 0;
|
|
7
|
+
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
8
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
9
|
+
const programs_1 = require("../programs");
|
|
10
|
+
class WithdrawalTicket {
|
|
11
|
+
constructor(pool, address, data) {
|
|
12
|
+
this.pool = pool;
|
|
13
|
+
this.address = address;
|
|
14
|
+
this.data = data;
|
|
15
|
+
}
|
|
16
|
+
static findAddress(ownerAddress, poolAddress, ticketIndex, programId) {
|
|
17
|
+
const indexBuf = Buffer.alloc(2);
|
|
18
|
+
indexBuf.writeUInt16LE(ticketIndex);
|
|
19
|
+
return web3_js_1.PublicKey.findProgramAddressSync([
|
|
20
|
+
Buffer.from("ticket"),
|
|
21
|
+
ownerAddress.toBuffer(),
|
|
22
|
+
poolAddress.toBuffer(),
|
|
23
|
+
indexBuf,
|
|
24
|
+
], programId || programs_1.VAULT_PROGRAM_ID)[0];
|
|
25
|
+
}
|
|
26
|
+
get amount() {
|
|
27
|
+
return new decimal_js_1.default(this.data.amount.toString())
|
|
28
|
+
.div(this.pool.vaultMultiplier)
|
|
29
|
+
.toFixed();
|
|
30
|
+
}
|
|
31
|
+
get rewardAmount() {
|
|
32
|
+
return new decimal_js_1.default(this.data.rewardAmount.toString())
|
|
33
|
+
.div(this.pool.vaultMultiplier)
|
|
34
|
+
.toFixed();
|
|
35
|
+
}
|
|
36
|
+
get totalAmount() {
|
|
37
|
+
return new decimal_js_1.default(this.data.amount.add(this.data.rewardAmount).toString())
|
|
38
|
+
.div(this.pool.vaultMultiplier)
|
|
39
|
+
.toFixed();
|
|
40
|
+
}
|
|
41
|
+
get totalAmountRaw() {
|
|
42
|
+
return this.data.amount.add(this.data.rewardAmount);
|
|
43
|
+
}
|
|
44
|
+
get createdEpochIndex() {
|
|
45
|
+
return this.data.createdEpochIndex;
|
|
46
|
+
}
|
|
47
|
+
get ticketIndex() {
|
|
48
|
+
return this.data.ticketIndex;
|
|
49
|
+
}
|
|
50
|
+
/** Whether the ticket can be redeemed (2 full epochs have passed). */
|
|
51
|
+
get isRedeemable() {
|
|
52
|
+
return this.pool.epochIndex > this.data.createdEpochIndex + 1;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
exports.WithdrawalTicket = WithdrawalTicket;
|
|
56
|
+
//# sourceMappingURL=ticket.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ticket.js","sourceRoot":"","sources":["../../src/accounts/ticket.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAiC;AAEjC,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;CACF;AA9DD,4CA8DC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"address": "
|
|
2
|
+
"address": "BZBw16QMsX6V2NvYw5Sj7oSkJ3stp4U4X9aC7M9g1XCs",
|
|
3
3
|
"metadata": {
|
|
4
4
|
"name": "elemental_vault_v2",
|
|
5
5
|
"version": "2.0.0",
|
|
@@ -106,6 +106,61 @@
|
|
|
106
106
|
}
|
|
107
107
|
]
|
|
108
108
|
},
|
|
109
|
+
{
|
|
110
|
+
"name": "create_ticket",
|
|
111
|
+
"docs": [
|
|
112
|
+
"Create a withdrawal ticket for a partial or full amount.",
|
|
113
|
+
"Position stays active with remaining balance.",
|
|
114
|
+
"amount=0 creates a yield-only ticket (rewards without capital)."
|
|
115
|
+
],
|
|
116
|
+
"discriminator": [
|
|
117
|
+
16,
|
|
118
|
+
178,
|
|
119
|
+
122,
|
|
120
|
+
25,
|
|
121
|
+
213,
|
|
122
|
+
85,
|
|
123
|
+
96,
|
|
124
|
+
129
|
|
125
|
+
],
|
|
126
|
+
"accounts": [
|
|
127
|
+
{
|
|
128
|
+
"name": "payer",
|
|
129
|
+
"writable": true,
|
|
130
|
+
"signer": true
|
|
131
|
+
},
|
|
132
|
+
{
|
|
133
|
+
"name": "position_owner",
|
|
134
|
+
"accounts": [
|
|
135
|
+
{
|
|
136
|
+
"name": "owner",
|
|
137
|
+
"signer": true
|
|
138
|
+
},
|
|
139
|
+
{
|
|
140
|
+
"name": "position",
|
|
141
|
+
"writable": true
|
|
142
|
+
},
|
|
143
|
+
{
|
|
144
|
+
"name": "pool",
|
|
145
|
+
"writable": true
|
|
146
|
+
}
|
|
147
|
+
]
|
|
148
|
+
},
|
|
149
|
+
{
|
|
150
|
+
"name": "ticket",
|
|
151
|
+
"writable": true
|
|
152
|
+
},
|
|
153
|
+
{
|
|
154
|
+
"name": "system_program"
|
|
155
|
+
}
|
|
156
|
+
],
|
|
157
|
+
"args": [
|
|
158
|
+
{
|
|
159
|
+
"name": "amount",
|
|
160
|
+
"type": "u64"
|
|
161
|
+
}
|
|
162
|
+
]
|
|
163
|
+
},
|
|
109
164
|
{
|
|
110
165
|
"name": "deactivate",
|
|
111
166
|
"docs": [
|
|
@@ -516,6 +571,71 @@
|
|
|
516
571
|
}
|
|
517
572
|
]
|
|
518
573
|
},
|
|
574
|
+
{
|
|
575
|
+
"name": "redeem_ticket",
|
|
576
|
+
"docs": [
|
|
577
|
+
"Redeem a matured withdrawal ticket (after 2-epoch cooldown).",
|
|
578
|
+
"Closes the ticket account and transfers vault_mint to user."
|
|
579
|
+
],
|
|
580
|
+
"discriminator": [
|
|
581
|
+
129,
|
|
582
|
+
120,
|
|
583
|
+
104,
|
|
584
|
+
224,
|
|
585
|
+
155,
|
|
586
|
+
25,
|
|
587
|
+
22,
|
|
588
|
+
192
|
|
589
|
+
],
|
|
590
|
+
"accounts": [
|
|
591
|
+
{
|
|
592
|
+
"name": "owner",
|
|
593
|
+
"signer": true
|
|
594
|
+
},
|
|
595
|
+
{
|
|
596
|
+
"name": "ticket",
|
|
597
|
+
"writable": true
|
|
598
|
+
},
|
|
599
|
+
{
|
|
600
|
+
"name": "position",
|
|
601
|
+
"writable": true
|
|
602
|
+
},
|
|
603
|
+
{
|
|
604
|
+
"name": "pool",
|
|
605
|
+
"writable": true
|
|
606
|
+
},
|
|
607
|
+
{
|
|
608
|
+
"name": "pool_authority"
|
|
609
|
+
},
|
|
610
|
+
{
|
|
611
|
+
"name": "liquidity_faucet",
|
|
612
|
+
"docs": [
|
|
613
|
+
"Faucet holding vault_mint for withdrawals (funded by admin)"
|
|
614
|
+
],
|
|
615
|
+
"writable": true
|
|
616
|
+
},
|
|
617
|
+
{
|
|
618
|
+
"name": "user_vault_token_account",
|
|
619
|
+
"docs": [
|
|
620
|
+
"User's vault_mint token account (receives withdrawal)"
|
|
621
|
+
],
|
|
622
|
+
"writable": true
|
|
623
|
+
},
|
|
624
|
+
{
|
|
625
|
+
"name": "vault_mint",
|
|
626
|
+
"docs": [
|
|
627
|
+
"The vault mint (what user receives)"
|
|
628
|
+
]
|
|
629
|
+
},
|
|
630
|
+
{
|
|
631
|
+
"name": "token_program",
|
|
632
|
+
"docs": [
|
|
633
|
+
"Token program"
|
|
634
|
+
]
|
|
635
|
+
}
|
|
636
|
+
],
|
|
637
|
+
"args": []
|
|
638
|
+
},
|
|
519
639
|
{
|
|
520
640
|
"name": "transfer_to_faucet",
|
|
521
641
|
"docs": [
|
|
@@ -597,11 +717,15 @@
|
|
|
597
717
|
"accounts": [
|
|
598
718
|
{
|
|
599
719
|
"name": "admin",
|
|
720
|
+
"writable": true,
|
|
600
721
|
"signer": true
|
|
601
722
|
},
|
|
602
723
|
{
|
|
603
724
|
"name": "pool",
|
|
604
725
|
"writable": true
|
|
726
|
+
},
|
|
727
|
+
{
|
|
728
|
+
"name": "system_program"
|
|
605
729
|
}
|
|
606
730
|
],
|
|
607
731
|
"args": [
|
|
@@ -766,6 +890,19 @@
|
|
|
766
890
|
247,
|
|
767
891
|
208
|
|
768
892
|
]
|
|
893
|
+
},
|
|
894
|
+
{
|
|
895
|
+
"name": "WithdrawalTicket",
|
|
896
|
+
"discriminator": [
|
|
897
|
+
92,
|
|
898
|
+
140,
|
|
899
|
+
181,
|
|
900
|
+
69,
|
|
901
|
+
244,
|
|
902
|
+
220,
|
|
903
|
+
233,
|
|
904
|
+
156
|
|
905
|
+
]
|
|
769
906
|
}
|
|
770
907
|
],
|
|
771
908
|
"events": [
|
|
@@ -968,6 +1105,16 @@
|
|
|
968
1105
|
"code": 6023,
|
|
969
1106
|
"name": "NoFundsToFlush",
|
|
970
1107
|
"msg": "No funds available to flush"
|
|
1108
|
+
},
|
|
1109
|
+
{
|
|
1110
|
+
"code": 6024,
|
|
1111
|
+
"name": "TicketModeActive",
|
|
1112
|
+
"msg": "Ticket mode is active - use create_ticket/redeem_ticket"
|
|
1113
|
+
},
|
|
1114
|
+
{
|
|
1115
|
+
"code": 6025,
|
|
1116
|
+
"name": "LegacyDeactivationPending",
|
|
1117
|
+
"msg": "Legacy deactivation pending - complete withdraw before using tickets"
|
|
971
1118
|
}
|
|
972
1119
|
],
|
|
973
1120
|
"types": [
|
|
@@ -1431,13 +1578,18 @@
|
|
|
1431
1578
|
"type": "u8"
|
|
1432
1579
|
},
|
|
1433
1580
|
{
|
|
1434
|
-
"name": "
|
|
1435
|
-
"
|
|
1436
|
-
"
|
|
1437
|
-
|
|
1438
|
-
|
|
1439
|
-
|
|
1440
|
-
|
|
1581
|
+
"name": "ticket_mode",
|
|
1582
|
+
"docs": [
|
|
1583
|
+
"Whether this position uses ticket-based withdrawals (1=yes, 0=legacy)"
|
|
1584
|
+
],
|
|
1585
|
+
"type": "u8"
|
|
1586
|
+
},
|
|
1587
|
+
{
|
|
1588
|
+
"name": "ticket_count",
|
|
1589
|
+
"docs": [
|
|
1590
|
+
"Auto-incrementing counter for ticket PDA derivation"
|
|
1591
|
+
],
|
|
1592
|
+
"type": "u16"
|
|
1441
1593
|
},
|
|
1442
1594
|
{
|
|
1443
1595
|
"name": "_reserved",
|
|
@@ -1577,6 +1729,57 @@
|
|
|
1577
1729
|
}
|
|
1578
1730
|
]
|
|
1579
1731
|
}
|
|
1732
|
+
},
|
|
1733
|
+
{
|
|
1734
|
+
"name": "WithdrawalTicket",
|
|
1735
|
+
"type": {
|
|
1736
|
+
"kind": "struct",
|
|
1737
|
+
"fields": [
|
|
1738
|
+
{
|
|
1739
|
+
"name": "pool",
|
|
1740
|
+
"type": "pubkey"
|
|
1741
|
+
},
|
|
1742
|
+
{
|
|
1743
|
+
"name": "owner",
|
|
1744
|
+
"type": "pubkey"
|
|
1745
|
+
},
|
|
1746
|
+
{
|
|
1747
|
+
"name": "amount",
|
|
1748
|
+
"docs": [
|
|
1749
|
+
"Principal amount being withdrawn"
|
|
1750
|
+
],
|
|
1751
|
+
"type": "u64"
|
|
1752
|
+
},
|
|
1753
|
+
{
|
|
1754
|
+
"name": "reward_amount",
|
|
1755
|
+
"docs": [
|
|
1756
|
+
"Reward amount claimed at ticket creation"
|
|
1757
|
+
],
|
|
1758
|
+
"type": "u64"
|
|
1759
|
+
},
|
|
1760
|
+
{
|
|
1761
|
+
"name": "created_epoch_index",
|
|
1762
|
+
"docs": [
|
|
1763
|
+
"Epoch index when ticket was created (must wait 2 epochs)"
|
|
1764
|
+
],
|
|
1765
|
+
"type": "u32"
|
|
1766
|
+
},
|
|
1767
|
+
{
|
|
1768
|
+
"name": "ticket_index",
|
|
1769
|
+
"docs": [
|
|
1770
|
+
"Ticket index for this owner+pool (auto-incremented from position.ticket_count)"
|
|
1771
|
+
],
|
|
1772
|
+
"type": "u16"
|
|
1773
|
+
},
|
|
1774
|
+
{
|
|
1775
|
+
"name": "bump",
|
|
1776
|
+
"docs": [
|
|
1777
|
+
"Bump seed for PDA"
|
|
1778
|
+
],
|
|
1779
|
+
"type": "u8"
|
|
1780
|
+
}
|
|
1781
|
+
]
|
|
1782
|
+
}
|
|
1580
1783
|
}
|
|
1581
1784
|
]
|
|
1582
1785
|
}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { ElementalV2Context, VAULT_PROGRAM_ID } from "./programs";
|
|
2
|
-
export { Pool, Position } from "./accounts";
|
|
3
|
-
export { PoolData, PositionData, PositionStatus, SwapAdapter, FIXED_ONE, ONRE_PROGRAM_ID, ONRE_STATE, POOL_FAUCET_CONFIG, } from "./types";
|
|
2
|
+
export { Pool, Position, WithdrawalTicket } from "./accounts";
|
|
3
|
+
export { PoolData, PositionData, WithdrawalTicketData, PositionStatus, SwapAdapter, FIXED_ONE, ONRE_PROGRAM_ID, ONRE_STATE, POOL_FAUCET_CONFIG, } from "./types";
|
|
4
4
|
//# 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,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,oBAAoB,EACpB,cAAc,EACd,WAAW,EACX,SAAS,EACT,eAAe,EACf,UAAU,EACV,kBAAkB,GACnB,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.POOL_FAUCET_CONFIG = exports.ONRE_STATE = exports.ONRE_PROGRAM_ID = exports.FIXED_ONE = exports.SwapAdapter = exports.Position = exports.Pool = exports.VAULT_PROGRAM_ID = exports.ElementalV2Context = void 0;
|
|
3
|
+
exports.POOL_FAUCET_CONFIG = exports.ONRE_STATE = exports.ONRE_PROGRAM_ID = exports.FIXED_ONE = exports.SwapAdapter = exports.WithdrawalTicket = exports.Position = exports.Pool = 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; } });
|
|
@@ -8,6 +8,7 @@ Object.defineProperty(exports, "VAULT_PROGRAM_ID", { enumerable: true, get: func
|
|
|
8
8
|
var accounts_1 = require("./accounts");
|
|
9
9
|
Object.defineProperty(exports, "Pool", { enumerable: true, get: function () { return accounts_1.Pool; } });
|
|
10
10
|
Object.defineProperty(exports, "Position", { enumerable: true, get: function () { return accounts_1.Position; } });
|
|
11
|
+
Object.defineProperty(exports, "WithdrawalTicket", { enumerable: true, get: function () { return accounts_1.WithdrawalTicket; } });
|
|
11
12
|
var types_1 = require("./types");
|
|
12
13
|
Object.defineProperty(exports, "SwapAdapter", { enumerable: true, get: function () { return types_1.SwapAdapter; } });
|
|
13
14
|
Object.defineProperty(exports, "FIXED_ONE", { enumerable: true, get: function () { return types_1.FIXED_ONE; } });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,eAAe;AACf,uCAAkE;AAAzD,8GAAA,kBAAkB,OAAA;AAAE,4GAAA,gBAAgB,OAAA;AAC7C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,eAAe;AACf,uCAAkE;AAAzD,8GAAA,kBAAkB,OAAA;AAAE,4GAAA,gBAAgB,OAAA;AAC7C,uCAA8D;AAArD,gGAAA,IAAI,OAAA;AAAE,oGAAA,QAAQ,OAAA;AAAE,4GAAA,gBAAgB,OAAA;AACzC,iCAUiB;AALf,oGAAA,WAAW,OAAA;AACX,kGAAA,SAAS,OAAA;AACT,wGAAA,eAAe,OAAA;AACf,mGAAA,UAAU,OAAA;AACV,2GAAA,kBAAkB,OAAA"}
|
|
@@ -1,23 +1,29 @@
|
|
|
1
|
+
import BN from "bn.js";
|
|
1
2
|
import { Program, AnchorProvider } from "@coral-xyz/anchor";
|
|
2
3
|
import { PublicKey, Keypair, TransactionInstruction, TransactionSignature, Connection } from "@solana/web3.js";
|
|
3
|
-
import { Pool, Position } from "../accounts";
|
|
4
|
+
import { Pool, Position, WithdrawalTicket } from "../accounts";
|
|
4
5
|
import { PoolData, PositionData } from "../types";
|
|
5
6
|
export declare const VAULT_PROGRAM_ID: PublicKey;
|
|
6
7
|
export declare class ElementalV2Context {
|
|
7
8
|
readonly provider: AnchorProvider;
|
|
8
9
|
readonly program: Program;
|
|
9
10
|
private listeners;
|
|
10
|
-
constructor(provider: AnchorProvider);
|
|
11
|
+
constructor(provider: AnchorProvider, programId?: PublicKey);
|
|
11
12
|
get connection(): Connection;
|
|
12
13
|
get walletAddress(): PublicKey;
|
|
13
14
|
findPoolAuthority(poolAddress: PublicKey): PublicKey;
|
|
14
15
|
findPositionAddress(poolAddress: PublicKey, ownerAddress?: PublicKey): PublicKey;
|
|
16
|
+
findTicketAddress(poolAddress: PublicKey, ticketIndex: number, ownerAddress?: PublicKey): PublicKey;
|
|
15
17
|
loadPool(address: PublicKey): Promise<Pool>;
|
|
16
18
|
loadPools(addresses: PublicKey[]): Promise<Pool[]>;
|
|
17
19
|
getTotalPositionsByPool(poolAddress: PublicKey): Promise<number>;
|
|
18
20
|
loadPosition(pool: Pool, ownerAddress?: PublicKey): Promise<Position>;
|
|
19
21
|
loadPositions(pools: Pool[], ownerAddress?: PublicKey): Promise<Position[]>;
|
|
20
22
|
private defaultPositionData;
|
|
23
|
+
/** Load all withdrawal tickets for an owner on a pool. */
|
|
24
|
+
loadTickets(pool: Pool, ownerAddress?: PublicKey): Promise<WithdrawalTicket[]>;
|
|
25
|
+
/** Load a specific ticket by index. */
|
|
26
|
+
loadTicket(pool: Pool, ticketIndex: number, ownerAddress?: PublicKey): Promise<WithdrawalTicket | null>;
|
|
21
27
|
createPositionInstruction(pool: Pool, ownerAddress?: PublicKey): Promise<TransactionInstruction>;
|
|
22
28
|
depositInstructions(position: Position, amount: number | string, minOutput?: number | string): Promise<TransactionInstruction[]>;
|
|
23
29
|
/**
|
|
@@ -35,6 +41,15 @@ export declare class ElementalV2Context {
|
|
|
35
41
|
claimInstructions(position: Position): Promise<TransactionInstruction[]>;
|
|
36
42
|
withdrawInstructions(position: Position): Promise<TransactionInstruction[]>;
|
|
37
43
|
fundFaucetInstructions(pool: Pool, amount: number | string): Promise<TransactionInstruction[]>;
|
|
44
|
+
/**
|
|
45
|
+
* Create a withdrawal ticket.
|
|
46
|
+
* - amount > 0: withdraw capital (rounded to min_deposit_amount multiples) + proportional rewards
|
|
47
|
+
* - amount = 0: yield-only ticket (withdraw all accrued rewards, capital untouched)
|
|
48
|
+
*
|
|
49
|
+
* Ticket index is auto-assigned from position.ticketCount.
|
|
50
|
+
*/
|
|
51
|
+
createTicketInstructions(position: Position, amount: BN): Promise<TransactionInstruction[]>;
|
|
52
|
+
redeemTicketInstructions(ticket: WithdrawalTicket, position: Position): Promise<TransactionInstruction[]>;
|
|
38
53
|
updateEpochInstruction(pool: Pool): Promise<TransactionInstruction>;
|
|
39
54
|
updateConfigInstructions(pool: Pool, params: {
|
|
40
55
|
rewardAnnualRate?: number | string;
|
|
@@ -48,6 +63,8 @@ export declare class ElementalV2Context {
|
|
|
48
63
|
deactivate(position: Position, amount: number | string): Promise<TransactionSignature>;
|
|
49
64
|
claim(position: Position): Promise<TransactionSignature>;
|
|
50
65
|
withdraw(position: Position): Promise<TransactionSignature>;
|
|
66
|
+
createTicket(position: Position, amount: BN): Promise<TransactionSignature>;
|
|
67
|
+
redeemTicket(ticket: WithdrawalTicket, position: Position): Promise<TransactionSignature>;
|
|
51
68
|
fundFaucet(pool: Pool, amount: number | string): Promise<TransactionSignature>;
|
|
52
69
|
updateEpoch(pool: Pool): Promise<TransactionSignature>;
|
|
53
70
|
updateConfig(pool: Pool, params: {
|