@deriverse/kit 1.0.41 → 1.0.42

package/dist/constants.d.ts

@@ -6,6 +6,8 @@ export declare const SYSTEM_PROGRAM_ID: import("@solana/kit").Address<"111111111
 export declare const TOKEN_PROGRAM_ID: import("@solana/kit").Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
 export declare const TOKEN_2022_PROGRAM_ID: import("@solana/kit").Address<"TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb">;
 export declare const ASSOCIATED_TOKEN_PROGRAM_ID: import("@solana/kit").Address<"ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL">;
+export declare const MAX_SWAP_FEE_RATE = 0.0002;
+export declare const DF = 1000000000;
 export declare let dec: number;
 export declare let lpDec: number;
 export declare const nullOrder = 65535;

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nullOrder = exports.lpDec = exports.dec = exports.ASSOCIATED_TOKEN_PROGRAM_ID = exports.TOKEN_2022_PROGRAM_ID = exports.TOKEN_PROGRAM_ID = exports.SYSTEM_PROGRAM_ID = exports.ADDRESS_LOOKUP_TABLE_PROGRAM_ID = exports.MARKET_DEPTH = exports.PROGRAM_ID = exports.VERSION = void 0;
+exports.nullOrder = exports.lpDec = exports.dec = exports.DF = exports.MAX_SWAP_FEE_RATE = exports.ASSOCIATED_TOKEN_PROGRAM_ID = exports.TOKEN_2022_PROGRAM_ID = exports.TOKEN_PROGRAM_ID = exports.SYSTEM_PROGRAM_ID = exports.ADDRESS_LOOKUP_TABLE_PROGRAM_ID = exports.MARKET_DEPTH = exports.PROGRAM_ID = exports.VERSION = void 0;
 exports.setDecimals = setDecimals;
 const kit_1 = require("@solana/kit");
 exports.VERSION = 1;
@@ -11,6 +11,8 @@ exports.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');
+exports.MAX_SWAP_FEE_RATE = 0.0002;
+exports.DF = 1000000000;
 exports.dec = 1000000000;
 exports.lpDec = 10000;
 exports.nullOrder = 0xffff;

package/dist/engine/index.test.js

@@ -407,12 +407,10 @@ function setupEngineWithClient() {
             const { engine } = yield setupEngineWithClient();
             yield engine.spotQuotesReplaceInstruction({
                 instrId: 1,
-                newBidPrice: 99,
-                newBidQty: 10,
-                bidOrderIdToCancel: 1,
-                newAskPrice: 101,
-                newAskQty: 10,
-                askOrderIdToCancel: 2,
+                orders: [
+                    { newPrice: 99, newQty: 10, oldId: 1, side: 0 },
+                    { newPrice: 101, newQty: 10, oldId: 2, side: 1 },
+                ],
             });
             (0, vitest_1.expect)(spot_instructions_1.buildSpotQuotesReplaceInstruction).toHaveBeenCalled();
         }));
@@ -440,9 +438,35 @@ function setupEngineWithClient() {
                 amount: 100,
                 limitPrice: 100,
                 crncyInput: true,
+                refFeeRate: 0,
+                minAmountOut: 0,
             });
             (0, vitest_1.expect)(spot_instructions_1.buildSwapInstruction).toHaveBeenCalled();
         }));
+        (0, vitest_1.it)('should not call buildSwapInstruction because refFeeRate out of maximum', () => __awaiter(void 0, void 0, void 0, function* () {
+            const { engine } = yield setupEngineWithClient();
+            yield (0, vitest_1.expect)(engine.swapInstruction({
+                assetMint: 'AssetMint1111111111111111111111111111',
+                crncyMint: 'CrncyMint1111111111111111111111111111',
+                amount: 100,
+                limitPrice: 100,
+                crncyInput: true,
+                refFeeRate: 0.0003,
+                minAmountOut: 0,
+            })).rejects.toThrow();
+        }));
+        (0, vitest_1.it)('should not call buildSwapInstruction because minAmountOut below 0', () => __awaiter(void 0, void 0, void 0, function* () {
+            const { engine } = yield setupEngineWithClient();
+            yield (0, vitest_1.expect)(engine.swapInstruction({
+                assetMint: 'AssetMint1111111111111111111111111111',
+                crncyMint: 'CrncyMint1111111111111111111111111111',
+                amount: 100,
+                limitPrice: 100,
+                crncyInput: true,
+                refFeeRate: 0.0002,
+                minAmountOut: -0.005,
+            })).rejects.toThrow();
+        }));
     });
     // Perp instructions
     (0, vitest_1.describe)('upgradeToPerpInstructions', () => {
@@ -501,12 +525,10 @@ function setupEngineWithClient() {
             const { engine } = yield setupEngineWithClient();
             yield engine.perpQuotesReplaceInstruction({
                 instrId: 1,
-                newBidPrice: 99,
-                newBidQty: 10,
-                bidOrderIdToCancel: 1,
-                newAskPrice: 101,
-                newAskQty: 10,
-                askOrderIdToCancel: 2,
+                orders: [
+                    { newPrice: 99, newQty: 10, oldId: 1, side: 0 },
+                    { newPrice: 101, newQty: 10, oldId: 2, side: 1 },
+                ],
             });
             (0, vitest_1.expect)(perp_instructions_1.buildPerpQuotesReplaceInstruction).toHaveBeenCalled();
         }));

package/dist/engine/logs-decoder.js

@@ -408,6 +408,117 @@ function decodeTransactionLogs(data, ctx) {
                 }
                 break;
             }
+            case logs_models_1.LogType.swapOrder: {
+                if (buffer.length == logs_models_1.PlaceSwapOrderReportModel.LENGTH) {
+                    let report = logs_models_1.PlaceSwapOrderReportModel.fromBuffer(buffer);
+                    if (uiNumbers) {
+                        const instrInfo = instruments.get(report.instrId);
+                        if (instrInfo) {
+                            assetTokenDec = (0, utils_1.tokenDec)(tokens, instrInfo.header.assetTokenId, uiNumbers);
+                            crncyTokenDec = (0, utils_1.tokenDec)(tokens, instrInfo.header.crncyTokenId, uiNumbers);
+                            report.qty /= assetTokenDec;
+                        }
+                        report.price /= constants_1.dec;
+                    }
+                    logs.push(report);
+                }
+                break;
+            }
+            case logs_models_1.LogType.changedPoints: {
+                if (buffer.length == logs_models_1.ChangePointsRecordModel.LENGTH) {
+                    let report = logs_models_1.ChangePointsRecordModel.fromBuffer(buffer);
+                    logs.push(report);
+                }
+                break;
+            }
+            case logs_models_1.LogType.swapFees: {
+                if (buffer.length == logs_models_1.SwapRefFeesReportModel.LENGTH) {
+                    let report = logs_models_1.SwapRefFeesReportModel.fromBuffer(buffer);
+                    if (uiNumbers) {
+                        report.fees /= crncyTokenDec;
+                    }
+                    logs.push(report);
+                }
+                break;
+            }
+            case logs_models_1.LogType.vmInitActivate: {
+                if (buffer.length == logs_models_1.VmInitActivateReportModel.LENGTH) {
+                    let report = logs_models_1.VmInitActivateReportModel.fromBuffer(buffer);
+                    logs.push(report);
+                }
+                break;
+            }
+            case logs_models_1.LogType.vmInitActivateCancel: {
+                if (buffer.length == logs_models_1.VmInitActivateCancelReportModel.LENGTH) {
+                    let report = logs_models_1.VmInitActivateCancelReportModel.fromBuffer(buffer);
+                    logs.push(report);
+                }
+                break;
+            }
+            case logs_models_1.LogType.vmFinalizeActivate: {
+                if (buffer.length == logs_models_1.VmFinalizeActivateReportModel.LENGTH) {
+                    let report = logs_models_1.VmFinalizeActivateReportModel.fromBuffer(buffer);
+                    logs.push(report);
+                }
+                break;
+            }
+            case logs_models_1.LogType.vmInitDeactivate: {
+                if (buffer.length == logs_models_1.VmInitDeactivateReportModel.LENGTH) {
+                    let report = logs_models_1.VmInitDeactivateReportModel.fromBuffer(buffer);
+                    logs.push(report);
+                }
+                break;
+            }
+            case logs_models_1.LogType.vmInitDeactivateCancel: {
+                if (buffer.length == logs_models_1.VmInitDeactivateCancelReportModel.LENGTH) {
+                    let report = logs_models_1.VmInitDeactivateCancelReportModel.fromBuffer(buffer);
+                    logs.push(report);
+                }
+                break;
+            }
+            case logs_models_1.LogType.vmFinalizeDeactivate: {
+                if (buffer.length == logs_models_1.VmFinalizeDeactivateReportModel.LENGTH) {
+                    let report = logs_models_1.VmFinalizeDeactivateReportModel.fromBuffer(buffer);
+                    logs.push(report);
+                }
+                break;
+            }
+            case logs_models_1.LogType.vmChangeList: {
+                if (buffer.length == logs_models_1.VmChangeListReportModel.LENGTH) {
+                    let report = logs_models_1.VmChangeListReportModel.fromBuffer(buffer);
+                    logs.push(report);
+                }
+                break;
+            }
+            case logs_models_1.LogType.vmInitWithdraw: {
+                if (buffer.length == logs_models_1.VmInitWithdrawReportModel.LENGTH) {
+                    let report = logs_models_1.VmInitWithdrawReportModel.fromBuffer(buffer);
+                    if (uiNumbers) {
+                        crncyTokenDec = (0, utils_1.tokenDec)(tokens, report.tokenId, uiNumbers);
+                        report.amount /= crncyTokenDec;
+                    }
+                    logs.push(report);
+                }
+                break;
+            }
+            case logs_models_1.LogType.vmInitWithdrawCancel: {
+                if (buffer.length == logs_models_1.VmInitWithdrawCancelReportModel.LENGTH) {
+                    let report = logs_models_1.VmInitWithdrawCancelReportModel.fromBuffer(buffer);
+                    logs.push(report);
+                }
+                break;
+            }
+            case logs_models_1.LogType.vmInitWithdrawFinalize: {
+                if (buffer.length == logs_models_1.VmInitWithdrawFinalizeReportModel.LENGTH) {
+                    let report = logs_models_1.VmInitWithdrawFinalizeReportModel.fromBuffer(buffer);
+                    if (uiNumbers) {
+                        crncyTokenDec = (0, utils_1.tokenDec)(tokens, report.tokenId, uiNumbers);
+                        report.amount /= crncyTokenDec;
+                    }
+                    logs.push(report);
+                }
+                break;
+            }
         }
     }
     return logs;

package/dist/engine/perp-instructions.js

@@ -26,6 +26,7 @@ const system_1 = require("@solana-program/system");
 const enums_1 = require("../types/enums");
 const constants_1 = require("../constants");
 const utils_1 = require("./utils");
+const structure_models_1 = require("../structure_models");
 const instruction_models_1 = require("../instruction_models");
 const account_helpers_1 = require("./account-helpers");
 const context_builders_1 = require("./context-builders");
@@ -171,6 +172,7 @@ function buildPerpBuySeatInstruction(ctx, args, instr) {
             { address: ctx.rootAccount, role: kit_1.AccountRole.READONLY },
             { address: ctx.clientPrimaryAccount, role: kit_1.AccountRole.WRITABLE },
             ...(yield (0, context_builders_1.getPerpContext)(ctx, instr.header)),
+            { address: yield (0, account_helpers_1.getAccountByTag)(ctx, enums_1.AccountType.COMMUNITY), role: kit_1.AccountRole.READONLY },
             { address: constants_1.SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
         ];
         const slippage = (_a = args.slippage) !== null && _a !== void 0 ? _a : 0;
@@ -199,7 +201,7 @@ function buildPerpSellSeatInstruction(ctx, args, instr) {
             { address: constants_1.SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
         ];
         const slippage = (_a = args.slippage) !== null && _a !== void 0 ? _a : 0;
-        const slippagePrice = ((0, utils_1.perpSeatReserve)(instr.header.perpClientsCount + 1) - (0, utils_1.perpSeatReserve)(instr.header.perpClientsCount)) /
+        const slippagePrice = ((0, utils_1.perpSeatReserve)(instr.header.perpClientsCount) - (0, utils_1.perpSeatReserve)(instr.header.perpClientsCount - 1)) /
             (1 + slippage);
         const crncyDec = (0, utils_1.tokenDec)(ctx.tokens, instr.header.crncyTokenId, ctx.uiNumbers);
         return {
@@ -233,7 +235,7 @@ function buildNewPerpOrderInstruction(ctx, args, instr) {
         return {
             accounts: keys,
             programAddress: ctx.programId,
-            data: (0, instruction_models_1.newPerpOrderData)(19, (_a = args.ioc) !== null && _a !== void 0 ? _a : 0, (_b = args.leverage) !== null && _b !== void 0 ? _b : 0, (_c = args.orderType) !== null && _c !== void 0 ? _c : 0, args.side, args.instrId, args.price * 1000000000, args.qty * (0, utils_1.tokenDec)(ctx.tokens, instr.header.assetTokenId, ctx.uiNumbers), ((_d = args.edgePrice) !== null && _d !== void 0 ? _d : 0) * 1000000000),
+            data: (0, instruction_models_1.newPerpOrderData)(19, (_a = args.ioc) !== null && _a !== void 0 ? _a : 0, (_b = args.leverage) !== null && _b !== void 0 ? _b : 0, (_c = args.orderType) !== null && _c !== void 0 ? _c : 0, args.side, args.instrId, args.price * constants_1.DF, args.qty * (0, utils_1.tokenDec)(ctx.tokens, instr.header.assetTokenId, ctx.uiNumbers), ((_d = args.edgePrice) !== null && _d !== void 0 ? _d : 0) * constants_1.DF),
         };
     });
 }
@@ -243,7 +245,24 @@ function buildNewPerpOrderInstruction(ctx, args, instr) {
 function buildPerpQuotesReplaceInstruction(ctx, args, instr) {
     return __awaiter(this, void 0, void 0, function* () {
         let assetTokenDecFactor = (0, utils_1.tokenDec)(ctx.tokens, instr.header.assetTokenId, ctx.uiNumbers);
-        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);
+        if (args.orders.length > 12) {
+            throw new Error('Exceeded orders limit of 12 for perp quotes replace instruction');
+        }
+        let mask = args.orders.length & 0b1111;
+        for (let i = 0; i < args.orders.length; i++) {
+            if (args.orders[i].side === 0) {
+                mask |= 1 << (4 + i);
+            }
+        }
+        let headerBuf = (0, instruction_models_1.perpQuotesReplaceData)(42, mask, args.instrId);
+        let ordersBuf = Buffer.alloc(args.orders.length * structure_models_1.QuoteOrderModel.LENGTH);
+        for (let i = 0; i < args.orders.length; i++) {
+            const offset = i * structure_models_1.QuoteOrderModel.LENGTH;
+            ordersBuf.writeBigInt64LE(BigInt(Math.round(args.orders[i].newPrice * constants_1.DF)), offset + structure_models_1.QuoteOrderModel.OFFSET_NEW_PRICE);
+            ordersBuf.writeBigInt64LE(BigInt(Math.round(args.orders[i].newQty * assetTokenDecFactor)), offset + structure_models_1.QuoteOrderModel.OFFSET_NEW_QTY);
+            ordersBuf.writeBigInt64LE(BigInt(Math.floor(args.orders[i].oldId)), offset + structure_models_1.QuoteOrderModel.OFFSET_OLD_ID);
+        }
+        let buf = Buffer.concat([headerBuf, ordersBuf]);
         let keys = [
             { address: ctx.signer, role: kit_1.AccountRole.READONLY_SIGNER },
             { address: ctx.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -318,7 +337,7 @@ function buildPerpChangeLeverageInstruction(ctx, args, instr) {
         return {
             accounts: keys,
             programAddress: ctx.programId,
-            data: (0, instruction_models_1.perpChangeLeverageData)(37, args.instrId, args.leverage),
+            data: (0, instruction_models_1.perpChangeLeverageData)(37, args.leverage, args.instrId),
         };
     });
 }
@@ -471,7 +490,7 @@ function buildNewInstrumentInstructions(ctx, args, rpcGetSlot, rpcGetAccountInfo
         const newInstrIx = {
             accounts: keys,
             programAddress: ctx.programId,
-            data: (0, instruction_models_1.newInstrumentData)(9, crncyTokenId, slot, args.initialPrice * 1000000000),
+            data: (0, instruction_models_1.newInstrumentData)(9, crncyTokenId, slot, args.initialPrice * constants_1.DF),
         };
         return [createMapsAccountIx, newInstrIx];
     });

package/dist/engine/perp-instructions.test.js

@@ -251,12 +251,10 @@ function createMockPerpContext(overrides = {}) {
             const instr = ctx.instruments.get(1);
             const args = {
                 instrId: 1,
-                newBidPrice: 99,
-                newBidQty: 10,
-                bidOrderIdToCancel: 12345,
-                newAskPrice: 101,
-                newAskQty: 10,
-                askOrderIdToCancel: 67890,
+                orders: [
+                    { newPrice: 99, newQty: 10, oldId: 12345, side: 0 },
+                    { newPrice: 101, newQty: 10, oldId: 67890, side: 1 },
+                ],
             };
             const instruction = yield (0, perp_instructions_1.buildPerpQuotesReplaceInstruction)(ctx, args, instr);
             (0, vitest_1.expect)(instruction).toBeDefined();
@@ -271,12 +269,10 @@ function createMockPerpContext(overrides = {}) {
             const instr = ctx.instruments.get(1);
             const args = {
                 instrId: 1,
-                newBidPrice: 99,
-                newBidQty: 10,
-                bidOrderIdToCancel: 12345,
-                newAskPrice: 101,
-                newAskQty: 10,
-                askOrderIdToCancel: 67890,
+                orders: [
+                    { newPrice: 99, newQty: 10, oldId: 12345, side: 0 },
+                    { newPrice: 101, newQty: 10, oldId: 67890, side: 1 },
+                ],
             };
             const instruction = yield (0, perp_instructions_1.buildPerpQuotesReplaceInstruction)(ctx, args, instr);
             (0, vitest_1.expect)(instruction.accounts.length).toBeGreaterThan(18);

package/dist/engine/spot-instructions.js

@@ -21,6 +21,7 @@ const kit_1 = require("@solana/kit");
 const enums_1 = require("../types/enums");
 const constants_1 = require("../constants");
 const utils_1 = require("./utils");
+const structure_models_1 = require("../structure_models");
 const instruction_models_1 = require("../instruction_models");
 const account_helpers_1 = require("./account-helpers");
 const context_builders_1 = require("./context-builders");
@@ -199,7 +200,7 @@ function buildSpotLpInstruction(ctx, args, instr) {
         return {
             accounts: keys,
             programAddress: ctx.programId,
-            data: (0, instruction_models_1.spotLpData)(14, args.side, args.instrId, Math.round(args.amount * constants_1.lpDec), minPrice * 1000000000, maxPrice * 1000000000),
+            data: (0, instruction_models_1.spotLpData)(14, args.side, args.instrId, Math.round(args.amount * constants_1.lpDec), minPrice * constants_1.DF, maxPrice * constants_1.DF),
         };
     });
 }
@@ -209,7 +210,7 @@ function buildSpotLpInstruction(ctx, args, instr) {
 function buildNewSpotOrderInstruction(ctx, args, instr) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        let buf = (0, instruction_models_1.newSpotOrderData)(12, (_a = args.ioc) !== null && _a !== void 0 ? _a : 0, (_b = args.orderType) !== null && _b !== void 0 ? _b : 0, args.side, args.instrId, Math.round(args.price * 1000000000), Math.round(args.qty * (0, utils_1.tokenDec)(ctx.tokens, instr.header.assetTokenId, ctx.uiNumbers)), ((_c = args.edgePrice) !== null && _c !== void 0 ? _c : 0) * 1000000000);
+        let buf = (0, instruction_models_1.newSpotOrderData)(12, (_a = args.ioc) !== null && _a !== void 0 ? _a : 0, (_b = args.orderType) !== null && _b !== void 0 ? _b : 0, args.side, args.instrId, Math.round(args.price * constants_1.DF), Math.round(args.qty * (0, utils_1.tokenDec)(ctx.tokens, instr.header.assetTokenId, ctx.uiNumbers)), ((_c = args.edgePrice) !== null && _c !== void 0 ? _c : 0) * constants_1.DF);
         let keys = [
             { address: ctx.signer, role: kit_1.AccountRole.READONLY_SIGNER },
             { address: ctx.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -238,7 +239,24 @@ function buildNewSpotOrderInstruction(ctx, args, instr) {
 function buildSpotQuotesReplaceInstruction(ctx, args, instr) {
     return __awaiter(this, void 0, void 0, function* () {
         let assetTokenDecFactor = (0, utils_1.tokenDec)(ctx.tokens, instr.header.assetTokenId, ctx.uiNumbers);
-        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);
+        if (args.orders.length > 12) {
+            throw new Error('Exceeded orders limit of 12 for spot quotes replace instruction');
+        }
+        let mask = args.orders.length & 0b1111;
+        for (let i = 0; i < args.orders.length; i++) {
+            if (args.orders[i].side === 0) {
+                mask |= 1 << (4 + i);
+            }
+        }
+        let headerBuf = (0, instruction_models_1.spotQuotesReplaceData)(34, mask, args.instrId);
+        let ordersBuf = Buffer.alloc(args.orders.length * structure_models_1.QuoteOrderModel.LENGTH);
+        for (let i = 0; i < args.orders.length; i++) {
+            const offset = i * structure_models_1.QuoteOrderModel.LENGTH;
+            ordersBuf.writeBigInt64LE(BigInt(Math.round(args.orders[i].newPrice * constants_1.DF)), offset + structure_models_1.QuoteOrderModel.OFFSET_NEW_PRICE);
+            ordersBuf.writeBigInt64LE(BigInt(Math.round(args.orders[i].newQty * assetTokenDecFactor)), offset + structure_models_1.QuoteOrderModel.OFFSET_NEW_QTY);
+            ordersBuf.writeBigInt64LE(BigInt(Math.floor(args.orders[i].oldId)), offset + structure_models_1.QuoteOrderModel.OFFSET_OLD_ID);
+        }
+        let buf = Buffer.concat([headerBuf, ordersBuf]);
         let keys = [
             { address: ctx.signer, role: kit_1.AccountRole.READONLY_SIGNER },
             { address: ctx.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -347,10 +365,10 @@ function buildSwapInstruction(ctx, args, instr) {
         }
         const clientAssetTokenAccount = yield (0, utils_1.findAssociatedTokenAddress)(ctx.signer, assetTokenProgramId, args.assetMint);
         const clientCrncyTokenAccount = yield (0, utils_1.findAssociatedTokenAddress)(ctx.signer, crncyTokenProgramId, args.crncyMint);
-        let buf = (0, instruction_models_1.swapData)(26, args.crncyInput ? 1 : 0, instrId, Math.round(args.limitPrice * 1000000000), Math.round(args.amount *
+        let buf = (0, instruction_models_1.swapData)(26, args.crncyInput ? 1 : 0, instrId, Math.round(args.limitPrice * constants_1.DF), Math.round(args.amount *
             (args.crncyInput
                 ? (0, utils_1.tokenDec)(ctx.tokens, instr.header.crncyTokenId, ctx.uiNumbers)
-                : (0, utils_1.tokenDec)(ctx.tokens, instr.header.assetTokenId, ctx.uiNumbers))));
+                : (0, utils_1.tokenDec)(ctx.tokens, instr.header.assetTokenId, ctx.uiNumbers))), args.refFeeRate, args.minAmountOut);
         let keys = [
             { address: ctx.signer, role: kit_1.AccountRole.READONLY_SIGNER },
             { address: ctx.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -371,6 +389,11 @@ function buildSwapInstruction(ctx, args, instr) {
             { address: crncyTokenProgramId, role: kit_1.AccountRole.READONLY },
             { address: constants_1.ASSOCIATED_TOKEN_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
         ];
+        if (args.feeTakerWallet && args.refFeeRate > 0) {
+            const feeTakerTokenAccount = yield (0, utils_1.findAssociatedTokenAddress)(args.feeTakerWallet, crncyTokenProgramId, args.crncyMint);
+            keys.push({ address: feeTakerTokenAccount, role: kit_1.AccountRole.WRITABLE });
+            keys.push({ address: args.feeTakerWallet, role: kit_1.AccountRole.WRITABLE });
+        }
         return { accounts: keys, programAddress: ctx.programId, data: buf };
     });
 }

package/dist/engine/utils.js

@@ -269,11 +269,14 @@ function getPerpPriceStep(price) {
         return 1000;
     }
 }
+const MAX_SUPPLY = 262200;
+const INIT_SEAT_PRICE = 1.0;
 function perpSeatReserve(activeUsers) {
-    if (activeUsers >= 25000) {
-        throw new Error('Active users cannot exceed 24999');
+    const differenceToMax = MAX_SUPPLY - activeUsers;
+    if (differenceToMax <= 0) {
+        throw new Error('Active users cannot exceed MAX_SUPPLY');
     }
-    return (250000 * activeUsers) / (25000 - activeUsers);
+    return (MAX_SUPPLY * INIT_SEAT_PRICE * activeUsers) / differenceToMax;
 }
 function getMultipleSpotOrders(data, firstEntry, clientId) {
     let orders = [];

package/dist/instruction_models.d.ts

@@ -1,5 +1,5 @@
-export declare function newOperatorData(tag: number): Buffer;
-export declare function newRootAccountData(tag: number, privateMode: number, lutSlot: number): Buffer;
+export declare function newOperatorData(tag: number, version: number): Buffer;
+export declare function newRootAccountData(tag: number, privateMode: number, version: number, lutSlot: 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;
@@ -15,13 +15,13 @@ 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, 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 swapData(tag: number, inputCrncy: number, instrId: number, price: number, amount: number, refFeeRate: number, minAmountOut: number): Buffer;
+export declare function spotQuotesReplaceData(tag: number, mask: number, instrId: number): Buffer;
+export declare function perpQuotesReplaceData(tag: number, mask: number, instrId: 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 setInstrReadyForPerpUpgradeData(tag: number, instrId: number, variance: number): Buffer;
+export declare function setInstrReadyForPerpUpgradeData(tag: number, instrId: 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 changeRefProgramData(tag: number, refProgramDuration: number, refLinkDuration: number, refDiscount: number, refRatio: number): Buffer;
@@ -29,7 +29,7 @@ export declare function buyMarketSeatData(tag: number, instrId: number, edgePric
 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 setVarianceData(tag: number, instrId: 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;
@@ -37,3 +37,6 @@ export declare function setSeatPurchasingFeeData(tag: number, fee: number): Buff
 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;
+export declare function cleanCandlesData(tag: number, instrId: number): Buffer;
+export declare function vmInitWithdrawData(tag: number, tokenId: number, amount: number): Buffer;
+export declare function vmChangeWhitelistData(tag: number, mask: number): Buffer;

package/dist/instruction_models.js

@@ -39,19 +39,24 @@ exports.setSeatPurchasingFeeData = setSeatPurchasingFeeData;
 exports.changeVotingData = changeVotingData;
 exports.garbageCollectorData = garbageCollectorData;
 exports.activateClientRefProgramData = activateClientRefProgramData;
-function newOperatorData(tag) {
-    let buf = Buffer.alloc(4);
+exports.cleanCandlesData = cleanCandlesData;
+exports.vmInitWithdrawData = vmInitWithdrawData;
+exports.vmChangeWhitelistData = vmChangeWhitelistData;
+function newOperatorData(tag, version) {
+    let buf = Buffer.alloc(8);
     buf.writeUint8(tag, 0);
     buf.writeUint8(0, 1);
     buf.writeUint16LE(0, 2);
+    buf.writeUint32LE(version, 4);
     return buf;
 }
-function newRootAccountData(tag, privateMode, lutSlot) {
-    let buf = Buffer.alloc(8);
+function newRootAccountData(tag, privateMode, version, lutSlot) {
+    let buf = Buffer.alloc(12);
     buf.writeUint8(tag, 0);
     buf.writeUint8(privateMode, 1);
     buf.writeUint16LE(0, 2);
-    buf.writeUint32LE(lutSlot, 4);
+    buf.writeUint32LE(version, 4);
+    buf.writeUint32LE(lutSlot, 8);
     return buf;
 }
 function newSpotOrderData(tag, ioc, orderType, side, instrId, price, amount, edgePrice) {
@@ -202,42 +207,31 @@ function withdrawData(tag, tokenId, amount) {
     buf.writeBigInt64LE(BigInt(Math.floor(amount)), 8);
     return buf;
 }
-function swapData(tag, inputCrncy, instrId, price, amount) {
-    let buf = Buffer.alloc(24);
+function swapData(tag, inputCrncy, instrId, price, amount, refFeeRate, minAmountOut) {
+    let buf = Buffer.alloc(40);
     buf.writeUint8(tag, 0);
     buf.writeUint8(inputCrncy, 1);
     buf.writeUint16LE(0, 2);
     buf.writeUint32LE(instrId, 4);
     buf.writeBigInt64LE(BigInt(Math.floor(price)), 8);
     buf.writeBigInt64LE(BigInt(Math.floor(amount)), 16);
+    buf.writeBigInt64LE(BigInt(Math.floor(minAmountOut)), 24);
     return buf;
 }
-function spotQuotesReplaceData(tag, instrId, newBidPrice, newBidQty, oldBidOrderId, newAskPrice, newAskQty, oldAskOrderId) {
-    let buf = Buffer.alloc(56);
+function spotQuotesReplaceData(tag, mask, instrId) {
+    let buf = Buffer.alloc(8);
     buf.writeUint8(tag, 0);
     buf.writeUint8(0, 1);
-    buf.writeUint16LE(0, 2);
+    buf.writeUint16LE(mask, 2);
     buf.writeUint32LE(instrId, 4);
-    buf.writeBigInt64LE(BigInt(Math.floor(newBidPrice)), 8);
-    buf.writeBigInt64LE(BigInt(Math.floor(newBidQty)), 16);
-    buf.writeBigInt64LE(BigInt(Math.floor(oldBidOrderId)), 24);
-    buf.writeBigInt64LE(BigInt(Math.floor(newAskPrice)), 32);
-    buf.writeBigInt64LE(BigInt(Math.floor(newAskQty)), 40);
-    buf.writeBigInt64LE(BigInt(Math.floor(oldAskOrderId)), 48);
     return buf;
 }
-function perpQuotesReplaceData(tag, instrId, newBidPrice, newBidQty, oldBidOrderId, newAskPrice, newAskQty, oldAskOrderId) {
-    let buf = Buffer.alloc(56);
+function perpQuotesReplaceData(tag, mask, instrId) {
+    let buf = Buffer.alloc(8);
     buf.writeUint8(tag, 0);
     buf.writeUint8(0, 1);
-    buf.writeUint16LE(0, 2);
+    buf.writeUint16LE(mask, 2);
     buf.writeUint32LE(instrId, 4);
-    buf.writeBigInt64LE(BigInt(Math.floor(newBidPrice)), 8);
-    buf.writeBigInt64LE(BigInt(Math.floor(newBidQty)), 16);
-    buf.writeBigInt64LE(BigInt(Math.floor(oldBidOrderId)), 24);
-    buf.writeBigInt64LE(BigInt(Math.floor(newAskPrice)), 32);
-    buf.writeBigInt64LE(BigInt(Math.floor(newAskQty)), 40);
-    buf.writeBigInt64LE(BigInt(Math.floor(oldAskOrderId)), 48);
     return buf;
 }
 function votingData(tag, choice, votingCounter) {
@@ -264,8 +258,8 @@ function upgradeToPerpData(tag, instrId) {
     buf.writeUint32LE(instrId, 4);
     return buf;
 }
-function setInstrReadyForPerpUpgradeData(tag, instrId, variance) {
-    let buf = Buffer.alloc(16);
+function setInstrReadyForPerpUpgradeData(tag, instrId) {
+    let buf = Buffer.alloc(8);
     buf.writeUint8(tag, 0);
     buf.writeUint8(0, 1);
     buf.writeUint16LE(0, 2);
@@ -334,11 +328,12 @@ function pointsProgramExpiration(tag, newExpirationTime) {
     buf.writeUint32LE(newExpirationTime, 4);
     return buf;
 }
-function setVarianceData(tag, variance) {
-    let buf = Buffer.alloc(12);
+function setVarianceData(tag, instrId, variance) {
+    let buf = Buffer.alloc(16);
     buf.writeUint8(tag, 0);
     buf.writeUint8(0, 1);
     buf.writeUint16LE(0, 2);
+    buf.writeUint32LE(instrId, 4);
     return buf;
 }
 function changeDenominatorData(tag, baseCrncyId, denominator) {
@@ -397,3 +392,28 @@ function activateClientRefProgramData(tag, refId) {
     buf.writeUint32LE(refId, 4);
     return buf;
 }
+function cleanCandlesData(tag, instrId) {
+    let buf = Buffer.alloc(8);
+    buf.writeUint8(tag, 0);
+    buf.writeUint8(0, 1);
+    buf.writeUint16LE(0, 2);
+    buf.writeUint32LE(instrId, 4);
+    return buf;
+}
+function vmInitWithdrawData(tag, tokenId, amount) {
+    let buf = Buffer.alloc(16);
+    buf.writeUint8(tag, 0);
+    buf.writeUint8(0, 1);
+    buf.writeUint16LE(0, 2);
+    buf.writeUint32LE(tokenId, 4);
+    buf.writeBigInt64LE(BigInt(Math.floor(amount)), 8);
+    return buf;
+}
+function vmChangeWhitelistData(tag, mask) {
+    let buf = Buffer.alloc(8);
+    buf.writeUint8(tag, 0);
+    buf.writeUint8(0, 1);
+    buf.writeUint16LE(0, 2);
+    buf.writeUint32LE(mask, 4);
+    return buf;
+}