@elmntl/vaults-v2 1.0.8 → 1.0.10

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.
@@ -292,6 +292,65 @@
292
292
  }
293
293
  ]
294
294
  },
295
+ {
296
+ "name": "flush_to_manager",
297
+ "docs": [
298
+ "Flush all funds from liquidity_holder to manager_wallet",
299
+ "",
300
+ "PERMISSIONLESS: Anyone can call this to move accumulated deposits",
301
+ "to the manager's wallet. Enables custodial vault operation."
302
+ ],
303
+ "discriminator": [
304
+ 233,
305
+ 60,
306
+ 174,
307
+ 213,
308
+ 169,
309
+ 31,
310
+ 252,
311
+ 164
312
+ ],
313
+ "accounts": [
314
+ {
315
+ "name": "pool",
316
+ "docs": [
317
+ "The pool"
318
+ ]
319
+ },
320
+ {
321
+ "name": "pool_authority"
322
+ },
323
+ {
324
+ "name": "liquidity_holder",
325
+ "docs": [
326
+ "Source: liquidity_holder (where deposits go)",
327
+ "Must be owned by pool_authority PDA"
328
+ ],
329
+ "writable": true
330
+ },
331
+ {
332
+ "name": "manager_token_account",
333
+ "docs": [
334
+ "Destination: manager's token account",
335
+ "Must be owned by the pool's manager_wallet"
336
+ ],
337
+ "writable": true
338
+ },
339
+ {
340
+ "name": "vault_mint",
341
+ "docs": [
342
+ "The vault mint"
343
+ ]
344
+ },
345
+ {
346
+ "name": "token_program",
347
+ "docs": [
348
+ "Token program"
349
+ ]
350
+ }
351
+ ],
352
+ "args": []
353
+ },
295
354
  {
296
355
  "name": "fund_faucet",
297
356
  "docs": [
@@ -363,7 +422,8 @@
363
422
  "",
364
423
  "- deposit_mint: Token users deposit (e.g., USDC)",
365
424
  "- vault_mint: Token vault holds (e.g., ONyc, or same as deposit_mint)",
366
- "- adapter_type: Swap adapter to use (0=Direct, 1=OnRe, 2=Jupiter, 3=External)"
425
+ "- adapter_type: Swap adapter to use (0=Direct, 1=OnRe, 2=Jupiter, 3=External)",
426
+ "- manager_wallet: Optional destination for flush_to_manager (custodial flow)"
367
427
  ],
368
428
  "discriminator": [
369
429
  175,
@@ -403,7 +463,7 @@
403
463
  "name": "liquidity_holder",
404
464
  "docs": [
405
465
  "Token account holding the vault's vault_mint tokens",
406
- "Must be owned by pool_authority"
466
+ "Can be owned by pool_authority (PDA) or by a manager wallet (custodial)"
407
467
  ]
408
468
  },
409
469
  {
@@ -447,47 +507,75 @@
447
507
  {
448
508
  "name": "adapter_type",
449
509
  "type": "u8"
510
+ },
511
+ {
512
+ "name": "manager_wallet",
513
+ "type": {
514
+ "option": "pubkey"
515
+ }
450
516
  }
451
517
  ]
452
518
  },
453
519
  {
454
- "name": "migrate_position",
520
+ "name": "transfer_to_faucet",
455
521
  "docs": [
456
- "Migrate an existing position (admin only)"
522
+ "Transfer funds from liquidity_holder to liquidity_faucet (admin only)"
457
523
  ],
458
524
  "discriminator": [
459
- 15,
460
- 132,
461
- 59,
462
- 50,
463
- 199,
464
- 6,
465
- 251,
466
- 46
525
+ 78,
526
+ 27,
527
+ 32,
528
+ 107,
529
+ 119,
530
+ 121,
531
+ 171,
532
+ 0
467
533
  ],
468
534
  "accounts": [
469
535
  {
470
- "name": "payer",
471
- "writable": true,
536
+ "name": "admin",
537
+ "docs": [
538
+ "Admin must sign"
539
+ ],
472
540
  "signer": true
473
541
  },
474
542
  {
475
543
  "name": "pool",
544
+ "docs": [
545
+ "The pool (must have admin as the signer)"
546
+ ]
547
+ },
548
+ {
549
+ "name": "pool_authority"
550
+ },
551
+ {
552
+ "name": "liquidity_holder",
553
+ "docs": [
554
+ "Source: liquidity_holder (where deposits go)"
555
+ ],
476
556
  "writable": true
477
557
  },
478
558
  {
479
- "name": "position",
559
+ "name": "liquidity_faucet",
560
+ "docs": [
561
+ "Destination: liquidity_faucet (where withdrawals come from)"
562
+ ],
480
563
  "writable": true
481
564
  },
482
565
  {
483
- "name": "system_program"
566
+ "name": "vault_mint",
567
+ "docs": [
568
+ "The vault mint"
569
+ ]
570
+ },
571
+ {
572
+ "name": "token_program",
573
+ "docs": [
574
+ "Token program"
575
+ ]
484
576
  }
485
577
  ],
486
578
  "args": [
487
- {
488
- "name": "owner",
489
- "type": "pubkey"
490
- },
491
579
  {
492
580
  "name": "amount",
493
581
  "type": "u64"
@@ -870,6 +958,16 @@
870
958
  "code": 6021,
871
959
  "name": "InsufficientPendingAmount",
872
960
  "msg": "Insufficient pending amount for withdrawal"
961
+ },
962
+ {
963
+ "code": 6022,
964
+ "name": "ManagerWalletNotConfigured",
965
+ "msg": "Manager wallet not configured for this pool"
966
+ },
967
+ {
968
+ "code": 6023,
969
+ "name": "NoFundsToFlush",
970
+ "msg": "No funds available to flush"
873
971
  }
874
972
  ],
875
973
  "types": [
@@ -987,6 +1085,12 @@
987
1085
  "type": {
988
1086
  "option": "u64"
989
1087
  }
1088
+ },
1089
+ {
1090
+ "name": "epoch_start_time",
1091
+ "type": {
1092
+ "option": "u32"
1093
+ }
990
1094
  }
991
1095
  ]
992
1096
  }
@@ -1184,6 +1288,14 @@
1184
1288
  }
1185
1289
  }
1186
1290
  },
1291
+ {
1292
+ "name": "manager_wallet",
1293
+ "docs": [
1294
+ "Destination wallet for flush_to_manager (custodial flow)",
1295
+ "If set to system program (default), flush is disabled"
1296
+ ],
1297
+ "type": "pubkey"
1298
+ },
1187
1299
  {
1188
1300
  "name": "_reserved",
1189
1301
  "docs": [
@@ -1192,7 +1304,7 @@
1192
1304
  "type": {
1193
1305
  "array": [
1194
1306
  "u8",
1195
- 64
1307
+ 32
1196
1308
  ]
1197
1309
  }
1198
1310
  }
@@ -1456,6 +1568,12 @@
1456
1568
  "type": {
1457
1569
  "option": "u64"
1458
1570
  }
1571
+ },
1572
+ {
1573
+ "name": "epoch_start_time",
1574
+ "type": {
1575
+ "option": "u32"
1576
+ }
1459
1577
  }
1460
1578
  ]
1461
1579
  }
@@ -1 +1 @@
1
- {"version":3,"file":"elemental.d.ts","sourceRoot":"","sources":["../../src/programs/elemental.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"elemental.d.ts","sourceRoot":"","sources":["../../src/programs/elemental.ts"],"names":[],"mappings":"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"}
@@ -143,22 +143,19 @@ class ElementalV2Context {
143
143
  const depositMintInfo = await this.connection.getParsedAccountInfo(pool.depositMintAddress);
144
144
  const depositDecimals = depositMintInfo.value?.data?.parsed?.info?.decimals ?? 6;
145
145
  const depositMultiplier = Math.pow(10, depositDecimals);
146
- const amountBN = new bn_js_1.default(new decimal_js_1.default(amount.toString())
147
- .mul(depositMultiplier)
148
- .toFixed(0));
146
+ const amountBN = new bn_js_1.default(new decimal_js_1.default(amount.toString()).mul(depositMultiplier).toFixed(0));
149
147
  const minOutputBN = minOutput
150
148
  ? new bn_js_1.default(new decimal_js_1.default(minOutput.toString())
151
149
  .mul(new decimal_js_1.default(pool.data.perTokenAmount.toString()))
152
150
  .toFixed(0))
153
151
  : null;
154
- const userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(pool.depositMintAddress, this.walletAddress);
152
+ const userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(pool.depositMintAddress, this.walletAddress, true);
155
153
  // For OnRe adapter, we need to:
156
154
  // 1. Create pool_authority's deposit token ATA if needed
157
155
  // 2. Transfer user's tokens to pool_authority's ATA
158
156
  // 3. Use pool_authority's ATA in the deposit instruction
159
157
  if (pool.adapterType === types_1.SwapAdapter.OnRe) {
160
- const poolAuthTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(pool.depositMintAddress, poolAuthority, true // allowOwnerOffCurve for PDA
161
- );
158
+ const poolAuthTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(pool.depositMintAddress, poolAuthority, true);
162
159
  // Check if pool_authority's token account exists
163
160
  try {
164
161
  await (0, spl_token_1.getAccount)(this.connection, poolAuthTokenAccount);
@@ -236,7 +233,11 @@ class ElementalV2Context {
236
233
  // OnRe state PDA
237
234
  const [onreState] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state")], types_1.ONRE_PROGRAM_ID);
238
235
  // OnRe offer PDA (derived from token pair)
239
- const [onreOfferPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("offer"), pool.depositMintAddress.toBuffer(), pool.vaultMintAddress.toBuffer()], types_1.ONRE_PROGRAM_ID);
236
+ const [onreOfferPda] = web3_js_1.PublicKey.findProgramAddressSync([
237
+ Buffer.from("offer"),
238
+ pool.depositMintAddress.toBuffer(),
239
+ pool.vaultMintAddress.toBuffer(),
240
+ ], types_1.ONRE_PROGRAM_ID);
240
241
  // Boss - hardcoded for mainnet (from OnRe state account)
241
242
  const boss = new web3_js_1.PublicKey("45YnzauhsBM8CpUz96Djf8UG5vqq2Dua62wuW9H3jaJ5");
242
243
  // OnRe vault token accounts (owned by OnRe vault_authority)
@@ -264,12 +265,24 @@ class ElementalV2Context {
264
265
  { pubkey: pool.vaultMintAddress, isSigner: false, isWritable: true }, // 12: token_out_mint
265
266
  { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }, // 13: token_out_program
266
267
  { pubkey: poolAuthTokenAccount, isSigner: false, isWritable: true }, // 14: user_token_in_account (pool_authority's ATA!)
267
- { pubkey: pool.liquidityHolderAddress, isSigner: false, isWritable: true }, // 15: user_token_out_account (vault's liquidity holder)
268
+ {
269
+ pubkey: pool.liquidityHolderAddress,
270
+ isSigner: false,
271
+ isWritable: true,
272
+ }, // 15: user_token_out_account (vault's liquidity holder)
268
273
  { pubkey: bossTokenIn, isSigner: false, isWritable: true }, // 16: boss_token_in_account
269
274
  { pubkey: mintAuthority, isSigner: false, isWritable: false }, // 17: mint_authority
270
- { pubkey: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY, isSigner: false, isWritable: false }, // 18: instructions_sysvar
275
+ {
276
+ pubkey: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
277
+ isSigner: false,
278
+ isWritable: false,
279
+ }, // 18: instructions_sysvar
271
280
  { pubkey: poolAuthority, isSigner: false, isWritable: true }, // 19: user (pool_authority signs via CPI!)
272
- { pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }, // 20: associated_token_program
281
+ {
282
+ pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
283
+ isSigner: false,
284
+ isWritable: false,
285
+ }, // 20: associated_token_program
273
286
  { pubkey: web3_js_1.SystemProgram.programId, isSigner: false, isWritable: false }, // 21: system_program
274
287
  ];
275
288
  }
@@ -281,10 +294,8 @@ class ElementalV2Context {
281
294
  const pool = position.pool;
282
295
  // Amount is in vault_mint terms (e.g., ONyc with 9 decimals)
283
296
  const vaultMultiplier = Math.pow(10, pool.vaultDecimals);
284
- const amountBN = new bn_js_1.default(new decimal_js_1.default(amount.toString())
285
- .mul(vaultMultiplier)
286
- .toFixed(0));
287
- const userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(pool.vaultMintAddress, this.walletAddress);
297
+ const amountBN = new bn_js_1.default(new decimal_js_1.default(amount.toString()).mul(vaultMultiplier).toFixed(0));
298
+ const userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(pool.vaultMintAddress, this.walletAddress, true);
288
299
  const depositIx = await this.program.methods
289
300
  .depositVaultMint(amountBN)
290
301
  .accounts({
@@ -330,7 +341,7 @@ class ElementalV2Context {
330
341
  async withdrawInstructions(position) {
331
342
  const instructions = [];
332
343
  const pool = position.pool;
333
- const userVaultTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(pool.vaultMintAddress, this.walletAddress);
344
+ const userVaultTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(pool.vaultMintAddress, this.walletAddress, true);
334
345
  // Check if user's vault token account exists
335
346
  try {
336
347
  await (0, spl_token_1.getAccount)(this.connection, userVaultTokenAccount);
@@ -365,7 +376,7 @@ class ElementalV2Context {
365
376
  const amountBN = new bn_js_1.default(new decimal_js_1.default(amount.toString())
366
377
  .mul(new decimal_js_1.default(pool.data.perTokenAmount.toString()))
367
378
  .toFixed(0));
368
- const userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(pool.vaultMintAddress, this.walletAddress);
379
+ const userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(pool.vaultMintAddress, this.walletAddress, true);
369
380
  const ix = await this.program.methods
370
381
  .fundFaucet(amountBN)
371
382
  .accounts({
@@ -1 +1 @@
1
- {"version":3,"file":"elemental.js","sourceRoot":"","sources":["../../src/programs/elemental.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"elemental.js","sourceRoot":"","sources":["../../src/programs/elemental.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@elmntl/vaults-v2",
3
- "version": "1.0.8",
3
+ "version": "1.0.10",
4
4
  "description": "SDK for Elemental Vault V2 (ELE6) - Multi-mint vault with swap adapters",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -292,6 +292,65 @@
292
292
  }
293
293
  ]
294
294
  },
295
+ {
296
+ "name": "flush_to_manager",
297
+ "docs": [
298
+ "Flush all funds from liquidity_holder to manager_wallet",
299
+ "",
300
+ "PERMISSIONLESS: Anyone can call this to move accumulated deposits",
301
+ "to the manager's wallet. Enables custodial vault operation."
302
+ ],
303
+ "discriminator": [
304
+ 233,
305
+ 60,
306
+ 174,
307
+ 213,
308
+ 169,
309
+ 31,
310
+ 252,
311
+ 164
312
+ ],
313
+ "accounts": [
314
+ {
315
+ "name": "pool",
316
+ "docs": [
317
+ "The pool"
318
+ ]
319
+ },
320
+ {
321
+ "name": "pool_authority"
322
+ },
323
+ {
324
+ "name": "liquidity_holder",
325
+ "docs": [
326
+ "Source: liquidity_holder (where deposits go)",
327
+ "Must be owned by pool_authority PDA"
328
+ ],
329
+ "writable": true
330
+ },
331
+ {
332
+ "name": "manager_token_account",
333
+ "docs": [
334
+ "Destination: manager's token account",
335
+ "Must be owned by the pool's manager_wallet"
336
+ ],
337
+ "writable": true
338
+ },
339
+ {
340
+ "name": "vault_mint",
341
+ "docs": [
342
+ "The vault mint"
343
+ ]
344
+ },
345
+ {
346
+ "name": "token_program",
347
+ "docs": [
348
+ "Token program"
349
+ ]
350
+ }
351
+ ],
352
+ "args": []
353
+ },
295
354
  {
296
355
  "name": "fund_faucet",
297
356
  "docs": [
@@ -363,7 +422,8 @@
363
422
  "",
364
423
  "- deposit_mint: Token users deposit (e.g., USDC)",
365
424
  "- vault_mint: Token vault holds (e.g., ONyc, or same as deposit_mint)",
366
- "- adapter_type: Swap adapter to use (0=Direct, 1=OnRe, 2=Jupiter, 3=External)"
425
+ "- adapter_type: Swap adapter to use (0=Direct, 1=OnRe, 2=Jupiter, 3=External)",
426
+ "- manager_wallet: Optional destination for flush_to_manager (custodial flow)"
367
427
  ],
368
428
  "discriminator": [
369
429
  175,
@@ -403,7 +463,7 @@
403
463
  "name": "liquidity_holder",
404
464
  "docs": [
405
465
  "Token account holding the vault's vault_mint tokens",
406
- "Must be owned by pool_authority"
466
+ "Can be owned by pool_authority (PDA) or by a manager wallet (custodial)"
407
467
  ]
408
468
  },
409
469
  {
@@ -447,47 +507,75 @@
447
507
  {
448
508
  "name": "adapter_type",
449
509
  "type": "u8"
510
+ },
511
+ {
512
+ "name": "manager_wallet",
513
+ "type": {
514
+ "option": "pubkey"
515
+ }
450
516
  }
451
517
  ]
452
518
  },
453
519
  {
454
- "name": "migrate_position",
520
+ "name": "transfer_to_faucet",
455
521
  "docs": [
456
- "Migrate an existing position (admin only)"
522
+ "Transfer funds from liquidity_holder to liquidity_faucet (admin only)"
457
523
  ],
458
524
  "discriminator": [
459
- 15,
460
- 132,
461
- 59,
462
- 50,
463
- 199,
464
- 6,
465
- 251,
466
- 46
525
+ 78,
526
+ 27,
527
+ 32,
528
+ 107,
529
+ 119,
530
+ 121,
531
+ 171,
532
+ 0
467
533
  ],
468
534
  "accounts": [
469
535
  {
470
- "name": "payer",
471
- "writable": true,
536
+ "name": "admin",
537
+ "docs": [
538
+ "Admin must sign"
539
+ ],
472
540
  "signer": true
473
541
  },
474
542
  {
475
543
  "name": "pool",
544
+ "docs": [
545
+ "The pool (must have admin as the signer)"
546
+ ]
547
+ },
548
+ {
549
+ "name": "pool_authority"
550
+ },
551
+ {
552
+ "name": "liquidity_holder",
553
+ "docs": [
554
+ "Source: liquidity_holder (where deposits go)"
555
+ ],
476
556
  "writable": true
477
557
  },
478
558
  {
479
- "name": "position",
559
+ "name": "liquidity_faucet",
560
+ "docs": [
561
+ "Destination: liquidity_faucet (where withdrawals come from)"
562
+ ],
480
563
  "writable": true
481
564
  },
482
565
  {
483
- "name": "system_program"
566
+ "name": "vault_mint",
567
+ "docs": [
568
+ "The vault mint"
569
+ ]
570
+ },
571
+ {
572
+ "name": "token_program",
573
+ "docs": [
574
+ "Token program"
575
+ ]
484
576
  }
485
577
  ],
486
578
  "args": [
487
- {
488
- "name": "owner",
489
- "type": "pubkey"
490
- },
491
579
  {
492
580
  "name": "amount",
493
581
  "type": "u64"
@@ -870,6 +958,16 @@
870
958
  "code": 6021,
871
959
  "name": "InsufficientPendingAmount",
872
960
  "msg": "Insufficient pending amount for withdrawal"
961
+ },
962
+ {
963
+ "code": 6022,
964
+ "name": "ManagerWalletNotConfigured",
965
+ "msg": "Manager wallet not configured for this pool"
966
+ },
967
+ {
968
+ "code": 6023,
969
+ "name": "NoFundsToFlush",
970
+ "msg": "No funds available to flush"
873
971
  }
874
972
  ],
875
973
  "types": [
@@ -987,6 +1085,12 @@
987
1085
  "type": {
988
1086
  "option": "u64"
989
1087
  }
1088
+ },
1089
+ {
1090
+ "name": "epoch_start_time",
1091
+ "type": {
1092
+ "option": "u32"
1093
+ }
990
1094
  }
991
1095
  ]
992
1096
  }
@@ -1184,6 +1288,14 @@
1184
1288
  }
1185
1289
  }
1186
1290
  },
1291
+ {
1292
+ "name": "manager_wallet",
1293
+ "docs": [
1294
+ "Destination wallet for flush_to_manager (custodial flow)",
1295
+ "If set to system program (default), flush is disabled"
1296
+ ],
1297
+ "type": "pubkey"
1298
+ },
1187
1299
  {
1188
1300
  "name": "_reserved",
1189
1301
  "docs": [
@@ -1192,7 +1304,7 @@
1192
1304
  "type": {
1193
1305
  "array": [
1194
1306
  "u8",
1195
- 64
1307
+ 32
1196
1308
  ]
1197
1309
  }
1198
1310
  }
@@ -1456,6 +1568,12 @@
1456
1568
  "type": {
1457
1569
  "option": "u64"
1458
1570
  }
1571
+ },
1572
+ {
1573
+ "name": "epoch_start_time",
1574
+ "type": {
1575
+ "option": "u32"
1576
+ }
1459
1577
  }
1460
1578
  ]
1461
1579
  }
@@ -33,7 +33,7 @@ import {
33
33
  import idl from "../generated/idl/elemental_vault_v2.json";
34
34
 
35
35
  export const VAULT_PROGRAM_ID = new PublicKey(
36
- "ELE6rYCZUaegWxVhWM4ef9pXZBAgGUVaVKkTbDvX6BMU"
36
+ "ELE6rYCZUaegWxVhWM4ef9pXZBAgGUVaVKkTbDvX6BMU",
37
37
  );
38
38
 
39
39
  export class ElementalV2Context {
@@ -61,18 +61,21 @@ export class ElementalV2Context {
61
61
  findPoolAuthority(poolAddress: PublicKey): PublicKey {
62
62
  return PublicKey.findProgramAddressSync(
63
63
  [Buffer.from("pool_authority"), poolAddress.toBuffer()],
64
- VAULT_PROGRAM_ID
64
+ VAULT_PROGRAM_ID,
65
65
  )[0];
66
66
  }
67
67
 
68
- findPositionAddress(poolAddress: PublicKey, ownerAddress?: PublicKey): PublicKey {
68
+ findPositionAddress(
69
+ poolAddress: PublicKey,
70
+ ownerAddress?: PublicKey,
71
+ ): PublicKey {
69
72
  return PublicKey.findProgramAddressSync(
70
73
  [
71
74
  Buffer.from("position"),
72
75
  (ownerAddress || this.walletAddress).toBuffer(),
73
76
  poolAddress.toBuffer(),
74
77
  ],
75
- VAULT_PROGRAM_ID
78
+ VAULT_PROGRAM_ID,
76
79
  )[0];
77
80
  }
78
81
 
@@ -90,14 +93,18 @@ export class ElementalV2Context {
90
93
  this.connection.getParsedAccountInfo(poolData.vaultMint),
91
94
  ]);
92
95
 
93
- const depositDecimals = (depositMintInfo.value?.data as any)?.parsed?.info?.decimals ?? 6;
94
- const vaultDecimals = (vaultMintInfo.value?.data as any)?.parsed?.info?.decimals ?? 9;
96
+ const depositDecimals =
97
+ (depositMintInfo.value?.data as any)?.parsed?.info?.decimals ?? 6;
98
+ const vaultDecimals =
99
+ (vaultMintInfo.value?.data as any)?.parsed?.info?.decimals ?? 9;
95
100
 
96
101
  return new Pool(address, poolData, depositDecimals, vaultDecimals);
97
102
  }
98
103
 
99
104
  async loadPools(addresses: PublicKey[]): Promise<Pool[]> {
100
- const accounts = await (this.program.account as any).pool.fetchMultiple(addresses);
105
+ const accounts = await (this.program.account as any).pool.fetchMultiple(
106
+ addresses,
107
+ );
101
108
 
102
109
  // For multiple pools, we'd need to batch fetch all mints
103
110
  // For now, load each pool individually to get correct decimals
@@ -109,9 +116,13 @@ export class ElementalV2Context {
109
116
  this.connection.getParsedAccountInfo(data.depositMint),
110
117
  this.connection.getParsedAccountInfo(data.vaultMint),
111
118
  ]);
112
- const depositDecimals = (depositMintInfo.value?.data as any)?.parsed?.info?.decimals ?? 6;
113
- const vaultDecimals = (vaultMintInfo.value?.data as any)?.parsed?.info?.decimals ?? 9;
114
- pools.push(new Pool(addresses[i], data, depositDecimals, vaultDecimals));
119
+ const depositDecimals =
120
+ (depositMintInfo.value?.data as any)?.parsed?.info?.decimals ?? 6;
121
+ const vaultDecimals =
122
+ (vaultMintInfo.value?.data as any)?.parsed?.info?.decimals ?? 9;
123
+ pools.push(
124
+ new Pool(addresses[i], data, depositDecimals, vaultDecimals),
125
+ );
115
126
  } else {
116
127
  pools.push(new Pool(addresses[i], undefined));
117
128
  }
@@ -137,29 +148,40 @@ export class ElementalV2Context {
137
148
 
138
149
  async loadPosition(pool: Pool, ownerAddress?: PublicKey): Promise<Position> {
139
150
  const address = this.findPositionAddress(pool.address, ownerAddress);
140
- const data = await (this.program.account as any).position.fetchNullable(address);
151
+ const data = await (this.program.account as any).position.fetchNullable(
152
+ address,
153
+ );
141
154
  return new Position(
142
155
  pool,
143
156
  address,
144
- data || this.defaultPositionData(pool, ownerAddress)
157
+ data || this.defaultPositionData(pool, ownerAddress),
145
158
  );
146
159
  }
147
160
 
148
- async loadPositions(pools: Pool[], ownerAddress?: PublicKey): Promise<Position[]> {
161
+ async loadPositions(
162
+ pools: Pool[],
163
+ ownerAddress?: PublicKey,
164
+ ): Promise<Position[]> {
149
165
  const addresses = pools.map((pool) =>
150
- this.findPositionAddress(pool.address, ownerAddress)
166
+ this.findPositionAddress(pool.address, ownerAddress),
167
+ );
168
+ const accounts = await (this.program.account as any).position.fetchMultiple(
169
+ addresses,
151
170
  );
152
- const accounts = await (this.program.account as any).position.fetchMultiple(addresses);
153
- return accounts.map((data: PositionData | null, index: number) =>
154
- new Position(
155
- pools[index],
156
- addresses[index],
157
- data || this.defaultPositionData(pools[index], ownerAddress)
158
- )
171
+ return accounts.map(
172
+ (data: PositionData | null, index: number) =>
173
+ new Position(
174
+ pools[index],
175
+ addresses[index],
176
+ data || this.defaultPositionData(pools[index], ownerAddress),
177
+ ),
159
178
  );
160
179
  }
161
180
 
162
- private defaultPositionData(pool: Pool, ownerAddress?: PublicKey): PositionData {
181
+ private defaultPositionData(
182
+ pool: Pool,
183
+ ownerAddress?: PublicKey,
184
+ ): PositionData {
163
185
  return {
164
186
  pool: pool.address,
165
187
  owner: ownerAddress || this.walletAddress,
@@ -180,7 +202,7 @@ export class ElementalV2Context {
180
202
 
181
203
  async createPositionInstruction(
182
204
  pool: Pool,
183
- ownerAddress?: PublicKey
205
+ ownerAddress?: PublicKey,
184
206
  ): Promise<TransactionInstruction> {
185
207
  const owner = ownerAddress || this.walletAddress;
186
208
  const positionAddress = this.findPositionAddress(pool.address, owner);
@@ -199,7 +221,7 @@ export class ElementalV2Context {
199
221
  async depositInstructions(
200
222
  position: Position,
201
223
  amount: number | string,
202
- minOutput?: number | string
224
+ minOutput?: number | string,
203
225
  ): Promise<TransactionInstruction[]> {
204
226
  const instructions: TransactionInstruction[] = [];
205
227
 
@@ -214,27 +236,29 @@ export class ElementalV2Context {
214
236
  // IMPORTANT: Deposits are in deposit_mint terms (e.g., USDC with 6 decimals)
215
237
  // NOT vault_mint terms (e.g., ONYC with 9 decimals)
216
238
  // Fetch deposit mint decimals
217
- const depositMintInfo = await this.connection.getParsedAccountInfo(pool.depositMintAddress);
218
- const depositDecimals = (depositMintInfo.value?.data as any)?.parsed?.info?.decimals ?? 6;
239
+ const depositMintInfo = await this.connection.getParsedAccountInfo(
240
+ pool.depositMintAddress,
241
+ );
242
+ const depositDecimals =
243
+ (depositMintInfo.value?.data as any)?.parsed?.info?.decimals ?? 6;
219
244
  const depositMultiplier = Math.pow(10, depositDecimals);
220
245
 
221
246
  const amountBN = new BN(
222
- new Decimal(amount.toString())
223
- .mul(depositMultiplier)
224
- .toFixed(0)
247
+ new Decimal(amount.toString()).mul(depositMultiplier).toFixed(0),
225
248
  );
226
249
 
227
250
  const minOutputBN = minOutput
228
251
  ? new BN(
229
252
  new Decimal(minOutput.toString())
230
253
  .mul(new Decimal(pool.data.perTokenAmount.toString()))
231
- .toFixed(0)
254
+ .toFixed(0),
232
255
  )
233
256
  : null;
234
257
 
235
258
  const userTokenAccount = getAssociatedTokenAddressSync(
236
259
  pool.depositMintAddress,
237
- this.walletAddress
260
+ this.walletAddress,
261
+ true,
238
262
  );
239
263
 
240
264
  // For OnRe adapter, we need to:
@@ -245,7 +269,7 @@ export class ElementalV2Context {
245
269
  const poolAuthTokenAccount = getAssociatedTokenAddressSync(
246
270
  pool.depositMintAddress,
247
271
  poolAuthority,
248
- true // allowOwnerOffCurve for PDA
272
+ true, // allowOwnerOffCurve for PDA
249
273
  );
250
274
 
251
275
  // Check if pool_authority's token account exists
@@ -258,8 +282,8 @@ export class ElementalV2Context {
258
282
  this.walletAddress,
259
283
  poolAuthTokenAccount,
260
284
  poolAuthority,
261
- pool.depositMintAddress
262
- )
285
+ pool.depositMintAddress,
286
+ ),
263
287
  );
264
288
  } else {
265
289
  throw err;
@@ -272,12 +296,15 @@ export class ElementalV2Context {
272
296
  userTokenAccount,
273
297
  poolAuthTokenAccount,
274
298
  this.walletAddress,
275
- BigInt(amountBN.toString())
276
- )
299
+ BigInt(amountBN.toString()),
300
+ ),
277
301
  );
278
302
 
279
303
  // Build remaining accounts for OnRe CPI
280
- const remainingAccounts = await this.getOnReRemainingAccounts(pool, poolAuthTokenAccount);
304
+ const remainingAccounts = await this.getOnReRemainingAccounts(
305
+ pool,
306
+ poolAuthTokenAccount,
307
+ );
281
308
 
282
309
  // Build deposit instruction
283
310
  const depositIx = await (this.program.methods as any)
@@ -333,7 +360,7 @@ export class ElementalV2Context {
333
360
  */
334
361
  private async getOnReRemainingAccounts(
335
362
  pool: Pool,
336
- poolAuthTokenAccount: PublicKey
363
+ poolAuthTokenAccount: PublicKey,
337
364
  ): Promise<{ pubkey: PublicKey; isSigner: boolean; isWritable: boolean }[]> {
338
365
  const onreOffer = pool.onReOfferAddress;
339
366
  if (!onreOffer) throw new Error("OnRe offer not configured");
@@ -343,29 +370,33 @@ export class ElementalV2Context {
343
370
  // Derive OnRe PDAs
344
371
  const [onreVaultAuth] = PublicKey.findProgramAddressSync(
345
372
  [Buffer.from("offer_vault_authority")],
346
- ONRE_PROGRAM_ID
373
+ ONRE_PROGRAM_ID,
347
374
  );
348
375
 
349
376
  const [permissionlessAuth] = PublicKey.findProgramAddressSync(
350
377
  [Buffer.from("permissionless-1")],
351
- ONRE_PROGRAM_ID
378
+ ONRE_PROGRAM_ID,
352
379
  );
353
380
 
354
381
  const [mintAuthority] = PublicKey.findProgramAddressSync(
355
382
  [Buffer.from("mint_authority")],
356
- ONRE_PROGRAM_ID
383
+ ONRE_PROGRAM_ID,
357
384
  );
358
385
 
359
386
  // OnRe state PDA
360
387
  const [onreState] = PublicKey.findProgramAddressSync(
361
388
  [Buffer.from("state")],
362
- ONRE_PROGRAM_ID
389
+ ONRE_PROGRAM_ID,
363
390
  );
364
391
 
365
392
  // OnRe offer PDA (derived from token pair)
366
393
  const [onreOfferPda] = PublicKey.findProgramAddressSync(
367
- [Buffer.from("offer"), pool.depositMintAddress.toBuffer(), pool.vaultMintAddress.toBuffer()],
368
- ONRE_PROGRAM_ID
394
+ [
395
+ Buffer.from("offer"),
396
+ pool.depositMintAddress.toBuffer(),
397
+ pool.vaultMintAddress.toBuffer(),
398
+ ],
399
+ ONRE_PROGRAM_ID,
369
400
  );
370
401
 
371
402
  // Boss - hardcoded for mainnet (from OnRe state account)
@@ -375,63 +406,75 @@ export class ElementalV2Context {
375
406
  const onreVaultUsdcAccount = getAssociatedTokenAddressSync(
376
407
  pool.depositMintAddress,
377
408
  onreVaultAuth,
378
- true
409
+ true,
379
410
  );
380
411
  const onreVaultOnycAccount = getAssociatedTokenAddressSync(
381
412
  pool.vaultMintAddress,
382
413
  onreVaultAuth,
383
- true
414
+ true,
384
415
  );
385
416
 
386
417
  // Permissionless token accounts
387
418
  const permTokenIn = getAssociatedTokenAddressSync(
388
419
  pool.depositMintAddress,
389
420
  permissionlessAuth,
390
- true
421
+ true,
391
422
  );
392
423
  const permTokenOut = getAssociatedTokenAddressSync(
393
424
  pool.vaultMintAddress,
394
425
  permissionlessAuth,
395
- true
426
+ true,
396
427
  );
397
428
 
398
429
  // Boss token account
399
430
  const bossTokenIn = getAssociatedTokenAddressSync(
400
431
  pool.depositMintAddress,
401
432
  boss,
402
- true
433
+ true,
403
434
  );
404
435
 
405
436
  // 22 accounts for OnRe CPI - ORDER MATTERS!
406
437
  return [
407
- { pubkey: ONRE_PROGRAM_ID, isSigner: false, isWritable: false }, // 0: onre_program
408
- { pubkey: onreOfferPda, isSigner: false, isWritable: true }, // 1: offer
409
- { pubkey: onreState, isSigner: false, isWritable: false }, // 2: state
410
- { pubkey: boss, isSigner: false, isWritable: false }, // 3: boss
411
- { pubkey: onreVaultAuth, isSigner: false, isWritable: false }, // 4: vault_authority
412
- { pubkey: onreVaultUsdcAccount, isSigner: false, isWritable: true }, // 5: vault_token_in_account
413
- { pubkey: onreVaultOnycAccount, isSigner: false, isWritable: true }, // 6: vault_token_out_account
414
- { pubkey: permissionlessAuth, isSigner: false, isWritable: false }, // 7: permissionless_authority
415
- { pubkey: permTokenIn, isSigner: false, isWritable: true }, // 8: permissionless_token_in_account
416
- { pubkey: permTokenOut, isSigner: false, isWritable: true }, // 9: permissionless_token_out_account
417
- { pubkey: pool.depositMintAddress, isSigner: false, isWritable: true }, // 10: token_in_mint
418
- { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }, // 11: token_in_program
419
- { pubkey: pool.vaultMintAddress, isSigner: false, isWritable: true }, // 12: token_out_mint
420
- { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }, // 13: token_out_program
421
- { pubkey: poolAuthTokenAccount, isSigner: false, isWritable: true }, // 14: user_token_in_account (pool_authority's ATA!)
422
- { pubkey: pool.liquidityHolderAddress, isSigner: false, isWritable: true }, // 15: user_token_out_account (vault's liquidity holder)
423
- { pubkey: bossTokenIn, isSigner: false, isWritable: true }, // 16: boss_token_in_account
424
- { pubkey: mintAuthority, isSigner: false, isWritable: false }, // 17: mint_authority
425
- { pubkey: SYSVAR_INSTRUCTIONS_PUBKEY, isSigner: false, isWritable: false }, // 18: instructions_sysvar
426
- { pubkey: poolAuthority, isSigner: false, isWritable: true }, // 19: user (pool_authority signs via CPI!)
427
- { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },// 20: associated_token_program
428
- { pubkey: SystemProgram.programId, isSigner: false, isWritable: false }, // 21: system_program
438
+ { pubkey: ONRE_PROGRAM_ID, isSigner: false, isWritable: false }, // 0: onre_program
439
+ { pubkey: onreOfferPda, isSigner: false, isWritable: true }, // 1: offer
440
+ { pubkey: onreState, isSigner: false, isWritable: false }, // 2: state
441
+ { pubkey: boss, isSigner: false, isWritable: false }, // 3: boss
442
+ { pubkey: onreVaultAuth, isSigner: false, isWritable: false }, // 4: vault_authority
443
+ { pubkey: onreVaultUsdcAccount, isSigner: false, isWritable: true }, // 5: vault_token_in_account
444
+ { pubkey: onreVaultOnycAccount, isSigner: false, isWritable: true }, // 6: vault_token_out_account
445
+ { pubkey: permissionlessAuth, isSigner: false, isWritable: false }, // 7: permissionless_authority
446
+ { pubkey: permTokenIn, isSigner: false, isWritable: true }, // 8: permissionless_token_in_account
447
+ { pubkey: permTokenOut, isSigner: false, isWritable: true }, // 9: permissionless_token_out_account
448
+ { pubkey: pool.depositMintAddress, isSigner: false, isWritable: true }, // 10: token_in_mint
449
+ { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }, // 11: token_in_program
450
+ { pubkey: pool.vaultMintAddress, isSigner: false, isWritable: true }, // 12: token_out_mint
451
+ { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }, // 13: token_out_program
452
+ { pubkey: poolAuthTokenAccount, isSigner: false, isWritable: true }, // 14: user_token_in_account (pool_authority's ATA!)
453
+ {
454
+ pubkey: pool.liquidityHolderAddress,
455
+ isSigner: false,
456
+ isWritable: true,
457
+ }, // 15: user_token_out_account (vault's liquidity holder)
458
+ { pubkey: bossTokenIn, isSigner: false, isWritable: true }, // 16: boss_token_in_account
459
+ { pubkey: mintAuthority, isSigner: false, isWritable: false }, // 17: mint_authority
460
+ {
461
+ pubkey: SYSVAR_INSTRUCTIONS_PUBKEY,
462
+ isSigner: false,
463
+ isWritable: false,
464
+ }, // 18: instructions_sysvar
465
+ { pubkey: poolAuthority, isSigner: false, isWritable: true }, // 19: user (pool_authority signs via CPI!)
466
+ {
467
+ pubkey: ASSOCIATED_TOKEN_PROGRAM_ID,
468
+ isSigner: false,
469
+ isWritable: false,
470
+ }, // 20: associated_token_program
471
+ { pubkey: SystemProgram.programId, isSigner: false, isWritable: false }, // 21: system_program
429
472
  ];
430
473
  }
431
474
 
432
475
  async depositVaultMintInstructions(
433
476
  position: Position,
434
- amount: number | string
477
+ amount: number | string,
435
478
  ): Promise<TransactionInstruction[]> {
436
479
  const instructions: TransactionInstruction[] = [];
437
480
 
@@ -445,14 +488,13 @@ export class ElementalV2Context {
445
488
  const vaultMultiplier = Math.pow(10, pool.vaultDecimals);
446
489
 
447
490
  const amountBN = new BN(
448
- new Decimal(amount.toString())
449
- .mul(vaultMultiplier)
450
- .toFixed(0)
491
+ new Decimal(amount.toString()).mul(vaultMultiplier).toFixed(0),
451
492
  );
452
493
 
453
494
  const userTokenAccount = getAssociatedTokenAddressSync(
454
495
  pool.vaultMintAddress,
455
- this.walletAddress
496
+ this.walletAddress,
497
+ true,
456
498
  );
457
499
 
458
500
  const depositIx = await (this.program.methods as any)
@@ -476,12 +518,12 @@ export class ElementalV2Context {
476
518
 
477
519
  async deactivateInstructions(
478
520
  position: Position,
479
- amount: number | string
521
+ amount: number | string,
480
522
  ): Promise<TransactionInstruction[]> {
481
523
  const amountBN = new BN(
482
524
  new Decimal(amount.toString())
483
525
  .mul(new Decimal(position.pool.data.perTokenAmount.toString()))
484
- .toFixed(0)
526
+ .toFixed(0),
485
527
  );
486
528
 
487
529
  const ix = await (this.program.methods as any)
@@ -496,7 +538,9 @@ export class ElementalV2Context {
496
538
  return [ix];
497
539
  }
498
540
 
499
- async claimInstructions(position: Position): Promise<TransactionInstruction[]> {
541
+ async claimInstructions(
542
+ position: Position,
543
+ ): Promise<TransactionInstruction[]> {
500
544
  const ix = await (this.program.methods as any)
501
545
  .claim()
502
546
  .accounts({
@@ -509,13 +553,16 @@ export class ElementalV2Context {
509
553
  return [ix];
510
554
  }
511
555
 
512
- async withdrawInstructions(position: Position): Promise<TransactionInstruction[]> {
556
+ async withdrawInstructions(
557
+ position: Position,
558
+ ): Promise<TransactionInstruction[]> {
513
559
  const instructions: TransactionInstruction[] = [];
514
560
  const pool = position.pool;
515
561
 
516
562
  const userVaultTokenAccount = getAssociatedTokenAddressSync(
517
563
  pool.vaultMintAddress,
518
- this.walletAddress
564
+ this.walletAddress,
565
+ true,
519
566
  );
520
567
 
521
568
  // Check if user's vault token account exists
@@ -528,8 +575,8 @@ export class ElementalV2Context {
528
575
  this.walletAddress,
529
576
  userVaultTokenAccount,
530
577
  this.walletAddress,
531
- pool.vaultMintAddress
532
- )
578
+ pool.vaultMintAddress,
579
+ ),
533
580
  );
534
581
  } else {
535
582
  throw err;
@@ -558,17 +605,18 @@ export class ElementalV2Context {
558
605
 
559
606
  async fundFaucetInstructions(
560
607
  pool: Pool,
561
- amount: number | string
608
+ amount: number | string,
562
609
  ): Promise<TransactionInstruction[]> {
563
610
  const amountBN = new BN(
564
611
  new Decimal(amount.toString())
565
612
  .mul(new Decimal(pool.data.perTokenAmount.toString()))
566
- .toFixed(0)
613
+ .toFixed(0),
567
614
  );
568
615
 
569
616
  const userTokenAccount = getAssociatedTokenAddressSync(
570
617
  pool.vaultMintAddress,
571
- this.walletAddress
618
+ this.walletAddress,
619
+ true,
572
620
  );
573
621
 
574
622
  const ix = await (this.program.methods as any)
@@ -601,35 +649,35 @@ export class ElementalV2Context {
601
649
  maxSupply?: number | string;
602
650
  maxDepositAmount?: number | string;
603
651
  minDepositAmount?: number | string;
604
- }
652
+ },
605
653
  ): Promise<TransactionInstruction[]> {
606
654
  const configParams = {
607
655
  rewardAnnualRate: params.rewardAnnualRate
608
656
  ? new BN(
609
657
  new Decimal(params.rewardAnnualRate.toString())
610
658
  .mul(FIXED_ONE.toString())
611
- .toFixed(0)
659
+ .toFixed(0),
612
660
  )
613
661
  : null,
614
662
  maxSupply: params.maxSupply
615
663
  ? new BN(
616
664
  new Decimal(params.maxSupply.toString())
617
665
  .mul(new Decimal(pool.data.perTokenAmount.toString()))
618
- .toFixed(0)
666
+ .toFixed(0),
619
667
  )
620
668
  : null,
621
669
  maxDepositAmount: params.maxDepositAmount
622
670
  ? new BN(
623
671
  new Decimal(params.maxDepositAmount.toString())
624
672
  .mul(new Decimal(pool.data.perTokenAmount.toString()))
625
- .toFixed(0)
673
+ .toFixed(0),
626
674
  )
627
675
  : null,
628
676
  minDepositAmount: params.minDepositAmount
629
677
  ? new BN(
630
678
  new Decimal(params.minDepositAmount.toString())
631
679
  .mul(new Decimal(pool.data.perTokenAmount.toString()))
632
- .toFixed(0)
680
+ .toFixed(0),
633
681
  )
634
682
  : null,
635
683
  };
@@ -651,7 +699,7 @@ export class ElementalV2Context {
651
699
 
652
700
  async sendTransaction(
653
701
  instructions: TransactionInstruction[],
654
- signers: Keypair[] = []
702
+ signers: Keypair[] = [],
655
703
  ): Promise<TransactionSignature> {
656
704
  const tx = new Transaction().add(...instructions);
657
705
  return await this.provider.sendAndConfirm(tx, signers);
@@ -661,23 +709,30 @@ export class ElementalV2Context {
661
709
  async deposit(
662
710
  position: Position,
663
711
  amount: number | string,
664
- minOutput?: number | string
712
+ minOutput?: number | string,
665
713
  ): Promise<TransactionSignature> {
666
- const instructions = await this.depositInstructions(position, amount, minOutput);
714
+ const instructions = await this.depositInstructions(
715
+ position,
716
+ amount,
717
+ minOutput,
718
+ );
667
719
  return await this.sendTransaction(instructions);
668
720
  }
669
721
 
670
722
  async depositVaultMint(
671
723
  position: Position,
672
- amount: number | string
724
+ amount: number | string,
673
725
  ): Promise<TransactionSignature> {
674
- const instructions = await this.depositVaultMintInstructions(position, amount);
726
+ const instructions = await this.depositVaultMintInstructions(
727
+ position,
728
+ amount,
729
+ );
675
730
  return await this.sendTransaction(instructions);
676
731
  }
677
732
 
678
733
  async deactivate(
679
734
  position: Position,
680
- amount: number | string
735
+ amount: number | string,
681
736
  ): Promise<TransactionSignature> {
682
737
  const instructions = await this.deactivateInstructions(position, amount);
683
738
  return await this.sendTransaction(instructions);
@@ -693,7 +748,10 @@ export class ElementalV2Context {
693
748
  return await this.sendTransaction(instructions);
694
749
  }
695
750
 
696
- async fundFaucet(pool: Pool, amount: number | string): Promise<TransactionSignature> {
751
+ async fundFaucet(
752
+ pool: Pool,
753
+ amount: number | string,
754
+ ): Promise<TransactionSignature> {
697
755
  const instructions = await this.fundFaucetInstructions(pool, amount);
698
756
  return await this.sendTransaction(instructions);
699
757
  }
@@ -710,7 +768,7 @@ export class ElementalV2Context {
710
768
  maxSupply?: number | string;
711
769
  maxDepositAmount?: number | string;
712
770
  minDepositAmount?: number | string;
713
- }
771
+ },
714
772
  ): Promise<TransactionSignature> {
715
773
  const instructions = await this.updateConfigInstructions(pool, params);
716
774
  return await this.sendTransaction(instructions);
@@ -721,22 +779,31 @@ export class ElementalV2Context {
721
779
  // ============================================================================
722
780
 
723
781
  setPoolUpdatedEventListener(
724
- callback: (event: { pubkey: PublicKey; data: Partial<PoolData> }) => void
782
+ callback: (event: { pubkey: PublicKey; data: Partial<PoolData> }) => void,
725
783
  ): void {
726
784
  this.listeners.push(
727
- this.program.addEventListener("poolUpdatedEvent", (event, _slot, signature) => {
728
- callback(event);
729
- })
785
+ this.program.addEventListener(
786
+ "poolUpdatedEvent",
787
+ (event, _slot, signature) => {
788
+ callback(event);
789
+ },
790
+ ),
730
791
  );
731
792
  }
732
793
 
733
794
  setPositionUpdatedEventListener(
734
- callback: (event: { pubkey: PublicKey; data: Partial<PositionData> }) => void
795
+ callback: (event: {
796
+ pubkey: PublicKey;
797
+ data: Partial<PositionData>;
798
+ }) => void,
735
799
  ): void {
736
800
  this.listeners.push(
737
- this.program.addEventListener("positionUpdatedEvent", (event, _slot, signature) => {
738
- callback(event);
739
- })
801
+ this.program.addEventListener(
802
+ "positionUpdatedEvent",
803
+ (event, _slot, signature) => {
804
+ callback(event);
805
+ },
806
+ ),
740
807
  );
741
808
  }
742
809