@haven-fi/solauto-sdk 1.0.613 → 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.
@@ -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
|
@@ -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;
|
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"}
|
@@ -212,9 +212,9 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
|
|
212
212
|
},
|
213
213
|
]);
|
214
214
|
}
|
215
|
-
const banksRequiringBalanceClose = remainingAccounts
|
216
|
-
|
217
|
-
|
215
|
+
// const banksRequiringBalanceClose = remainingAccounts
|
216
|
+
// .filter((_, index) => index % 2 === 0)
|
217
|
+
// .map((x) => toWeb3JsPublicKey(x.pubkey));
|
218
218
|
return (0, umi_1.transactionBuilder)()
|
219
219
|
.add((0, marginfi_sdk_1.lendingAccountRepay)(this.umi, {
|
220
220
|
amount: flashLoan.baseUnitAmount,
|
@@ -226,19 +226,15 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
|
|
226
226
|
signer: this.signer,
|
227
227
|
signerTokenAccount: (0, umi_1.publicKey)((0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), flashLoan.mint)),
|
228
228
|
}))
|
229
|
-
.add(
|
229
|
+
// .add(
|
230
|
+
// banksRequiringBalanceClose.map((bank) =>
|
231
|
+
// this.closeBalance(iMfiAccount.accountPk, bank, marginfiGroup)
|
232
|
+
// )
|
233
|
+
// )
|
230
234
|
.add((0, marginfi_sdk_1.lendingAccountEndFlashloan)(this.umi, {
|
231
235
|
marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
|
232
236
|
signer: this.signer,
|
233
237
|
}).addRemainingAccounts(remainingAccounts));
|
234
238
|
}
|
235
|
-
closeBalance(marginfiAccount, bank, marginfiGroup) {
|
236
|
-
return (0, umi_1.transactionBuilder)().add((0, marginfi_sdk_1.lendingAccountCloseBalance)(this.umi, {
|
237
|
-
signer: this.signer,
|
238
|
-
marginfiAccount: (0, umi_1.publicKey)(marginfiAccount),
|
239
|
-
bank: (0, umi_1.publicKey)(bank),
|
240
|
-
marginfiGroup: (0, umi_1.publicKey)(marginfiGroup),
|
241
|
-
}));
|
242
|
-
}
|
243
239
|
}
|
244
240
|
exports.MarginfiFlProvider = MarginfiFlProvider;
|
package/package.json
CHANGED
@@ -340,9 +340,9 @@ export class MarginfiFlProvider extends FlProviderBase {
|
|
340
340
|
);
|
341
341
|
}
|
342
342
|
|
343
|
-
const banksRequiringBalanceClose = remainingAccounts
|
344
|
-
|
345
|
-
|
343
|
+
// const banksRequiringBalanceClose = remainingAccounts
|
344
|
+
// .filter((_, index) => index % 2 === 0)
|
345
|
+
// .map((x) => toWeb3JsPublicKey(x.pubkey));
|
346
346
|
|
347
347
|
return transactionBuilder()
|
348
348
|
.add(
|
@@ -362,11 +362,11 @@ export class MarginfiFlProvider extends FlProviderBase {
|
|
362
362
|
),
|
363
363
|
})
|
364
364
|
)
|
365
|
-
.add(
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
-
)
|
365
|
+
// .add(
|
366
|
+
// banksRequiringBalanceClose.map((bank) =>
|
367
|
+
// this.closeBalance(iMfiAccount.accountPk, bank, marginfiGroup)
|
368
|
+
// )
|
369
|
+
// )
|
370
370
|
.add(
|
371
371
|
lendingAccountEndFlashloan(this.umi, {
|
372
372
|
marginfiAccount: publicKey(iMfiAccount.accountPk),
|
@@ -375,18 +375,18 @@ export class MarginfiFlProvider extends FlProviderBase {
|
|
375
375
|
);
|
376
376
|
}
|
377
377
|
|
378
|
-
closeBalance(
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
) {
|
383
|
-
|
384
|
-
|
385
|
-
|
386
|
-
|
387
|
-
|
388
|
-
|
389
|
-
|
390
|
-
|
391
|
-
}
|
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
|
+
// }
|
392
392
|
}
|