@deriverse/kit 1.0.14 → 1.0.16

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 } from './types';
+import { Instrument, GetClientSpotOrdersInfoResponse, GetClientSpotOrdersArgs, GetClientSpotOrdersResponse, SpotOrderCancelArgs, GetClientDataResponse, GetClientSpotOrdersInfoArgs, SpotLpArgs, getInstrAccountByTagArgs, GetInstrIdArgs, NewSpotOrderArgs, DepositArgs, WithdrawArgs, SpotQuotesReplaceArgs, SpotMassCancelArgs, InstrId, GetClientPerpOrdersInfoArgs, GetClientPerpOrdersInfoResponse, GetClientPerpOrdersArgs, GetClientPerpOrdersResponse, PerpDepositArgs, NewPerpOrderArgs, PerpQuotesReplaceArgs, PerpOrderCancelArgs, PerpMassCancelArgs, PerpForcedCloseArgs, CommunityData, LogMessage, PerpChangeLeverageArgs, PerpStatisticsResetArgs, EngineArgs, NewInstrumentArgs } from './types';
 import { InstrAccountHeaderModel, RootStateModel, TokenStateModel } from "./structure_models";
 export * from './types';
 export * from './logs_models';
@@ -227,4 +227,10 @@ export declare class Engine {
      * @returns Transaction instruction
      */
     perpStatisticsResetInstruction(args: PerpStatisticsResetArgs): Promise<any>;
+    /**
+       * Build new instrument instructions
+       * @param args New instrument data
+       * @returns Transaction instruction
+       */
+    newInstrumentInstructions(args: NewInstrumentArgs): Promise<any[]>;
 }

package/dist/index.js

@@ -1986,7 +1986,7 @@ 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 * dec), Math.round(args.qty * this.tokenDec(instr.header.assetTokenId)));
+            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)));
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2021,7 +2021,7 @@ class Engine {
             }
             let 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 * dec), Math.round(args.newBidQty * assetTokenDecFactor), args.bidOrderIdToCancel, Math.round(args.newAskPrice * dec), Math.round(args.newAskQty * assetTokenDecFactor), args.askOrderIdToCancel);
+            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 = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2145,10 +2145,9 @@ class Engine {
             });
             const perpMapsAccountSize = 175336;
             const perpMapsAccountLamports = yield this.rpc.getMinimumBalanceForRentExemption(BigInt(perpMapsAccountSize)).send();
-            const signer = (0, kit_1.createNoopSigner)(this.signer);
             const createMapsAccountIx = (0, system_1.getCreateAccountWithSeedInstruction)({
-                payer: signer,
-                baseAccount: signer,
+                payer: this.signer,
+                baseAccount: this.signer,
                 base: this.signer,
                 newAccount: perpMapsAccount,
                 seed: perpMapsAccountSeed,
@@ -2339,7 +2338,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 * dec, 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)),
             };
         });
     }
@@ -2355,7 +2354,7 @@ class Engine {
             }
             const 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 * dec), Math.round(args.newBidQty * assetTokenDecFactor), args.bidOrderIdToCancel, Math.round(args.newAskPrice * dec), Math.round(args.newAskQty * assetTokenDecFactor), args.askOrderIdToCancel);
+            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 = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2529,5 +2528,167 @@ class Engine {
             };
         });
     }
+    /**
+       * Build new instrument instructions
+       * @param args New instrument data
+       * @returns Transaction instruction
+       */
+    newInstrumentInstructions(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.signer == null) {
+                throw new Error("Wallet is not connected");
+            }
+            if (args.initialPrice <= 0) {
+                throw new Error("Invalid initial price");
+            }
+            const assetInfo = yield this.rpc.getAccountInfo(args.assetMint).send();
+            if (!assetInfo.value) {
+                throw new Error("Asset mint not found");
+            }
+            const tokenProgramId = assetInfo.value.owner == TOKEN_2022_PROGRAM_ID ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID;
+            const crncyTokenId = yield this.getTokenId(args.crncyMint);
+            const id = yield this.getTokenId(args.assetMint);
+            const newAssetTokenId = id != null;
+            const assetTokenId = id !== null && id !== void 0 ? id : this.rootAccount.tokensCount;
+            if (!crncyTokenId) {
+                throw new Error("Currency mint not found");
+            }
+            const mapsAccountSeed = this.version.toString() + "_" +
+                types_1.AccountType.SPOT_MAPS.toString() + "_" +
+                assetTokenId.toString() + "_" +
+                crncyTokenId.toString();
+            const mapsAccount = yield (0, kit_1.createAddressWithSeed)({
+                baseAddress: this.signer,
+                programAddress: this.programId,
+                seed: mapsAccountSeed
+            });
+            const mapsAccountSize = 42184;
+            const mapsAccountLamports = yield this.rpc.getMinimumBalanceForRentExemption(BigInt(mapsAccountSize)).send();
+            const createMapsAccountIx = (0, system_1.getCreateAccountWithSeedInstruction)({
+                payer: this.signer,
+                baseAccount: this.signer,
+                base: this.signer,
+                newAccount: mapsAccount,
+                seed: mapsAccountSeed,
+                space: mapsAccountSize,
+                programAddress: this.programId,
+                amount: mapsAccountLamports,
+            });
+            const slot = Number((yield this.rpc.getSlot().send())) - 1;
+            const lutAddress = yield getLookupTableAddress(this.signer, slot);
+            let keys = [
+                { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
+                { address: this.rootAccount, role: kit_1.AccountRole.WRITABLE },
+                { address: yield this.getTokenAccount(args.assetMint), role: newAssetTokenId ? kit_1.AccountRole.WRITABLE : kit_1.AccountRole.READONLY },
+                { address: yield this.getTokenAccount(args.crncyMint), role: kit_1.AccountRole.READONLY },
+                { address: newAssetTokenId ? args.newProgramAccountAddress : this.tokens.get(assetTokenId).programAddress, role: newAssetTokenId ? kit_1.AccountRole.WRITABLE_SIGNER : kit_1.AccountRole.READONLY },
+                { address: args.assetMint, role: kit_1.AccountRole.READONLY },
+                { address: lutAddress, role: kit_1.AccountRole.WRITABLE },
+                { address: tokenProgramId, role: kit_1.AccountRole.READONLY },
+                { address: ADDRESS_LOOKUP_TABLE_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
+                { address: this.drvsAuthority, role: kit_1.AccountRole.READONLY },
+                {
+                    address: yield this.getInstrAccountByTag({
+                        assetTokenId: assetTokenId,
+                        crncyTokenId: crncyTokenId,
+                        tag: types_1.AccountType.INSTR
+                    }), role: kit_1.AccountRole.WRITABLE
+                },
+                {
+                    address: yield this.getInstrAccountByTag({
+                        assetTokenId: assetTokenId,
+                        crncyTokenId: crncyTokenId,
+                        tag: types_1.AccountType.SPOT_BIDS_TREE
+                    }), role: kit_1.AccountRole.WRITABLE
+                },
+                {
+                    address: yield this.getInstrAccountByTag({
+                        assetTokenId: assetTokenId,
+                        crncyTokenId: crncyTokenId,
+                        tag: types_1.AccountType.SPOT_ASKS_TREE
+                    }), role: kit_1.AccountRole.WRITABLE
+                },
+                {
+                    address: yield this.getInstrAccountByTag({
+                        assetTokenId: assetTokenId,
+                        crncyTokenId: crncyTokenId,
+                        tag: types_1.AccountType.SPOT_BID_ORDERS
+                    }), role: kit_1.AccountRole.WRITABLE
+                },
+                {
+                    address: yield this.getInstrAccountByTag({
+                        assetTokenId: assetTokenId,
+                        crncyTokenId: crncyTokenId,
+                        tag: types_1.AccountType.SPOT_ASK_ORDERS
+                    }), role: kit_1.AccountRole.WRITABLE
+                },
+                {
+                    address: yield this.getInstrAccountByTag({
+                        assetTokenId: assetTokenId,
+                        crncyTokenId: crncyTokenId,
+                        tag: types_1.AccountType.SPOT_LINES
+                    }), role: kit_1.AccountRole.WRITABLE
+                },
+                {
+                    address: mapsAccount, role: kit_1.AccountRole.WRITABLE
+                },
+                {
+                    address: yield this.getInstrAccountByTag({
+                        assetTokenId: assetTokenId,
+                        crncyTokenId: crncyTokenId,
+                        tag: types_1.AccountType.SPOT_CLIENT_INFOS
+                    }), role: kit_1.AccountRole.WRITABLE
+                },
+                {
+                    address: yield this.getInstrAccountByTag({
+                        assetTokenId: assetTokenId,
+                        crncyTokenId: crncyTokenId,
+                        tag: types_1.AccountType.SPOT_CLIENT_INFOS2
+                    }), role: kit_1.AccountRole.WRITABLE
+                },
+                {
+                    address: yield this.getInstrAccountByTag({
+                        assetTokenId: assetTokenId,
+                        crncyTokenId: crncyTokenId,
+                        tag: types_1.AccountType.SPOT_CLIENT_ACCOUNTS
+                    }), role: kit_1.AccountRole.WRITABLE
+                },
+                {
+                    address: yield this.getInstrAccountByTag({
+                        assetTokenId: assetTokenId,
+                        crncyTokenId: crncyTokenId,
+                        tag: types_1.AccountType.SPOT_1M_CANDLES
+                    }), role: kit_1.AccountRole.WRITABLE
+                },
+                {
+                    address: yield this.getInstrAccountByTag({
+                        assetTokenId: assetTokenId,
+                        crncyTokenId: crncyTokenId,
+                        tag: types_1.AccountType.SPOT_15M_CANDLES
+                    }), role: kit_1.AccountRole.WRITABLE
+                },
+                {
+                    address: yield this.getInstrAccountByTag({
+                        assetTokenId: assetTokenId,
+                        crncyTokenId: crncyTokenId,
+                        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
+                },
+            ];
+            const upgradeIx = {
+                accounts: keys,
+                programAddress: this.programId,
+                data: (0, instruction_models_1.newInstrumentData)(9, crncyTokenId, slot, args.initialPrice * 1000000000)
+            };
+            return [createMapsAccountIx, upgradeIx];
+        });
+    }
 }
 exports.Engine = Engine;

package/dist/types.d.ts

@@ -552,4 +552,10 @@ export interface NewPerpOrderArgs {
     leverage?: number;
     side: number;
 }
+export interface NewInstrumentArgs {
+    assetMint: Address;
+    crncyMint: Address;
+    newProgramAccountAddress?: Address;
+    initialPrice: number;
+}
 export type LogMessage = DepositReportModel | WithdrawReportModel | PerpDepositReportModel | PerpWithdrawReportModel | FeesDepositReportModel | FeesWithdrawReportModel | SpotlpTradeReportModel | EarningsReportModel | DrvsAirdropReportModel | SpotPlaceOrderReportModel | SpotFillOrderReportModel | SpotNewOrderReportModel | SpotOrderCancelReportModel | SpotOrderRevokeReportModel | SpotFeesReportModel | SpotPlaceMassCancelReportModel | SpotMassCancelReportModel | PerpPlaceOrderReportModel | PerpFillOrderReportModel | PerpNewOrderReportModel | PerpOrderCancelReportModel | PerpOrderRevokeReportModel | PerpFeesReportModel | PerpPlaceMassCancelReportModel | PerpMassCancelReportModel | PerpFundingReportModel | PerpSocLossReportModel | PerpChangeLeverageReportModel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deriverse/kit",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",