@deriverse/kit 1.0.1 → 1.0.3

package/dist/auto_buffer.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 export declare class AutoBuffer {
     buffer: Buffer;
     offset_: number;

package/dist/auto_data.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Address, Base64EncodedDataResponse } from '@solana/kit';
 export declare class AutoData {
     buffer: Buffer;

package/dist/index.d.ts

@@ -1,11 +1,8 @@
 import { Address, Base64EncodedDataResponse, Rpc, IAccountMeta, IInstruction, Commitment } from "@solana/kit";
-import { Instrument, GetClientSpotOrdersInfoResponse, GetClientSpotOrdersArgs, GetClientSpotOrdersResponse, SpotOrderCancelArgs, GetClientDataResponse, GetClientSpotOrdersInfoArgs, SpotLpArgs, getInstrAccountByTagArgs, GetInstrIdArgs, NewSpotOrderArgs, DepositArgs, updateInstrDataArgs, WithdrawArgs, SpotQuotesReplaceArgs, SpotMassCancelArgs, InstrId, GetClientPerpOrdersInfoArgs, GetClientPerpOrdersInfoResponse, GetClientPerpOrdersArgs, GetClientPerpOrdersResponse, PerpDepositArgs, NewPerpOrderArgs, PerpQuotesReplaceArgs, PerpOrderCancelArgs, PerpMassCancelArgs, PerpForcedCloseArgs, CommunityData, LogMessage, PerpChangeLeverageArgs, PerpStatisticsResetArgs, EngineArgs } from './types';
+import { Instrument, GetClientSpotOrdersInfoResponse, GetClientSpotOrdersArgs, GetClientSpotOrdersResponse, SpotOrderCancelArgs, GetClientDataResponse, GetClientSpotOrdersInfoArgs, SpotLpArgs, getInstrAccountByTagArgs, GetInstrIdArgs, NewSpotOrderArgs, DepositArgs, WithdrawArgs, SpotQuotesReplaceArgs, SpotMassCancelArgs, InstrId, GetClientPerpOrdersInfoArgs, GetClientPerpOrdersInfoResponse, GetClientPerpOrdersArgs, GetClientPerpOrdersResponse, PerpDepositArgs, NewPerpOrderArgs, PerpQuotesReplaceArgs, PerpOrderCancelArgs, PerpMassCancelArgs, PerpForcedCloseArgs, CommunityData, LogMessage, PerpChangeLeverageArgs, PerpStatisticsResetArgs, EngineArgs } from './types';
 import { InstrAccountHeaderModel, RootStateModel, TokenStateModel } from "./structure_models";
 export * from './types';
-export { LogType } from './logs_models';
-export declare const TOKEN_PROGRAM_ID: Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
-export declare const TOKEN_2022_PROGRAM_ID: Address<"TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb">;
-export declare const ASSOCIATED_TOKEN_PROGRAM_ID: Address<"ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL">;
+export * from './logs_models';
 /**
  * Get price step between orderbook lines depending on curent price
  * @param price Current market price
@@ -75,7 +72,7 @@ export declare class Engine {
     getInstrId(args: GetInstrIdArgs): Promise<number | null>;
     /**
      * Assignes client public key to Engine
-     * @param wallet Client public key
+     * @param signer Client public key
      */
     setSigner(signer: Address<any>): Promise<void>;
     private findClientPrimaryAccount;
@@ -107,10 +104,10 @@ export declare class Engine {
      */
     getClientSpotOrders(args: GetClientSpotOrdersArgs): Promise<GetClientSpotOrdersResponse>;
     /**
-       * Get list of open orders (perp) in particular instrument
-       * @param args Contains data from getClientSpotOrdersInfo
-       * @returns List of open orders
-       */
+     * Get list of open orders (perp) in particular instrument
+     * @param args Contains data from getClientSpotOrdersInfo
+     * @returns List of open orders
+     */
     getClientPerpOrders(args: GetClientPerpOrdersArgs): Promise<GetClientPerpOrdersResponse>;
     /**
      * Unpack market data to Engine fields, you can use this function to subscribe to Solana account
@@ -127,7 +124,7 @@ export declare class Engine {
      * Update market data on Engine fields
      * @param args Instrument ID
      */
-    updateInstrData(args: updateInstrDataArgs): Promise<void>;
+    updateInstrData(args: InstrId): Promise<void>;
     /**
       * Build instruction to deposit SPL tokens
       * @param args Order data

package/dist/index.js

@@ -23,23 +23,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Engine = exports.getPriceStep = exports.ASSOCIATED_TOKEN_PROGRAM_ID = exports.TOKEN_2022_PROGRAM_ID = exports.TOKEN_PROGRAM_ID = exports.LogType = void 0;
+exports.Engine = exports.getPriceStep = void 0;
 const kit_1 = require("@solana/kit");
 const system_1 = require("@solana-program/system");
 const bs58_1 = require("bs58");
+const buffer_1 = require("buffer");
 const types_1 = require("./types");
 const structure_models_1 = require("./structure_models");
 const instruction_models_1 = require("./instruction_models");
 const base64_arraybuffer_1 = require("base64-arraybuffer");
 const logs_models_1 = require("./logs_models");
 __exportStar(require("./types"), exports);
-var logs_models_2 = require("./logs_models");
-Object.defineProperty(exports, "LogType", { enumerable: true, get: function () { return logs_models_2.LogType; } });
+__exportStar(require("./logs_models"), exports);
 const ADDRESS_LOOKUP_TABLE_PROGRAM_ID = (0, kit_1.address)("AddressLookupTab1e1111111111111111111111111");
 const SYSTEM_PROGRAM_ID = (0, kit_1.address)("11111111111111111111111111111111");
-exports.TOKEN_PROGRAM_ID = (0, kit_1.address)('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
-exports.TOKEN_2022_PROGRAM_ID = (0, kit_1.address)('TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb');
-exports.ASSOCIATED_TOKEN_PROGRAM_ID = (0, kit_1.address)('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL');
+const TOKEN_PROGRAM_ID = (0, kit_1.address)('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
+const TOKEN_2022_PROGRAM_ID = (0, kit_1.address)('TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb');
+const ASSOCIATED_TOKEN_PROGRAM_ID = (0, kit_1.address)('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL');
 const dec = 1000000000;
 const nullOrder = 0xFFFF;
 /**
@@ -164,7 +164,7 @@ exports.getPriceStep = getPriceStep;
 function findAssociatedTokenAddress(owner, tokenProgramId, mint) {
     return __awaiter(this, void 0, void 0, function* () {
         const address = (yield (0, kit_1.getProgramDerivedAddress)({
-            programAddress: exports.ASSOCIATED_TOKEN_PROGRAM_ID,
+            programAddress: ASSOCIATED_TOKEN_PROGRAM_ID,
             seeds: [
                 (0, kit_1.getAddressEncoder)().encode(owner),
                 (0, kit_1.getAddressEncoder)().encode(tokenProgramId),
@@ -198,7 +198,7 @@ function getMultiplePerpOrders(data, firstEntry) {
 }
 function getLookupTableAddress(authority, slot) {
     return __awaiter(this, void 0, void 0, function* () {
-        let buf = Buffer.alloc(8);
+        let buf = buffer_1.Buffer.alloc(8);
         buf.writeBigInt64LE(BigInt(slot), 0);
         const address = (yield (0, kit_1.getProgramDerivedAddress)({
             programAddress: ADDRESS_LOOKUP_TABLE_PROGRAM_ID,
@@ -248,7 +248,7 @@ class Engine {
             if (!log.startsWith("Program data: ")) {
                 continue;
             }
-            const buffer = Buffer.from((0, base64_arraybuffer_1.decode)(log.substring(14)));
+            const buffer = buffer_1.Buffer.from((0, base64_arraybuffer_1.decode)(log.substring(14)));
             switch (buffer[0]) {
                 case logs_models_1.LogType.deposit: {
                     if (buffer.length == logs_models_1.DepositReportModel.LENGTH) {
@@ -525,7 +525,7 @@ class Engine {
     }
     findAccountsByTag(tag, dataSlice) {
         return __awaiter(this, void 0, void 0, function* () {
-            let tagBuf = Buffer.alloc(8);
+            let tagBuf = buffer_1.Buffer.alloc(8);
             tagBuf.writeUInt32LE(tag, 0);
             tagBuf.writeUInt32LE(this.version, 4);
             let accounts = yield this.rpc.getProgramAccounts(this.programId, {
@@ -570,7 +570,7 @@ class Engine {
                 });
                 const instrAccounts = yield this.findAccountsByTag(types_1.AccountType.INSTR, { offset: 8, length: 16 });
                 instrAccounts.forEach((response) => {
-                    const buffer = Buffer.from((0, kit_1.getBase64Encoder)().encode(response.account.data[0]));
+                    const buffer = buffer_1.Buffer.from((0, kit_1.getBase64Encoder)().encode(response.account.data[0]));
                     let instrAccountHeaderModel = new structure_models_1.InstrAccountHeaderModel();
                     instrAccountHeaderModel.id = buffer.readUint32LE(0);
                     instrAccountHeaderModel.assetTokenId = buffer.readUint32LE(4);
@@ -671,7 +671,7 @@ class Engine {
     }
     getInstrAccountByTag(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let buf = Buffer.alloc(16);
+            let buf = buffer_1.Buffer.alloc(16);
             buf.writeInt32LE(this.version, 0);
             buf.writeInt32LE(args.tag, 4);
             buf.writeInt32LE(args.assetTokenId, 8);
@@ -685,7 +685,7 @@ class Engine {
     }
     getAccountByTag(tag) {
         return __awaiter(this, void 0, void 0, function* () {
-            let buf = Buffer.alloc(8);
+            let buf = buffer_1.Buffer.alloc(8);
             buf.writeInt32LE(this.version, 0);
             buf.writeInt32LE(tag, 4);
             const address = (yield (0, kit_1.getProgramDerivedAddress)({
@@ -947,7 +947,7 @@ class Engine {
     }
     getTokenAccount(mint) {
         return __awaiter(this, void 0, void 0, function* () {
-            let buf = Buffer.from((0, kit_1.getAddressEncoder)().encode(mint).buffer);
+            let buf = buffer_1.Buffer.from((0, kit_1.getAddressEncoder)().encode(mint).buffer);
             buf.writeInt32LE(this.version, 28);
             const address = (yield (0, kit_1.getProgramDerivedAddress)({
                 programAddress: this.programId,
@@ -969,7 +969,7 @@ class Engine {
                 return null;
             }
             else {
-                const data = Buffer.from((0, kit_1.getBase64Encoder)().encode(info.value.data[0]));
+                const data = buffer_1.Buffer.from((0, kit_1.getBase64Encoder)().encode(info.value.data[0]));
                 return data.readUInt32LE(0);
             }
         });
@@ -981,7 +981,7 @@ class Engine {
      */
     getInstrId(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let buf = Buffer.alloc(16);
+            let buf = buffer_1.Buffer.alloc(16);
             buf.writeInt32LE(this.version, 0);
             buf.writeInt32LE(types_1.AccountType.INSTR, 4);
             buf.writeInt32LE(args.assetTokenId, 8);
@@ -996,19 +996,19 @@ class Engine {
                 return null;
             }
             else {
-                const data = Buffer.from((0, kit_1.getBase64Encoder)().encode(info.value.data[0]));
+                const data = buffer_1.Buffer.from((0, kit_1.getBase64Encoder)().encode(info.value.data[0]));
                 return data.readUInt32LE(0);
             }
         });
     }
     /**
      * Assignes client public key to Engine
-     * @param wallet Client public key
+     * @param signer Client public key
      */
     setSigner(signer) {
         return __awaiter(this, void 0, void 0, function* () {
             this.signer = signer;
-            let buf = Buffer.alloc(8);
+            let buf = buffer_1.Buffer.alloc(8);
             buf.writeUint32LE(this.version, 0);
             buf.writeUint32LE(types_1.AccountType.CLIENT_PRIMARY, 4);
             const clientPrimaryAccount = yield this.findClientPrimaryAccount(signer);
@@ -1052,7 +1052,7 @@ class Engine {
     }
     findClientPrimaryAccount(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
-            let tagBuf = Buffer.alloc(8);
+            let tagBuf = buffer_1.Buffer.alloc(8);
             tagBuf.writeUint32LE(this.version, 0);
             tagBuf.writeUint32LE(types_1.AccountType.CLIENT_PRIMARY, 4);
             let source = (wallet == null || wallet == undefined) ? this.signer : wallet;
@@ -1065,7 +1065,7 @@ class Engine {
     }
     findClientCommunityAccount(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
-            let tagBuf = Buffer.alloc(8);
+            let tagBuf = buffer_1.Buffer.alloc(8);
             tagBuf.writeUint32LE(this.version, 0);
             tagBuf.writeUint32LE(types_1.AccountType.CLIENT_COMMUNITY, 4);
             let source = (wallet == null || wallet == undefined) ? this.signer : wallet;
@@ -1078,7 +1078,7 @@ class Engine {
     }
     findClientDrvAccount() {
         return __awaiter(this, void 0, void 0, function* () {
-            let tagBuf = Buffer.alloc(8);
+            let tagBuf = buffer_1.Buffer.alloc(8);
             tagBuf.writeUint32LE(this.version, 0);
             tagBuf.writeUint32LE(types_1.AccountType.CLIENT_DRV, 4);
             const address = (yield (0, kit_1.getProgramDerivedAddress)({
@@ -1135,7 +1135,7 @@ class Engine {
             }
             const clientPrimaryAccountHeaderModel = structure_models_1.ClientPrimaryAccountHeaderModel.fromBuffer(infos.value[0].data);
             let clientCommunityAccountHeaderModel = structure_models_1.ClientCommunityAccountHeaderModel.fromBuffer(infos.value[1].data);
-            const primaryData = Buffer.from((0, kit_1.getBase64Encoder)().encode(infos.value[0].data[0]));
+            const primaryData = buffer_1.Buffer.from((0, kit_1.getBase64Encoder)().encode(infos.value[0].data[0]));
             let tokens = new Map();
             let lp = new Map();
             let spot = new Map();
@@ -1266,8 +1266,8 @@ class Engine {
             if (infos.value[0] == null || infos.value[1] == null) {
                 throw new Error("Orders Info Not Found");
             }
-            const data = Buffer.from((0, kit_1.getBase64Encoder)().encode(infos.value[0].data[0]));
-            const data1 = Buffer.from((0, kit_1.getBase64Encoder)().encode(infos.value[1].data[0]));
+            const data = buffer_1.Buffer.from((0, kit_1.getBase64Encoder)().encode(infos.value[0].data[0]));
+            const data1 = buffer_1.Buffer.from((0, kit_1.getBase64Encoder)().encode(infos.value[1].data[0]));
             return {
                 contextSlot: Number(infos.context.slot),
                 bidSlot: data1.readUint32LE(structure_models_1.SpotClientInfo2Model.OFFSET_BID_SLOT),
@@ -1280,6 +1280,10 @@ class Engine {
                     this.tokenDec(instr.header.assetTokenId),
                 tempCrncyTokens: Number(data.readBigInt64LE(structure_models_1.SpotClientInfoModel.OFFSET_AVAIL_CRNCY_TOKENS)) /
                     this.tokenDec(instr.header.crncyTokenId),
+                inOrdersAssetTokens: Number(data1.readBigInt64LE(structure_models_1.SpotClientInfo2Model.OFFSET_IN_ORDERS_ASSET_TOKENS)) /
+                    this.tokenDec(instr.header.assetTokenId),
+                inOrdersCrncyTokens: Number(data1.readBigInt64LE(structure_models_1.SpotClientInfo2Model.OFFSET_IN_ORDERS_CRNCY_TOKENS)) /
+                    this.tokenDec(instr.header.crncyTokenId),
             };
         });
     }
@@ -1376,13 +1380,25 @@ class Engine {
                 crncyTokenId: instr.header.crncyTokenId,
                 tag: types_1.AccountType.SPOT_ASK_ORDERS
             });
+            const assetTokenDec = this.tokenDec(instr.header.assetTokenId);
+            const crncyTokenDec = this.tokenDec(instr.header.crncyTokenId);
             if (args.bidsCount > 1 && args.asksCount > 1) {
                 let infos = yield this.rpc.getMultipleAccounts([bidOrdersAccount, askOrdersAccount], { commitment: this.commitment, encoding: 'base64' }).send();
+                let bids = getMultipleSpotOrders(infos.value[0].data, args.bidsEntry);
+                for (let i = 0; i < bids.length; ++i) {
+                    bids[i].qty /= assetTokenDec;
+                    bids[i].sum /= crncyTokenDec;
+                }
+                let asks = getMultipleSpotOrders(infos.value[1].data, args.asksEntry);
+                for (let i = 0; i < asks.length; ++i) {
+                    asks[i].qty /= assetTokenDec;
+                    asks[i].sum /= crncyTokenDec;
+                }
                 return {
                     bidContextSlot: Number(infos.context.slot),
                     askContextSlot: Number(infos.context.slot),
-                    bids: getMultipleSpotOrders(infos.value[0].data, args.bidsEntry),
-                    asks: getMultipleSpotOrders(infos.value[1].data, args.asksEntry)
+                    bids: bids,
+                    asks: asks
                 };
             }
             let bids = [];
@@ -1429,6 +1445,14 @@ class Engine {
                 asks = [structure_models_1.OrderModel.fromBuffer(info.value.data)];
                 askContextSlot = Number(info.context.slot);
             }
+            for (let i = 0; i < bids.length; ++i) {
+                bids[i].qty /= assetTokenDec;
+                bids[i].sum /= crncyTokenDec;
+            }
+            for (let i = 0; i < asks.length; ++i) {
+                asks[i].qty /= assetTokenDec;
+                asks[i].sum /= crncyTokenDec;
+            }
             return {
                 bidContextSlot: bidContextSlot,
                 askContextSlot: askContextSlot,
@@ -1438,10 +1462,10 @@ class Engine {
         });
     }
     /**
-       * Get list of open orders (perp) in particular instrument
-       * @param args Contains data from getClientSpotOrdersInfo
-       * @returns List of open orders
-       */
+     * Get list of open orders (perp) in particular instrument
+     * @param args Contains data from getClientSpotOrdersInfo
+     * @returns List of open orders
+     */
     getClientPerpOrders(args) {
         return __awaiter(this, void 0, void 0, function* () {
             const instr = this.instruments.get(args.instrId);
@@ -1455,13 +1479,25 @@ class Engine {
                 crncyTokenId: instr.header.crncyTokenId,
                 tag: types_1.AccountType.PERP_ASK_ORDERS
             });
+            const assetTokenDec = this.tokenDec(instr.header.assetTokenId);
+            const crncyTokenDec = this.tokenDec(instr.header.crncyTokenId);
             if (args.bidsCount > 1 && args.asksCount > 1) {
                 let infos = yield this.rpc.getMultipleAccounts([bidOrdersAccount, askOrdersAccount], { commitment: this.commitment, encoding: 'base64' }).send();
+                let bids = getMultiplePerpOrders(infos.value[0].data, args.bidsEntry);
+                for (let i = 0; i < bids.length; ++i) {
+                    bids[i].qty /= assetTokenDec;
+                    bids[i].sum /= crncyTokenDec;
+                }
+                let asks = getMultiplePerpOrders(infos.value[1].data, args.asksEntry);
+                for (let i = 0; i < asks.length; ++i) {
+                    asks[i].qty /= assetTokenDec;
+                    asks[i].sum /= crncyTokenDec;
+                }
                 return {
                     bidContextSlot: Number(infos.context.slot),
                     askContextSlot: Number(infos.context.slot),
-                    bids: getMultiplePerpOrders(infos.value[0].data, args.bidsEntry),
-                    asks: getMultiplePerpOrders(infos.value[1].data, args.asksEntry)
+                    bids: bids,
+                    asks: asks
                 };
             }
             let bids = [];
@@ -1502,6 +1538,14 @@ class Engine {
                 asks = [structure_models_1.OrderModel.fromBuffer(info.value.data)];
                 askContextSlot = Number(info.context.slot);
             }
+            for (let i = 0; i < bids.length; ++i) {
+                bids[i].qty /= assetTokenDec;
+                bids[i].sum /= crncyTokenDec;
+            }
+            for (let i = 0; i < asks.length; ++i) {
+                asks[i].qty /= assetTokenDec;
+                asks[i].sum /= crncyTokenDec;
+            }
             return {
                 bidContextSlot: bidContextSlot,
                 askContextSlot: askContextSlot,
@@ -1602,7 +1646,7 @@ class Engine {
                 line.qty /= assetTokenDec;
                 perpAsks.push(line);
             }
-            let pattern = Buffer.alloc(16);
+            let pattern = buffer_1.Buffer.alloc(16);
             pattern.writeInt32LE(this.version, 0);
             pattern.writeInt32LE(types_1.AccountType.INSTR, 4);
             pattern.writeInt32LE(header.assetTokenId, 8);
@@ -1635,9 +1679,10 @@ class Engine {
      */
     updateInstrData(args) {
         return __awaiter(this, void 0, void 0, function* () {
+            const instr = this.instruments.get(args.instrId);
             let instrAccount = yield this.getInstrAccountByTag({
-                assetTokenId: args.assetTokenId,
-                crncyTokenId: args.crncyTokenId,
+                assetTokenId: instr.header.assetTokenId,
+                crncyTokenId: instr.header.crncyTokenId,
                 tag: types_1.AccountType.INSTR
             });
             const info = yield this.rpc.getAccountInfo(instrAccount, { commitment: this.commitment, encoding: 'base64' }).send();
@@ -1656,7 +1701,7 @@ class Engine {
                 throw new Error("Wallet is not connected");
             }
             const token = this.tokens.get(args.tokenId);
-            const tokenProgramId = (token.mask & 0x80000000) != 0 ? exports.TOKEN_2022_PROGRAM_ID : exports.TOKEN_PROGRAM_ID;
+            const tokenProgramId = (token.mask & 0x80000000) != 0 ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID;
             const clientTokenAccount = yield findAssociatedTokenAddress(this.signer, tokenProgramId, token.address);
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
@@ -1723,7 +1768,7 @@ class Engine {
                 throw new Error("Client account not found");
             }
             const token = this.tokens.get(args.tokenId);
-            const tokenProgramId = (token.mask & 0x80000000) != 0 ? exports.TOKEN_2022_PROGRAM_ID : exports.TOKEN_PROGRAM_ID;
+            const tokenProgramId = (token.mask & 0x80000000) != 0 ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID;
             const clientTokenAccount = yield findAssociatedTokenAddress(this.signer, tokenProgramId, token.address);
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
@@ -1736,7 +1781,7 @@ class Engine {
                 { address: SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
                 { address: tokenProgramId, role: kit_1.AccountRole.READONLY },
                 { address: this.drvsAuthority, role: kit_1.AccountRole.READONLY },
-                { address: exports.ASSOCIATED_TOKEN_PROGRAM_ID, role: kit_1.AccountRole.WRITABLE },
+                { address: ASSOCIATED_TOKEN_PROGRAM_ID, role: kit_1.AccountRole.WRITABLE },
             ];
             if (args.spot != undefined) {
                 keys.push({ address: yield this.findClientDrvAccount(), role: kit_1.AccountRole.READONLY });
@@ -1952,8 +1997,7 @@ class Engine {
                 throw new Error("Invalid Instr ID");
             }
             yield this.updateInstrData({
-                assetTokenId: instr.header.assetTokenId,
-                crncyTokenId: instr.header.crncyTokenId
+                instrId: args.instrId
             });
             instr = this.instruments.get(args.instrId);
             if ((instr.header.mask & types_1.InstrMask.READY_TO_PERP_UPGRADE) == 0) {
@@ -2291,7 +2335,7 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            let buf = Buffer.alloc(1);
+            let buf = buffer_1.Buffer.alloc(1);
             buf.writeUInt8(45, 0);
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },

package/dist/instruction_models.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 export declare function newOperatorData(tag: number, version: number): Buffer;
 export declare function newRootAccountData(tag: number, lutSlot: number): Buffer;
 export declare function newSpotOrderData(tag: number, ioc: number, orderType: number, side: number, instrId: number, price: number, amount: number): Buffer;

package/dist/logs_models.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 export declare enum LogType {
     deposit = 1,
     withdraw = 2,
@@ -59,14 +60,14 @@ export declare class EarningsReportModel {
     static readonly LENGTH: number;
     static readonly OFFSET_TAG = 0;
     static readonly OFFSET_CLIENT_ID = 4;
-    static readonly OFFSET_AMOUNT = 8;
-    static readonly OFFSET_TIME = 16;
-    static readonly OFFSET_TOKEN_ID = 20;
+    static readonly OFFSET_TOKEN_ID = 8;
+    static readonly OFFSET_TIME = 12;
+    static readonly OFFSET_AMOUNT = 16;
     tag: number;
     clientId: number;
-    amount: number;
-    time: number;
     tokenId: number;
+    time: number;
+    amount: number;
     static fromBuffer(buffer: Buffer, offset?: number): EarningsReportModel;
 }
 export declare class DepositReportModel {

package/dist/logs_models.js

@@ -81,9 +81,9 @@ class EarningsReportModel {
         autoBuffer.readU8();
         autoBuffer.readU16();
         result.clientId = autoBuffer.readU32();
-        result.amount = autoBuffer.readI64();
-        result.time = autoBuffer.readU32();
         result.tokenId = autoBuffer.readU32();
+        result.time = autoBuffer.readU32();
+        result.amount = autoBuffer.readI64();
         return result;
     }
 }
@@ -91,9 +91,9 @@ exports.EarningsReportModel = EarningsReportModel;
 EarningsReportModel.LENGTH = 2 * 1 + 1 * 2 + 3 * 4 + 1 * 8; // 24 bytes
 EarningsReportModel.OFFSET_TAG = 0;
 EarningsReportModel.OFFSET_CLIENT_ID = 4;
-EarningsReportModel.OFFSET_AMOUNT = 8;
-EarningsReportModel.OFFSET_TIME = 16;
-EarningsReportModel.OFFSET_TOKEN_ID = 20;
+EarningsReportModel.OFFSET_TOKEN_ID = 8;
+EarningsReportModel.OFFSET_TIME = 12;
+EarningsReportModel.OFFSET_AMOUNT = 16;
 class DepositReportModel {
     static fromBuffer(buffer, offset) {
         const result = new DepositReportModel();

package/dist/types.d.ts

@@ -228,6 +228,8 @@ export interface GetClientSpotOrdersInfoResponse {
     contextSlot: number;
     tempAssetTokens: number;
     tempCrncyTokens: number;
+    inOrdersAssetTokens: number;
+    inOrdersCrncyTokens: number;
 }
 /**
  * Contains general data about client perps in particular instrument

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deriverse/kit",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,15 +12,13 @@
   "author": "Deriverse",
   "license": "Apache-2.0",
   "devDependencies": {
-    "typedoc": "^0.25.13",
+    "@types/node": "^22.14.0",
     "typescript": "^5.4.3"
   },
   "dependencies": {
-    "@solana/spl-token": "^0.4.6",
-    "@solana/kit": "^2.1.0",
     "@solana-program/system": "^0.7.0",
-    "bigint-buffer": "^1.1.5",
-    "bs58": "^5.0.0",
-    "base64-arraybuffer": "^1.0.2"
+    "@solana/kit": "^2.1.0",
+    "base64-arraybuffer": "^1.0.2",
+    "bs58": "^5.0.0"
   }
 }