@deriverse/kit 1.0.32 → 1.0.38

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { Address, Base64EncodedDataResponse, Rpc, IAccountMeta, IInstruction, Commitment } from "@solana/kit";
-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, NewInstrumentArgs, PerpBuySeatArgs } from './types';
+import { Address, Base64EncodedDataResponse, Rpc, IAccountMeta, Commitment } from "@solana/kit";
+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, CommunityData, LogMessage, PerpChangeLeverageArgs, PerpStatisticsResetArgs, EngineArgs, NewInstrumentArgs, PerpBuySeatArgs, SwapArgs, PerpSellSeatArgs } from './types';
 import { InstrAccountHeaderModel, RootStateModel, TokenStateModel } from "./structure_models";
 export * from './types';
 export * from './logs_models';
@@ -38,6 +38,7 @@ export declare class Engine {
     clientLutAddress?: Address<any>;
     private refClientPrimaryAccount?;
     private refClientCommunityAccount?;
+    privateMode?: boolean;
     tokens: Map<number, TokenStateModel>;
     instruments: Map<number, Instrument>;
     version: number;
@@ -191,7 +192,7 @@ export declare class Engine {
      * @returns Transaction instruction
      */
     perpBuySeatInstruction(args: PerpBuySeatArgs): Promise<any>;
-    perpSellSeatInstruction(args: PerpBuySeatArgs): Promise<any>;
+    perpSellSeatInstruction(args: PerpSellSeatArgs): Promise<any>;
     /**
      * Build instruction for new perp order in particular instrument
      * @param args Order data
@@ -216,12 +217,6 @@ export declare class Engine {
      * @returns Transaction instruction
      */
     perpMassCancelInstruction(args: PerpMassCancelArgs): Promise<any>;
-    /**
-     * Build instruction for perp forced close in particular instrument
-     * @param args Order data
-     * @returns Transaction instruction
-     */
-    perpForcedCloseInstruction(args: PerpForcedCloseArgs): Promise<IInstruction>;
     /**
      * Build instruction for new referral link
      * @returns Transaction instruction
@@ -245,4 +240,10 @@ export declare class Engine {
        * @returns Transaction instruction
        */
     newInstrumentInstructions(args: NewInstrumentArgs): Promise<any[]>;
+    /**
+     * Build instruction for durect swap
+     * @param args Order data
+     * @returns Transaction instruction
+     */
+    swapInstruction(args: SwapArgs): Promise<any>;
 }

package/dist/index.js

@@ -281,6 +281,9 @@ function getPerpPriceStep(price) {
     }
 }
 exports.getPerpPriceStep = getPerpPriceStep;
+function perpSeatReserve(activeUsers) {
+    return 250000 * activeUsers / (25000 - activeUsers);
+}
 function findAssociatedTokenAddress(owner, tokenProgramId, mint) {
     return __awaiter(this, void 0, void 0, function* () {
         const address = (yield (0, kit_1.getProgramDerivedAddress)({
@@ -815,6 +818,7 @@ class Engine {
                 this.rootStateModel = structure_models_1.RootStateModel.fromBuffer(infos.value[0].data);
                 this.tokens = new Map();
                 this.instruments = new Map();
+                this.privateMode = (this.rootStateModel.mask & 1) != 0;
                 const tokenAccounts = yield this.findAccountsByTag(types_1.AccountType.TOKEN);
                 tokenAccounts.forEach((t) => {
                     let tokenStateModel = structure_models_1.TokenStateModel.fromBuffer(t.account.data);
@@ -1018,16 +1022,6 @@ class Engine {
                     }),
                     role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag({
-                    assetTokenId: instrAccountHeaderModel.assetTokenId,
-                    crncyTokenId: instrAccountHeaderModel.crncyTokenId,
-                    tag: AccountType.SPOT_CLIENT_ACCOUNTS
-                  }),
-                  role: AccountRole.WRITABLE
-                },
-                */
             ];
         });
     }
@@ -1126,16 +1120,6 @@ class Engine {
                     }),
                     role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag({
-                    assetTokenId: instrAccountHeaderModel.assetTokenId,
-                    crncyTokenId: instrAccountHeaderModel.crncyTokenId,
-                    tag: AccountType.PERP_CLIENT_ACCOUNTS
-                  }),
-                  role: AccountRole.WRITABLE
-                },
-                */
                 {
                     address: yield this.getInstrAccountByTag({
                         assetTokenId: instrAccountHeaderModel.assetTokenId,
@@ -1160,16 +1144,6 @@ class Engine {
                     }),
                     role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag({
-                    assetTokenId: instrAccountHeaderModel.assetTokenId,
-                    crncyTokenId: instrAccountHeaderModel.crncyTokenId,
-                    tag: AccountType.PERP_PRIORITY_TREE
-                  }),
-                  role: AccountRole.WRITABLE
-                },
-                */
             ];
         });
     }
@@ -1389,8 +1363,8 @@ class Engine {
             for (var i = 0; i < clientPrimaryAccountHeaderModel.assetsCount; ++i) {
                 const offset = structure_models_1.ClientPrimaryAccountHeaderModel.LENGTH + i * 16;
                 const assetInfo = primaryData.readUint32LE(offset);
-                const tag = assetInfo >> 24;
-                const id = assetInfo & 0xFFFFFF;
+                const tag = assetInfo >> 28;
+                const id = assetInfo & 0xFFFFFFF;
                 if (tag == 1) {
                     tokens.set(id, {
                         tokenId: id,
@@ -1862,8 +1836,8 @@ class Engine {
             header.dayCrncyTokens /= crncyTokenDec;
             header.prevDayAssetTokens /= assetTokenDec;
             header.prevDayCrncyTokens /= crncyTokenDec;
-            header.perpLastAssetTokens /= assetTokenDec;
-            header.perpLastCrncyTokens /= crncyTokenDec;
+            header.perpLastTradeAssetTokens /= assetTokenDec;
+            header.perpLastTradeCrncyTokens /= crncyTokenDec;
             header.perpDayAssetTokens /= assetTokenDec;
             header.perpDayCrncyTokens /= crncyTokenDec;
             header.fixingAssetTokens /= assetTokenDec;
@@ -1888,8 +1862,8 @@ class Engine {
             header.fixingPx /= dec;
             header.perpLastClose /= dec;
             header.perpLastPx /= dec;
-            //header.lastHourPx /= dec;
-            header.perpSpotPriceForWithdrowal /= dec;
+            header.perpLongSpotPriceForWithdrowal /= dec;
+            header.perpShortSpotPriceForWithdrowal /= dec;
             header.poolFees /= crncyTokenDec;
             let spotBids = [];
             let spotAsks = [];
@@ -2006,6 +1980,9 @@ class Engine {
                 { address: SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
                 { address: tokenProgramId, role: kit_1.AccountRole.READONLY },
             ];
+            if (this.privateMode) {
+                keys.push({ address: yield this.getAccountByTag(types_1.AccountType.PRIVATE_CLIENTS), role: kit_1.AccountRole.WRITABLE });
+            }
             if (exists) {
                 if (args.tokenId == 0) {
                     keys.push({ address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY), role: kit_1.AccountRole.WRITABLE });
@@ -2021,11 +1998,6 @@ 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: 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 });
@@ -2080,7 +2052,6 @@ class Engine {
                 { address: ASSOCIATED_TOKEN_PROGRAM_ID, role: kit_1.AccountRole.WRITABLE },
             ];
             if (args.spot != undefined) {
-                //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) {
@@ -2097,8 +2068,8 @@ class Engine {
                 }
             }
             if (args.tokenId == 0) {
-                keys.push({ address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY), role: kit_1.AccountRole.READONLY });
-                keys.push({ address: yield this.clientCommunityAccount, role: kit_1.AccountRole.READONLY });
+                keys.push({ address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY), role: kit_1.AccountRole.WRITABLE });
+                keys.push({ address: yield this.clientCommunityAccount, role: kit_1.AccountRole.WRITABLE });
             }
             return {
                 accounts: keys,
@@ -2117,7 +2088,8 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            yield this.updateInstrData({ instrId: args.instrId });
+            let instr = this.instruments.get(args.instrId);
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2136,10 +2108,12 @@ class Engine {
                 keys.push({ address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY), role: kit_1.AccountRole.WRITABLE });
                 keys.push({ address: this.clientCommunityAccount, role: kit_1.AccountRole.WRITABLE });
             }
+            const minPrice = (args.minPrice == undefined || args.minPrice == null) ? 0 : args.minPrice;
+            const maxPrice = (args.maxPrice == undefined || args.maxPrice == null) ? 0 : args.maxPrice;
             return {
                 accounts: keys,
                 programAddress: this.programId,
-                data: (0, instruction_models_1.spotLpData)(14, args.side, args.instrId, Math.round(args.amount * lpDec)),
+                data: (0, instruction_models_1.spotLpData)(14, args.side, args.instrId, Math.round(args.amount * lpDec), minPrice * 1000000000, maxPrice * 1000000000),
             };
         });
     }
@@ -2154,7 +2128,11 @@ class Engine {
                 throw new Error("Client account not found");
             }
             let instr = this.instruments.get(args.instrId);
-            let buf = (0, instruction_models_1.newSpotOrderData)(12, args.ioc == null || args.ioc == undefined ? 0 : args.ioc, args.orderType == null || args.orderType == undefined ? 0 : args.orderType, args.side, args.instrId, Math.round(args.price * 1000000000), Math.round(args.qty * this.tokenDec(instr.header.assetTokenId)));
+            if (instr.header.mapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
+            let buf = (0, instruction_models_1.newSpotOrderData)(12, args.ioc == null || args.ioc == undefined ? 0 : args.ioc, args.orderType == null || args.orderType == undefined ? 0 : args.orderType, args.side, args.instrId, Math.round(args.price * 1000000000), Math.round(args.qty * this.tokenDec(instr.header.assetTokenId)), args.edgePrice == null || args.edgePrice == undefined ? 0 : args.edgePrice * 1000000000);
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2188,6 +2166,10 @@ class Engine {
                 throw new Error("Client account not found");
             }
             let instr = this.instruments.get(args.instrId);
+            if (instr.header.mapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let assetTokenDecFactor = this.tokenDec(instr.header.assetTokenId);
             let buf = (0, instruction_models_1.spotQuotesReplaceData)(34, args.instrId, Math.round(args.newBidPrice * 1000000000), Math.round(args.newBidQty * assetTokenDecFactor), args.bidOrderIdToCancel, Math.round(args.newAskPrice * 1000000000), Math.round(args.newAskQty * assetTokenDecFactor), args.askOrderIdToCancel);
             let keys = [
@@ -2223,6 +2205,10 @@ class Engine {
                 throw new Error("Client account not found");
             }
             let instr = this.instruments.get(args.instrId);
+            if (instr.header.mapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             const drvs = instr.header.assetTokenId == 0;
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
@@ -2255,7 +2241,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.mapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             const drvs = instr.header.assetTokenId == 0;
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
@@ -2410,16 +2400,6 @@ class Engine {
                         tag: types_1.AccountType.PERP_CLIENT_INFOS5
                     }), role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag(
-                    {
-                      assetTokenId: instr.header.assetTokenId,
-                      crncyTokenId: instr.header.crncyTokenId,
-                      tag: AccountType.PERP_CLIENT_ACCOUNTS
-                    }), role: AccountRole.WRITABLE
-                },
-                */
                 {
                     address: yield this.getInstrAccountByTag({
                         assetTokenId: instr.header.assetTokenId,
@@ -2441,16 +2421,6 @@ class Engine {
                         tag: types_1.AccountType.PERP_REBALANCE_TIME_TREE
                     }), role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag(
-                    {
-                      assetTokenId: instr.header.assetTokenId,
-                      crncyTokenId: instr.header.crncyTokenId,
-                      tag: AccountType.PERP_PRIORITY_TREE
-                    }), role: AccountRole.WRITABLE
-                },
-                */
             ];
             const upgradeIx = {
                 accounts: keys,
@@ -2470,7 +2440,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2495,7 +2469,8 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            yield this.updateInstrData({ instrId: args.instrId });
+            let instr = this.instruments.get(args.instrId);
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2503,10 +2478,14 @@ class Engine {
                 ...yield this.getPerpContext(instr.header),
                 { address: SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
             ];
+            const splippage = (args.slippage == undefined || args.slippage == null) ? 0 : args.slippage;
+            const slippagePrice = (perpSeatReserve(instr.header.perpClientsCount + 1) -
+                perpSeatReserve(instr.header.perpClientsCount)) * (1 + splippage);
+            const crncyDec = this.tokenDec(instr.header.crncyTokenId);
             return {
                 accounts: keys,
                 programAddress: this.programId,
-                data: (0, instruction_models_1.buyMarketSeatData)(47, args.instrId, args.amount * this.tokenDec(instr.header.crncyTokenId)),
+                data: (0, instruction_models_1.buyMarketSeatData)(47, args.instrId, slippagePrice * crncyDec, args.amount * crncyDec),
             };
         });
     }
@@ -2515,7 +2494,8 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            yield this.updateInstrData({ instrId: args.instrId });
+            let instr = this.instruments.get(args.instrId);
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2524,10 +2504,14 @@ class Engine {
                 { address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY), role: kit_1.AccountRole.READONLY },
                 { address: SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
             ];
+            const splippage = (args.slippage == undefined || args.slippage == null) ? 0 : args.slippage;
+            const slippagePrice = (perpSeatReserve(instr.header.perpClientsCount + 1) -
+                perpSeatReserve(instr.header.perpClientsCount)) / (1 + splippage);
+            const crncyDec = this.tokenDec(instr.header.crncyTokenId);
             return {
                 accounts: keys,
                 programAddress: this.programId,
-                data: (0, instruction_models_1.sellMarketSeatData)(48, args.instrId),
+                data: (0, instruction_models_1.sellMarketSeatData)(48, slippagePrice * crncyDec, args.instrId),
             };
         });
     }
@@ -2541,7 +2525,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2558,7 +2546,7 @@ class Engine {
             return {
                 accounts: keys,
                 programAddress: this.programId,
-                data: (0, instruction_models_1.newPerpOrderData)(19, args.ioc == null || args.ioc == undefined ? 0 : args.ioc, args.leverage == null || args.leverage == undefined ? 0 : args.leverage, args.orderType == null || args.orderType == undefined ? 0 : args.orderType, args.side, args.instrId, args.price * 1000000000, args.qty * this.tokenDec(instr.header.assetTokenId)),
+                data: (0, instruction_models_1.newPerpOrderData)(19, args.ioc == null || args.ioc == undefined ? 0 : args.ioc, args.leverage == null || args.leverage == undefined ? 0 : args.leverage, args.orderType == null || args.orderType == undefined ? 0 : args.orderType, args.side, args.instrId, args.price * 1000000000, args.qty * this.tokenDec(instr.header.assetTokenId), args.edgePrice == null || args.edgePrice == undefined ? 0 : args.edgePrice * 1000000000),
             };
         });
     }
@@ -2572,7 +2560,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let assetTokenDecFactor = this.tokenDec(instr.header.assetTokenId);
             let buf = (0, instruction_models_1.perpQuotesReplaceData)(42, args.instrId, Math.round(args.newBidPrice * 1000000000), Math.round(args.newBidQty * assetTokenDecFactor), args.bidOrderIdToCancel, Math.round(args.newAskPrice * 1000000000), Math.round(args.newAskQty * assetTokenDecFactor), args.askOrderIdToCancel);
             let keys = [
@@ -2605,7 +2597,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2631,7 +2627,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2647,32 +2647,6 @@ class Engine {
             };
         });
     }
-    /**
-     * Build instruction for perp forced close in particular instrument
-     * @param args Order data
-     * @returns Transaction instruction
-     */
-    perpForcedCloseInstruction(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.checkClient())) {
-                throw new Error("Client account not found");
-            }
-            const instr = this.instruments.get(args.instrId);
-            let keys = [
-                { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
-                { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
-                { address: args.clientPrimaryAccount, role: kit_1.AccountRole.WRITABLE },
-                ...yield this.getPerpContext(instr.header),
-                { address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY), role: kit_1.AccountRole.READONLY },
-                { address: SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
-            ];
-            return {
-                accounts: keys,
-                programAddress: this.programId,
-                data: (0, instruction_models_1.perpForcedCloseData)(38, args.instrId),
-            };
-        });
-    }
     /**
      * Build instruction for new referral link
      * @returns Transaction instruction
@@ -2706,7 +2680,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2732,7 +2710,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2867,16 +2849,6 @@ class Engine {
                         tag: types_1.AccountType.SPOT_CLIENT_INFOS2
                     }), role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag(
-                    {
-                      assetTokenId: assetTokenId,
-                      crncyTokenId: crncyTokenId,
-                      tag: AccountType.SPOT_CLIENT_ACCOUNTS
-                    }), role: AccountRole.WRITABLE
-                },
-                */
                 {
                     address: yield this.getInstrAccountByTag({
                         assetTokenId: assetTokenId,
@@ -2898,16 +2870,6 @@ class Engine {
                         tag: types_1.AccountType.SPOT_DAY_CANDLES
                     }), role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag(
-                    {
-                      assetTokenId: assetTokenId,
-                      crncyTokenId: crncyTokenId,
-                      tag: AccountType.INSTR_TRACE
-                    }), role: AccountRole.WRITABLE
-                },
-                */
             ];
             const newInstrIx = {
                 accounts: keys,
@@ -2917,5 +2879,65 @@ class Engine {
             return [createMapsAccountIx, newInstrIx];
         });
     }
+    /**
+     * Build instruction for durect swap
+     * @param args Order data
+     * @returns Transaction instruction
+     */
+    swapInstruction(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.checkClient())) {
+                throw new Error("Client account not found");
+            }
+            const assetTokenId = yield this.getTokenId(args.assetMint);
+            const crncyTokenId = yield this.getTokenId(args.crncyMint);
+            const assetTokenAccount = this.tokens.get(assetTokenId);
+            const crncyTokenAccount = this.tokens.get(crncyTokenId);
+            const assetTokenProgramId = (assetTokenAccount.mask & 0x80000000) == 0 ?
+                TOKEN_PROGRAM_ID : TOKEN_2022_PROGRAM_ID;
+            const crncyTokenProgramId = (crncyTokenAccount.mask & 0x80000000) == 0 ?
+                TOKEN_PROGRAM_ID : TOKEN_2022_PROGRAM_ID;
+            let instrId = yield this.getInstrId({
+                assetTokenId: assetTokenId,
+                crncyTokenId: crncyTokenId
+            });
+            const clientAssetTokenAccount = yield findAssociatedTokenAddress(this.signer, assetTokenProgramId, args.assetMint);
+            const clientCrncyTokenAccount = yield findAssociatedTokenAddress(this.signer, crncyTokenProgramId, args.crncyMint);
+            let instr = this.instruments.get(instrId);
+            if (instr.header.mapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: instrId });
+                instr = this.instruments.get(instrId);
+            }
+            let buf = (0, instruction_models_1.swapData)(26, args.crncyInput ? 1 : 0, instrId, Math.round(args.limitPrice * 1000000000), Math.round(args.amount *
+                (args.crncyInput ?
+                    this.tokenDec(instr.header.crncyTokenId) :
+                    this.tokenDec(instr.header.assetTokenId))));
+            let keys = [
+                { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
+                { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
+                ...yield this.getSpotContext(instr.header),
+                ...yield this.getSpotCandles(instr.header),
+                {
+                    address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY),
+                    role: kit_1.AccountRole.READONLY
+                },
+                { address: SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
+                { address: assetTokenProgramId, role: kit_1.AccountRole.READONLY },
+                { address: crncyTokenProgramId, role: kit_1.AccountRole.READONLY },
+                { address: assetTokenAccount.programAddress, role: kit_1.AccountRole.WRITABLE },
+                { address: crncyTokenAccount.programAddress, role: kit_1.AccountRole.WRITABLE },
+                { address: args.assetMint, role: kit_1.AccountRole.READONLY },
+                { address: args.crncyMint, role: kit_1.AccountRole.READONLY },
+                { address: yield this.getTokenAccount(args.assetMint), role: kit_1.AccountRole.READONLY },
+                { address: yield this.getTokenAccount(args.crncyMint), role: kit_1.AccountRole.READONLY },
+                { address: clientAssetTokenAccount, role: kit_1.AccountRole.WRITABLE },
+                { address: clientCrncyTokenAccount, role: kit_1.AccountRole.WRITABLE },
+                { address: this.drvsAuthority, role: kit_1.AccountRole.READONLY },
+            ];
+            return {
+                accounts: keys, programAddress: this.programId, data: buf
+            };
+        });
+    }
 }
 exports.Engine = Engine;

package/dist/instruction_models.d.ts

@@ -2,13 +2,13 @@
 /// <reference types="node" />
 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 newSpotOrderData(tag: number, ioc: number, orderType: number, side: number, instrId: number, price: number, amount: number, edgePrice: number): Buffer;
+export declare function newPerpOrderData(tag: number, ioc: number, leverage: number, orderType: number, side: number, instrId: number, price: number, amount: number, edgePrice: number): Buffer;
 export declare function perpChangeLeverageData(tag: number, leverage: number, instrId: number): Buffer;
 export declare function perpStatisticsResetData(tag: number, instrId: number): Buffer;
 export declare function spotOrderCancelData(tag: number, side: number, instrId: number, orderId: number): Buffer;
 export declare function spotMassCancelData(tag: number, instrId: number): Buffer;
-export declare function spotLpData(tag: number, side: number, instrId: number, amount: number): Buffer;
+export declare function spotLpData(tag: number, side: number, instrId: number, amount: number, minPrice: number, maxPrice: number): Buffer;
 export declare function newInstrumentData(tag: number, crncyTokenId: number, lutSlot: number, price: number): Buffer;
 export declare function depositData(tag: number, competitionId: number, depositAll: number, tokenId: number, amount: number, lutSlot: number, refId: number): Buffer;
 export declare function feesDepositData(tag: number, tokenId: number, amount: number): Buffer;
@@ -17,19 +17,25 @@ export declare function perpDepositData(tag: number, instrId: number, amount: nu
 export declare function moveSpotAvailFundsData(tag: number, instrId: number): Buffer;
 export declare function perpWithdrawData(tag: number, instrId: number, amount: number): Buffer;
 export declare function withdrawData(tag: number, tokenId: number, amount: number): Buffer;
-export declare function swapData(tag: number, side: number, instrId: number, price: number, amount: number): Buffer;
+export declare function swapData(tag: number, inputCrncy: number, instrId: number, price: number, amount: number): Buffer;
 export declare function spotQuotesReplaceData(tag: number, instrId: number, newBidPrice: number, newBidQty: number, oldBidOrderId: number, newAskPrice: number, newAskQty: number, oldAskOrderId: number): Buffer;
 export declare function perpQuotesReplaceData(tag: number, instrId: number, newBidPrice: number, newBidQty: number, oldBidOrderId: number, newAskPrice: number, newAskQty: number, oldAskOrderId: number): Buffer;
 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): 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;
 export declare function perpMassCancelData(tag: number, instrId: number): Buffer;
-export declare function perpForcedCloseData(tag: number, instrId: number): Buffer;
 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 buyMarketSeatData(tag: number, instrId: number, edgePrice: number, amount: number): Buffer;
+export declare function sellMarketSeatData(tag: number, instrId: number, edgePrice: number): Buffer;
 export declare function newPrivateClient(tag: number, expirationTime: number): Buffer;
+export declare function pointsProgramExpiration(tag: number, newExpirationTime: number): Buffer;
+export declare function setVarianceData(tag: number, variance: number): Buffer;
+export declare function changeDenominatorData(tag: number, baseCrncyId: number, denominator: number): Buffer;
+export declare function newBaseCrncyData(tag: number, denominator: number): Buffer;
+export declare function perpClientsProcessingData(tag: number, instrId: number): Buffer;
+export declare function setSeatPurchasingFeeData(tag: number, fee: number): Buffer;
+export declare function changeVotingData(tag: number, newChoice: number, votingCounter: number): Buffer;
+export declare function garbageCollectorData(tag: number, instrId: number): Buffer;
+export declare function activateClientRefProgramData(tag: number, refId: number): Buffer;