@elemental-stv-core/sdk 0.3.0 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/elemental-lend/constants.d.ts +2 -2
- package/dist/elemental-lend/constants.d.ts.map +1 -1
- package/dist/elemental-lend/constants.js +2 -2
- package/dist/elemental-lend/constants.js.map +1 -1
- package/dist/elemental-lend/jupiter-lend.d.ts.map +1 -1
- package/dist/elemental-lend/jupiter-lend.js +5 -3
- package/dist/elemental-lend/jupiter-lend.js.map +1 -1
- package/dist/jlpd-strategy/adapter.d.ts +61 -0
- package/dist/jlpd-strategy/adapter.d.ts.map +1 -0
- package/dist/jlpd-strategy/adapter.js +91 -0
- package/dist/jlpd-strategy/adapter.js.map +1 -0
- package/dist/jlpd-strategy/constants.d.ts +7 -4
- package/dist/jlpd-strategy/constants.d.ts.map +1 -1
- package/dist/jlpd-strategy/constants.js +11 -4
- package/dist/jlpd-strategy/constants.js.map +1 -1
- package/dist/jlpd-strategy/index.d.ts +3 -0
- package/dist/jlpd-strategy/index.d.ts.map +1 -1
- package/dist/jlpd-strategy/index.js +3 -0
- package/dist/jlpd-strategy/index.js.map +1 -1
- package/dist/jlpd-strategy/jlp-borrow.d.ts +35 -0
- package/dist/jlpd-strategy/jlp-borrow.d.ts.map +1 -0
- package/dist/jlpd-strategy/jlp-borrow.js +59 -0
- package/dist/jlpd-strategy/jlp-borrow.js.map +1 -0
- package/dist/jlpd-strategy/jupusd-earn.d.ts +65 -0
- package/dist/jlpd-strategy/jupusd-earn.d.ts.map +1 -0
- package/dist/jlpd-strategy/jupusd-earn.js +152 -0
- package/dist/jlpd-strategy/jupusd-earn.js.map +1 -0
- package/dist/jlpd-strategy/swap-jlp.d.ts +2 -0
- package/dist/jlpd-strategy/swap-jlp.d.ts.map +1 -1
- package/dist/jlpd-strategy/swap-jlp.js +37 -1
- package/dist/jlpd-strategy/swap-jlp.js.map +1 -1
- package/dist/p-stv-core/constants.d.ts +2 -1
- package/dist/p-stv-core/constants.d.ts.map +1 -1
- package/dist/p-stv-core/constants.js +6 -3
- package/dist/p-stv-core/constants.js.map +1 -1
- package/dist/p-stv-core/send-tx.d.ts +2 -0
- package/dist/p-stv-core/send-tx.d.ts.map +1 -1
- package/dist/p-stv-core/send-tx.js +1 -1
- package/dist/p-stv-core/send-tx.js.map +1 -1
- package/package.json +1 -1
|
@@ -17,8 +17,8 @@ export declare const IX_JUP_LEND_DEPOSIT: Buffer<ArrayBuffer>;
|
|
|
17
17
|
export declare const IX_JUP_LEND_WITHDRAW: Buffer<ArrayBuffer>;
|
|
18
18
|
export declare const IX_ADD_MANAGER: Buffer<ArrayBuffer>;
|
|
19
19
|
export declare const IX_REMOVE_MANAGER: Buffer<ArrayBuffer>;
|
|
20
|
-
export declare const STRATEGY_STATE_SIZE =
|
|
21
|
-
export declare const STV_POSITION_SIZE =
|
|
20
|
+
export declare const STRATEGY_STATE_SIZE = 536;
|
|
21
|
+
export declare const STV_POSITION_SIZE = 120;
|
|
22
22
|
export declare const MANAGER_ROLE_SIZE = 80;
|
|
23
23
|
export declare const FLAG_PAUSED = 1;
|
|
24
24
|
export declare const MAX_PROTOCOLS = 10;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/elemental-lend/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,UAAU,WAEtB,CAAC;AAGF,eAAO,MAAM,mBAAmB,qBAAgC,CAAC;AACjE,eAAO,MAAM,aAAa,qBAA0B,CAAC;AACrD,eAAO,MAAM,YAAY,qBAAyB,CAAC;AAGnD,eAAO,MAAM,mBAAmB,qBAAqD,CAAC;AACtF,eAAO,MAAM,iBAAiB,qBAAqD,CAAC;AAEpF,eAAO,MAAM,iBAAiB,qBAAgE,CAAC;AAG/F,eAAO,MAAM,0BAA0B,qBAAoD,CAAC;AAC5F,eAAO,MAAM,gBAAgB,qBAAkD,CAAC;AAChF,eAAO,MAAM,UAAU,qBAAsD,CAAC;AAC9E,eAAO,MAAM,WAAW,qBAAqD,CAAC;AAC9E,eAAO,MAAM,aAAa,qBAAqD,CAAC;AAChF,eAAO,MAAM,iBAAiB,qBAAoD,CAAC;AACnF,eAAO,MAAM,kBAAkB,qBAAsD,CAAC;AACtF,eAAO,MAAM,mBAAmB,qBAAoD,CAAC;AACrF,eAAO,MAAM,oBAAoB,qBAAoD,CAAC;AAEtF,eAAO,MAAM,cAAc,qBAAgE,CAAC;AAE5F,eAAO,MAAM,iBAAiB,qBAAgE,CAAC;AAG/F,eAAO,MAAM,mBAAmB,MAAM,CAAC;AACvC,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/elemental-lend/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,UAAU,WAEtB,CAAC;AAGF,eAAO,MAAM,mBAAmB,qBAAgC,CAAC;AACjE,eAAO,MAAM,aAAa,qBAA0B,CAAC;AACrD,eAAO,MAAM,YAAY,qBAAyB,CAAC;AAGnD,eAAO,MAAM,mBAAmB,qBAAqD,CAAC;AACtF,eAAO,MAAM,iBAAiB,qBAAqD,CAAC;AAEpF,eAAO,MAAM,iBAAiB,qBAAgE,CAAC;AAG/F,eAAO,MAAM,0BAA0B,qBAAoD,CAAC;AAC5F,eAAO,MAAM,gBAAgB,qBAAkD,CAAC;AAChF,eAAO,MAAM,UAAU,qBAAsD,CAAC;AAC9E,eAAO,MAAM,WAAW,qBAAqD,CAAC;AAC9E,eAAO,MAAM,aAAa,qBAAqD,CAAC;AAChF,eAAO,MAAM,iBAAiB,qBAAoD,CAAC;AACnF,eAAO,MAAM,kBAAkB,qBAAsD,CAAC;AACtF,eAAO,MAAM,mBAAmB,qBAAoD,CAAC;AACrF,eAAO,MAAM,oBAAoB,qBAAoD,CAAC;AAEtF,eAAO,MAAM,cAAc,qBAAgE,CAAC;AAE5F,eAAO,MAAM,iBAAiB,qBAAgE,CAAC;AAG/F,eAAO,MAAM,mBAAmB,MAAM,CAAC;AACvC,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAGpC,eAAO,MAAM,WAAW,IAAS,CAAC;AAGlC,eAAO,MAAM,aAAa,KAAK,CAAC;AAGhC,eAAO,MAAM,oBAAoB,WAA+D,CAAC;AACjG,eAAO,MAAM,gBAAgB,WAA+D,CAAC;AAE7F,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC"}
|
|
@@ -27,8 +27,8 @@ exports.IX_ADD_MANAGER = Buffer.from([0x7d, 0x26, 0xc0, 0xd4, 0x65, 0x5b, 0xb3,
|
|
|
27
27
|
// sha256("global:remove_manager")[..8]
|
|
28
28
|
exports.IX_REMOVE_MANAGER = Buffer.from([0x96, 0x37, 0x9d, 0x4d, 0x80, 0x94, 0x07, 0x0f]);
|
|
29
29
|
// Account sizes
|
|
30
|
-
exports.STRATEGY_STATE_SIZE =
|
|
31
|
-
exports.STV_POSITION_SIZE =
|
|
30
|
+
exports.STRATEGY_STATE_SIZE = 536;
|
|
31
|
+
exports.STV_POSITION_SIZE = 120;
|
|
32
32
|
exports.MANAGER_ROLE_SIZE = 80;
|
|
33
33
|
// Flags
|
|
34
34
|
exports.FLAG_PAUSED = 0x0001;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/elemental-lend/constants.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/elemental-lend/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jupiter-lend.d.ts","sourceRoot":"","sources":["../../src/elemental-lend/jupiter-lend.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,WAAW,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAQxE,uDAAuD;AACvD,eAAO,MAAM,aAAa,WAAgE,CAAC;AAE3F,sCAAsC;AACtC,eAAO,MAAM,oBAAoB,WAA+D,CAAC;AAEjG,8BAA8B;AAC9B,eAAO,MAAM,mBAAmB,WAAgE,CAAC;AAMjG,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,SAAS,CAAC;IACnB,UAAU,EAAE,SAAS,CAAC;IACtB,sBAAsB,EAAE,SAAS,CAAC;IAClC,yBAAyB,EAAE,SAAS,CAAC;IACrC,gBAAgB,EAAE,SAAS,CAAC;IAC5B,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,SAAS,CAAC;CACzB;AAED,eAAO,MAAM,SAAS,EAAE,eAUvB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,eAUtB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,eAUzB,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAI1D,CAAC;AAMF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,eAAe,EACrB,MAAM,EAAE,SAAS,EACjB,qBAAqB,EAAE,SAAS,EAChC,qBAAqB,EAAE,SAAS,GAC/B,WAAW,EAAE,CAoBf;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,eAAe,EACrB,gBAAgB,EAAE,SAAS,EAC3B,eAAe,EAAE,SAAS,EAC1B,iBAAiB,EAAE,SAAS,GAC3B,WAAW,EAAE,CAYf;AAMD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,eAAe,EACrB,MAAM,EAAE,SAAS,EACjB,iBAAiB,EAAE,SAAS,EAC5B,qBAAqB,EAAE,SAAS,GAC/B,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"jupiter-lend.d.ts","sourceRoot":"","sources":["../../src/elemental-lend/jupiter-lend.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,WAAW,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAQxE,uDAAuD;AACvD,eAAO,MAAM,aAAa,WAAgE,CAAC;AAE3F,sCAAsC;AACtC,eAAO,MAAM,oBAAoB,WAA+D,CAAC;AAEjG,8BAA8B;AAC9B,eAAO,MAAM,mBAAmB,WAAgE,CAAC;AAMjG,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,SAAS,CAAC;IACnB,UAAU,EAAE,SAAS,CAAC;IACtB,sBAAsB,EAAE,SAAS,CAAC;IAClC,yBAAyB,EAAE,SAAS,CAAC;IACrC,gBAAgB,EAAE,SAAS,CAAC;IAC5B,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,SAAS,CAAC;CACzB;AAED,eAAO,MAAM,SAAS,EAAE,eAUvB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,eAUtB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,eAUzB,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAI1D,CAAC;AAMF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,eAAe,EACrB,MAAM,EAAE,SAAS,EACjB,qBAAqB,EAAE,SAAS,EAChC,qBAAqB,EAAE,SAAS,GAC/B,WAAW,EAAE,CAoBf;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,eAAe,EACrB,gBAAgB,EAAE,SAAS,EAC3B,eAAe,EAAE,SAAS,EAC1B,iBAAiB,EAAE,SAAS,GAC3B,WAAW,EAAE,CAYf;AAMD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,eAAe,EACrB,MAAM,EAAE,SAAS,EACjB,iBAAiB,EAAE,SAAS,EAC5B,qBAAqB,EAAE,SAAS,GAC/B,WAAW,EAAE,CAuBf;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,eAAe,EACrB,gBAAgB,EAAE,SAAS,EAC3B,iBAAiB,EAAE,SAAS,EAC5B,eAAe,EAAE,SAAS,GACzB,WAAW,EAAE,CAYf"}
|
|
@@ -102,7 +102,7 @@ function buildJupLendDepositAccounts(pool, signer, depositorTokenAccount, recipi
|
|
|
102
102
|
{ pubkey: pool.rateModel, isSigner: false, isWritable: false },
|
|
103
103
|
{ pubkey: pool.vault, isSigner: false, isWritable: true },
|
|
104
104
|
{ pubkey: exports.LIQUIDITY_SINGLETON, isSigner: false, isWritable: true },
|
|
105
|
-
{ pubkey: exports.LIQUIDITY_PROGRAM_ID, isSigner: false, isWritable:
|
|
105
|
+
{ pubkey: exports.LIQUIDITY_PROGRAM_ID, isSigner: false, isWritable: false },
|
|
106
106
|
{ pubkey: pool.rewardsRateModel, isSigner: false, isWritable: false },
|
|
107
107
|
{ pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
|
|
108
108
|
{ pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
|
|
@@ -162,9 +162,11 @@ function buildJupLendWithdrawAccounts(pool, signer, ownerTokenAccount, recipient
|
|
|
162
162
|
{ pubkey: pool.supplyPositionOnLiquidity, isSigner: false, isWritable: true },
|
|
163
163
|
{ pubkey: pool.rateModel, isSigner: false, isWritable: false },
|
|
164
164
|
{ pubkey: pool.vault, isSigner: false, isWritable: true },
|
|
165
|
-
|
|
165
|
+
// claim_account: on-chain CPI hardcodes this as writable (AccountMeta::new),
|
|
166
|
+
// so we can't pass System Program (PublicKey.default). Use vault as safe placeholder.
|
|
167
|
+
{ pubkey: pool.claimAccount.equals(web3_js_1.PublicKey.default) ? pool.vault : pool.claimAccount, isSigner: false, isWritable: true },
|
|
166
168
|
{ pubkey: exports.LIQUIDITY_SINGLETON, isSigner: false, isWritable: true },
|
|
167
|
-
{ pubkey: exports.LIQUIDITY_PROGRAM_ID, isSigner: false, isWritable:
|
|
169
|
+
{ pubkey: exports.LIQUIDITY_PROGRAM_ID, isSigner: false, isWritable: false },
|
|
168
170
|
{ pubkey: pool.rewardsRateModel, isSigner: false, isWritable: false },
|
|
169
171
|
{ pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
|
|
170
172
|
{ pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jupiter-lend.js","sourceRoot":"","sources":["../../src/elemental-lend/jupiter-lend.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAwGH,kEAyBC;AAQD,sEAiBC;AA6BD,
|
|
1
|
+
{"version":3,"file":"jupiter-lend.js","sourceRoot":"","sources":["../../src/elemental-lend/jupiter-lend.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* JLPD Adapter instruction builders.
|
|
3
|
+
*
|
|
4
|
+
* These build JLPD-side instructions (deposit_to_adapter, withdraw_from_adapter)
|
|
5
|
+
* that CPI into the earn adapter program.
|
|
6
|
+
*/
|
|
7
|
+
import { PublicKey, TransactionInstruction, AccountMeta } from "@solana/web3.js";
|
|
8
|
+
import BN from "bn.js";
|
|
9
|
+
export interface DepositToAdapterArgs {
|
|
10
|
+
manager: PublicKey;
|
|
11
|
+
config: PublicKey;
|
|
12
|
+
managerRole: PublicKey;
|
|
13
|
+
vaultJlpAta: PublicKey;
|
|
14
|
+
adapterState: PublicKey;
|
|
15
|
+
adapterProgram: PublicKey;
|
|
16
|
+
amount: BN | number;
|
|
17
|
+
/** Protocol-specific remaining accounts for the adapter's deposit CPI */
|
|
18
|
+
remainingAccounts?: AccountMeta[];
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Build `deposit_to_adapter` instruction.
|
|
22
|
+
*
|
|
23
|
+
* Anchor data: [8-byte disc, DepositToAdapterParams(u64 + bool + u16 + u32)]
|
|
24
|
+
*/
|
|
25
|
+
export declare function createDepositToAdapterIx(args: DepositToAdapterArgs, programId?: PublicKey): TransactionInstruction;
|
|
26
|
+
export interface WithdrawFromAdapterArgs {
|
|
27
|
+
manager: PublicKey;
|
|
28
|
+
config: PublicKey;
|
|
29
|
+
managerRole: PublicKey;
|
|
30
|
+
vaultJlpAta: PublicKey;
|
|
31
|
+
adapterState: PublicKey;
|
|
32
|
+
adapterProgram: PublicKey;
|
|
33
|
+
amount: BN | number;
|
|
34
|
+
remainingAccounts?: AccountMeta[];
|
|
35
|
+
}
|
|
36
|
+
export declare function createWithdrawFromAdapterIx(args: WithdrawFromAdapterArgs, programId?: PublicKey): TransactionInstruction;
|
|
37
|
+
/** Adapter instruction discriminators for adapter_manage */
|
|
38
|
+
export declare const ADAPTER_DISC_BORROW = 3;
|
|
39
|
+
export declare const ADAPTER_DISC_DEPOSIT_EARN = 4;
|
|
40
|
+
export declare const ADAPTER_DISC_WITHDRAW_EARN = 5;
|
|
41
|
+
export declare const ADAPTER_DISC_REPAY = 6;
|
|
42
|
+
export interface AdapterManageArgs {
|
|
43
|
+
manager: PublicKey;
|
|
44
|
+
config: PublicKey;
|
|
45
|
+
managerRole: PublicKey;
|
|
46
|
+
adapterState: PublicKey;
|
|
47
|
+
adapterProgram: PublicKey;
|
|
48
|
+
/** Adapter instruction discriminator (e.g. ADAPTER_DISC_BORROW) */
|
|
49
|
+
adapterDisc: number;
|
|
50
|
+
amount: BN | number;
|
|
51
|
+
/** Protocol-specific remaining accounts for the adapter CPI */
|
|
52
|
+
remainingAccounts?: AccountMeta[];
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* Build `adapter_manage` instruction.
|
|
56
|
+
*
|
|
57
|
+
* Routes borrow/repay/earn operations through JLPD for config PDA signer propagation.
|
|
58
|
+
* Anchor data: [8-byte disc, AdapterManageParams(u8 + u64)]
|
|
59
|
+
*/
|
|
60
|
+
export declare function createAdapterManageIx(args: AdapterManageArgs, programId?: PublicKey): TransactionInstruction;
|
|
61
|
+
//# sourceMappingURL=adapter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/jlpd-strategy/adapter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,SAAS,EACT,sBAAsB,EACtB,WAAW,EACZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,OAAO,CAAC;AA+DvB,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,SAAS,CAAC;IACnB,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,SAAS,CAAC;IACvB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,SAAS,CAAC;IACxB,cAAc,EAAE,SAAS,CAAC;IAC1B,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC;IACpB,yEAAyE;IACzE,iBAAiB,CAAC,EAAE,WAAW,EAAE,CAAC;CACnC;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,oBAAoB,EAC1B,SAAS,GAAE,SAAsB,GAChC,sBAAsB,CAExB;AAMD,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,SAAS,CAAC;IACnB,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,SAAS,CAAC;IACvB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,SAAS,CAAC;IACxB,cAAc,EAAE,SAAS,CAAC;IAC1B,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,WAAW,EAAE,CAAC;CACnC;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,uBAAuB,EAC7B,SAAS,GAAE,SAAsB,GAChC,sBAAsB,CAExB;AAMD,4DAA4D;AAC5D,eAAO,MAAM,mBAAmB,IAAO,CAAC;AACxC,eAAO,MAAM,yBAAyB,IAAO,CAAC;AAC9C,eAAO,MAAM,0BAA0B,IAAO,CAAC;AAC/C,eAAO,MAAM,kBAAkB,IAAO,CAAC;AAEvC,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,SAAS,CAAC;IACnB,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,SAAS,CAAC;IACxB,cAAc,EAAE,SAAS,CAAC;IAC1B,mEAAmE;IACnE,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC;IACpB,+DAA+D;IAC/D,iBAAiB,CAAC,EAAE,WAAW,EAAE,CAAC;CACnC;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,iBAAiB,EACvB,SAAS,GAAE,SAAsB,GAChC,sBAAsB,CA2BxB"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* JLPD Adapter instruction builders.
|
|
4
|
+
*
|
|
5
|
+
* These build JLPD-side instructions (deposit_to_adapter, withdraw_from_adapter)
|
|
6
|
+
* that CPI into the earn adapter program.
|
|
7
|
+
*/
|
|
8
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.ADAPTER_DISC_REPAY = exports.ADAPTER_DISC_WITHDRAW_EARN = exports.ADAPTER_DISC_DEPOSIT_EARN = exports.ADAPTER_DISC_BORROW = void 0;
|
|
13
|
+
exports.createDepositToAdapterIx = createDepositToAdapterIx;
|
|
14
|
+
exports.createWithdrawFromAdapterIx = createWithdrawFromAdapterIx;
|
|
15
|
+
exports.createAdapterManageIx = createAdapterManageIx;
|
|
16
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
17
|
+
const bn_js_1 = __importDefault(require("bn.js"));
|
|
18
|
+
const constants_1 = require("./constants");
|
|
19
|
+
/**
|
|
20
|
+
* Internal helper — builds the instruction for deposit_to_adapter or
|
|
21
|
+
* withdraw_from_adapter. Both share the same account layout and data
|
|
22
|
+
* format (8-byte disc + u64 amount); only the discriminator differs.
|
|
23
|
+
*/
|
|
24
|
+
function buildAdapterIx(disc, args, programId) {
|
|
25
|
+
const { manager, config, managerRole, vaultJlpAta, adapterState, adapterProgram, amount, remainingAccounts = [], } = args;
|
|
26
|
+
const data = Buffer.alloc(16);
|
|
27
|
+
disc.copy(data, 0);
|
|
28
|
+
const amtBuf = typeof amount === "number" ? new bn_js_1.default(amount) : amount;
|
|
29
|
+
amtBuf.toArrayLike(Buffer, "le", 8).copy(data, 8);
|
|
30
|
+
return new web3_js_1.TransactionInstruction({
|
|
31
|
+
programId,
|
|
32
|
+
keys: [
|
|
33
|
+
{ pubkey: manager, isSigner: true, isWritable: false },
|
|
34
|
+
{ pubkey: config, isSigner: false, isWritable: true },
|
|
35
|
+
{ pubkey: managerRole, isSigner: false, isWritable: false },
|
|
36
|
+
{ pubkey: vaultJlpAta, isSigner: false, isWritable: true },
|
|
37
|
+
{ pubkey: adapterState, isSigner: false, isWritable: true },
|
|
38
|
+
{ pubkey: adapterProgram, isSigner: false, isWritable: false },
|
|
39
|
+
...remainingAccounts,
|
|
40
|
+
],
|
|
41
|
+
data,
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Build `deposit_to_adapter` instruction.
|
|
46
|
+
*
|
|
47
|
+
* Anchor data: [8-byte disc, DepositToAdapterParams(u64 + bool + u16 + u32)]
|
|
48
|
+
*/
|
|
49
|
+
function createDepositToAdapterIx(args, programId = constants_1.PROGRAM_ID) {
|
|
50
|
+
return buildAdapterIx(constants_1.IX_DEPOSIT_TO_ADAPTER, args, programId);
|
|
51
|
+
}
|
|
52
|
+
function createWithdrawFromAdapterIx(args, programId = constants_1.PROGRAM_ID) {
|
|
53
|
+
return buildAdapterIx(constants_1.IX_WITHDRAW_FROM_ADAPTER, args, programId);
|
|
54
|
+
}
|
|
55
|
+
// ============================================================================
|
|
56
|
+
// adapter_manage (generic: borrow, repay, deposit_earn, withdraw_earn)
|
|
57
|
+
// ============================================================================
|
|
58
|
+
/** Adapter instruction discriminators for adapter_manage */
|
|
59
|
+
exports.ADAPTER_DISC_BORROW = 0x03;
|
|
60
|
+
exports.ADAPTER_DISC_DEPOSIT_EARN = 0x04;
|
|
61
|
+
exports.ADAPTER_DISC_WITHDRAW_EARN = 0x05;
|
|
62
|
+
exports.ADAPTER_DISC_REPAY = 0x06;
|
|
63
|
+
/**
|
|
64
|
+
* Build `adapter_manage` instruction.
|
|
65
|
+
*
|
|
66
|
+
* Routes borrow/repay/earn operations through JLPD for config PDA signer propagation.
|
|
67
|
+
* Anchor data: [8-byte disc, AdapterManageParams(u8 + u64)]
|
|
68
|
+
*/
|
|
69
|
+
function createAdapterManageIx(args, programId = constants_1.PROGRAM_ID) {
|
|
70
|
+
const { manager, config, managerRole, adapterState, adapterProgram, adapterDisc, amount, remainingAccounts = [], } = args;
|
|
71
|
+
// Anchor data: [8-byte disc, adapter_disc: u8, amount: u64]
|
|
72
|
+
const data = Buffer.alloc(17);
|
|
73
|
+
constants_1.IX_ADAPTER_MANAGE.copy(data, 0);
|
|
74
|
+
data[8] = adapterDisc;
|
|
75
|
+
const amtBuf = typeof amount === "number" ? new bn_js_1.default(amount) : amount;
|
|
76
|
+
amtBuf.toArrayLike(Buffer, "le", 8).copy(data, 9);
|
|
77
|
+
return new web3_js_1.TransactionInstruction({
|
|
78
|
+
programId,
|
|
79
|
+
keys: [
|
|
80
|
+
{ pubkey: manager, isSigner: true, isWritable: false },
|
|
81
|
+
{ pubkey: config, isSigner: false, isWritable: true },
|
|
82
|
+
{ pubkey: managerRole, isSigner: false, isWritable: false },
|
|
83
|
+
// remaining_accounts: [adapter_state, adapter_program, ...jupiter accounts]
|
|
84
|
+
{ pubkey: adapterState, isSigner: false, isWritable: true },
|
|
85
|
+
{ pubkey: adapterProgram, isSigner: false, isWritable: false },
|
|
86
|
+
...remainingAccounts,
|
|
87
|
+
],
|
|
88
|
+
data,
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
//# sourceMappingURL=adapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/jlpd-strategy/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,16 +37,19 @@ export declare const IX_WITHDRAW: Buffer<ArrayBuffer>;
|
|
|
37
37
|
export declare const IX_UPDATE_AUM: Buffer<ArrayBuffer>;
|
|
38
38
|
export declare const IX_SWAP_JLP: Buffer<ArrayBuffer>;
|
|
39
39
|
export declare const IX_SETTLE_YIELD: Buffer<ArrayBuffer>;
|
|
40
|
+
export declare const IX_DEPOSIT_TO_ADAPTER: Buffer<ArrayBuffer>;
|
|
41
|
+
export declare const IX_WITHDRAW_FROM_ADAPTER: Buffer<ArrayBuffer>;
|
|
42
|
+
export declare const IX_ADAPTER_MANAGE: Buffer<ArrayBuffer>;
|
|
40
43
|
export declare const IX_ADD_MANAGER: Buffer<ArrayBuffer>;
|
|
41
44
|
export declare const IX_REMOVE_MANAGER: Buffer<ArrayBuffer>;
|
|
42
45
|
/** @deprecated Use IX_INIT_OR_UPDATE_CONFIG instead */
|
|
43
46
|
export declare const IX_INIT_OR_UPDATE_JLP_VAULT: Buffer<ArrayBuffer>;
|
|
44
|
-
export declare const JLPD_CONFIG_SIZE =
|
|
47
|
+
export declare const JLPD_CONFIG_SIZE = 392;
|
|
45
48
|
export declare const MANAGER_ROLE_SIZE = 80;
|
|
46
|
-
export declare const STRATEGY_STATE_SIZE =
|
|
47
|
-
export declare const STV_POSITION_SIZE =
|
|
49
|
+
export declare const STRATEGY_STATE_SIZE = 224;
|
|
50
|
+
export declare const STV_POSITION_SIZE = 120;
|
|
48
51
|
/** @deprecated Use JLPD_CONFIG_SIZE instead */
|
|
49
|
-
export declare const JLP_VAULT_SIZE =
|
|
52
|
+
export declare const JLP_VAULT_SIZE = 392;
|
|
50
53
|
export declare const FLAG_PAUSED = 1;
|
|
51
54
|
export declare const FLAG_DEPOSITS_DISABLED = 2;
|
|
52
55
|
export declare const FLAG_WITHDRAWALS_DISABLED = 4;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/jlpd-strategy/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,UAAU,WAAgE,CAAC;AACxF,eAAO,MAAM,kBAAkB,WAAa,CAAC;AAC7C,eAAO,MAAM,iBAAiB,WAAgE,CAAC;AAM/F,qBAAqB;AACrB,eAAO,MAAM,QAAQ,WAAgE,CAAC;AAEtF,gDAAgD;AAChD,eAAO,MAAM,eAAe,WAA+D,CAAC;AAE5F,uCAAuC;AACvC,eAAO,MAAM,aAAa,WAAgE,CAAC;AAE3F,uCAAuC;AACvC,eAAO,MAAM,aAAa,WAAgE,CAAC;AAE3F,uCAAuC;AACvC,eAAO,MAAM,aAAa,WAAgE,CAAC;AAE3F,2EAA2E;AAC3E,eAAO,MAAM,gBAAgB,WAAgE,CAAC;AAE9F,oCAAoC;AACpC,eAAO,MAAM,qBAAqB,WAA+D,CAAC;AAGlG,eAAO,MAAM,WAAW,qBAAwB,CAAC;AACjD,eAAO,MAAM,YAAY,qBAAyB,CAAC;AACnD,eAAO,MAAM,mBAAmB,qBAAgC,CAAC;AACjE,eAAO,MAAM,aAAa,qBAA0B,CAAC;AAErD,0CAA0C;AAC1C,eAAO,MAAM,cAAc,qBAAc,CAAC;AAI1C,eAAO,MAAM,gBAAgB,qBAAqD,CAAC;AAEnF,eAAO,MAAM,iBAAiB,qBAAuD,CAAC;AACtF,eAAO,MAAM,mBAAmB,qBAAqD,CAAC;AACtF,eAAO,MAAM,iBAAiB,qBAAqD,CAAC;AAEpF,+CAA+C;AAC/C,eAAO,MAAM,cAAc,qBAAmB,CAAC;AAG/C,eAAO,MAAM,wBAAwB,qBAAuD,CAAC;AAC7F,eAAO,MAAM,gCAAgC,qBAAkD,CAAC;AAChG,eAAO,MAAM,gBAAgB,qBAAkD,CAAC;AAChF,eAAO,MAAM,iBAAiB,qBAAiD,CAAC;AAChF,eAAO,MAAM,UAAU,qBAAsD,CAAC;AAC9E,eAAO,MAAM,WAAW,qBAAqD,CAAC;AAC9E,eAAO,MAAM,aAAa,qBAAqD,CAAC;AAChF,eAAO,MAAM,WAAW,qBAAuD,CAAC;AAChF,eAAO,MAAM,eAAe,qBAAkD,CAAC;AAE/E,eAAO,MAAM,cAAc,qBAAqD,CAAC;AAEjF,eAAO,MAAM,iBAAiB,qBAAmD,CAAC;AAElF,uDAAuD;AACvD,eAAO,MAAM,2BAA2B,qBAA2B,CAAC;AAGpE,eAAO,MAAM,gBAAgB,MAAM,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,mBAAmB,MAAM,CAAC;AACvC,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/jlpd-strategy/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,UAAU,WAAgE,CAAC;AACxF,eAAO,MAAM,kBAAkB,WAAa,CAAC;AAC7C,eAAO,MAAM,iBAAiB,WAAgE,CAAC;AAM/F,qBAAqB;AACrB,eAAO,MAAM,QAAQ,WAAgE,CAAC;AAEtF,gDAAgD;AAChD,eAAO,MAAM,eAAe,WAA+D,CAAC;AAE5F,uCAAuC;AACvC,eAAO,MAAM,aAAa,WAAgE,CAAC;AAE3F,uCAAuC;AACvC,eAAO,MAAM,aAAa,WAAgE,CAAC;AAE3F,uCAAuC;AACvC,eAAO,MAAM,aAAa,WAAgE,CAAC;AAE3F,2EAA2E;AAC3E,eAAO,MAAM,gBAAgB,WAAgE,CAAC;AAE9F,oCAAoC;AACpC,eAAO,MAAM,qBAAqB,WAA+D,CAAC;AAGlG,eAAO,MAAM,WAAW,qBAAwB,CAAC;AACjD,eAAO,MAAM,YAAY,qBAAyB,CAAC;AACnD,eAAO,MAAM,mBAAmB,qBAAgC,CAAC;AACjE,eAAO,MAAM,aAAa,qBAA0B,CAAC;AAErD,0CAA0C;AAC1C,eAAO,MAAM,cAAc,qBAAc,CAAC;AAI1C,eAAO,MAAM,gBAAgB,qBAAqD,CAAC;AAEnF,eAAO,MAAM,iBAAiB,qBAAuD,CAAC;AACtF,eAAO,MAAM,mBAAmB,qBAAqD,CAAC;AACtF,eAAO,MAAM,iBAAiB,qBAAqD,CAAC;AAEpF,+CAA+C;AAC/C,eAAO,MAAM,cAAc,qBAAmB,CAAC;AAG/C,eAAO,MAAM,wBAAwB,qBAAuD,CAAC;AAC7F,eAAO,MAAM,gCAAgC,qBAAkD,CAAC;AAChG,eAAO,MAAM,gBAAgB,qBAAkD,CAAC;AAChF,eAAO,MAAM,iBAAiB,qBAAiD,CAAC;AAChF,eAAO,MAAM,UAAU,qBAAsD,CAAC;AAC9E,eAAO,MAAM,WAAW,qBAAqD,CAAC;AAC9E,eAAO,MAAM,aAAa,qBAAqD,CAAC;AAChF,eAAO,MAAM,WAAW,qBAAuD,CAAC;AAChF,eAAO,MAAM,eAAe,qBAAkD,CAAC;AAE/E,eAAO,MAAM,qBAAqB,qBAAoD,CAAC;AAEvF,eAAO,MAAM,wBAAwB,qBAAqD,CAAC;AAE3F,eAAO,MAAM,iBAAiB,qBAAqD,CAAC;AAEpF,eAAO,MAAM,cAAc,qBAAqD,CAAC;AAEjF,eAAO,MAAM,iBAAiB,qBAAmD,CAAC;AAElF,uDAAuD;AACvD,eAAO,MAAM,2BAA2B,qBAA2B,CAAC;AAGpE,eAAO,MAAM,gBAAgB,MAAM,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,mBAAmB,MAAM,CAAC;AACvC,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC,+CAA+C;AAC/C,eAAO,MAAM,cAAc,MAAmB,CAAC;AAG/C,eAAO,MAAM,WAAW,IAAS,CAAC;AAClC,eAAO,MAAM,sBAAsB,IAAS,CAAC;AAC7C,eAAO,MAAM,yBAAyB,IAAS,CAAC;AAChD,eAAO,MAAM,iBAAiB,IAAS,CAAC;AACxC,eAAO,MAAM,uBAAuB,KAAS,CAAC;AAC9C,eAAO,MAAM,cAAc,KAAS,CAAC;AAGrC,eAAO,MAAM,UAAU,IAAI,CAAC;AAC5B,eAAO,MAAM,gBAAgB,MAAM,CAAC;AACpC,eAAO,MAAM,gBAAgB,OAAO,CAAC;AAErC,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEpE,0EAA0E;AAC1E,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAMjD,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.PPS_DECIMALS = exports.MAX_PERF_FEE_BPS = exports.MAX_MGMT_FEE_BPS = exports.NUM_ASSETS = exports.FLAG_TEST_MODE = exports.FLAG_REBALANCE_DISABLED = exports.FLAG_JLP_DISABLED = exports.FLAG_WITHDRAWALS_DISABLED = exports.FLAG_DEPOSITS_DISABLED = exports.FLAG_PAUSED = exports.JLP_VAULT_SIZE = exports.STV_POSITION_SIZE = exports.STRATEGY_STATE_SIZE = exports.MANAGER_ROLE_SIZE = exports.JLPD_CONFIG_SIZE = exports.IX_INIT_OR_UPDATE_JLP_VAULT = exports.IX_REMOVE_MANAGER = exports.IX_ADD_MANAGER = exports.IX_ADAPTER_MANAGE = exports.IX_WITHDRAW_FROM_ADAPTER = exports.IX_DEPOSIT_TO_ADAPTER = exports.IX_SETTLE_YIELD = exports.IX_SWAP_JLP = exports.IX_UPDATE_AUM = exports.IX_WITHDRAW = exports.IX_DEPOSIT = exports.IX_CLOSE_POSITION = exports.IX_INIT_POSITION = exports.IX_INIT_OR_UPDATE_STRATEGY_STATE = exports.IX_INIT_OR_UPDATE_CONFIG = exports.DISC_JLP_VAULT = exports.DISC_STV_POSITION = exports.DISC_STRATEGY_STATE = exports.DISC_MANAGER_ROLE = exports.DISC_JLPD_CONFIG = exports.JLP_VAULT_SEED = exports.POSITION_SEED = exports.STRATEGY_STATE_SEED = exports.MANAGER_SEED = exports.CONFIG_SEED = exports.JUPITER_PERPS_PROGRAM = exports.JLP_POOL_ACCOUNT = exports.DOVES_SOL_USD = exports.DOVES_ETH_USD = exports.DOVES_BTC_USD = exports.JUPITER_PROGRAM = exports.JLP_MINT = exports.PROGRAM_ID_DEVNET = exports.PROGRAM_ID_MAINNET = exports.PROGRAM_ID = void 0;
|
|
4
|
+
exports.JLPD_VAULT_IDS = exports.BPS_DENOMINATOR = void 0;
|
|
4
5
|
const web3_js_1 = require("@solana/web3.js");
|
|
5
6
|
exports.PROGRAM_ID = new web3_js_1.PublicKey("GXqt4ZH2UUBsLWwMNJiZMXza3q7xEGChfW8XjVRjLxr5");
|
|
6
7
|
exports.PROGRAM_ID_MAINNET = exports.PROGRAM_ID;
|
|
@@ -48,6 +49,12 @@ exports.IX_WITHDRAW = Buffer.from([183, 18, 70, 156, 148, 109, 161, 34]);
|
|
|
48
49
|
exports.IX_UPDATE_AUM = Buffer.from([162, 40, 227, 16, 84, 169, 182, 185]);
|
|
49
50
|
exports.IX_SWAP_JLP = Buffer.from([190, 44, 224, 191, 169, 243, 146, 127]);
|
|
50
51
|
exports.IX_SETTLE_YIELD = Buffer.from([64, 28, 44, 24, 43, 204, 58, 215]);
|
|
52
|
+
// sha256("global:deposit_to_adapter")[..8]
|
|
53
|
+
exports.IX_DEPOSIT_TO_ADAPTER = Buffer.from([123, 167, 9, 180, 75, 80, 195, 219]);
|
|
54
|
+
// sha256("global:withdraw_from_adapter")[..8]
|
|
55
|
+
exports.IX_WITHDRAW_FROM_ADAPTER = Buffer.from([87, 57, 243, 113, 157, 131, 135, 83]);
|
|
56
|
+
// sha256("global:adapter_manage")[..8]
|
|
57
|
+
exports.IX_ADAPTER_MANAGE = Buffer.from([210, 30, 127, 237, 109, 210, 2, 212]);
|
|
51
58
|
// sha256("global:add_manager")[..8]
|
|
52
59
|
exports.IX_ADD_MANAGER = Buffer.from([125, 38, 192, 212, 101, 91, 179, 16]);
|
|
53
60
|
// sha256("global:remove_manager")[..8]
|
|
@@ -55,10 +62,10 @@ exports.IX_REMOVE_MANAGER = Buffer.from([150, 55, 157, 77, 128, 148, 7, 15]);
|
|
|
55
62
|
/** @deprecated Use IX_INIT_OR_UPDATE_CONFIG instead */
|
|
56
63
|
exports.IX_INIT_OR_UPDATE_JLP_VAULT = exports.IX_INIT_OR_UPDATE_CONFIG;
|
|
57
64
|
// Account sizes
|
|
58
|
-
exports.JLPD_CONFIG_SIZE =
|
|
65
|
+
exports.JLPD_CONFIG_SIZE = 392;
|
|
59
66
|
exports.MANAGER_ROLE_SIZE = 80;
|
|
60
|
-
exports.STRATEGY_STATE_SIZE =
|
|
61
|
-
exports.STV_POSITION_SIZE =
|
|
67
|
+
exports.STRATEGY_STATE_SIZE = 224;
|
|
68
|
+
exports.STV_POSITION_SIZE = 120;
|
|
62
69
|
/** @deprecated Use JLPD_CONFIG_SIZE instead */
|
|
63
70
|
exports.JLP_VAULT_SIZE = exports.JLPD_CONFIG_SIZE;
|
|
64
71
|
// Flags
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/jlpd-strategy/constants.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/jlpd-strategy/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/jlpd-strategy/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/jlpd-strategy/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC"}
|
|
@@ -22,4 +22,7 @@ __exportStar(require("./instructions"), exports);
|
|
|
22
22
|
__exportStar(require("./swap-jlp"), exports);
|
|
23
23
|
__exportStar(require("./settle-yield"), exports);
|
|
24
24
|
__exportStar(require("./jlp-data"), exports);
|
|
25
|
+
__exportStar(require("./jlp-borrow"), exports);
|
|
26
|
+
__exportStar(require("./jupusd-earn"), exports);
|
|
27
|
+
__exportStar(require("./adapter"), exports);
|
|
25
28
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/jlpd-strategy/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,0CAAwB;AACxB,wCAAsB;AACtB,6CAA2B;AAC3B,iDAA+B;AAC/B,6CAA2B;AAC3B,iDAA+B;AAC/B,6CAA2B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/jlpd-strategy/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,0CAAwB;AACxB,wCAAsB;AACtB,6CAA2B;AAC3B,iDAA+B;AAC/B,6CAA2B;AAC3B,iDAA+B;AAC/B,6CAA2B;AAC3B,+CAA6B;AAC7B,gDAA8B;AAC9B,4CAA0B"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Jupiter Lend Borrow (Fluid Vaults) — account constants and position reading.
|
|
3
|
+
*
|
|
4
|
+
* The instruction builders for deposit/withdraw are in adapter.ts.
|
|
5
|
+
* This file provides static account addresses and position parsing utilities.
|
|
6
|
+
*/
|
|
7
|
+
import { PublicKey } from "@solana/web3.js";
|
|
8
|
+
import BN from "bn.js";
|
|
9
|
+
export declare const JUP_LEND_BORROW_PROGRAM: PublicKey;
|
|
10
|
+
export declare const BORROW_VAULT_CONFIG: PublicKey;
|
|
11
|
+
export declare const BORROW_VAULT_STATE: PublicKey;
|
|
12
|
+
export declare const BORROW_ORACLE: PublicKey;
|
|
13
|
+
export declare const SUPPLY_RESERVES_LIQUIDITY: PublicKey;
|
|
14
|
+
export declare const BORROW_RESERVES_LIQUIDITY: PublicKey;
|
|
15
|
+
export declare const VAULT_SUPPLY_POS_ON_LIQ: PublicKey;
|
|
16
|
+
export declare const VAULT_BORROW_POS_ON_LIQ: PublicKey;
|
|
17
|
+
export declare const SUPPLY_RATE_MODEL: PublicKey;
|
|
18
|
+
export declare const BORROW_RATE_MODEL: PublicKey;
|
|
19
|
+
export declare const VAULT_SUPPLY_ATA: PublicKey;
|
|
20
|
+
export declare const VAULT_BORROW_ATA: PublicKey;
|
|
21
|
+
export declare const NEW_BRANCH: PublicKey;
|
|
22
|
+
export declare const LIQUIDITY: PublicKey;
|
|
23
|
+
export declare const LIQUIDITY_PROGRAM: PublicKey;
|
|
24
|
+
export declare const ORACLE_PROGRAM: PublicKey;
|
|
25
|
+
export declare const JLP_JUPUSD_VAULT_ID = 58;
|
|
26
|
+
export declare const POSITION_DISCRIMINATOR: Buffer<ArrayBuffer>;
|
|
27
|
+
export interface BorrowPosition {
|
|
28
|
+
tick: number;
|
|
29
|
+
supplyAmount: BN;
|
|
30
|
+
dustDebtAmount: BN;
|
|
31
|
+
positionMint: PublicKey;
|
|
32
|
+
}
|
|
33
|
+
export declare function parsePosition(data: Buffer): BorrowPosition;
|
|
34
|
+
export declare function readBorrowExchangePrice(vaultStateData: Buffer): BN;
|
|
35
|
+
//# sourceMappingURL=jlp-borrow.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jlp-borrow.d.ts","sourceRoot":"","sources":["../../src/jlpd-strategy/jlp-borrow.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,MAAM,OAAO,CAAC;AAOvB,eAAO,MAAM,uBAAuB,WAEnC,CAAC;AAMF,eAAO,MAAM,mBAAmB,WAAgE,CAAC;AACjG,eAAO,MAAM,kBAAkB,WAAgE,CAAC;AAChG,eAAO,MAAM,aAAa,WAAgE,CAAC;AAC3F,eAAO,MAAM,yBAAyB,WAAgE,CAAC;AACvG,eAAO,MAAM,yBAAyB,WAAgE,CAAC;AACvG,eAAO,MAAM,uBAAuB,WAA+D,CAAC;AACpG,eAAO,MAAM,uBAAuB,WAAgE,CAAC;AACrG,eAAO,MAAM,iBAAiB,WAAgE,CAAC;AAC/F,eAAO,MAAM,iBAAiB,WAAgE,CAAC;AAC/F,eAAO,MAAM,gBAAgB,WAAgE,CAAC;AAC9F,eAAO,MAAM,gBAAgB,WAAgE,CAAC;AAC9F,eAAO,MAAM,UAAU,WAAgE,CAAC;AACxF,eAAO,MAAM,SAAS,WAAgE,CAAC;AACvF,eAAO,MAAM,iBAAiB,WAA+D,CAAC;AAC9F,eAAO,MAAM,cAAc,WAA+D,CAAC;AAE3F,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAMtC,eAAO,MAAM,sBAAsB,qBAAgE,CAAC;AAEpG,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,EAAE,CAAC;IACjB,cAAc,EAAE,EAAE,CAAC;IACnB,YAAY,EAAE,SAAS,CAAC;CACzB;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAU1D;AAED,wBAAgB,uBAAuB,CAAC,cAAc,EAAE,MAAM,GAAG,EAAE,CAGlE"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Jupiter Lend Borrow (Fluid Vaults) — account constants and position reading.
|
|
4
|
+
*
|
|
5
|
+
* The instruction builders for deposit/withdraw are in adapter.ts.
|
|
6
|
+
* This file provides static account addresses and position parsing utilities.
|
|
7
|
+
*/
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.POSITION_DISCRIMINATOR = exports.JLP_JUPUSD_VAULT_ID = exports.ORACLE_PROGRAM = exports.LIQUIDITY_PROGRAM = exports.LIQUIDITY = exports.NEW_BRANCH = exports.VAULT_BORROW_ATA = exports.VAULT_SUPPLY_ATA = exports.BORROW_RATE_MODEL = exports.SUPPLY_RATE_MODEL = exports.VAULT_BORROW_POS_ON_LIQ = exports.VAULT_SUPPLY_POS_ON_LIQ = exports.BORROW_RESERVES_LIQUIDITY = exports.SUPPLY_RESERVES_LIQUIDITY = exports.BORROW_ORACLE = exports.BORROW_VAULT_STATE = exports.BORROW_VAULT_CONFIG = exports.JUP_LEND_BORROW_PROGRAM = void 0;
|
|
10
|
+
exports.parsePosition = parsePosition;
|
|
11
|
+
exports.readBorrowExchangePrice = readBorrowExchangePrice;
|
|
12
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
13
|
+
const buffer_1 = require("../common/buffer");
|
|
14
|
+
// ============================================================================
|
|
15
|
+
// Jupiter Lend Borrow Program
|
|
16
|
+
// ============================================================================
|
|
17
|
+
exports.JUP_LEND_BORROW_PROGRAM = new web3_js_1.PublicKey("jupr81YtYssSyPt8jbnGuiWon5f6x9TcDEFxYe3Bdzi");
|
|
18
|
+
// ============================================================================
|
|
19
|
+
// JLP → JupUSD Fluid Vault — Static Accounts
|
|
20
|
+
// ============================================================================
|
|
21
|
+
exports.BORROW_VAULT_CONFIG = new web3_js_1.PublicKey("3b5bK5PspMmVmA6ZkqXcKtLTskPJGvkJZqjCezspLBu8");
|
|
22
|
+
exports.BORROW_VAULT_STATE = new web3_js_1.PublicKey("4nzptpV8dMv9D6CnsqmNMQJ5TVnRGQDES75a1FWi23YL");
|
|
23
|
+
exports.BORROW_ORACLE = new web3_js_1.PublicKey("25UZhqEoQeMA2ovbM1PgwZbU3NGUA8eM2y5g1j58YmFV");
|
|
24
|
+
exports.SUPPLY_RESERVES_LIQUIDITY = new web3_js_1.PublicKey("2cYcYwTWHkiszdzDs8aPq1fkcpipJ8zVEzwCXo5RzXpx");
|
|
25
|
+
exports.BORROW_RESERVES_LIQUIDITY = new web3_js_1.PublicKey("2tQE8jVR5ezDw3PDa21BNzfyQ14Ug5cTf6n3swJNjkod");
|
|
26
|
+
exports.VAULT_SUPPLY_POS_ON_LIQ = new web3_js_1.PublicKey("fHbvnrFe9ywN9hc8SZHdxFUcMWrgSMmVXfYdizQALkR");
|
|
27
|
+
exports.VAULT_BORROW_POS_ON_LIQ = new web3_js_1.PublicKey("2fewCticRvPLQbC1EczxF7Fv46J7HK9hdyTHVopy1Wg9");
|
|
28
|
+
exports.SUPPLY_RATE_MODEL = new web3_js_1.PublicKey("9miY226e1qR9YgHfCE6hTKTxMRiyFZSUUTcdeZD6Ntmw");
|
|
29
|
+
exports.BORROW_RATE_MODEL = new web3_js_1.PublicKey("2hT44GA9r5PiqsbbmqN5CuF7ymtquoEdokRncAs9CVej");
|
|
30
|
+
exports.VAULT_SUPPLY_ATA = new web3_js_1.PublicKey("EJ6CLvJPJErjkUnPQicVahzw4Q4NHLfpDV9knoP7iqfK");
|
|
31
|
+
exports.VAULT_BORROW_ATA = new web3_js_1.PublicKey("9kGqd5zsQGaFfFPdUuEgbRM4V7x72Jdt7WTS4uRouAQ7");
|
|
32
|
+
exports.NEW_BRANCH = new web3_js_1.PublicKey("BpdVtFA1FmQkXdcdjPNDb3TL86VdKcHqRU9dNfBrRD1i");
|
|
33
|
+
exports.LIQUIDITY = new web3_js_1.PublicKey("7s1da8DduuBFqGra5bJBjpnvL5E9mGzCuMk1Qkh4or2Z");
|
|
34
|
+
exports.LIQUIDITY_PROGRAM = new web3_js_1.PublicKey("jupeiUmn818Jg1ekPURTpr4mFo29p46vygyykFJ3wZC");
|
|
35
|
+
exports.ORACLE_PROGRAM = new web3_js_1.PublicKey("jupnw4B6Eqs7ft6rxpzYLJZYSnrpRgPcr589n5Kv4oc");
|
|
36
|
+
exports.JLP_JUPUSD_VAULT_ID = 58;
|
|
37
|
+
// ============================================================================
|
|
38
|
+
// Position Account Parsing
|
|
39
|
+
// ============================================================================
|
|
40
|
+
exports.POSITION_DISCRIMINATOR = Buffer.from([0xaa, 0xbc, 0x8f, 0xe4, 0x7a, 0x40, 0xf7, 0xd0]);
|
|
41
|
+
function parsePosition(data) {
|
|
42
|
+
if (data.length < 71)
|
|
43
|
+
throw new Error(`Position data too short: ${data.length}`);
|
|
44
|
+
const disc = data.subarray(0, 8);
|
|
45
|
+
if (!disc.equals(exports.POSITION_DISCRIMINATOR))
|
|
46
|
+
throw new Error("Invalid Position discriminator");
|
|
47
|
+
return {
|
|
48
|
+
positionMint: new web3_js_1.PublicKey(data.subarray(14, 46)),
|
|
49
|
+
tick: data.readInt32LE(47),
|
|
50
|
+
supplyAmount: (0, buffer_1.readU64)(data, 55),
|
|
51
|
+
dustDebtAmount: (0, buffer_1.readU64)(data, 63),
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
function readBorrowExchangePrice(vaultStateData) {
|
|
55
|
+
if (vaultStateData.length < 115)
|
|
56
|
+
throw new Error("VaultState data too short");
|
|
57
|
+
return (0, buffer_1.readU64)(vaultStateData, 107);
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=jlp-borrow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jlp-borrow.js","sourceRoot":"","sources":["../../src/jlpd-strategy/jlp-borrow.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAiDH,sCAUC;AAED,0DAGC;AA9DD,6CAAwD;AAExD,6CAA2C;AAE3C,+EAA+E;AAC/E,8BAA8B;AAC9B,+EAA+E;AAElE,QAAA,uBAAuB,GAAG,IAAI,mBAAS,CAClD,6CAA6C,CAC9C,CAAC;AAEF,+EAA+E;AAC/E,6CAA6C;AAC7C,+EAA+E;AAElE,QAAA,mBAAmB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AACpF,QAAA,kBAAkB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AACnF,QAAA,aAAa,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAC9E,QAAA,yBAAyB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAC1F,QAAA,yBAAyB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAC1F,QAAA,uBAAuB,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AACvF,QAAA,uBAAuB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AACxF,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAClF,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAClF,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AACjF,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AACjF,QAAA,UAAU,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAC3E,QAAA,SAAS,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAC1E,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AACjF,QAAA,cAAc,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AAE9E,QAAA,mBAAmB,GAAG,EAAE,CAAC;AAEtC,+EAA+E;AAC/E,2BAA2B;AAC3B,+EAA+E;AAElE,QAAA,sBAAsB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AASpG,SAAgB,aAAa,CAAC,IAAY;IACxC,IAAI,IAAI,CAAC,MAAM,GAAG,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACjF,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,8BAAsB,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAC5F,OAAO;QACL,YAAY,EAAE,IAAI,mBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAClD,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;QAC1B,YAAY,EAAE,IAAA,gBAAO,EAAC,IAAI,EAAE,EAAE,CAAC;QAC/B,cAAc,EAAE,IAAA,gBAAO,EAAC,IAAI,EAAE,EAAE,CAAC;KAClC,CAAC;AACJ,CAAC;AAED,SAAgB,uBAAuB,CAAC,cAAsB;IAC5D,IAAI,cAAc,CAAC,MAAM,GAAG,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC9E,OAAO,IAAA,gBAAO,EAAC,cAAc,EAAE,GAAG,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Jupiter Lend Earn SDK helpers for JLPD Strategy.
|
|
3
|
+
*
|
|
4
|
+
* Provides instruction builder and position reading for depositing
|
|
5
|
+
* borrowed JupUSD into Jupiter Lend Earn for yield.
|
|
6
|
+
*
|
|
7
|
+
* Reuses the JupUSD pool config from elemental-lend/jupiter-lend.ts
|
|
8
|
+
* since it's the same Jupiter Lend Earn program and pool.
|
|
9
|
+
*/
|
|
10
|
+
import { Connection, PublicKey } from "@solana/web3.js";
|
|
11
|
+
import BN from "bn.js";
|
|
12
|
+
export declare const JUP_LEND_EARN_PROGRAM: PublicKey;
|
|
13
|
+
export declare const JUPUSD_LENDING: PublicKey;
|
|
14
|
+
export declare const JUPUSD_FTOKEN_MINT: PublicKey;
|
|
15
|
+
export declare const JUPUSD_RESERVES_LIQUIDITY: PublicKey;
|
|
16
|
+
export declare const JUPUSD_SUPPLY_POS_ON_LIQ: PublicKey;
|
|
17
|
+
export declare const JUPUSD_RATE_MODEL: PublicKey;
|
|
18
|
+
export declare const JUPUSD_VAULT: PublicKey;
|
|
19
|
+
export declare const JUPUSD_REWARDS_RATE_MODEL: PublicKey;
|
|
20
|
+
export declare const JUPUSD_LENDING_ADMIN: PublicKey;
|
|
21
|
+
/**
|
|
22
|
+
* Read the earn exchange rate from lending account + rewards model.
|
|
23
|
+
* Returns the rate scaled to 1e12.
|
|
24
|
+
*/
|
|
25
|
+
export declare function computeExchangeRate(lendingData: Buffer, rewardsModelData: Buffer, fTokenTotalSupply: BN, currentTimestamp: number): bigint;
|
|
26
|
+
/**
|
|
27
|
+
* Compute the value of fTokens in JupUSD (native 6-decimal).
|
|
28
|
+
*/
|
|
29
|
+
export declare function computeFTokenValue(fTokenBalance: BN, exchangeRate: bigint): BN;
|
|
30
|
+
export interface EarnAprBreakdown {
|
|
31
|
+
lendingApr: number;
|
|
32
|
+
rewardsApr: number;
|
|
33
|
+
totalApr: number;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Compute earn APR breakdown: base lending + rewards.
|
|
37
|
+
*
|
|
38
|
+
* Total APR is derived by projecting the exchange rate 1 year forward
|
|
39
|
+
* (captures both lending yield and rewards). Rewards APR is isolated
|
|
40
|
+
* from yearly_reward / total_assets. Base = total - rewards.
|
|
41
|
+
*/
|
|
42
|
+
/**
|
|
43
|
+
* Compute earn APR breakdown: base lending + rewards.
|
|
44
|
+
*
|
|
45
|
+
* Reads the liquidity pool's supply rate from the liquidity account,
|
|
46
|
+
* and the rewards rate from the rewards model. Requires the liquidity
|
|
47
|
+
* account data as an additional parameter.
|
|
48
|
+
*
|
|
49
|
+
* @param rewardsModelData - Rewards rate model account data
|
|
50
|
+
* @param fTokenTotalSupply - fToken total supply (from mint)
|
|
51
|
+
* @param tokenExchangePrice - From lending account offset 115
|
|
52
|
+
* @param liquiditySupplyRate - Supply rate from liquidity pool (pass 0 if unknown)
|
|
53
|
+
*/
|
|
54
|
+
export declare function computeEarnApr(rewardsModelData: Buffer, fTokenTotalSupply: BN, tokenExchangePrice: bigint, liquiditySupplyRate?: number): EarnAprBreakdown;
|
|
55
|
+
export interface EarnPositionInfo {
|
|
56
|
+
fTokenBalance: BN;
|
|
57
|
+
jupusdValue: BN;
|
|
58
|
+
apr: EarnAprBreakdown;
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Fetch the earn position for a jlpd_config PDA.
|
|
62
|
+
* Returns null if no fToken ATA exists.
|
|
63
|
+
*/
|
|
64
|
+
export declare function fetchEarnPosition(connection: Connection, fTokenAta: PublicKey): Promise<EarnPositionInfo | null>;
|
|
65
|
+
//# sourceMappingURL=jupusd-earn.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jupusd-earn.d.ts","sourceRoot":"","sources":["../../src/jlpd-strategy/jupusd-earn.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,MAAM,OAAO,CAAC;AAOvB,eAAO,MAAM,qBAAqB,WAEjC,CAAC;AAOF,eAAO,MAAM,cAAc,WAA+D,CAAC;AAC3F,eAAO,MAAM,kBAAkB,WAAgE,CAAC;AAChG,eAAO,MAAM,yBAAyB,WAAgE,CAAC;AACvG,eAAO,MAAM,wBAAwB,WAAgE,CAAC;AACtG,eAAO,MAAM,iBAAiB,WAAgE,CAAC;AAC/F,eAAO,MAAM,YAAY,WAAgE,CAAC;AAC1F,eAAO,MAAM,yBAAyB,WAAgE,CAAC;AACvG,eAAO,MAAM,oBAAoB,WAAgE,CAAC;AAclG;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,EAAE,EACrB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CA4BR;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,EAAE,CAG9E;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;GAMG;AACH;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAC5B,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,EAAE,EACrB,kBAAkB,EAAE,MAAM,EAC1B,mBAAmB,CAAC,EAAE,MAAM,GAC3B,gBAAgB,CAqBlB;AAMD,MAAM,WAAW,gBAAgB;IAC/B,aAAa,EAAE,EAAE,CAAC;IAClB,WAAW,EAAE,EAAE,CAAC;IAChB,GAAG,EAAE,gBAAgB,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CA6BlC"}
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Jupiter Lend Earn SDK helpers for JLPD Strategy.
|
|
4
|
+
*
|
|
5
|
+
* Provides instruction builder and position reading for depositing
|
|
6
|
+
* borrowed JupUSD into Jupiter Lend Earn for yield.
|
|
7
|
+
*
|
|
8
|
+
* Reuses the JupUSD pool config from elemental-lend/jupiter-lend.ts
|
|
9
|
+
* since it's the same Jupiter Lend Earn program and pool.
|
|
10
|
+
*/
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.JUPUSD_LENDING_ADMIN = exports.JUPUSD_REWARDS_RATE_MODEL = exports.JUPUSD_VAULT = exports.JUPUSD_RATE_MODEL = exports.JUPUSD_SUPPLY_POS_ON_LIQ = exports.JUPUSD_RESERVES_LIQUIDITY = exports.JUPUSD_FTOKEN_MINT = exports.JUPUSD_LENDING = exports.JUP_LEND_EARN_PROGRAM = void 0;
|
|
16
|
+
exports.computeExchangeRate = computeExchangeRate;
|
|
17
|
+
exports.computeFTokenValue = computeFTokenValue;
|
|
18
|
+
exports.computeEarnApr = computeEarnApr;
|
|
19
|
+
exports.fetchEarnPosition = fetchEarnPosition;
|
|
20
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
21
|
+
const bn_js_1 = __importDefault(require("bn.js"));
|
|
22
|
+
const buffer_1 = require("../common/buffer");
|
|
23
|
+
// ============================================================================
|
|
24
|
+
// Jupiter Lend Earn Program
|
|
25
|
+
// ============================================================================
|
|
26
|
+
exports.JUP_LEND_EARN_PROGRAM = new web3_js_1.PublicKey("jup3YeL8QhtSx1e253b2FDvsMNC87fDrgQZivbrndc9");
|
|
27
|
+
// ============================================================================
|
|
28
|
+
// JupUSD Earn Pool — Static Accounts (same pool as elemental-lend)
|
|
29
|
+
// ============================================================================
|
|
30
|
+
const EARN_MINT = new web3_js_1.PublicKey("JuprjznTrTSp2UFa3ZBUFgwdAmtZCq4MQCwysN55USD");
|
|
31
|
+
exports.JUPUSD_LENDING = new web3_js_1.PublicKey("papYEgeG5uPE4niUWZhihUUzVVotJn1mAWbYo2UBSHi");
|
|
32
|
+
exports.JUPUSD_FTOKEN_MINT = new web3_js_1.PublicKey("7GxATsNMnaC88vdwd2t3mwrFuQwwGvmYPrUQ4D6FotXk");
|
|
33
|
+
exports.JUPUSD_RESERVES_LIQUIDITY = new web3_js_1.PublicKey("2tQE8jVR5ezDw3PDa21BNzfyQ14Ug5cTf6n3swJNjkod");
|
|
34
|
+
exports.JUPUSD_SUPPLY_POS_ON_LIQ = new web3_js_1.PublicKey("DXFoJruECdEch2KpzLQ2cSpxoBSsyg4bpYPnHYofsbD4");
|
|
35
|
+
exports.JUPUSD_RATE_MODEL = new web3_js_1.PublicKey("2hT44GA9r5PiqsbbmqN5CuF7ymtquoEdokRncAs9CVej");
|
|
36
|
+
exports.JUPUSD_VAULT = new web3_js_1.PublicKey("9kGqd5zsQGaFfFPdUuEgbRM4V7x72Jdt7WTS4uRouAQ7");
|
|
37
|
+
exports.JUPUSD_REWARDS_RATE_MODEL = new web3_js_1.PublicKey("E3U32h49TL9Qof3NeLja9qJxTrGYpY1o1NQPtrSLJjcc");
|
|
38
|
+
exports.JUPUSD_LENDING_ADMIN = new web3_js_1.PublicKey("5nmGjA4s7ATzpBQXC5RNceRpaJ7pYw2wKsNBWyuSAZV6");
|
|
39
|
+
const LIQUIDITY = new web3_js_1.PublicKey("7s1da8DduuBFqGra5bJBjpnvL5E9mGzCuMk1Qkh4or2Z");
|
|
40
|
+
const LIQUIDITY_PROGRAM = new web3_js_1.PublicKey("jupeiUmn818Jg1ekPURTpr4mFo29p46vygyykFJ3wZC");
|
|
41
|
+
const TOKEN_PROGRAM = new web3_js_1.PublicKey("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
|
|
42
|
+
const ATA_PROGRAM = new web3_js_1.PublicKey("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
|
|
43
|
+
// ============================================================================
|
|
44
|
+
// Exchange Rate / APR Computation
|
|
45
|
+
// ============================================================================
|
|
46
|
+
const EXCHANGE_PRICES_PRECISION = 1000000000000n; // 1e12
|
|
47
|
+
const SECONDS_PER_YEAR = 31536000;
|
|
48
|
+
/**
|
|
49
|
+
* Read the earn exchange rate from lending account + rewards model.
|
|
50
|
+
* Returns the rate scaled to 1e12.
|
|
51
|
+
*/
|
|
52
|
+
function computeExchangeRate(lendingData, rewardsModelData, fTokenTotalSupply, currentTimestamp) {
|
|
53
|
+
if (lendingData.length < 131)
|
|
54
|
+
throw new Error("Lending data too short");
|
|
55
|
+
// Base exchange price (offset 115, u64 LE, 1e12 precision)
|
|
56
|
+
const baseRate = (0, buffer_1.readU64)(lendingData, 115).toNumber();
|
|
57
|
+
const lastUpdate = (0, buffer_1.readU64)(lendingData, 123).toNumber();
|
|
58
|
+
// Rewards rate model (offset 56: start_time, 64: yearly_reward)
|
|
59
|
+
if (rewardsModelData.length < 72)
|
|
60
|
+
return BigInt(baseRate);
|
|
61
|
+
const startTime = (0, buffer_1.readU64)(rewardsModelData, 56).toNumber();
|
|
62
|
+
const yearlyReward = (0, buffer_1.readU64)(rewardsModelData, 64).toNumber();
|
|
63
|
+
if (yearlyReward === 0 || fTokenTotalSupply.isZero())
|
|
64
|
+
return BigInt(baseRate);
|
|
65
|
+
// Compute time-accrued rewards since last update
|
|
66
|
+
const elapsed = Math.max(0, currentTimestamp - Math.max(lastUpdate, startTime));
|
|
67
|
+
const totalAssets = Number((BigInt(fTokenTotalSupply.toString()) * BigInt(baseRate)) / EXCHANGE_PRICES_PRECISION);
|
|
68
|
+
if (totalAssets === 0)
|
|
69
|
+
return BigInt(baseRate);
|
|
70
|
+
// rewards_return = yearly_reward * elapsed / SECONDS_PER_YEAR / total_assets
|
|
71
|
+
// new_rate = base_rate + base_rate * rewards_return / 1e14
|
|
72
|
+
const rewardAmount = (yearlyReward * elapsed) / SECONDS_PER_YEAR;
|
|
73
|
+
const rewardsReturn = Math.floor((rewardAmount * 1e14) / totalAssets);
|
|
74
|
+
const newRate = BigInt(baseRate) + (BigInt(baseRate) * BigInt(rewardsReturn)) / 100000000000000n;
|
|
75
|
+
return newRate;
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* Compute the value of fTokens in JupUSD (native 6-decimal).
|
|
79
|
+
*/
|
|
80
|
+
function computeFTokenValue(fTokenBalance, exchangeRate) {
|
|
81
|
+
const value = (BigInt(fTokenBalance.toString()) * exchangeRate) / EXCHANGE_PRICES_PRECISION;
|
|
82
|
+
return new bn_js_1.default(value.toString());
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Compute earn APR breakdown: base lending + rewards.
|
|
86
|
+
*
|
|
87
|
+
* Total APR is derived by projecting the exchange rate 1 year forward
|
|
88
|
+
* (captures both lending yield and rewards). Rewards APR is isolated
|
|
89
|
+
* from yearly_reward / total_assets. Base = total - rewards.
|
|
90
|
+
*/
|
|
91
|
+
/**
|
|
92
|
+
* Compute earn APR breakdown: base lending + rewards.
|
|
93
|
+
*
|
|
94
|
+
* Reads the liquidity pool's supply rate from the liquidity account,
|
|
95
|
+
* and the rewards rate from the rewards model. Requires the liquidity
|
|
96
|
+
* account data as an additional parameter.
|
|
97
|
+
*
|
|
98
|
+
* @param rewardsModelData - Rewards rate model account data
|
|
99
|
+
* @param fTokenTotalSupply - fToken total supply (from mint)
|
|
100
|
+
* @param tokenExchangePrice - From lending account offset 115
|
|
101
|
+
* @param liquiditySupplyRate - Supply rate from liquidity pool (pass 0 if unknown)
|
|
102
|
+
*/
|
|
103
|
+
function computeEarnApr(rewardsModelData, fTokenTotalSupply, tokenExchangePrice, liquiditySupplyRate) {
|
|
104
|
+
const zero = { lendingApr: 0, rewardsApr: 0, totalApr: 0 };
|
|
105
|
+
if (rewardsModelData.length < 72)
|
|
106
|
+
return zero;
|
|
107
|
+
if (fTokenTotalSupply.isZero() || tokenExchangePrice === 0n)
|
|
108
|
+
return zero;
|
|
109
|
+
// Rewards APR: yearly_reward / total_assets * 100
|
|
110
|
+
const yearlyReward = Number((0, buffer_1.readU64)(rewardsModelData, 64).toString());
|
|
111
|
+
const totalAssets = Number(BigInt(fTokenTotalSupply.toString()) * tokenExchangePrice / EXCHANGE_PRICES_PRECISION);
|
|
112
|
+
const rewardsApr = totalAssets > 0 ? (yearlyReward / totalAssets) * 100 : 0;
|
|
113
|
+
// Lending APR: from liquidity pool supply rate if provided
|
|
114
|
+
// The lend-read SDK returns supplyRate as an integer where /100 = %
|
|
115
|
+
const lendingApr = liquiditySupplyRate != null ? liquiditySupplyRate / 100 : 0;
|
|
116
|
+
return {
|
|
117
|
+
lendingApr,
|
|
118
|
+
rewardsApr,
|
|
119
|
+
totalApr: lendingApr + rewardsApr,
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* Fetch the earn position for a jlpd_config PDA.
|
|
124
|
+
* Returns null if no fToken ATA exists.
|
|
125
|
+
*/
|
|
126
|
+
async function fetchEarnPosition(connection, fTokenAta) {
|
|
127
|
+
const [ataInfo, lendingInfo, rewardsInfo, mintInfo] = await connection.getMultipleAccountsInfo([
|
|
128
|
+
fTokenAta,
|
|
129
|
+
exports.JUPUSD_LENDING,
|
|
130
|
+
exports.JUPUSD_REWARDS_RATE_MODEL,
|
|
131
|
+
exports.JUPUSD_FTOKEN_MINT,
|
|
132
|
+
]);
|
|
133
|
+
if (!ataInfo || !lendingInfo || !rewardsInfo || !mintInfo)
|
|
134
|
+
return null;
|
|
135
|
+
// Read fToken balance from token account (offset 64, u64)
|
|
136
|
+
const ataData = ataInfo.data;
|
|
137
|
+
if (ataData.length < 72)
|
|
138
|
+
return null;
|
|
139
|
+
const fTokenBalance = (0, buffer_1.readU64)(ataData, 64);
|
|
140
|
+
// Read fToken total supply from mint (offset 36, u64)
|
|
141
|
+
const mintData = mintInfo.data;
|
|
142
|
+
const fTokenSupply = (0, buffer_1.readU64)(mintData, 36);
|
|
143
|
+
const lendingData = lendingInfo.data;
|
|
144
|
+
const rewardsData = rewardsInfo.data;
|
|
145
|
+
const tokenExchangePrice = BigInt((0, buffer_1.readU64)(lendingData, 115).toString());
|
|
146
|
+
const now = Math.floor(Date.now() / 1000);
|
|
147
|
+
const exchangeRate = computeExchangeRate(lendingData, rewardsData, fTokenSupply, now);
|
|
148
|
+
const jupusdValue = computeFTokenValue(fTokenBalance, exchangeRate);
|
|
149
|
+
const apr = computeEarnApr(rewardsData, fTokenSupply, tokenExchangePrice);
|
|
150
|
+
return { fTokenBalance, jupusdValue, apr };
|
|
151
|
+
}
|
|
152
|
+
//# sourceMappingURL=jupusd-earn.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jupusd-earn.js","sourceRoot":"","sources":["../../src/jlpd-strategy/jupusd-earn.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;;;AA4CH,kDAiCC;AAKD,gDAGC;AA2BD,wCA0BC;AAgBD,8CAgCC;AAxLD,6CAAwD;AACxD,kDAAuB;AACvB,6CAA2C;AAE3C,+EAA+E;AAC/E,4BAA4B;AAC5B,+EAA+E;AAElE,QAAA,qBAAqB,GAAG,IAAI,mBAAS,CAChD,6CAA6C,CAC9C,CAAC;AAEF,+EAA+E;AAC/E,mEAAmE;AACnE,+EAA+E;AAE/E,MAAM,SAAS,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AAClE,QAAA,cAAc,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AAC9E,QAAA,kBAAkB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AACnF,QAAA,yBAAyB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAC1F,QAAA,wBAAwB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AACzF,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAClF,QAAA,YAAY,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAC7E,QAAA,yBAAyB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAC1F,QAAA,oBAAoB,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAElG,MAAM,SAAS,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAChF,MAAM,iBAAiB,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AACvF,MAAM,aAAa,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AACnF,MAAM,WAAW,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;AAElF,+EAA+E;AAC/E,kCAAkC;AAClC,+EAA+E;AAE/E,MAAM,yBAAyB,GAAG,cAAkB,CAAC,CAAC,OAAO;AAC7D,MAAM,gBAAgB,GAAG,QAAU,CAAC;AAEpC;;;GAGG;AACH,SAAgB,mBAAmB,CACjC,WAAmB,EACnB,gBAAwB,EACxB,iBAAqB,EACrB,gBAAwB;IAExB,IAAI,WAAW,CAAC,MAAM,GAAG,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAExE,2DAA2D;IAC3D,MAAM,QAAQ,GAAG,IAAA,gBAAO,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;IACtD,MAAM,UAAU,GAAG,IAAA,gBAAO,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;IAExD,gEAAgE;IAChE,IAAI,gBAAgB,CAAC,MAAM,GAAG,EAAE;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1D,MAAM,SAAS,GAAG,IAAA,gBAAO,EAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC3D,MAAM,YAAY,GAAG,IAAA,gBAAO,EAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IAE9D,IAAI,YAAY,KAAK,CAAC,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE9E,iDAAiD;IACjD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;IAChF,MAAM,WAAW,GAAG,MAAM,CACxB,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,yBAAyB,CACtF,CAAC;IACF,IAAI,WAAW,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE/C,6EAA6E;IAC7E,2DAA2D;IAC3D,MAAM,YAAY,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,GAAG,gBAAgB,CAAC;IACjE,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,gBAAoB,CAAC;IAErG,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,aAAiB,EAAE,YAAoB;IACxE,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,GAAG,YAAY,CAAC,GAAG,yBAAyB,CAAC;IAC5F,OAAO,IAAI,eAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;AAClC,CAAC;AAQD;;;;;;GAMG;AACH;;;;;;;;;;;GAWG;AACH,SAAgB,cAAc,CAC5B,gBAAwB,EACxB,iBAAqB,EACrB,kBAA0B,EAC1B,mBAA4B;IAE5B,MAAM,IAAI,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IAC3D,IAAI,gBAAgB,CAAC,MAAM,GAAG,EAAE;QAAE,OAAO,IAAI,CAAC;IAC9C,IAAI,iBAAiB,CAAC,MAAM,EAAE,IAAI,kBAAkB,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IAEzE,kDAAkD;IAClD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAA,gBAAO,EAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,MAAM,CACxB,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,GAAG,kBAAkB,GAAG,yBAAyB,CACtF,CAAC;IACF,MAAM,UAAU,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5E,2DAA2D;IAC3D,oEAAoE;IACpE,MAAM,UAAU,GAAG,mBAAmB,IAAI,IAAI,CAAC,CAAC,CAAC,mBAAmB,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/E,OAAO;QACL,UAAU;QACV,UAAU;QACV,QAAQ,EAAE,UAAU,GAAG,UAAU;KAClC,CAAC;AACJ,CAAC;AAYD;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CACrC,UAAsB,EACtB,SAAoB;IAEpB,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC,GAAG,MAAM,UAAU,CAAC,uBAAuB,CAAC;QAC7F,SAAS;QACT,sBAAc;QACd,iCAAyB;QACzB,0BAAkB;KACnB,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAEvE,0DAA0D;IAC1D,MAAM,OAAO,GAAG,OAAO,CAAC,IAAc,CAAC;IACvC,IAAI,OAAO,CAAC,MAAM,GAAG,EAAE;QAAE,OAAO,IAAI,CAAC;IACrC,MAAM,aAAa,GAAG,IAAA,gBAAO,EAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAE3C,sDAAsD;IACtD,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAc,CAAC;IACzC,MAAM,YAAY,GAAG,IAAA,gBAAO,EAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAE3C,MAAM,WAAW,GAAG,WAAW,CAAC,IAAc,CAAC;IAC/C,MAAM,WAAW,GAAG,WAAW,CAAC,IAAc,CAAC;IAC/C,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAA,gBAAO,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAExE,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;IACtF,MAAM,WAAW,GAAG,kBAAkB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IACpE,MAAM,GAAG,GAAG,cAAc,CAAC,WAAW,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC;IAE1E,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;AAC7C,CAAC"}
|
|
@@ -136,6 +136,8 @@ export interface RebalanceResult {
|
|
|
136
136
|
preInstructions: TransactionInstruction[];
|
|
137
137
|
/** Tx 2 instructions (swap_jlp, optionally + withdraw_from_strategy) */
|
|
138
138
|
instructions: TransactionInstruction[];
|
|
139
|
+
/** Tx 3 instructions (post-sweep route to Jupiter Lend, or empty) */
|
|
140
|
+
postInstructions: TransactionInstruction[];
|
|
139
141
|
addressLookupTables: AddressLookupTableAccount[];
|
|
140
142
|
routeDescription: string;
|
|
141
143
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swap-jlp.d.ts","sourceRoot":"","sources":["../../src/jlpd-strategy/swap-jlp.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,sBAAsB,EACtB,UAAU,EACV,yBAAyB,EACzB,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"swap-jlp.d.ts","sourceRoot":"","sources":["../../src/jlpd-strategy/swap-jlp.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,8 @@ const remaining_accounts_1 = require("../p-stv-core/remaining-accounts");
|
|
|
20
20
|
const accounts_2 = require("../p-stv-core/accounts");
|
|
21
21
|
const constants_2 = require("../p-stv-core/constants");
|
|
22
22
|
const pda_3 = require("../elemental-lend/pda");
|
|
23
|
+
const jupiter_lend_1 = require("../elemental-lend/jupiter-lend");
|
|
24
|
+
const instructions_2 = require("../elemental-lend/instructions");
|
|
23
25
|
// ---------------------------------------------------------------------------
|
|
24
26
|
// Helpers
|
|
25
27
|
// ---------------------------------------------------------------------------
|
|
@@ -306,6 +308,7 @@ async function buildBaseToJlpRebalance(args) {
|
|
|
306
308
|
return {
|
|
307
309
|
preInstructions: [],
|
|
308
310
|
instructions: swapIxs,
|
|
311
|
+
postInstructions: [],
|
|
309
312
|
addressLookupTables,
|
|
310
313
|
routeDescription: "Direct swap (strategy has funds)",
|
|
311
314
|
};
|
|
@@ -350,6 +353,7 @@ async function buildBaseToJlpRebalance(args) {
|
|
|
350
353
|
return {
|
|
351
354
|
preInstructions: allPreIxs,
|
|
352
355
|
instructions: swapIxs,
|
|
356
|
+
postInstructions: [],
|
|
353
357
|
addressLookupTables,
|
|
354
358
|
routeDescription: depositCtx.autoUnrouteCount > 0
|
|
355
359
|
? "Unsweep from lend → deposit to strategy → swap"
|
|
@@ -419,11 +423,43 @@ async function buildJlpToBaseRebalance(args) {
|
|
|
419
423
|
shares: new bn_js_1.default(sharesToWithdraw.toString()),
|
|
420
424
|
remainingAccounts: lendAccounts,
|
|
421
425
|
}, pStvProgramId);
|
|
426
|
+
// Build Jupiter Lend deposit instruction to route funds from Elemental Lend → Jupiter Lend.
|
|
427
|
+
// After withdraw_from_strategy, funds are swept to Elemental Lend's base ATA.
|
|
428
|
+
// This instruction routes them into the Jupiter Lend pool for yield.
|
|
429
|
+
const postInstructions = [];
|
|
430
|
+
const jupPool = jupiter_lend_1.JUP_LEND_POOLS[baseMint.toBase58()];
|
|
431
|
+
if (!stv.lendProgram.equals(DEFAULT_PUBKEY) && jupPool) {
|
|
432
|
+
const lendProgramId = stv.lendProgram;
|
|
433
|
+
const [lendStrategyState] = (0, pda_3.findStrategyStatePda)(baseMint, lendProgramId);
|
|
434
|
+
const [lendManagerRole] = (0, pda_3.findManagerRolePda)(lendStrategyState, manager, lendProgramId);
|
|
435
|
+
const lendBaseAta = findAta(baseMint, lendStrategyState, tokenProgram);
|
|
436
|
+
const lendFtokenAta = findAta(jupPool.fTokenMint, lendStrategyState, tokenProgram);
|
|
437
|
+
const JUP_LEND_PROG = new web3_js_1.PublicKey("jup3YeL8QhtSx1e253b2FDvsMNC87fDrgQZivbrndc9");
|
|
438
|
+
const jupLendAccounts = [
|
|
439
|
+
...(0, jupiter_lend_1.buildJupLendDepositAccounts)(jupPool, lendStrategyState, lendBaseAta, lendFtokenAta).map((a) => ({ ...a, isSigner: false })),
|
|
440
|
+
{ pubkey: JUP_LEND_PROG, isSigner: false, isWritable: false },
|
|
441
|
+
];
|
|
442
|
+
// Use minBaseOut as the deposit amount — this is the minimum base tokens
|
|
443
|
+
// that will arrive in the lend base ATA after swap → withdraw → sweep.
|
|
444
|
+
// The actual amount may be slightly higher due to favorable slippage.
|
|
445
|
+
postInstructions.push((0, instructions_2.createJupLendDepositIx)({
|
|
446
|
+
manager,
|
|
447
|
+
strategyState: lendStrategyState,
|
|
448
|
+
managerRole: lendManagerRole,
|
|
449
|
+
depositorBaseAta: lendBaseAta,
|
|
450
|
+
depositorFtokenAta: lendFtokenAta,
|
|
451
|
+
amount: new bn_js_1.default(minBaseOut.toString()),
|
|
452
|
+
remainingAccounts: jupLendAccounts,
|
|
453
|
+
}, lendProgramId));
|
|
454
|
+
}
|
|
422
455
|
return {
|
|
423
456
|
preInstructions: [],
|
|
424
457
|
instructions: [...swapIxs, withdrawIx],
|
|
458
|
+
postInstructions,
|
|
425
459
|
addressLookupTables,
|
|
426
|
-
routeDescription:
|
|
460
|
+
routeDescription: jupPool
|
|
461
|
+
? "Swap JLP → base → withdraw to vault → route to Jupiter Lend"
|
|
462
|
+
: "Swap JLP → base → withdraw to vault",
|
|
427
463
|
};
|
|
428
464
|
}
|
|
429
465
|
//# sourceMappingURL=swap-jlp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swap-jlp.js","sourceRoot":"","sources":["../../src/jlpd-strategy/swap-jlp.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"swap-jlp.js","sourceRoot":"","sources":["../../src/jlpd-strategy/swap-jlp.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,11 +44,12 @@ export declare const FLAG_WITHDRAWALS_DISABLED = 4;
|
|
|
44
44
|
export declare const FLAG_REBALANCE_DISABLED = 8;
|
|
45
45
|
export declare const FLAG_TEST_MODE = 16;
|
|
46
46
|
export declare const FLAG_ALLOCATOR = 32;
|
|
47
|
+
export declare const CFG_FLAG_ADMIN_LOCKED = 1;
|
|
47
48
|
export { PPS_DECIMALS, BPS_DENOMINATOR, STALENESS_THRESHOLD } from "../common/constants";
|
|
48
49
|
export declare const MAX_STRATEGIES = 10;
|
|
49
50
|
export declare const FEE_CAP_BPS = 9900;
|
|
50
51
|
export declare const GLOBAL_CONFIG_SIZE = 56;
|
|
51
52
|
export declare const STV_SIZE = 664;
|
|
52
|
-
export declare const WITHDRAW_REQUEST_SIZE =
|
|
53
|
+
export declare const WITHDRAW_REQUEST_SIZE = 168;
|
|
53
54
|
export declare const MANAGER_ROLE_SIZE = 80;
|
|
54
55
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/p-stv-core/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM5C,eAAO,MAAM,UAAU,WAEtB,CAAC;AAMF,eAAO,MAAM,WAAW,qBAAwB,CAAC;AACjD,eAAO,MAAM,QAAQ,qBAAqB,CAAC;AAC3C,eAAO,MAAM,YAAY,qBAAyB,CAAC;AACnD,eAAO,MAAM,qBAAqB,qBAAkC,CAAC;AACrE,eAAO,MAAM,YAAY,qBAAyB,CAAC;AAMnD,eAAO,MAAM,kBAAkB,qBAE7B,CAAC;AACH,eAAO,MAAM,QAAQ,qBAEnB,CAAC;AACH,eAAO,MAAM,qBAAqB,qBAEhC,CAAC;AACH,eAAO,MAAM,iBAAiB,qBAE5B,CAAC;AAMH,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAC1C,eAAO,MAAM,qBAAqB,IAAI,CAAC;AACvC,eAAO,MAAM,UAAU,IAAI,CAAC;AAC5B,eAAO,MAAM,mBAAmB,IAAI,CAAC;AACrC,eAAO,MAAM,iBAAiB,IAAI,CAAC;AACnC,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,YAAY,IAAI,CAAC;AAC9B,eAAO,MAAM,cAAc,IAAI,CAAC;AAChC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,KAAK,CAAC;AAM7C,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,eAAe,IAAI,CAAC;AACjC,eAAO,MAAM,eAAe,IAAI,CAAC;AACjC,eAAO,MAAM,aAAa,IAAI,CAAC;AAC/B,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,8BAA8B,IAAI,CAAC;AAChD,eAAO,MAAM,oBAAoB,IAAI,CAAC;AACtC,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAC7C,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,gBAAgB,KAAK,CAAC;AACnC,eAAO,MAAM,cAAc,KAAK,CAAC;AACjC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,eAAO,MAAM,6BAA6B,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/p-stv-core/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM5C,eAAO,MAAM,UAAU,WAEtB,CAAC;AAMF,eAAO,MAAM,WAAW,qBAAwB,CAAC;AACjD,eAAO,MAAM,QAAQ,qBAAqB,CAAC;AAC3C,eAAO,MAAM,YAAY,qBAAyB,CAAC;AACnD,eAAO,MAAM,qBAAqB,qBAAkC,CAAC;AACrE,eAAO,MAAM,YAAY,qBAAyB,CAAC;AAMnD,eAAO,MAAM,kBAAkB,qBAE7B,CAAC;AACH,eAAO,MAAM,QAAQ,qBAEnB,CAAC;AACH,eAAO,MAAM,qBAAqB,qBAEhC,CAAC;AACH,eAAO,MAAM,iBAAiB,qBAE5B,CAAC;AAMH,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAC1C,eAAO,MAAM,qBAAqB,IAAI,CAAC;AACvC,eAAO,MAAM,UAAU,IAAI,CAAC;AAC5B,eAAO,MAAM,mBAAmB,IAAI,CAAC;AACrC,eAAO,MAAM,iBAAiB,IAAI,CAAC;AACnC,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,YAAY,IAAI,CAAC;AAC9B,eAAO,MAAM,cAAc,IAAI,CAAC;AAChC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,KAAK,CAAC;AAM7C,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,eAAe,IAAI,CAAC;AACjC,eAAO,MAAM,eAAe,IAAI,CAAC;AACjC,eAAO,MAAM,aAAa,IAAI,CAAC;AAC/B,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,8BAA8B,IAAI,CAAC;AAChD,eAAO,MAAM,oBAAoB,IAAI,CAAC;AACtC,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAC7C,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,gBAAgB,KAAK,CAAC;AACnC,eAAO,MAAM,cAAc,KAAK,CAAC;AACjC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAOhD,eAAO,MAAM,WAAW,IAAS,CAAC;AAClC,eAAO,MAAM,sBAAsB,IAAS,CAAC;AAC7C,eAAO,MAAM,yBAAyB,IAAS,CAAC;AAChD,eAAO,MAAM,uBAAuB,IAAS,CAAC;AAC9C,eAAO,MAAM,cAAc,KAAS,CAAC;AACrC,eAAO,MAAM,cAAc,KAAS,CAAC;AAGrC,eAAO,MAAM,qBAAqB,IAAS,CAAC;AAM5C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACzF,eAAO,MAAM,cAAc,KAAK,CAAC;AACjC,eAAO,MAAM,WAAW,OAAQ,CAAC;AAMjC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,QAAQ,MAAM,CAAC;AAC5B,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,iBAAiB,KAAK,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.MANAGER_ROLE_SIZE = exports.WITHDRAW_REQUEST_SIZE = exports.STV_SIZE = exports.GLOBAL_CONFIG_SIZE = void 0;
|
|
3
|
+
exports.MAX_STRATEGIES = exports.STALENESS_THRESHOLD = exports.BPS_DENOMINATOR = exports.PPS_DECIMALS = exports.CFG_FLAG_ADMIN_LOCKED = exports.FLAG_ALLOCATOR = exports.FLAG_TEST_MODE = exports.FLAG_REBALANCE_DISABLED = exports.FLAG_WITHDRAWALS_DISABLED = exports.FLAG_DEPOSITS_DISABLED = exports.FLAG_PAUSED = exports.EVT_WITHDRAW_OVERRIDE_CLAIMED = exports.EVT_MANAGER_REMOVED = exports.EVT_MANAGER_ADDED = exports.EVT_STV_CLOSED = exports.EVT_FEES_SETTLED = exports.EVT_EPOCH_ADVANCED = exports.EVT_EPOCH_PROCESSED = exports.EVT_WITHDRAWN_FROM_STRATEGY = exports.EVT_DEPOSITED_TO_STRATEGY = exports.EVT_WITHDRAW_CLAIMED = exports.EVT_WITHDRAW_REQUEST_INCREASED = exports.EVT_WITHDRAW_REQUESTED = exports.EVT_DEPOSITED = exports.EVT_STV_UPDATED = exports.EVT_STV_CREATED = exports.EVT_CONFIG_UPDATED = exports.EVT_CONFIG_INITIALIZED = exports.IX_OVERRIDE_CLAIM_WITHDRAW = exports.IX_REMOVE_MANAGER = exports.IX_ADD_MANAGER = exports.IX_CLOSE_STV = exports.IX_WITHDRAW_FROM_STRATEGY = exports.IX_DEPOSIT_TO_STRATEGY = exports.IX_PROCESS_EPOCH = exports.IX_CLAIM_WITHDRAW = exports.IX_REQUEST_WITHDRAW = exports.IX_DEPOSIT = exports.IX_INIT_OR_UPDATE_STV = exports.IX_INIT_OR_UPDATE_CONFIG = exports.DISC_MANAGER_ROLE = exports.DISC_WITHDRAW_REQUEST = exports.DISC_STV = exports.DISC_GLOBAL_CONFIG = exports.MANAGER_SEED = exports.WITHDRAW_REQUEST_SEED = exports.EV_MINT_SEED = exports.STV_SEED = exports.CONFIG_SEED = exports.PROGRAM_ID = void 0;
|
|
4
|
+
exports.MANAGER_ROLE_SIZE = exports.WITHDRAW_REQUEST_SIZE = exports.STV_SIZE = exports.GLOBAL_CONFIG_SIZE = exports.FEE_CAP_BPS = void 0;
|
|
5
5
|
const web3_js_1 = require("@solana/web3.js");
|
|
6
6
|
// ---------------------------------------------------------------------------
|
|
7
7
|
// Program ID
|
|
@@ -68,12 +68,15 @@ exports.EVT_WITHDRAW_OVERRIDE_CLAIMED = 16;
|
|
|
68
68
|
// ---------------------------------------------------------------------------
|
|
69
69
|
// Vault Flags
|
|
70
70
|
// ---------------------------------------------------------------------------
|
|
71
|
+
// STV flags
|
|
71
72
|
exports.FLAG_PAUSED = 0x0001;
|
|
72
73
|
exports.FLAG_DEPOSITS_DISABLED = 0x0002;
|
|
73
74
|
exports.FLAG_WITHDRAWALS_DISABLED = 0x0004;
|
|
74
75
|
exports.FLAG_REBALANCE_DISABLED = 0x0008;
|
|
75
76
|
exports.FLAG_TEST_MODE = 0x0010;
|
|
76
77
|
exports.FLAG_ALLOCATOR = 0x0020;
|
|
78
|
+
// GlobalConfig flags
|
|
79
|
+
exports.CFG_FLAG_ADMIN_LOCKED = 0x0001;
|
|
77
80
|
// ---------------------------------------------------------------------------
|
|
78
81
|
// Protocol Constants
|
|
79
82
|
// ---------------------------------------------------------------------------
|
|
@@ -88,6 +91,6 @@ exports.FEE_CAP_BPS = 9900;
|
|
|
88
91
|
// ---------------------------------------------------------------------------
|
|
89
92
|
exports.GLOBAL_CONFIG_SIZE = 56;
|
|
90
93
|
exports.STV_SIZE = 664;
|
|
91
|
-
exports.WITHDRAW_REQUEST_SIZE =
|
|
94
|
+
exports.WITHDRAW_REQUEST_SIZE = 168;
|
|
92
95
|
exports.MANAGER_ROLE_SIZE = 80;
|
|
93
96
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/p-stv-core/constants.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/p-stv-core/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,8 @@ export interface SmartTxOptions {
|
|
|
37
37
|
noPriorityFee?: boolean;
|
|
38
38
|
/** Custom compute unit limit (skips simulation) */
|
|
39
39
|
computeUnits?: number;
|
|
40
|
+
/** Force legacy transaction (no ALTs). Use when CPI programs appear as regular accounts. */
|
|
41
|
+
forceLegacy?: boolean;
|
|
40
42
|
}
|
|
41
43
|
/**
|
|
42
44
|
* Build, simulate, and send a transaction with optimal compute budget.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-tx.d.ts","sourceRoot":"","sources":["../../src/p-stv-core/send-tx.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EACL,yBAAyB,EAGzB,SAAS,EAET,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AAEzB,oDAAoD;AACpD,eAAO,MAAM,mBAAmB,WAE/B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB;IAChC,8DAA8D;;IAE9D,uDAAuD;;IAEvD,uEAAuE;;CAExE,CAAC;AAeF,MAAM,MAAM,iBAAiB,GAAG,CAAC,EAAE,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAG1D,MAAM,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAEpC,MAAM,WAAW,cAAc;IAC7B,oFAAoF;IACpF,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,+DAA+D;IAC/D,cAAc,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAC7C,sCAAsC;IACtC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mDAAmD;IACnD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAC/B,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,sBAAsB,EAAE,EACtC,KAAK,EAAE,SAAS,EAChB,eAAe,EAAE,iBAAiB,EAClC,YAAY,CAAC,EAAE,SAAS,GAAG,cAAc,GACxC,OAAO,CAAC,MAAM,CAAC,CA4FjB;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,sBAAsB,EAAE,EACtC,KAAK,EAAE,SAAS,EAChB,YAAY,CAAC,EAAE,SAAS,GAAG,cAAc,GACxC,OAAO,CAAC,OAAO,CAAC,CAwClB"}
|
|
1
|
+
{"version":3,"file":"send-tx.d.ts","sourceRoot":"","sources":["../../src/p-stv-core/send-tx.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EACL,yBAAyB,EAGzB,SAAS,EAET,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AAEzB,oDAAoD;AACpD,eAAO,MAAM,mBAAmB,WAE/B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB;IAChC,8DAA8D;;IAE9D,uDAAuD;;IAEvD,uEAAuE;;CAExE,CAAC;AAeF,MAAM,MAAM,iBAAiB,GAAG,CAAC,EAAE,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAG1D,MAAM,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAEpC,MAAM,WAAW,cAAc;IAC7B,oFAAoF;IACpF,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,+DAA+D;IAC/D,cAAc,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAC7C,sCAAsC;IACtC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mDAAmD;IACnD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4FAA4F;IAC5F,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAC/B,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,sBAAsB,EAAE,EACtC,KAAK,EAAE,SAAS,EAChB,eAAe,EAAE,iBAAiB,EAClC,YAAY,CAAC,EAAE,SAAS,GAAG,cAAc,GACxC,OAAO,CAAC,MAAM,CAAC,CA4FjB;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,sBAAsB,EAAE,EACtC,KAAK,EAAE,SAAS,EAChB,YAAY,CAAC,EAAE,SAAS,GAAG,cAAc,GACxC,OAAO,CAAC,OAAO,CAAC,CAwClB"}
|
|
@@ -86,7 +86,7 @@ async function sendSmartTx(connection, instructions, payer, signTransaction, opt
|
|
|
86
86
|
];
|
|
87
87
|
// 5. Build transaction (legacy or versioned)
|
|
88
88
|
let signedTx;
|
|
89
|
-
if (needsVersionedTx && allLuts.length > 0) {
|
|
89
|
+
if (needsVersionedTx && allLuts.length > 0 && !options.forceLegacy) {
|
|
90
90
|
const msgV0 = new web3_js_1.TransactionMessage({
|
|
91
91
|
payerKey: payer,
|
|
92
92
|
recentBlockhash: blockhash,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-tx.js","sourceRoot":"","sources":["../../src/p-stv-core/send-tx.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;
|
|
1
|
+
{"version":3,"file":"send-tx.js","sourceRoot":"","sources":["../../src/p-stv-core/send-tx.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED