@deriverse/kit 1.0.1 → 1.0.2

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,7 +23,7 @@ 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");
@@ -33,13 +33,12 @@ 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 +163,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),
@@ -1003,7 +1002,7 @@ class Engine {
     }
     /**
      * 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* () {
@@ -1280,6 +1279,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 +1379,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 +1444,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 +1461,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 +1478,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 +1537,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,
@@ -1635,9 +1678,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 +1700,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 +1767,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 +1780,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 +1996,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) {

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.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",