@triadxyz/triad-protocol 0.5.7-beta.devnet → 0.5.9-beta.devnet

package/dist/trade.js

@@ -111,7 +111,20 @@ class Trade {
     openOrder(marketId, args, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, helpers_1.getMarketAddressSync)(this.program.programId, marketId);
-            const method = this.program.methods
+            const ixs = [];
+            try {
+                const userTradePDA = (0, helpers_1.getUserTradeAddressSync)(this.program.programId, this.provider.publicKey);
+                this.program.account.userTrade.fetch(userTradePDA);
+            }
+            catch (_a) {
+                ixs.push(yield this.program.methods
+                    .createUserTrade()
+                    .accounts({
+                    signer: this.provider.publicKey
+                })
+                    .instruction());
+            }
+            ixs.push(yield this.program.methods
                 .openOrder({
                 amount: new bn_js_1.default(args.amount / Math.pow(10, constants_1.TRD_DECIMALS)),
                 direction: args.direction,
@@ -119,21 +132,28 @@ class Trade {
                 limitPrice: args.limitPrice
                     ? new bn_js_1.default(args.limitPrice / Math.pow(10, constants_1.TRD_DECIMALS))
                     : undefined,
-                comment: (0, helpers_1.encodeString)(args.comment, 64)
+                comment: args.comment ? (0, helpers_1.encodeString)(args.comment, 64) : undefined
             })
                 .accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
-                mint: constants_1.TRD_MINT
-            });
+                mint: constants_1.TRD_MINT_DEVNET
+            })
+                .instruction());
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
-                method.postInstructions([
-                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                        microLamports: options.microLamports
-                    })
-                ]);
+                ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                    microLamports: options.microLamports
+                }));
             }
-            return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
+            const { blockhash } = yield this.provider.connection.getLatestBlockhash();
+            return this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
+                instructions: ixs,
+                recentBlockhash: blockhash,
+                payerKey: this.provider.publicKey
+            }).compileToV0Message()), [], {
+                skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
+                commitment: 'confirmed'
+            });
         });
     }
 }

package/dist/types/idl_triad_protocol.json

@@ -164,6 +164,38 @@
                 }
             ]
         },
+        {
+            "name": "create_user_trade",
+            "discriminator": [232, 235, 58, 194, 135, 248, 153, 1],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "user_trade",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [117, 115, 101, 114, 95, 116, 114, 97, 100, 101]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "signer"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": []
+        },
         {
             "name": "initialize_market",
             "discriminator": [35, 35, 189, 193, 155, 48, 170, 203],
@@ -1681,10 +1713,10 @@
                         "type": "u64"
                     },
                     {
-                        "name": "order_type",
+                        "name": "direction",
                         "type": {
                             "defined": {
-                                "name": "OrderType"
+                                "name": "OrderDirection"
                             }
                         }
                     },

package/dist/types/triad_protocol.d.ts

@@ -228,6 +228,38 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'createUserTrade';
+            discriminator: [232, 235, 58, 194, 135, 248, 153, 1];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'userTrade';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [117, 115, 101, 114, 95, 116, 114, 97, 100, 101];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [];
+        },
         {
             name: 'initializeMarket';
             discriminator: [35, 35, 189, 193, 155, 48, 170, 203];
@@ -2122,10 +2154,10 @@ export type TriadProtocol = {
                         type: 'u64';
                     },
                     {
-                        name: 'orderType';
+                        name: 'direction';
                         type: {
                             defined: {
-                                name: 'orderType';
+                                name: 'orderDirection';
                             };
                         };
                     },

package/dist/utils/helpers.d.ts

@@ -6,6 +6,7 @@ export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
 export declare const getMarketAddressSync: (programId: PublicKey, marketId: number) => PublicKey;
 export declare const getFeeVaultAddressSync: (programId: PublicKey, market: PublicKey) => PublicKey;
+export declare const getUserTradeAddressSync: (programId: PublicKey, wallet: PublicKey) => PublicKey;
 export declare const getStakeVaultAddressSync: (programId: PublicKey, vaultName: string) => PublicKey;
 export declare const getStakeAddressSync: (programId: PublicKey, wallet: PublicKey, name: string) => PublicKey;
 export declare const getNFTRewardsAddressSync: (programId: PublicKey, stake: PublicKey) => PublicKey;

package/dist/utils/helpers.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateAPR = exports.calculateTotalMultiplier = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.formatNumber = exports.getUserAddressSync = exports.getATASync = exports.getNFTRewardsAddressSync = exports.getStakeAddressSync = exports.getStakeVaultAddressSync = exports.getFeeVaultAddressSync = exports.getMarketAddressSync = exports.decodeString = exports.encodeString = exports.getTickerAddressSync = void 0;
+exports.calculateAPR = exports.calculateTotalMultiplier = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.formatNumber = exports.getUserAddressSync = exports.getATASync = exports.getNFTRewardsAddressSync = exports.getStakeAddressSync = exports.getStakeVaultAddressSync = exports.getUserTradeAddressSync = exports.getFeeVaultAddressSync = exports.getMarketAddressSync = exports.decodeString = exports.encodeString = exports.getTickerAddressSync = void 0;
 const stake_1 = require("./../types/stake");
 const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
@@ -35,6 +35,11 @@ const getFeeVaultAddressSync = (programId, market) => {
     return FeeVaultPDA;
 };
 exports.getFeeVaultAddressSync = getFeeVaultAddressSync;
+const getUserTradeAddressSync = (programId, wallet) => {
+    const [UserTradePDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('user_trade'), wallet.toBuffer()], programId);
+    return UserTradePDA;
+};
+exports.getUserTradeAddressSync = getUserTradeAddressSync;
 const getStakeVaultAddressSync = (programId, vaultName) => {
     const [StakeVaultPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('stake_vault'), Buffer.from(vaultName)], programId);
     return StakeVaultPDA;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "0.5.7-beta.devnet",
+  "version": "0.5.9-beta.devnet",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",