@deriverse/kit 1.0.19 → 1.0.21
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/index.js +8 -2
- package/dist/instruction_models.d.ts +1 -1
- package/dist/instruction_models.js +2 -2
- package/dist/types.d.ts +2 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -262,6 +262,9 @@ class Engine {
|
|
|
262
262
|
let crncyTokenDec = 1;
|
|
263
263
|
let logs = [];
|
|
264
264
|
for (var log of data) {
|
|
265
|
+
if (log.startsWith("Program returned error")) {
|
|
266
|
+
return [];
|
|
267
|
+
}
|
|
265
268
|
if (!log.startsWith("Program data: ")) {
|
|
266
269
|
continue;
|
|
267
270
|
}
|
|
@@ -1824,10 +1827,13 @@ class Engine {
|
|
|
1824
1827
|
*/
|
|
1825
1828
|
depositInstruction(args) {
|
|
1826
1829
|
return __awaiter(this, void 0, void 0, function* () {
|
|
1830
|
+
var _a, _b;
|
|
1827
1831
|
const exists = yield this.checkClient();
|
|
1828
1832
|
if (this.signer == null) {
|
|
1829
1833
|
throw new Error("Wallet is not connected");
|
|
1830
1834
|
}
|
|
1835
|
+
const amount = (_a = args.amount) !== null && _a !== void 0 ? _a : 0;
|
|
1836
|
+
const allFunds = (_b = args.all_funds) !== null && _b !== void 0 ? _b : false;
|
|
1831
1837
|
const token = this.tokens.get(args.tokenId);
|
|
1832
1838
|
const tokenProgramId = (token.mask & 0x80000000) != 0 ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID;
|
|
1833
1839
|
const clientTokenAccount = yield findAssociatedTokenAddress(this.signer, tokenProgramId, token.address);
|
|
@@ -1850,7 +1856,7 @@ class Engine {
|
|
|
1850
1856
|
return {
|
|
1851
1857
|
accounts: keys,
|
|
1852
1858
|
programAddress: this.programId,
|
|
1853
|
-
data: (0, instruction_models_1.depositData)(7, args.tokenId,
|
|
1859
|
+
data: (0, instruction_models_1.depositData)(7, args.tokenId, amount * this.tokenDec(args.tokenId), 0, 0, allFunds)
|
|
1854
1860
|
};
|
|
1855
1861
|
}
|
|
1856
1862
|
else {
|
|
@@ -1880,7 +1886,7 @@ class Engine {
|
|
|
1880
1886
|
return {
|
|
1881
1887
|
accounts: keys,
|
|
1882
1888
|
programAddress: this.programId,
|
|
1883
|
-
data: (0, instruction_models_1.depositData)(7, args.tokenId,
|
|
1889
|
+
data: (0, instruction_models_1.depositData)(7, args.tokenId, amount * this.tokenDec(args.tokenId), slot, refId, allFunds)
|
|
1884
1890
|
};
|
|
1885
1891
|
}
|
|
1886
1892
|
});
|
|
@@ -10,7 +10,7 @@ export declare function spotOrderCancelData(tag: number, side: number, instrId:
|
|
|
10
10
|
export declare function spotMassCancelData(tag: number, instrId: number): Buffer;
|
|
11
11
|
export declare function spotLpData(tag: number, side: number, instrId: number, amount: number): Buffer;
|
|
12
12
|
export declare function newInstrumentData(tag: number, crncyTokenId: number, lutSlot: number, price: number): Buffer;
|
|
13
|
-
export declare function depositData(tag: number, tokenId: number, amount: number, lutSlot: number, refId: number): Buffer;
|
|
13
|
+
export declare function depositData(tag: number, tokenId: number, amount: number, lutSlot: number, refId: number, allFunds: boolean): Buffer;
|
|
14
14
|
export declare function feesDepositData(tag: number, tokenId: number, amount: number): Buffer;
|
|
15
15
|
export declare function feesWithdrawData(tag: number, tokenId: number, amount: number): Buffer;
|
|
16
16
|
export declare function perpDepositData(tag: number, instrId: number, amount: number): Buffer;
|
|
@@ -106,11 +106,11 @@ function newInstrumentData(tag, crncyTokenId, lutSlot, price) {
|
|
|
106
106
|
return buf;
|
|
107
107
|
}
|
|
108
108
|
exports.newInstrumentData = newInstrumentData;
|
|
109
|
-
function depositData(tag, tokenId, amount, lutSlot, refId) {
|
|
109
|
+
function depositData(tag, tokenId, amount, lutSlot, refId, allFunds) {
|
|
110
110
|
let buf = Buffer.alloc(24);
|
|
111
111
|
buf.writeUint8(tag, 0);
|
|
112
112
|
buf.writeUint8(0, 1);
|
|
113
|
-
buf.writeUint16LE(0, 2);
|
|
113
|
+
buf.writeUint16LE(allFunds ? 1 : 0, 2);
|
|
114
114
|
buf.writeUint32LE(tokenId, 4);
|
|
115
115
|
buf.writeBigInt64LE(BigInt(amount), 8);
|
|
116
116
|
buf.writeUint32LE(lutSlot, 16);
|
package/dist/types.d.ts
CHANGED
|
@@ -357,9 +357,10 @@ export interface PerpOrderCancelArgs {
|
|
|
357
357
|
*/
|
|
358
358
|
export interface DepositArgs {
|
|
359
359
|
tokenId: number;
|
|
360
|
-
amount
|
|
360
|
+
amount?: number;
|
|
361
361
|
refId?: number;
|
|
362
362
|
refWallet?: Address;
|
|
363
|
+
all_funds?: boolean;
|
|
363
364
|
}
|
|
364
365
|
/**
|
|
365
366
|
* Contains data about SPL tokens on main client account
|