@deriverse/kit 1.0.2 → 1.0.4

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

@@ -36,6 +36,7 @@ export declare class Engine {
     instruments: Map<number, Instrument>;
     version: number;
     commitment: Commitment;
+    private uiNumbers;
     /**
      * @param rpc @solana/kit rpc
      */

package/dist/index.js

@@ -27,6 +27,7 @@ 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");
@@ -197,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,
@@ -238,6 +239,12 @@ class Engine {
         else {
             this.commitment = args.commitment;
         }
+        if (args == undefined || args.uiNumbers == null || args.uiNumbers == undefined) {
+            this.uiNumbers = true;
+        }
+        else {
+            this.uiNumbers = args.uiNumbers;
+        }
     }
     logsDecode(data) {
         let assetTokenDec = null;
@@ -247,7 +254,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) {
@@ -524,7 +531,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, {
@@ -569,7 +576,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);
@@ -670,7 +677,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);
@@ -684,7 +691,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)({
@@ -946,7 +953,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,
@@ -968,7 +975,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);
             }
         });
@@ -980,7 +987,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);
@@ -995,7 +1002,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);
             }
         });
@@ -1007,7 +1014,7 @@ class Engine {
     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);
@@ -1051,7 +1058,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;
@@ -1064,7 +1071,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;
@@ -1077,7 +1084,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)({
@@ -1134,7 +1141,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();
@@ -1230,8 +1237,18 @@ class Engine {
         });
     }
     tokenDec(tokenId) {
-        const token = this.tokens.get(tokenId);
-        return Math.pow(10, token.mask & 0xFF);
+        if (this.uiNumbers) {
+            const token = this.tokens.get(tokenId);
+            if (token) {
+                return Math.pow(10, token.mask & 0xFF);
+            }
+            else {
+                return 1;
+            }
+        }
+        else {
+            return 1;
+        }
     }
     /**
      * Get general information about open orders in particular instrument (spot)
@@ -1265,8 +1282,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),
@@ -1645,7 +1662,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);
@@ -2334,7 +2351,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

@@ -64,6 +64,7 @@ export interface EngineArgs {
     programId?: Address<any>;
     version?: number;
     commitment?: Commitment;
+    uiNumbers?: boolean;
 }
 /**
  * @property {number} instrId Instrument ID

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deriverse/kit",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "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"
   }
 }