@deriverse/kit 1.0.28 → 1.0.29

package/dist/index.d.ts

@@ -78,7 +78,6 @@ export declare class Engine {
     setSigner(signer: Address<any>): Promise<void>;
     private findClientPrimaryAccount;
     private findClientCommunityAccount;
-    private findClientDrvAccount;
     private checkClient;
     /**
      * Unpack client accounts

package/dist/index.js

@@ -1145,7 +1145,7 @@ class Engine {
                     const clientPrimaryAccountHeaderModel = structure_models_1.ClientPrimaryAccountHeaderModel.fromBuffer(info.value.data);
                     if (clientPrimaryAccountHeaderModel.walletAddress == signer) {
                         this.clientPrimaryAccount = clientPrimaryAccount;
-                        this.clientCommunityAccount = clientPrimaryAccountHeaderModel.communityAddress;
+                        this.clientCommunityAccount = yield this.findClientCommunityAccount(signer);
                         this.originalClientId = clientPrimaryAccountHeaderModel.id;
                         this.clientLutAddress = clientPrimaryAccountHeaderModel.lutAddress;
                         let date = Math.floor((new Date()).valueOf() / 1000);
@@ -1199,18 +1199,6 @@ class Engine {
             return address;
         });
     }
-    findClientDrvAccount() {
-        return __awaiter(this, void 0, void 0, function* () {
-            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)({
-                programAddress: this.programId,
-                seeds: [tagBuf, (0, kit_1.getAddressEncoder)().encode(this.signer)]
-            }))[0];
-            return address;
-        });
-    }
     checkClient() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.signer == null) {
@@ -1230,7 +1218,7 @@ class Engine {
                 }
                 const clientPrimaryAccountHeaderModel = structure_models_1.ClientPrimaryAccountHeaderModel.fromBuffer(info.value.data);
                 this.clientPrimaryAccount = clientPrimaryAccount;
-                this.clientCommunityAccount = clientPrimaryAccountHeaderModel.communityAddress;
+                this.clientCommunityAccount = yield this.findClientCommunityAccount();
                 this.originalClientId = clientPrimaryAccountHeaderModel.id;
                 return true;
             }
@@ -1898,7 +1886,11 @@ class Engine {
                 const slot = Number((yield this.rpc.getSlot().send())) - 1;
                 const lutAddress = yield getLookupTableAddress(this.signer, slot);
                 const clientCommunityAccount = yield this.findClientCommunityAccount();
-                keys.push({ address: yield this.findClientDrvAccount(), role: kit_1.AccountRole.WRITABLE });
+                /*
+                keys.push(
+                  { address: await this.findClientDrvAccount(), role: AccountRole.WRITABLE }
+                );
+                */
                 keys.push({ address: clientCommunityAccount, role: kit_1.AccountRole.WRITABLE });
                 keys.push({ address: lutAddress, role: kit_1.AccountRole.WRITABLE });
                 keys.push({ address: ADDRESS_LOOKUP_TABLE_PROGRAM_ID, role: kit_1.AccountRole.WRITABLE });
@@ -1953,7 +1945,7 @@ class Engine {
                 { 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 });
+                //keys.push({ address: await this.findClientDrvAccount(), role: AccountRole.READONLY });
                 for (var i = 0; i < args.spot.length; ++i) {
                     const instr = this.instruments.get(args.spot[i].instrId);
                     if (instr.header.assetTokenId == args.tokenId || instr.header.crncyTokenId == args.tokenId) {
@@ -2184,7 +2176,7 @@ class Engine {
                 programAddress: this.programId,
                 seed: perpMapsAccountSeed
             });
-            const perpMapsAccountSize = 175336;
+            const perpMapsAccountSize = 168576;
             const perpMapsAccountLamports = yield this.rpc.getMinimumBalanceForRentExemption(BigInt(perpMapsAccountSize)).send();
             const createMapsAccountIx = (0, system_1.getCreateAccountWithSeedInstruction)({
                 payer: this.signer,
@@ -2771,20 +2763,23 @@ class Engine {
                         tag: types_1.AccountType.SPOT_DAY_CANDLES
                     }), role: kit_1.AccountRole.WRITABLE
                 },
+                /*
                 {
-                    address: yield this.getInstrAccountByTag({
-                        assetTokenId: assetTokenId,
-                        crncyTokenId: crncyTokenId,
-                        tag: types_1.AccountType.INSTR_TRACE
-                    }), role: kit_1.AccountRole.WRITABLE
+                  address: await this.getInstrAccountByTag(
+                    {
+                      assetTokenId: assetTokenId,
+                      crncyTokenId: crncyTokenId,
+                      tag: AccountType.INSTR_TRACE
+                    }), role: AccountRole.WRITABLE
                 },
+                */
             ];
-            const upgradeIx = {
+            const newInstrIx = {
                 accounts: keys,
                 programAddress: this.programId,
                 data: (0, instruction_models_1.newInstrumentData)(9, crncyTokenId, slot, args.initialPrice * 1000000000)
             };
-            return [createMapsAccountIx, upgradeIx];
+            return [createMapsAccountIx, newInstrIx];
         });
     }
 }

package/dist/instruction_models.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
-export declare function newOperatorData(tag: number, version: number): Buffer;
-export declare function newRootAccountData(tag: number, version: number, lutSlot: number): Buffer;
+export declare function newOperatorData(tag: number): Buffer;
+export declare function newRootAccountData(tag: number, privateMode: number, lutSlot: number): Buffer;
 export declare function newSpotOrderData(tag: number, ioc: number, orderType: number, side: number, instrId: number, price: number, amount: number): Buffer;
 export declare function newPerpOrderData(tag: number, ioc: number, leverage: number, orderType: number, side: number, instrId: number, price: number, amount: number): Buffer;
 export declare function perpChangeLeverageData(tag: number, leverage: number, instrId: number): Buffer;
@@ -23,7 +23,7 @@ export declare function perpQuotesReplaceData(tag: number, instrId: number, newB
 export declare function votingData(tag: number, choice: number, votingCounter: number): Buffer;
 export declare function airdropData(tag: number, ratio: number): Buffer;
 export declare function upgradeToPerpData(tag: number, instrId: number): Buffer;
-export declare function setInstrOracleFeedData(tag: number, instrId: number, variance: number): Buffer;
+export declare function setInstrOracleFeedData(tag: number, instrId: number): Buffer;
 export declare function setInstrReadyForPerpUpgradeData(tag: number, instrId: number, variance: number): Buffer;
 export declare function newTokenData(tag: number, crncy: number, needInitialization: number): Buffer;
 export declare function perpOrderCancelData(tag: number, side: number, instrId: number, orderId: number): Buffer;
@@ -32,3 +32,4 @@ export declare function perpForcedCloseData(tag: number, instrId: number): Buffe
 export declare function changeRefProgramData(tag: number, refProgramDuration: number, refLinkDuration: number, refDiscount: number, refRatio: number): Buffer;
 export declare function buyMarketSeatData(tag: number, instrId: number, amount: number): Buffer;
 export declare function sellMarketSeatData(tag: number, instrId: number): Buffer;
+export declare function newPrivateClient(tag: number, expirationTime: number): Buffer;

package/dist/instruction_models.js

@@ -1,22 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sellMarketSeatData = exports.buyMarketSeatData = exports.changeRefProgramData = exports.perpForcedCloseData = exports.perpMassCancelData = exports.perpOrderCancelData = exports.newTokenData = exports.setInstrReadyForPerpUpgradeData = exports.setInstrOracleFeedData = exports.upgradeToPerpData = exports.airdropData = exports.votingData = exports.perpQuotesReplaceData = exports.spotQuotesReplaceData = exports.swapData = exports.withdrawData = exports.perpWithdrawData = exports.moveSpotAvailFundsData = exports.perpDepositData = exports.feesWithdrawData = exports.feesDepositData = exports.depositData = exports.newInstrumentData = exports.spotLpData = exports.spotMassCancelData = exports.spotOrderCancelData = exports.perpStatisticsResetData = exports.perpChangeLeverageData = exports.newPerpOrderData = exports.newSpotOrderData = exports.newRootAccountData = exports.newOperatorData = void 0;
-function newOperatorData(tag, version) {
-    let buf = Buffer.alloc(8);
+exports.newPrivateClient = exports.sellMarketSeatData = exports.buyMarketSeatData = exports.changeRefProgramData = exports.perpForcedCloseData = exports.perpMassCancelData = exports.perpOrderCancelData = exports.newTokenData = exports.setInstrReadyForPerpUpgradeData = exports.setInstrOracleFeedData = exports.upgradeToPerpData = exports.airdropData = exports.votingData = exports.perpQuotesReplaceData = exports.spotQuotesReplaceData = exports.swapData = exports.withdrawData = exports.perpWithdrawData = exports.moveSpotAvailFundsData = exports.perpDepositData = exports.feesWithdrawData = exports.feesDepositData = exports.depositData = exports.newInstrumentData = exports.spotLpData = exports.spotMassCancelData = exports.spotOrderCancelData = exports.perpStatisticsResetData = exports.perpChangeLeverageData = exports.newPerpOrderData = exports.newSpotOrderData = exports.newRootAccountData = exports.newOperatorData = void 0;
+function newOperatorData(tag) {
+    let buf = Buffer.alloc(4);
     buf.writeUint8(tag, 0);
     buf.writeUint8(0, 1);
     buf.writeUint16LE(0, 2);
-    buf.writeUint32LE(version, 4);
     return buf;
 }
 exports.newOperatorData = newOperatorData;
-function newRootAccountData(tag, version, lutSlot) {
-    let buf = Buffer.alloc(12);
+function newRootAccountData(tag, privateMode, lutSlot) {
+    let buf = Buffer.alloc(8);
     buf.writeUint8(tag, 0);
-    buf.writeUint8(0, 1);
+    buf.writeUint8(privateMode, 1);
     buf.writeUint16LE(0, 2);
-    buf.writeUint32LE(version, 4);
-    buf.writeUint32LE(lutSlot, 8);
+    buf.writeUint32LE(lutSlot, 4);
     return buf;
 }
 exports.newRootAccountData = newRootAccountData;
@@ -247,8 +245,8 @@ function upgradeToPerpData(tag, instrId) {
     return buf;
 }
 exports.upgradeToPerpData = upgradeToPerpData;
-function setInstrOracleFeedData(tag, instrId, variance) {
-    let buf = Buffer.alloc(16);
+function setInstrOracleFeedData(tag, instrId) {
+    let buf = Buffer.alloc(8);
     buf.writeUint8(tag, 0);
     buf.writeUint8(0, 1);
     buf.writeUint16LE(0, 2);
@@ -333,3 +331,12 @@ function sellMarketSeatData(tag, instrId) {
     return buf;
 }
 exports.sellMarketSeatData = sellMarketSeatData;
+function newPrivateClient(tag, expirationTime) {
+    let buf = Buffer.alloc(8);
+    buf.writeUint8(tag, 0);
+    buf.writeUint8(0, 1);
+    buf.writeUint16LE(0, 2);
+    buf.writeUint32LE(expirationTime, 4);
+    return buf;
+}
+exports.newPrivateClient = newPrivateClient;

package/dist/logs_models.d.ts

@@ -30,7 +30,10 @@ export declare enum LogType {
     perpSocLoss = 27,
     perpChangeLeverage = 28,
     buyMarketSeat = 29,
-    sellMarketSeat = 30
+    sellMarketSeat = 30,
+    swapOrder = 31,
+    moveSpot = 32,
+    newPrivateClient = 33
 }
 export declare class PerpChangeLeverageReportModel {
     static readonly LENGTH: number;
@@ -190,8 +193,8 @@ export declare class SpotlpTradeReportModel {
     static readonly LENGTH: number;
     static readonly OFFSET_TAG = 0;
     static readonly OFFSET_SIDE = 1;
-    static readonly OFFSET_TIME = 4;
-    static readonly OFFSET_CLIENT_ID = 8;
+    static readonly OFFSET_CLIENT_ID = 4;
+    static readonly OFFSET_TIME = 8;
     static readonly OFFSET_INSTR_ID = 12;
     static readonly OFFSET_ORDER_ID = 16;
     static readonly OFFSET_QTY = 24;
@@ -199,8 +202,8 @@ export declare class SpotlpTradeReportModel {
     static readonly OFFSET_CRNCY = 40;
     tag: number;
     side: number;
-    time: number;
     clientId: number;
+    time: number;
     instrId: number;
     orderId: number;
     qty: number;
@@ -298,6 +301,26 @@ export declare class SpotPlaceOrderReportModel {
     time: number;
     static fromBuffer(buffer: Buffer, offset?: number): SpotPlaceOrderReportModel;
 }
+export declare class SwapOrderReportModel {
+    static readonly LENGTH: number;
+    static readonly OFFSET_TAG = 0;
+    static readonly OFFSET_SIDE = 1;
+    static readonly OFFSET_ORDER_TYPE = 2;
+    static readonly OFFSET_ORDER_ID = 8;
+    static readonly OFFSET_QTY = 16;
+    static readonly OFFSET_PRICE = 24;
+    static readonly OFFSET_TIME = 32;
+    static readonly OFFSET_INSTR_ID = 36;
+    tag: number;
+    side: number;
+    orderType: number;
+    orderId: number;
+    qty: number;
+    price: number;
+    time: number;
+    instrId: number;
+    static fromBuffer(buffer: Buffer, offset?: number): SwapOrderReportModel;
+}
 export declare class PerpPlaceMassCancelReportModel {
     static readonly LENGTH: number;
     static readonly OFFSET_TAG = 0;
@@ -498,3 +521,19 @@ export declare class SpotOrderRevokeReportModel {
     crncy: number;
     static fromBuffer(buffer: Buffer, offset?: number): SpotOrderRevokeReportModel;
 }
+export declare class MoveSpotAvailFundsReportModel {
+    static readonly LENGTH: number;
+    static readonly OFFSET_TAG = 0;
+    static readonly OFFSET_CLIENT_ID = 4;
+    static readonly OFFSET_INSTR_ID = 8;
+    static readonly OFFSET_TIME = 12;
+    static readonly OFFSET_QTY = 16;
+    static readonly OFFSET_CRNCY = 24;
+    tag: number;
+    clientId: number;
+    instrId: number;
+    time: number;
+    qty: number;
+    crncy: number;
+    static fromBuffer(buffer: Buffer, offset?: number): MoveSpotAvailFundsReportModel;
+}

package/dist/logs_models.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SpotOrderRevokeReportModel = exports.PerpOrderRevokeReportModel = exports.SpotOrderCancelReportModel = exports.PerpOrderCancelReportModel = exports.SpotNewOrderReportModel = exports.PerpNewOrderReportModel = exports.PerpSocLossReportModel = exports.PerpFundingReportModel = exports.SpotFeesReportModel = exports.PerpFeesReportModel = exports.SpotMassCancelReportModel = exports.PerpMassCancelReportModel = exports.SpotPlaceMassCancelReportModel = exports.PerpPlaceMassCancelReportModel = exports.SpotPlaceOrderReportModel = exports.PerpPlaceOrderReportModel = exports.SpotFillOrderReportModel = exports.PerpFillOrderReportModel = exports.SpotlpTradeReportModel = exports.PerpWithdrawReportModel = exports.WithdrawReportModel = exports.SellMarketSeatReportModel = exports.BuyMarketSeatReportModel = exports.PerpDepositReportModel = exports.FeesWithdrawReportModel = exports.FeesDepositReportModel = exports.DepositReportModel = exports.EarningsReportModel = exports.DrvsAirdropReportModel = exports.PerpChangeLeverageReportModel = exports.LogType = void 0;
+exports.MoveSpotAvailFundsReportModel = exports.SpotOrderRevokeReportModel = exports.PerpOrderRevokeReportModel = exports.SpotOrderCancelReportModel = exports.PerpOrderCancelReportModel = exports.SpotNewOrderReportModel = exports.PerpNewOrderReportModel = exports.PerpSocLossReportModel = exports.PerpFundingReportModel = exports.SpotFeesReportModel = exports.PerpFeesReportModel = exports.SpotMassCancelReportModel = exports.PerpMassCancelReportModel = exports.SpotPlaceMassCancelReportModel = exports.PerpPlaceMassCancelReportModel = exports.SwapOrderReportModel = exports.SpotPlaceOrderReportModel = exports.PerpPlaceOrderReportModel = exports.SpotFillOrderReportModel = exports.PerpFillOrderReportModel = exports.SpotlpTradeReportModel = exports.PerpWithdrawReportModel = exports.WithdrawReportModel = exports.SellMarketSeatReportModel = exports.BuyMarketSeatReportModel = exports.PerpDepositReportModel = exports.FeesWithdrawReportModel = exports.FeesDepositReportModel = exports.DepositReportModel = exports.EarningsReportModel = exports.DrvsAirdropReportModel = exports.PerpChangeLeverageReportModel = exports.LogType = void 0;
 const auto_buffer_1 = require("./auto_buffer");
 var LogType;
 (function (LogType) {
@@ -34,6 +34,9 @@ var LogType;
     LogType[LogType["perpChangeLeverage"] = 28] = "perpChangeLeverage";
     LogType[LogType["buyMarketSeat"] = 29] = "buyMarketSeat";
     LogType[LogType["sellMarketSeat"] = 30] = "sellMarketSeat";
+    LogType[LogType["swapOrder"] = 31] = "swapOrder";
+    LogType[LogType["moveSpot"] = 32] = "moveSpot";
+    LogType[LogType["newPrivateClient"] = 33] = "newPrivateClient";
 })(LogType || (exports.LogType = LogType = {}));
 class PerpChangeLeverageReportModel {
     static fromBuffer(buffer, offset) {
@@ -273,8 +276,8 @@ class SpotlpTradeReportModel {
         result.tag = autoBuffer.readU8();
         result.side = autoBuffer.readU8();
         autoBuffer.readU16();
-        result.time = autoBuffer.readU32();
         result.clientId = autoBuffer.readU32();
+        result.time = autoBuffer.readU32();
         result.instrId = autoBuffer.readU32();
         result.orderId = autoBuffer.readI64();
         result.qty = autoBuffer.readI64();
@@ -287,8 +290,8 @@ exports.SpotlpTradeReportModel = SpotlpTradeReportModel;
 SpotlpTradeReportModel.LENGTH = 2 * 1 + 1 * 2 + 3 * 4 + 4 * 8; // 48 bytes
 SpotlpTradeReportModel.OFFSET_TAG = 0;
 SpotlpTradeReportModel.OFFSET_SIDE = 1;
-SpotlpTradeReportModel.OFFSET_TIME = 4;
-SpotlpTradeReportModel.OFFSET_CLIENT_ID = 8;
+SpotlpTradeReportModel.OFFSET_CLIENT_ID = 4;
+SpotlpTradeReportModel.OFFSET_TIME = 8;
 SpotlpTradeReportModel.OFFSET_INSTR_ID = 12;
 SpotlpTradeReportModel.OFFSET_ORDER_ID = 16;
 SpotlpTradeReportModel.OFFSET_QTY = 24;
@@ -407,6 +410,33 @@ SpotPlaceOrderReportModel.OFFSET_QTY = 16;
 SpotPlaceOrderReportModel.OFFSET_PRICE = 24;
 SpotPlaceOrderReportModel.OFFSET_INSTR_ID = 32;
 SpotPlaceOrderReportModel.OFFSET_TIME = 36;
+class SwapOrderReportModel {
+    static fromBuffer(buffer, offset) {
+        const result = new SwapOrderReportModel();
+        let autoBuffer = new auto_buffer_1.AutoBuffer(buffer, offset);
+        result.tag = autoBuffer.readU8();
+        result.side = autoBuffer.readU8();
+        result.orderType = autoBuffer.readU8();
+        autoBuffer.readU8();
+        autoBuffer.readU32();
+        result.orderId = autoBuffer.readI64();
+        result.qty = autoBuffer.readI64();
+        result.price = autoBuffer.readI64();
+        result.time = autoBuffer.readU32();
+        result.instrId = autoBuffer.readU32();
+        return result;
+    }
+}
+exports.SwapOrderReportModel = SwapOrderReportModel;
+SwapOrderReportModel.LENGTH = 4 * 1 + 3 * 4 + 3 * 8; // 40 bytes
+SwapOrderReportModel.OFFSET_TAG = 0;
+SwapOrderReportModel.OFFSET_SIDE = 1;
+SwapOrderReportModel.OFFSET_ORDER_TYPE = 2;
+SwapOrderReportModel.OFFSET_ORDER_ID = 8;
+SwapOrderReportModel.OFFSET_QTY = 16;
+SwapOrderReportModel.OFFSET_PRICE = 24;
+SwapOrderReportModel.OFFSET_TIME = 32;
+SwapOrderReportModel.OFFSET_INSTR_ID = 36;
 class PerpPlaceMassCancelReportModel {
     static fromBuffer(buffer, offset) {
         const result = new PerpPlaceMassCancelReportModel();
@@ -701,3 +731,26 @@ SpotOrderRevokeReportModel.OFFSET_CLIENT_ID = 4;
 SpotOrderRevokeReportModel.OFFSET_ORDER_ID = 8;
 SpotOrderRevokeReportModel.OFFSET_QTY = 16;
 SpotOrderRevokeReportModel.OFFSET_CRNCY = 24;
+class MoveSpotAvailFundsReportModel {
+    static fromBuffer(buffer, offset) {
+        const result = new MoveSpotAvailFundsReportModel();
+        let autoBuffer = new auto_buffer_1.AutoBuffer(buffer, offset);
+        result.tag = autoBuffer.readU8();
+        autoBuffer.readU8();
+        autoBuffer.readU16();
+        result.clientId = autoBuffer.readU32();
+        result.instrId = autoBuffer.readU32();
+        result.time = autoBuffer.readU32();
+        result.qty = autoBuffer.readI64();
+        result.crncy = autoBuffer.readI64();
+        return result;
+    }
+}
+exports.MoveSpotAvailFundsReportModel = MoveSpotAvailFundsReportModel;
+MoveSpotAvailFundsReportModel.LENGTH = 2 * 1 + 1 * 2 + 3 * 4 + 2 * 8; // 32 bytes
+MoveSpotAvailFundsReportModel.OFFSET_TAG = 0;
+MoveSpotAvailFundsReportModel.OFFSET_CLIENT_ID = 4;
+MoveSpotAvailFundsReportModel.OFFSET_INSTR_ID = 8;
+MoveSpotAvailFundsReportModel.OFFSET_TIME = 12;
+MoveSpotAvailFundsReportModel.OFFSET_QTY = 16;
+MoveSpotAvailFundsReportModel.OFFSET_CRNCY = 24;