@quartz-labs/sdk 0.3.0 → 0.3.2
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/client.d.ts.map +1 -1
- package/dist/client.js +2 -2
- package/dist/client.js.map +1 -1
- package/dist/config/constants.d.ts +1 -0
- package/dist/config/constants.d.ts.map +1 -1
- package/dist/config/constants.js +1 -0
- package/dist/config/constants.js.map +1 -1
- package/dist/services/driftClientService.d.ts.map +1 -1
- package/dist/services/driftClientService.js +5 -4
- package/dist/services/driftClientService.js.map +1 -1
- package/dist/types/classes/dummyWallet.class.d.ts +4 -4
- package/dist/types/classes/dummyWallet.class.d.ts.map +1 -1
- package/dist/types/classes/dummyWallet.class.js +8 -7
- package/dist/types/classes/dummyWallet.class.js.map +1 -1
- package/dist/user.d.ts +1 -1
- package/dist/user.d.ts.map +1 -1
- package/dist/user.js +16 -12
- package/dist/user.js.map +1 -1
- package/dist/utils/helpers.d.ts +2 -1
- package/dist/utils/helpers.d.ts.map +1 -1
- package/dist/utils/helpers.js +5 -0
- package/dist/utils/helpers.js.map +1 -1
- package/package.json +2 -2
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,EAAO,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAyC,OAAO,EAAe,MAAM,mBAAmB,CAAC;AAChG,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,yBAAyB,EAAE,0BAA0B,EAAS,MAAM,iBAAiB,CAAC;AAC3H,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAKvC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAE9D,qBAAa,YAAY;IACrB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,WAAW,CAAc;gBAG7B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EACxB,kBAAkB,EAAE,yBAAyB,EAC7C,WAAW,EAAE,WAAW;WAQR,WAAW,CAC3B,UAAU,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,EAAO,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAyC,OAAO,EAAe,MAAM,mBAAmB,CAAC;AAChG,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,yBAAyB,EAAE,0BAA0B,EAAS,MAAM,iBAAiB,CAAC;AAC3H,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAKvC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAE9D,qBAAa,YAAY;IACrB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,WAAW,CAAc;gBAG7B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EACxB,kBAAkB,EAAE,yBAAyB,EAC7C,WAAW,EAAE,WAAW;WAQR,WAAW,CAC3B,UAAU,EAAE,UAAU;IAoBb,+BAA+B,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAMvD,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;IAqBvD,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC;IAmC9E,cAAc,CAAC,eAAe,EAAE,MAAM;IAMtC,aAAa,CAAC,eAAe,EAAE,MAAM;YAMpC,oBAAoB;IAMrB,oBAAoB,CAC7B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,CAAC,WAAW,EAAE,0BAA0B,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,IAAI;IAgCjF,qBAAqB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;CA2B1F"}
|
package/dist/client.js
CHANGED
|
@@ -5,7 +5,7 @@ import { AnchorProvider, BorshInstructionCoder, Program, setProvider } from "@co
|
|
|
5
5
|
import { QuartzUser } from "./user.js";
|
|
6
6
|
import { getDriftStatePublicKey, getDriftUserPublicKey, getDriftUserStatsPublicKey, getVaultPublicKey } from "./utils/helpers.js";
|
|
7
7
|
import { DriftClientService } from "./services/driftClientService.js";
|
|
8
|
-
import {
|
|
8
|
+
import { SystemProgram, SYSVAR_RENT_PUBKEY, } from "@solana/web3.js";
|
|
9
9
|
import { DummyWallet } from "./types/classes/dummyWallet.class.js";
|
|
10
10
|
export class QuartzClient {
|
|
11
11
|
connection;
|
|
@@ -19,7 +19,7 @@ export class QuartzClient {
|
|
|
19
19
|
this.driftClient = driftClient;
|
|
20
20
|
}
|
|
21
21
|
static async fetchClient(connection) {
|
|
22
|
-
const wallet = new DummyWallet(
|
|
22
|
+
const wallet = new DummyWallet();
|
|
23
23
|
const provider = new AnchorProvider(connection, wallet, { commitment: "confirmed" });
|
|
24
24
|
setProvider(provider);
|
|
25
25
|
const program = new Program(IDL, QUARTZ_PROGRAM_ID, provider);
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,0BAA0B,IAAI,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AACzJ,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,GAAG,EAAe,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhG,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAClI,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { PublicKey } from "@solana/web3.js";
|
|
2
2
|
export declare const QUARTZ_PROGRAM_ID: PublicKey;
|
|
3
3
|
export declare const QUARTZ_ADDRESS_TABLE: PublicKey;
|
|
4
|
+
export declare const QUARTZ_DRIFT_ACCOUNT: PublicKey;
|
|
4
5
|
export declare const DRIFT_PROGRAM_ID: PublicKey;
|
|
5
6
|
export declare const PYTH_ORACLE_PROGRAM_ID: PublicKey;
|
|
6
7
|
export declare const QUARTZ_HEALTH_BUFFER = 10;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,iBAAiB,WAAgE,CAAC;AAC/F,eAAO,MAAM,oBAAoB,WAAgE,CAAC;AAElG,eAAO,MAAM,gBAAgB,WAA+D,CAAC;AAC7F,eAAO,MAAM,sBAAsB,WAA+D,CAAC;AAEnG,eAAO,MAAM,oBAAoB,KAAK,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,iBAAiB,WAAgE,CAAC;AAC/F,eAAO,MAAM,oBAAoB,WAAgE,CAAC;AAClG,eAAO,MAAM,oBAAoB,WAAgE,CAAC;AAElG,eAAO,MAAM,gBAAgB,WAA+D,CAAC;AAC7F,eAAO,MAAM,sBAAsB,WAA+D,CAAC;AAEnG,eAAO,MAAM,oBAAoB,KAAK,CAAC"}
|
package/dist/config/constants.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { PublicKey } from "@solana/web3.js";
|
|
2
2
|
export const QUARTZ_PROGRAM_ID = new PublicKey("6JjHXLheGSNvvexgzMthEcgjkcirDrGduc3HAKB2P1v2");
|
|
3
3
|
export const QUARTZ_ADDRESS_TABLE = new PublicKey("96BmeKKVGX3LKYSKo3FCEom1YpNY11kCnGscKq6ouxLx");
|
|
4
|
+
export const QUARTZ_DRIFT_ACCOUNT = new PublicKey("5XY5pQbBjwv8ByBxKPNE7Xyb9dVcdFgd51xcxKDJjGWE");
|
|
4
5
|
export const DRIFT_PROGRAM_ID = new PublicKey("dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH");
|
|
5
6
|
export const PYTH_ORACLE_PROGRAM_ID = new PublicKey("pythWSnswVUd12oZpeFP8e9CVaEqJg25g1Vtc2biRsT");
|
|
6
7
|
export const QUARTZ_HEALTH_BUFFER = 10;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAC/F,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAElG,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAC7F,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAEnG,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAC/F,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAClG,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAElG,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAC7F,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAEnG,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driftClientService.d.ts","sourceRoot":"","sources":["../../src/services/driftClientService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"driftClientService.d.ts","sourceRoot":"","sources":["../../src/services/driftClientService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAKlD,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAqB;IAC5C,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,sBAAsB,CAAmB;gBAG7C,UAAU,EAAE,UAAU;WAmBN,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC;CAOnF"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import { DriftClient
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import { DriftClient } from "@drift-labs/sdk";
|
|
2
|
+
import { MarketIndex } from "../config/tokens.js";
|
|
3
|
+
import { DummyWallet } from "../types/classes/dummyWallet.class.js";
|
|
4
|
+
import { QUARTZ_DRIFT_ACCOUNT } from "../config/constants.js";
|
|
4
5
|
export class DriftClientService {
|
|
5
6
|
static instance;
|
|
6
7
|
driftClient;
|
|
7
8
|
driftClientInitPromise;
|
|
8
9
|
constructor(connection) {
|
|
9
|
-
const wallet = new
|
|
10
|
+
const wallet = new DummyWallet(QUARTZ_DRIFT_ACCOUNT);
|
|
10
11
|
this.driftClient = new DriftClient({
|
|
11
12
|
connection: connection,
|
|
12
13
|
wallet: wallet,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driftClientService.js","sourceRoot":"","sources":["../../src/services/driftClientService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"driftClientService.js","sourceRoot":"","sources":["../../src/services/driftClientService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,OAAO,kBAAkB;IACnB,MAAM,CAAC,QAAQ,CAAqB;IACpC,WAAW,CAAc;IACzB,sBAAsB,CAAmB;IAEjD,YACI,UAAsB;QAEtB,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,oBAAoB,CAAC,CAAC;QAErD,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC;YAC/B,UAAU,EAAE,UAAU;YACtB,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,cAAc;YACnB,SAAS,EAAE,KAAK;YAChB,iBAAiB,EAAE,EAAE;YACrB,iBAAiB,EAAE,CAAC,GAAG,WAAW,CAAC;YACnC,mBAAmB,EAAE;gBACjB,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,WAAW;aAC1B;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;IAC/D,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,UAAsB;QACrD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;YAC/B,kBAAkB,CAAC,QAAQ,GAAG,IAAI,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACrE,CAAC;QACD,MAAM,kBAAkB,CAAC,QAAQ,CAAC,sBAAsB,CAAC;QACzD,OAAO,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC;IACnD,CAAC;CACJ"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Keypair, type PublicKey, type Transaction, type VersionedTransaction } from "@solana/web3.js";
|
|
2
2
|
export declare class DummyWallet {
|
|
3
3
|
publicKey: PublicKey;
|
|
4
4
|
payer: Keypair;
|
|
5
|
-
constructor(
|
|
6
|
-
signTransaction<T extends Transaction | VersionedTransaction>(
|
|
7
|
-
signAllTransactions<T extends Transaction | VersionedTransaction>(
|
|
5
|
+
constructor(publicKey?: PublicKey);
|
|
6
|
+
signTransaction<T extends Transaction | VersionedTransaction>(_: T): Promise<T>;
|
|
7
|
+
signAllTransactions<T extends Transaction | VersionedTransaction>(_: T[]): Promise<T[]>;
|
|
8
8
|
}
|
|
9
9
|
//# sourceMappingURL=dummyWallet.class.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dummyWallet.class.d.ts","sourceRoot":"","sources":["../../../src/types/classes/dummyWallet.class.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"dummyWallet.class.d.ts","sourceRoot":"","sources":["../../../src/types/classes/dummyWallet.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,KAAK,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvG,qBAAa,WAAW;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;gBAEH,SAAS,CAAC,EAAE,SAAS;IAKjC,eAAe,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAI/E,mBAAmB,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;CAG1F"}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
|
+
import { Keypair } from "@solana/web3.js";
|
|
1
2
|
export class DummyWallet {
|
|
2
3
|
publicKey;
|
|
3
4
|
payer;
|
|
4
|
-
constructor(
|
|
5
|
-
this.payer =
|
|
6
|
-
this.publicKey =
|
|
5
|
+
constructor(publicKey) {
|
|
6
|
+
this.payer = Keypair.generate();
|
|
7
|
+
this.publicKey = publicKey ?? this.payer.publicKey;
|
|
7
8
|
}
|
|
8
|
-
signTransaction(
|
|
9
|
-
|
|
9
|
+
signTransaction(_) {
|
|
10
|
+
throw new Error("DummyWallet cannot sign transactions");
|
|
10
11
|
}
|
|
11
|
-
signAllTransactions(
|
|
12
|
-
|
|
12
|
+
signAllTransactions(_) {
|
|
13
|
+
throw new Error("DummyWallet cannot sign transactions");
|
|
13
14
|
}
|
|
14
15
|
}
|
|
15
16
|
//# sourceMappingURL=dummyWallet.class.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dummyWallet.class.js","sourceRoot":"","sources":["../../../src/types/classes/dummyWallet.class.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dummyWallet.class.js","sourceRoot":"","sources":["../../../src/types/classes/dummyWallet.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA+D,MAAM,iBAAiB,CAAC;AAEvG,MAAM,OAAO,WAAW;IACpB,SAAS,CAAY;IACrB,KAAK,CAAU;IAEf,YAAY,SAAqB;QAC7B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IACvD,CAAC;IAED,eAAe,CAA+C,CAAI;QAC9D,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC5D,CAAC;IAED,mBAAmB,CAA+C,CAAM;QACpE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC5D,CAAC;CACJ"}
|
package/dist/user.d.ts
CHANGED
|
@@ -24,7 +24,7 @@ export declare class QuartzUser {
|
|
|
24
24
|
makeCloseAccountIxs(): Promise<TransactionInstruction[]>;
|
|
25
25
|
makeDepositIx(amountBaseUnits: number, mint: PublicKey, marketIndex: MarketIndex, reduceOnly: boolean): Promise<TransactionInstruction>;
|
|
26
26
|
makeWithdrawIx(amountBaseUnits: number, mint: PublicKey, marketIndex: MarketIndex, reduceOnly: boolean): Promise<TransactionInstruction>;
|
|
27
|
-
makeCollateralRepayIxs(caller: PublicKey,
|
|
27
|
+
makeCollateralRepayIxs(caller: PublicKey, depositMint: PublicKey, depositMarketIndex: MarketIndex, withdrawMint: PublicKey, withdrawMarketIndex: MarketIndex, callerWithdrawSplStartBalance: number, jupiterExactOutRouteQuote: QuoteResponse): Promise<{
|
|
28
28
|
ixs: TransactionInstruction[];
|
|
29
29
|
lookupTables: AddressLookupTableAccount[];
|
|
30
30
|
}>;
|
package/dist/user.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../src/user.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,sBAAsB,EAAG,MAAM,iBAAiB,CAAC;AAEtG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAG,MAAM,iBAAiB,CAAC;AASlD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,UAAU;IACnB,SAAgB,MAAM,EAAE,SAAS,CAAC;IAClC,SAAgB,WAAW,EAAE,SAAS,CAAC;IAEvC,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,iBAAiB,CAA4B;IAErD,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,WAAW,CAAY;gBAG3B,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EACxB,iBAAiB,EAAE,yBAAyB,EAC5C,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,WAAW;IAiBjC,OAAO,CAAC,qBAAqB;IAetB,SAAS,IAAI,MAAM;IAKnB,6BAA6B,CAChC,YAAY,EAAE,MAAM,EACpB,qBAAqB,EAAE,MAAM,GAC9B,MAAM;IA4BF,uBAAuB,IAAI,MAAM;IAIjC,+BAA+B,IAAI,MAAM;IAIzC,+BAA+B,IAAI,MAAM;IAInC,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIzD,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAO5D,mBAAmB;IAwBnB,aAAa,CACtB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../src/user.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,sBAAsB,EAAG,MAAM,iBAAiB,CAAC;AAEtG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAG,MAAM,iBAAiB,CAAC;AASlD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,UAAU;IACnB,SAAgB,MAAM,EAAE,SAAS,CAAC;IAClC,SAAgB,WAAW,EAAE,SAAS,CAAC;IAEvC,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,iBAAiB,CAA4B;IAErD,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,WAAW,CAAY;gBAG3B,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EACxB,iBAAiB,EAAE,yBAAyB,EAC5C,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,WAAW;IAiBjC,OAAO,CAAC,qBAAqB;IAetB,SAAS,IAAI,MAAM;IAKnB,6BAA6B,CAChC,YAAY,EAAE,MAAM,EACpB,qBAAqB,EAAE,MAAM,GAC9B,MAAM;IA4BF,uBAAuB,IAAI,MAAM;IAIjC,+BAA+B,IAAI,MAAM;IAIzC,+BAA+B,IAAI,MAAM;IAInC,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIzD,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAO5D,mBAAmB;IAwBnB,aAAa,CACtB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,OAAO;IA8BV,cAAc,CACvB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,OAAO;IA+BV,sBAAsB,CAC/B,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,SAAS,EACtB,kBAAkB,EAAE,WAAW,EAC/B,YAAY,EAAE,SAAS,EACvB,mBAAmB,EAAE,WAAW,EAChC,6BAA6B,EAAE,MAAM,EACrC,yBAAyB,EAAE,aAAa,GACzC,OAAO,CAAC;QACP,GAAG,EAAE,sBAAsB,EAAE,CAAA;QAC7B,YAAY,EAAE,yBAAyB,EAAE,CAAC;KAC7C,CAAC;CA4GL"}
|
package/dist/user.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { DriftUser } from "./types/classes/driftUser.class.js";
|
|
2
2
|
import { DRIFT_PROGRAM_ID, QUARTZ_HEALTH_BUFFER, } from "./config/constants.js";
|
|
3
|
-
import { getDriftSpotMarketVaultPublicKey, getDriftStatePublicKey, getPythOracle, getVaultPublicKey, getVaultSplPublicKey } from "./utils/helpers.js";
|
|
3
|
+
import { getDriftSpotMarketVaultPublicKey, getDriftStatePublicKey, getPythOracle, getTokenProgram, getVaultPublicKey, getVaultSplPublicKey } from "./utils/helpers.js";
|
|
4
4
|
import { getDriftSignerPublicKey } from "./utils/helpers.js";
|
|
5
|
-
import { getAssociatedTokenAddress,
|
|
5
|
+
import { getAssociatedTokenAddress, } from "@solana/spl-token";
|
|
6
6
|
import { SystemProgram, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
|
|
7
7
|
import { ASSOCIATED_TOKEN_PROGRAM_ID } from "@solana/spl-token";
|
|
8
8
|
import { BN } from "bn.js";
|
|
@@ -94,7 +94,8 @@ export class QuartzUser {
|
|
|
94
94
|
return [ix_closeDriftAccount, ix_closeVault];
|
|
95
95
|
}
|
|
96
96
|
async makeDepositIx(amountBaseUnits, mint, marketIndex, reduceOnly) {
|
|
97
|
-
const
|
|
97
|
+
const tokenProgram = await getTokenProgram(this.connection, mint);
|
|
98
|
+
const ownerSpl = await getAssociatedTokenAddress(mint, this.pubkey, false, tokenProgram);
|
|
98
99
|
const ix = await this.program.methods
|
|
99
100
|
.deposit(new BN(amountBaseUnits), marketIndex, reduceOnly)
|
|
100
101
|
.accounts({
|
|
@@ -107,7 +108,7 @@ export class QuartzUser {
|
|
|
107
108
|
driftUserStats: this.driftUser.statsPubkey,
|
|
108
109
|
driftState: getDriftStatePublicKey(),
|
|
109
110
|
spotMarketVault: getDriftSpotMarketVaultPublicKey(marketIndex),
|
|
110
|
-
tokenProgram:
|
|
111
|
+
tokenProgram: tokenProgram,
|
|
111
112
|
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
112
113
|
driftProgram: DRIFT_PROGRAM_ID,
|
|
113
114
|
systemProgram: SystemProgram.programId
|
|
@@ -117,7 +118,8 @@ export class QuartzUser {
|
|
|
117
118
|
return ix;
|
|
118
119
|
}
|
|
119
120
|
async makeWithdrawIx(amountBaseUnits, mint, marketIndex, reduceOnly) {
|
|
120
|
-
const
|
|
121
|
+
const tokenProgram = await getTokenProgram(this.connection, mint);
|
|
122
|
+
const ownerSpl = await getAssociatedTokenAddress(mint, this.pubkey, false, tokenProgram);
|
|
121
123
|
const ix = await this.program.methods
|
|
122
124
|
.withdraw(new BN(amountBaseUnits), marketIndex, reduceOnly)
|
|
123
125
|
.accounts({
|
|
@@ -131,7 +133,7 @@ export class QuartzUser {
|
|
|
131
133
|
driftState: getDriftStatePublicKey(),
|
|
132
134
|
spotMarketVault: getDriftSpotMarketVaultPublicKey(marketIndex),
|
|
133
135
|
driftSigner: this.driftSigner,
|
|
134
|
-
tokenProgram:
|
|
136
|
+
tokenProgram: tokenProgram,
|
|
135
137
|
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
136
138
|
driftProgram: DRIFT_PROGRAM_ID,
|
|
137
139
|
systemProgram: SystemProgram.programId
|
|
@@ -140,15 +142,17 @@ export class QuartzUser {
|
|
|
140
142
|
.instruction();
|
|
141
143
|
return ix;
|
|
142
144
|
}
|
|
143
|
-
async makeCollateralRepayIxs(caller,
|
|
144
|
-
if (jupiterExactOutRouteQuote.swapMode !== SwapMode.ExactOut)
|
|
145
|
-
throw Error("Jupiter quote must be ExactOutRoute");
|
|
145
|
+
async makeCollateralRepayIxs(caller, depositMint, depositMarketIndex, withdrawMint, withdrawMarketIndex, callerWithdrawSplStartBalance, jupiterExactOutRouteQuote) {
|
|
146
146
|
if (jupiterExactOutRouteQuote.swapMode !== SwapMode.ExactOut)
|
|
147
147
|
throw Error("Jupiter quote must be ExactOutRoute");
|
|
148
148
|
if (jupiterExactOutRouteQuote.inputMint !== withdrawMint.toBase58())
|
|
149
149
|
throw Error("Jupiter quote inputMint does not match withdrawMint");
|
|
150
150
|
if (jupiterExactOutRouteQuote.outputMint !== depositMint.toBase58())
|
|
151
151
|
throw Error("Jupiter quote outputMint does not match depositMint");
|
|
152
|
+
const depositTokenProgram = await getTokenProgram(this.connection, depositMint);
|
|
153
|
+
const callerDepositSpl = await getAssociatedTokenAddress(depositMint, caller, false, depositTokenProgram);
|
|
154
|
+
const withdrawTokenProgram = await getTokenProgram(this.connection, withdrawMint);
|
|
155
|
+
const callerWithdrawSpl = await getAssociatedTokenAddress(withdrawMint, caller, false, withdrawTokenProgram);
|
|
152
156
|
const driftState = getDriftStatePublicKey();
|
|
153
157
|
const driftSpotMarketDeposit = getDriftSpotMarketVaultPublicKey(depositMarketIndex);
|
|
154
158
|
const driftSpotMarketWithdraw = getDriftSpotMarketVaultPublicKey(withdrawMarketIndex);
|
|
@@ -161,7 +165,7 @@ export class QuartzUser {
|
|
|
161
165
|
vault: this.vaultPubkey,
|
|
162
166
|
vaultWithdrawSpl: getVaultSplPublicKey(this.pubkey, withdrawMint),
|
|
163
167
|
owner: this.pubkey,
|
|
164
|
-
tokenProgram:
|
|
168
|
+
tokenProgram: withdrawTokenProgram,
|
|
165
169
|
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
166
170
|
systemProgram: SystemProgram.programId,
|
|
167
171
|
instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
|
|
@@ -181,7 +185,7 @@ export class QuartzUser {
|
|
|
181
185
|
driftUserStats: this.driftUser.statsPubkey,
|
|
182
186
|
driftState: driftState,
|
|
183
187
|
spotMarketVault: driftSpotMarketDeposit,
|
|
184
|
-
tokenProgram:
|
|
188
|
+
tokenProgram: depositTokenProgram,
|
|
185
189
|
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
186
190
|
driftProgram: DRIFT_PROGRAM_ID,
|
|
187
191
|
systemProgram: SystemProgram.programId,
|
|
@@ -203,7 +207,7 @@ export class QuartzUser {
|
|
|
203
207
|
driftState: driftState,
|
|
204
208
|
spotMarketVault: driftSpotMarketWithdraw,
|
|
205
209
|
driftSigner: this.driftSigner,
|
|
206
|
-
tokenProgram:
|
|
210
|
+
tokenProgram: withdrawTokenProgram,
|
|
207
211
|
driftProgram: DRIFT_PROGRAM_ID,
|
|
208
212
|
systemProgram: SystemProgram.programId,
|
|
209
213
|
depositPriceUpdate: getPythOracle(depositMarketIndex),
|
package/dist/user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../src/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAG/D,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,GAAG,MAAM,uBAAuB,CAAC;AAIhF,OAAO,EAAE,gCAAgC,EAAE,sBAAsB,EAAE,aAAa,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../src/user.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/helpers.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PublicKey } from "@solana/web3.js";
|
|
1
|
+
import { type Connection, PublicKey } from "@solana/web3.js";
|
|
2
2
|
import type { AccountMeta } from "../types/interfaces/accountMeta.interface.js";
|
|
3
3
|
import { type MarketIndex } from "../config/tokens.js";
|
|
4
4
|
export declare const getVaultPublicKey: (user: PublicKey) => PublicKey;
|
|
@@ -13,4 +13,5 @@ export declare const getPythPriceFeedAccount: (shardId: number, priceFeedId: str
|
|
|
13
13
|
export declare const getPythOracle: (marketIndex: MarketIndex) => PublicKey;
|
|
14
14
|
export declare const createPriorityFeeInstructions: (computeBudget: number) => Promise<import("@solana/web3.js").TransactionInstruction[]>;
|
|
15
15
|
export declare const toRemainingAccount: (pubkey: PublicKey, isSigner: boolean, isWritable: boolean) => AccountMeta;
|
|
16
|
+
export declare const getTokenProgram: (connection: Connection, mint: PublicKey) => Promise<PublicKey>;
|
|
16
17
|
//# sourceMappingURL=helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,SAAS,EAAG,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,UAAU,EAAE,SAAS,EAAG,MAAM,iBAAiB,CAAC;AAGpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,KAAK,WAAW,EAAU,MAAM,qBAAqB,CAAC;AAG/D,eAAO,MAAM,iBAAiB,SAAU,SAAS,cAMhD,CAAA;AAED,eAAO,MAAM,oBAAoB,SAAU,SAAS,QAAQ,SAAS,cAOpE,CAAA;AAED,eAAO,MAAM,qBAAqB,aAAc,SAAS,cAUxD,CAAA;AAED,eAAO,MAAM,0BAA0B,aAAc,SAAS,cAM7D,CAAA;AAED,eAAO,MAAM,sBAAsB,iBAMlC,CAAA;AAED,eAAO,MAAM,uBAAuB,iBAMnC,CAAA;AAED,eAAO,MAAM,gCAAgC,gBAAiB,MAAM,cASnE,CAAA;AAED,eAAO,MAAM,2BAA2B,gBAAiB,MAAM,cAS9D,CAAA;AAED,eAAO,MAAM,uBAAuB,YAAa,MAAM,eAAe,MAAM,cAa3E,CAAA;AAED,eAAO,MAAM,aAAa,gBAAiB,WAAW,cAGrD,CAAA;AAED,eAAO,MAAM,6BAA6B,kBAAyB,MAAM,gEASxE,CAAA;AAED,eAAO,MAAM,kBAAkB,WAAY,SAAS,YAAY,OAAO,cAAc,OAAO,KAAG,WAM9F,CAAA;AAED,eAAO,MAAM,eAAe,eAAsB,UAAU,QAAQ,SAAS,uBAG5E,CAAA"}
|
package/dist/utils/helpers.js
CHANGED
|
@@ -2,6 +2,7 @@ import { ComputeBudgetProgram, PublicKey, } from "@solana/web3.js";
|
|
|
2
2
|
import { QUARTZ_PROGRAM_ID, DRIFT_PROGRAM_ID, PYTH_ORACLE_PROGRAM_ID } from "../config/constants.js";
|
|
3
3
|
import { BN } from "bn.js";
|
|
4
4
|
import { TOKENS } from "../config/tokens.js";
|
|
5
|
+
import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
|
|
5
6
|
export const getVaultPublicKey = (user) => {
|
|
6
7
|
const [vaultPda] = PublicKey.findProgramAddressSync([Buffer.from("vault"), user.toBuffer()], QUARTZ_PROGRAM_ID);
|
|
7
8
|
return vaultPda;
|
|
@@ -80,4 +81,8 @@ export const toRemainingAccount = (pubkey, isSigner, isWritable) => {
|
|
|
80
81
|
isWritable: isWritable,
|
|
81
82
|
};
|
|
82
83
|
};
|
|
84
|
+
export const getTokenProgram = async (connection, mint) => {
|
|
85
|
+
const mintAccount = await connection.getAccountInfo(mint);
|
|
86
|
+
return mintAccount?.owner || TOKEN_PROGRAM_ID;
|
|
87
|
+
};
|
|
83
88
|
//# sourceMappingURL=helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@quartz-labs/sdk",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.2",
|
|
4
4
|
"description": "SDK for interacting with the Quartz Protocol",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -64,4 +64,4 @@
|
|
|
64
64
|
"@solana/web3.js": "^1.98.0",
|
|
65
65
|
"rpc-websockets": "^9.0.4"
|
|
66
66
|
}
|
|
67
|
-
}
|
|
67
|
+
}
|