@triadxyz/triad-protocol 1.8.8-beta → 1.8.9-beta

package/dist/trade.d.ts

@@ -7,7 +7,6 @@ import BN from 'bn.js';
 export default class Trade {
     private program;
     private provider;
-    mint: PublicKey;
     decimals: number;
     constructor(program: Program<TriadProtocol>, provider: AnchorProvider);
     /**
@@ -288,7 +287,7 @@ export default class Trade {
      * @param options - RPC options
      *
      */
-    placeOrder({ marketId, amount, direction, orderSide, mint, price, bidOrderId }: PlaceOrderArgs, options?: RpcOptions): Promise<string>;
+    placeOrder({ marketId, amount, direction, orderSide, mint, price, bidOrderId, bidNonce }: PlaceOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Cancel Order
      * @param args.marketId - The ID of the Market

package/dist/trade.js

@@ -21,11 +21,11 @@ const trade_2 = require("./utils/pda/trade");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
 const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
+const pda_1 = require("./utils/pda");
 class Trade {
     constructor(program, provider) {
         this.program = program;
         this.provider = provider;
-        this.mint = constants_1.TRD_MINT;
         this.decimals = constants_1.TRD_DECIMALS; // We're using only TRD or USDC so we can use the same decimals 6
     }
     /**
@@ -196,7 +196,7 @@ class Trade {
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.closeOrder(new bn_js_1.default(orderId)).accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
-                mint: this.mint,
+                mint: constants_1.TRD_MINT,
                 userTrade: userTradePDA
             }), options);
         });
@@ -424,12 +424,11 @@ class Trade {
      * @param options - RPC options
      *
      */
-    placeOrder({ marketId, amount, direction, orderSide, mint, price, bidOrderId }, options) {
+    placeOrder({ marketId, amount, direction, orderSide, mint, price, bidOrderId, bidNonce }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const { userTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs();
-            console.log(userTradePDA);
             if (userTradeIxs.length > 0) {
                 ixs.push(...userTradeIxs);
             }
@@ -450,6 +449,11 @@ class Trade {
                     .instruction());
             }
             if (Object.keys(orderSide)[0] === 'ask' && bidOrderId) {
+                let bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+                if (bidNonce !== 0) {
+                    const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, bidNonce);
+                    bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+                }
                 ixs.push(yield this.program.methods
                     .placeAskOrder({
                     shares: new bn_js_1.default(amount * Math.pow(10, this.decimals)),
@@ -460,7 +464,8 @@ class Trade {
                     .accounts({
                     signer: this.provider.publicKey,
                     market: marketPDA,
-                    userTrade: userTradePDA
+                    userTrade: userTradePDA,
+                    bidUserTrade: bidUserTradePDA
                 })
                     .instruction());
             }
@@ -501,7 +506,7 @@ class Trade {
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.cancelAskOrder(new bn_js_1.default(orderId)).accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
-                userTrade: userTradePDA,
+                askUserTrade: userTradePDA,
                 bidUserTrade: bidUserTradePDA
             }), options);
         });
@@ -532,6 +537,7 @@ class Trade {
                 if (order.authority === this.provider.publicKey.toBase58()) {
                     continue;
                 }
+                console.log(order);
                 const orderPrice = Number(order.price);
                 const maxSharesForPrice = remainingUSDC / orderPrice;
                 const availableShares = Number(order.totalShares);
@@ -542,6 +548,7 @@ class Trade {
                     const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), Number(order.userNonce));
                     sellerTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
                 }
+                const tokenProgram = (0, helpers_1.getTokenProgram)(mint);
                 ixs.push(yield this.program.methods
                     .marketBidOrder({
                     amount: new bn_js_1.default(usdcAmount),
@@ -554,8 +561,10 @@ class Trade {
                     buyerTrade,
                     sellerTrade: sellerTradePDA,
                     mint,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(mint),
-                    sellerAuthority: new web3_js_1.PublicKey(order.authority)
+                    tokenProgram,
+                    sellerAuthority: new web3_js_1.PublicKey(order.authority),
+                    marketToAta: (0, pda_1.getTokenATA)(marketPDA, mint, tokenProgram),
+                    userFromAta: (0, pda_1.getTokenATA)(this.provider.publicKey, mint, tokenProgram)
                 })
                     .instruction());
                 remainingUSDC -= usdcAmount;

package/dist/types/idl_triad_protocol.json

@@ -74,15 +74,15 @@
                     "signer": true
                 },
                 {
-                    "name": "user_trade",
+                    "name": "ask_user_trade",
                     "writable": true
                 },
                 {
-                    "name": "market",
+                    "name": "bid_user_trade",
                     "writable": true
                 },
                 {
-                    "name": "bid_user_trade",
+                    "name": "market",
                     "writable": true
                 },
                 {

package/dist/types/trade.d.ts

@@ -97,6 +97,7 @@ export type PlaceOrderArgs = {
     };
     mint: PublicKey;
     bidOrderId: number | null;
+    bidNonce: number | null;
 };
 export type InitializeMarketArgs = {
     marketId: number;

package/dist/types/triad_protocol.d.ts

@@ -80,15 +80,15 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'userTrade';
+                    name: 'askUserTrade';
                     writable: true;
                 },
                 {
-                    name: 'market';
+                    name: 'bidUserTrade';
                     writable: true;
                 },
                 {
-                    name: 'bidUserTrade';
+                    name: 'market';
                     writable: true;
                 },
                 {

package/dist/utils/pda/index.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 export declare const getUserPositionPDA: (programId: PublicKey, wallet: PublicKey, ticker: PublicKey) => PublicKey;
-export declare const getTokenATA: (address: PublicKey, Mint: PublicKey) => PublicKey;
+export declare const getTokenATA: (address: PublicKey, Mint: PublicKey, program?: PublicKey) => PublicKey;
 export declare const getWheelPDA: (programId: PublicKey, name: string) => PublicKey;
 export declare const getCollectionPDA: (programId: PublicKey, collectionSymbol: string) => PublicKey;
 export declare const getNftPDA: (programId: PublicKey, number: number) => PublicKey;

package/dist/utils/pda/index.js

@@ -11,8 +11,8 @@ const getUserPositionPDA = (programId, wallet, ticker) => {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('user_position'), wallet.toBuffer(), ticker.toBuffer()], programId)[0];
 };
 exports.getUserPositionPDA = getUserPositionPDA;
-const getTokenATA = (address, Mint) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([address.toBytes(), spl_token_1.TOKEN_2022_PROGRAM_ID.toBytes(), Mint.toBytes()], new web3_js_1.PublicKey(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID))[0];
+const getTokenATA = (address, Mint, program = spl_token_1.TOKEN_2022_PROGRAM_ID) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([address.toBytes(), program.toBytes(), Mint.toBytes()], new web3_js_1.PublicKey(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID))[0];
 };
 exports.getTokenATA = getTokenATA;
 const getWheelPDA = (programId, name) => {

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "1.8.8-beta",
+  "version": "1.8.9-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
     "clean": "rimraf dist",
     "build": "yarn run clean && tsc",
-    "prepublishOnly": "yarn build",
-    "test": "rimraf dist && tsc && node ./dist/local-test/index.js"
+    "prepublishOnly": "yarn build"
   },
   "publishConfig": {
     "access": "public"