@haven-fi/solauto-sdk 1.0.612 → 1.0.614

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.
Files changed (8) hide show
  1. package/dist/services/flashLoans/marginfiFlProvider.d.ts +0 -1
  2. package/dist/services/flashLoans/marginfiFlProvider.d.ts.map +1 -1
  3. package/dist/services/flashLoans/marginfiFlProvider.js +9 -16
  4. package/dist/services/solauto/solautoClient.d.ts.map +1 -1
  5. package/dist/services/solauto/solautoClient.js +0 -1
  6. package/package.json +1 -1
  7. package/src/services/flashLoans/marginfiFlProvider.ts +23 -32
  8. package/src/services/solauto/solautoClient.ts +0 -1
package/dist/services/flashLoans/marginfiFlProvider.d.ts CHANGED
@@ -20,6 +20,5 @@ export declare class MarginfiFlProvider extends FlProviderBase {
20
20
  flFeeBps(source: TokenType, signerFlashLoan?: boolean): number;
21
21
  flashBorrow(flashLoan: FlashLoanDetails, destTokenAccount: PublicKey): TransactionBuilder;
22
22
  flashRepay(flashLoan: FlashLoanDetails): TransactionBuilder;
23
- closeBalance(marginfiAccount: PublicKey, bank: PublicKey, marginfiGroup: PublicKey): TransactionBuilder;
24
23
  }
25
24
  //# sourceMappingURL=marginfiFlProvider.d.ts.map
package/dist/services/flashLoans/marginfiFlProvider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marginfiFlProvider.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/marginfiFlProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAalC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAexE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQ/C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IAEhC,UAAU;YAiBF,iBAAiB;IA2C/B,OAAO,CAAC,sBAAsB;IA0CxB,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAc9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAoCrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IA6G3D,YAAY,CACV,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,SAAS;CAW3B"}
1
+ {"version":3,"file":"marginfiFlProvider.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/marginfiFlProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAalC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAexE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQ/C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IAEhC,UAAU;YAiBF,iBAAiB;IA2C/B,OAAO,CAAC,sBAAsB;IA0CxB,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAc9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAoCrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;CAkH5D"}
package/dist/services/flashLoans/marginfiFlProvider.js CHANGED
@@ -198,7 +198,7 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
198
198
  }
199
199
  });
200
200
  }
201
- if (!iMfiAccount.accountData || !includedFlashLoanToken) {
201
+ if (!includedFlashLoanToken) {
202
202
  remainingAccounts.push(...[
203
203
  {
204
204
  pubkey: bank.publicKey,
@@ -212,12 +212,9 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
212
212
  },
213
213
  ]);
214
214
  }
215
- const banksRequiringBalanceClose = Array.from(new Set([
216
- bank.publicKey.toString(),
217
- ...(iMfiAccount.accountData?.lendingAccount.balances ?? [])
218
- .filter((x) => x.active && (0, utils_1.bytesToI80F48)(x.liabilityShares.value) > 0)
219
- .map((x) => x.bankPk.toString()),
220
- ]));
215
+ // const banksRequiringBalanceClose = remainingAccounts
216
+ // .filter((_, index) => index % 2 === 0)
217
+ // .map((x) => toWeb3JsPublicKey(x.pubkey));
221
218
  return (0, umi_1.transactionBuilder)()
222
219
  .add((0, marginfi_sdk_1.lendingAccountRepay)(this.umi, {
223
220
  amount: flashLoan.baseUnitAmount,
@@ -229,19 +226,15 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
229
226
  signer: this.signer,
230
227
  signerTokenAccount: (0, umi_1.publicKey)((0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), flashLoan.mint)),
231
228
  }))
232
- .add(banksRequiringBalanceClose.map((x) => this.closeBalance(iMfiAccount.accountPk, new web3_js_1.PublicKey(x), marginfiGroup)))
229
+ // .add(
230
+ // banksRequiringBalanceClose.map((bank) =>
231
+ // this.closeBalance(iMfiAccount.accountPk, bank, marginfiGroup)
232
+ // )
233
+ // )
233
234
  .add((0, marginfi_sdk_1.lendingAccountEndFlashloan)(this.umi, {
234
235
  marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
235
236
  signer: this.signer,
236
237
  }).addRemainingAccounts(remainingAccounts));
237
238
  }
238
- closeBalance(marginfiAccount, bank, marginfiGroup) {
239
- return (0, umi_1.transactionBuilder)().add((0, marginfi_sdk_1.lendingAccountCloseBalance)(this.umi, {
240
- signer: this.signer,
241
- marginfiAccount: (0, umi_1.publicKey)(marginfiAccount),
242
- bank: (0, umi_1.publicKey)(bank),
243
- marginfiGroup: (0, umi_1.publicKey)(marginfiGroup),
244
- }));
245
- }
246
239
  }
247
240
  exports.MarginfiFlProvider = MarginfiFlProvider;
package/dist/services/solauto/solautoClient.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAEL,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,WAAW,iBAAkB,SAAQ,wBAAwB;IACjE,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,8BAAsB,aAAc,SAAQ,oBAAoB;IACvD,eAAe,EAAG,eAAe,CAAC;IAElC,SAAS,EAAG,SAAS,CAAC;IAEtB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,OAAO,CAAC;IACtB,GAAG,EAAG,iBAAiB,CAAC;IAExB,gBAAgB,EAAG,SAAS,CAAC;IAC7B,cAAc,EAAG,SAAS,CAAC;IAE3B,cAAc,EAAG,SAAS,CAAC;IAC3B,YAAY,EAAG,SAAS,CAAC;IAEzB,mBAAmB,EAAG,SAAS,CAAC;IAChC,iBAAiB,EAAG,SAAS,CAAC;IAE9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAEhC,UAAU,EAAG,oBAAoB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAwB;IAE7D,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,iBAAiB,CAAqB;IAExC,UAAU,CAAC,IAAI,EAAE,iBAAiB;IAmFxC,kBAAkB,IAAI,SAAS,GAAG,SAAS;IAO3C,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAOnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;IAkB1C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,gBAAgB,IAAI,SAAS,EAAE;IAoBzB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAC9B;QACE,EAAE,EAAE,kBAAkB,CAAC;QACvB,GAAG,EAAE,OAAO,CAAC;QACb,aAAa,EAAE,SAAS,EAAE,CAAC;KAC5B,GACD,SAAS,CACZ;IA4DK,cAAc,IAAI,OAAO,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IA8CF,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IA0BrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IAsDlE,QAAQ,CAAC,eAAe,IAAI,kBAAkB;IAE9C,WAAW,IAAI,kBAAkB;IAgCjC,QAAQ,CAAC,SAAS,IAAI,kBAAkB;IAExC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAsFlE,QAAQ,CAAC,WAAW,CAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CACtB"}
1
+ {"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAEL,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,WAAW,iBAAkB,SAAQ,wBAAwB;IACjE,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,8BAAsB,aAAc,SAAQ,oBAAoB;IACvD,eAAe,EAAG,eAAe,CAAC;IAElC,SAAS,EAAG,SAAS,CAAC;IAEtB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,OAAO,CAAC;IACtB,GAAG,EAAG,iBAAiB,CAAC;IAExB,gBAAgB,EAAG,SAAS,CAAC;IAC7B,cAAc,EAAG,SAAS,CAAC;IAE3B,cAAc,EAAG,SAAS,CAAC;IAC3B,YAAY,EAAG,SAAS,CAAC;IAEzB,mBAAmB,EAAG,SAAS,CAAC;IAChC,iBAAiB,EAAG,SAAS,CAAC;IAE9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAEhC,UAAU,EAAG,oBAAoB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAwB;IAE7D,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,iBAAiB,CAAqB;IAExC,UAAU,CAAC,IAAI,EAAE,iBAAiB;IAkFxC,kBAAkB,IAAI,SAAS,GAAG,SAAS;IAO3C,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAOnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;IAkB1C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,gBAAgB,IAAI,SAAS,EAAE;IAoBzB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAC9B;QACE,EAAE,EAAE,kBAAkB,CAAC;QACvB,GAAG,EAAE,OAAO,CAAC;QACb,aAAa,EAAE,SAAS,EAAE,CAAC;KAC5B,GACD,SAAS,CACZ;IA4DK,cAAc,IAAI,OAAO,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IA8CF,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IA0BrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IAsDlE,QAAQ,CAAC,eAAe,IAAI,kBAAkB;IAE9C,WAAW,IAAI,kBAAkB;IAgCjC,QAAQ,CAAC,SAAS,IAAI,kBAAkB;IAExC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAsFlE,QAAQ,CAAC,WAAW,CAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CACtB"}
package/dist/services/solauto/solautoClient.js CHANGED
@@ -54,7 +54,6 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
54
54
  this.log("Position DCA: ", this.pos.dca());
55
55
  this.log("Supply mint:", this.pos.supplyMint().toString());
56
56
  this.log("Debt mint:", this.pos.debtMint().toString());
57
- this.log("Lending pool:", (await this.pos.lendingPool()).toString());
58
57
  }
59
58
  referredBySupplyTa() {
60
59
  if (this.referredByState !== undefined) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haven-fi/solauto-sdk",
3
- "version": "1.0.612",
3
+ "version": "1.0.614",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "description": "Typescript SDK for the Solauto program on the Solana blockchain",
package/src/services/flashLoans/marginfiFlProvider.ts CHANGED
@@ -323,7 +323,7 @@ export class MarginfiFlProvider extends FlProviderBase {
323
323
  }
324
324
  });
325
325
  }
326
- if (!iMfiAccount.accountData || !includedFlashLoanToken) {
326
+ if (!includedFlashLoanToken) {
327
327
  remainingAccounts.push(
328
328
  ...[
329
329
  {
@@ -340,14 +340,9 @@ export class MarginfiFlProvider extends FlProviderBase {
340
340
  );
341
341
  }
342
342
 
343
- const banksRequiringBalanceClose = Array.from(
344
- new Set([
345
- bank.publicKey.toString(),
346
- ...(iMfiAccount.accountData?.lendingAccount.balances ?? [])
347
- .filter((x) => x.active && bytesToI80F48(x.liabilityShares.value) > 0)
348
- .map((x) => x.bankPk.toString()),
349
- ])
350
- );
343
+ // const banksRequiringBalanceClose = remainingAccounts
344
+ // .filter((_, index) => index % 2 === 0)
345
+ // .map((x) => toWeb3JsPublicKey(x.pubkey));
351
346
 
352
347
  return transactionBuilder()
353
348
  .add(
@@ -367,15 +362,11 @@ export class MarginfiFlProvider extends FlProviderBase {
367
362
  ),
368
363
  })
369
364
  )
370
- .add(
371
- banksRequiringBalanceClose.map((x) =>
372
- this.closeBalance(
373
- iMfiAccount.accountPk,
374
- new PublicKey(x),
375
- marginfiGroup
376
- )
377
- )
378
- )
365
+ // .add(
366
+ // banksRequiringBalanceClose.map((bank) =>
367
+ // this.closeBalance(iMfiAccount.accountPk, bank, marginfiGroup)
368
+ // )
369
+ // )
379
370
  .add(
380
371
  lendingAccountEndFlashloan(this.umi, {
381
372
  marginfiAccount: publicKey(iMfiAccount.accountPk),
@@ -384,18 +375,18 @@ export class MarginfiFlProvider extends FlProviderBase {
384
375
  );
385
376
  }
386
377
 
387
- closeBalance(
388
- marginfiAccount: PublicKey,
389
- bank: PublicKey,
390
- marginfiGroup: PublicKey
391
- ) {
392
- return transactionBuilder().add(
393
- lendingAccountCloseBalance(this.umi, {
394
- signer: this.signer,
395
- marginfiAccount: publicKey(marginfiAccount),
396
- bank: publicKey(bank),
397
- marginfiGroup: publicKey(marginfiGroup),
398
- })
399
- );
400
- }
378
+ // closeBalance(
379
+ // marginfiAccount: PublicKey,
380
+ // bank: PublicKey,
381
+ // marginfiGroup: PublicKey
382
+ // ) {
383
+ // return transactionBuilder().add(
384
+ // lendingAccountCloseBalance(this.umi, {
385
+ // signer: this.signer,
386
+ // marginfiAccount: publicKey(marginfiAccount),
387
+ // bank: publicKey(bank),
388
+ // marginfiGroup: publicKey(marginfiGroup),
389
+ // })
390
+ // );
391
+ // }
401
392
  }
package/src/services/solauto/solautoClient.ts CHANGED
@@ -162,7 +162,6 @@ export abstract class SolautoClient extends ReferralStateManager {
162
162
  this.log("Position DCA: ", this.pos.dca());
163
163
  this.log("Supply mint:", this.pos.supplyMint().toString());
164
164
  this.log("Debt mint:", this.pos.debtMint().toString());
165
- this.log("Lending pool:", (await this.pos.lendingPool()).toString());
166
165
  }
167
166
 
168
167
  referredBySupplyTa(): PublicKey | undefined {