@haven-fi/solauto-sdk 1.0.15 → 1.0.16
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.
|
@@ -12,7 +12,7 @@ export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
|
|
|
12
12
|
marginfiAccountSeedIdx?: bigint;
|
|
13
13
|
marginfiGroup?: PublicKey;
|
|
14
14
|
}
|
|
15
|
-
export declare function
|
|
15
|
+
export declare function newSolautoMarginfiPositionArgs(positionId: number, signer: Signer | undefined, wallet: WalletAdapter | undefined, supplyMint: PublicKey, debtMint: PublicKey, referredByAuthority?: PublicKey): SolautoMarginfiClientArgs;
|
|
16
16
|
export declare class SolautoMarginfiClient extends SolautoClient {
|
|
17
17
|
marginfiProgram: PublicKey;
|
|
18
18
|
marginfiAccountSeedIdx?: bigint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,MAAM,EACN,kBAAkB,
|
|
1
|
+
{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,MAAM,EACN,kBAAkB,EAOnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,SAAS,EAEV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAQhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAOnE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,mBAAmB,CAAC,EAAE,SAAS,GAC9B,yBAAyB,CAiB3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAuEhD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA2C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAMhE,OAAO,CAAC,6BAA6B;IA8DrC,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA4CrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SolautoMarginfiClient = exports.
|
|
3
|
+
exports.SolautoMarginfiClient = exports.newSolautoMarginfiPositionArgs = void 0;
|
|
4
4
|
const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
|
|
5
5
|
const umi_1 = require("@metaplex-foundation/umi");
|
|
6
6
|
const web3_js_1 = require("@solana/web3.js");
|
|
@@ -12,18 +12,21 @@ const generalUtils_1 = require("../utils/generalUtils");
|
|
|
12
12
|
const marginfi_sdk_1 = require("../marginfi-sdk");
|
|
13
13
|
const marginfiUtils_1 = require("../utils/marginfiUtils");
|
|
14
14
|
const numberUtils_1 = require("../utils/numberUtils");
|
|
15
|
-
function
|
|
15
|
+
function newSolautoMarginfiPositionArgs(positionId, signer, wallet, supplyMint, debtMint, referredByAuthority) {
|
|
16
16
|
return {
|
|
17
17
|
positionId,
|
|
18
18
|
signer,
|
|
19
19
|
wallet,
|
|
20
|
+
marginfiAccount: positionId === 0
|
|
21
|
+
? (0, umi_1.createSignerFromKeypair)((0, umi_1.createUmi)(), (0, umi_web3js_adapters_1.fromWeb3JsKeypair)(web3_js_1.Keypair.generate()))
|
|
22
|
+
: undefined,
|
|
20
23
|
marginfiAccountSeedIdx: positionId > 0 ? (0, generalUtils_1.generateRandomU64)() : undefined,
|
|
21
24
|
supplyMint: supplyMint,
|
|
22
25
|
debtMint: debtMint,
|
|
23
26
|
referredByAuthority,
|
|
24
27
|
};
|
|
25
28
|
}
|
|
26
|
-
exports.
|
|
29
|
+
exports.newSolautoMarginfiPositionArgs = newSolautoMarginfiPositionArgs;
|
|
27
30
|
class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
|
|
28
31
|
async initialize(args) {
|
|
29
32
|
if (args.marginfiAccount) {
|
package/package.json
CHANGED
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
transactionBuilder,
|
|
12
12
|
createSignerFromKeypair,
|
|
13
13
|
AccountMeta,
|
|
14
|
+
createUmi,
|
|
14
15
|
} from "@metaplex-foundation/umi";
|
|
15
16
|
import {
|
|
16
17
|
Keypair,
|
|
@@ -64,7 +65,7 @@ export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
|
|
|
64
65
|
marginfiGroup?: PublicKey;
|
|
65
66
|
}
|
|
66
67
|
|
|
67
|
-
export function
|
|
68
|
+
export function newSolautoMarginfiPositionArgs(
|
|
68
69
|
positionId: number,
|
|
69
70
|
signer: Signer | undefined,
|
|
70
71
|
wallet: WalletAdapter | undefined,
|
|
@@ -76,6 +77,13 @@ export function newMarginfiSolautoManagedPositionArgs(
|
|
|
76
77
|
positionId,
|
|
77
78
|
signer,
|
|
78
79
|
wallet,
|
|
80
|
+
marginfiAccount:
|
|
81
|
+
positionId === 0
|
|
82
|
+
? createSignerFromKeypair(
|
|
83
|
+
createUmi(),
|
|
84
|
+
fromWeb3JsKeypair(Keypair.generate())
|
|
85
|
+
)
|
|
86
|
+
: undefined,
|
|
79
87
|
marginfiAccountSeedIdx: positionId > 0 ? generateRandomU64() : undefined,
|
|
80
88
|
supplyMint: supplyMint,
|
|
81
89
|
debtMint: debtMint,
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { describe, it } from
|
|
1
|
+
import { describe, it } from "mocha";
|
|
2
2
|
import { none, some } from "@metaplex-foundation/umi";
|
|
3
3
|
import { setupTest } from "../shared";
|
|
4
4
|
import {
|
|
5
5
|
SolautoMarginfiClient,
|
|
6
|
-
|
|
6
|
+
newSolautoMarginfiPositionArgs,
|
|
7
7
|
} from "../../src/clients/solautoMarginfiClient";
|
|
8
8
|
import {
|
|
9
9
|
solautoAction,
|
|
@@ -17,6 +17,8 @@ import {
|
|
|
17
17
|
TransactionItem,
|
|
18
18
|
TransactionsManager,
|
|
19
19
|
} from "../../src/transactions/transactionsManager";
|
|
20
|
+
import { PublicKey } from "@solana/web3.js";
|
|
21
|
+
import { USDC_MINT } from "../../src/constants";
|
|
20
22
|
|
|
21
23
|
describe("Solauto Marginfi tests", async () => {
|
|
22
24
|
const signer = setupTest();
|
|
@@ -33,12 +35,12 @@ describe("Solauto Marginfi tests", async () => {
|
|
|
33
35
|
const debtDecimals = 6;
|
|
34
36
|
|
|
35
37
|
await client.initialize(
|
|
36
|
-
//
|
|
38
|
+
// newSolautoMarginfiPositionArgs(
|
|
37
39
|
// positionId,
|
|
38
40
|
// signer,
|
|
39
41
|
// undefined,
|
|
40
42
|
// supply,
|
|
41
|
-
//
|
|
43
|
+
// new PublicKey(USDC_MINT)
|
|
42
44
|
// )
|
|
43
45
|
{
|
|
44
46
|
signer,
|