@triadxyz/triad-protocol 4.0.3 → 4.0.4-beta.1

package/dist/customer.d.ts

@@ -16,12 +16,12 @@ export default class Customer {
      * Get Costumer By Wallet Address
      * @param wallet - The wallet address of the customer
      */
-    getCustomerByWallet(wallet: PublicKey): Promise<import("@triadxyz/triad-protocol").Customer>;
+    getCustomerByWallet(wallet: PublicKey): Promise<import("./types/customer").Customer>;
     /**
      * Get Customer By ID
      * @param customerId - The ID of the customer
      */
-    getCustomerById(customerId: number): Promise<import("@triadxyz/triad-protocol").Customer>;
+    getCustomerById(customerId: number): Promise<import("./types/customer").Customer>;
     /**
      * Create Customer
      * @param args.id - The ID of the customer

package/dist/customer.js

@@ -13,7 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const triad_protocol_1 = require("@triadxyz/triad-protocol");
+const helpers_1 = require("./utils/helpers");
+const pda_1 = require("./utils/pda");
 class Customer {
     constructor(program, rpcOptions) {
         this.program = program;
@@ -42,7 +43,7 @@ class Customer {
                     }
                 }
             ]);
-            return (0, triad_protocol_1.formatCustomer)(customer.account, customer.publicKey);
+            return (0, helpers_1.formatCustomer)(customer.account, customer.publicKey);
         });
     }
     /**
@@ -51,9 +52,9 @@ class Customer {
      */
     getCustomerById(customerId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const customerPDA = (0, triad_protocol_1.getCustomerPDA)(this.program.programId, customerId);
+            const customerPDA = (0, pda_1.getCustomerPDA)(this.program.programId, customerId);
             const customer = yield this.program.account.customer.fetch(customerPDA, this.rpcOptions.commitment);
-            return (0, triad_protocol_1.formatCustomer)(customer, customerPDA);
+            return (0, helpers_1.formatCustomer)(customer, customerPDA);
         });
     }
     /**

package/dist/predictor.js

@@ -18,6 +18,7 @@ const constants_1 = require("./utils/constants");
 const pda_1 = require("./utils/pda");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const helpers_1 = require("./utils/helpers");
+const spl_token_1 = require("@solana/spl-token");
 class Predictor {
     constructor(program, rpcOptions) {
         this.program = program;
@@ -33,7 +34,7 @@ class Predictor {
             const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customerId);
             try {
                 const predictor = yield this.program.account.predictor.fetch(predictorPDA);
-                const balance = yield this.program.provider.connection.getTokenAccountBalance((0, pda_1.getTokenATA)(authority, constants_1.UNIT_MINT, this.program.programId));
+                const balance = yield this.program.provider.connection.getTokenAccountBalance((0, pda_1.getTokenATA)(predictorPDA, constants_1.UNIT_MINT, spl_token_1.TOKEN_PROGRAM_ID));
                 return (0, helpers_1.formatPredictor)(predictor, predictorPDA, new bn_js_1.default(balance.value.amount));
             }
             catch (e) {

package/dist/types/customer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 export type Customer = {
     id: number;

package/dist/types/idl_triad_protocol.json

@@ -422,9 +422,8 @@
                     "signer": true
                 },
                 {
-                    "name": "squads",
-                    "writable": true,
-                    "address": "Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4"
+                    "name": "authority",
+                    "writable": true
                 },
                 {
                     "name": "market",
@@ -1509,6 +1508,116 @@
                 }
             ]
         },
+        {
+            "name": "place_order_v0",
+            "discriminator": [100, 204, 57, 226, 245, 228, 61, 187],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "payer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "market",
+                    "writable": true
+                },
+                {
+                    "name": "order_book",
+                    "writable": true
+                },
+                {
+                    "name": "order",
+                    "writable": true
+                },
+                {
+                    "name": "mint",
+                    "address": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
+                },
+                {
+                    "name": "user_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "signer"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "market_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "market"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "token_program",
+                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                },
+                {
+                    "name": "associated_token_program",
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "args",
+                    "type": {
+                        "defined": {
+                            "name": "PlaceOrderV0Args"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "remove_trader_poseidon",
             "discriminator": [150, 5, 46, 188, 189, 13, 246, 11],
@@ -2369,10 +2478,6 @@
             "name": "ActivityEvent",
             "discriminator": [231, 225, 142, 104, 209, 97, 39, 202]
         },
-        {
-            "name": "BookOrderEvent",
-            "discriminator": [175, 216, 61, 224, 98, 215, 181, 62]
-        },
         {
             "name": "ClaimTokenEvent",
             "discriminator": [127, 10, 14, 49, 47, 171, 31, 127]
@@ -2744,66 +2849,6 @@
                 ]
             }
         },
-        {
-            "name": "BookOrderEvent",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "market_id",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "price",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "total_shares",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "filled_shares",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "authority",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "user_nonce",
-                        "type": "u32"
-                    },
-                    {
-                        "name": "id",
-                        "type": "u8"
-                    },
-                    {
-                        "name": "linked_book_order_id",
-                        "type": "u8"
-                    },
-                    {
-                        "name": "order_direction",
-                        "type": {
-                            "defined": {
-                                "name": "OrderDirection"
-                            }
-                        }
-                    },
-                    {
-                        "name": "order_side",
-                        "type": {
-                            "defined": {
-                                "name": "OrderSide"
-                            }
-                        }
-                    }
-                ]
-            }
-        },
         {
             "name": "CancelOrderArgs",
             "type": {
@@ -3806,6 +3851,38 @@
                 ]
             }
         },
+        {
+            "name": "PlaceOrderV0Args",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "shares",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "price",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "order_direction",
+                        "type": {
+                            "defined": {
+                                "name": "OrderDirection"
+                            }
+                        }
+                    },
+                    {
+                        "name": "order_side",
+                        "type": {
+                            "defined": {
+                                "name": "OrderSide"
+                            }
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "Pool",
             "type": {

package/dist/types/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { Commitment, PublicKey } from '@solana/web3.js';
 export type RpcOptions = {
     skipPreflight?: boolean;

package/dist/types/predictor.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 export type Predictor = {
     address: string;

package/dist/types/trade.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { OrderDirectionEncoded } from './';
 export type PlaceBidOrderArgs = {

package/dist/types/triad_protocol.d.ts

@@ -626,9 +626,8 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'squads';
+                    name: 'authority';
                     writable: true;
-                    address: 'Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4';
                 },
                 {
                     name: 'market';
@@ -2159,6 +2158,174 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'placeOrderV0';
+            discriminator: [100, 204, 57, 226, 245, 228, 61, 187];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'payer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'market';
+                    writable: true;
+                },
+                {
+                    name: 'orderBook';
+                    writable: true;
+                },
+                {
+                    name: 'order';
+                    writable: true;
+                },
+                {
+                    name: 'mint';
+                    address: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
+                },
+                {
+                    name: 'userAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'tokenProgram';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'mint';
+                            }
+                        ];
+                        program: {
+                            kind: 'const';
+                            value: [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
+                {
+                    name: 'marketAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'market';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'tokenProgram';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'mint';
+                            }
+                        ];
+                        program: {
+                            kind: 'const';
+                            value: [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
+                {
+                    name: 'tokenProgram';
+                    address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
+                },
+                {
+                    name: 'associatedTokenProgram';
+                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'placeOrderV0Args';
+                        };
+                    };
+                }
+            ];
+        },
         {
             name: 'removeTraderPoseidon';
             discriminator: [150, 5, 46, 188, 189, 13, 246, 11];
@@ -3257,10 +3424,6 @@ export type TriadProtocol = {
             name: 'activityEvent';
             discriminator: [231, 225, 142, 104, 209, 97, 39, 202];
         },
-        {
-            name: 'bookOrderEvent';
-            discriminator: [175, 216, 61, 224, 98, 215, 181, 62];
-        },
         {
             name: 'claimTokenEvent';
             discriminator: [127, 10, 14, 49, 47, 171, 31, 127];
@@ -3632,66 +3795,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'bookOrderEvent';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'marketId';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'timestamp';
-                        type: 'i64';
-                    },
-                    {
-                        name: 'price';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'totalShares';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'filledShares';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'authority';
-                        type: 'pubkey';
-                    },
-                    {
-                        name: 'userNonce';
-                        type: 'u32';
-                    },
-                    {
-                        name: 'id';
-                        type: 'u8';
-                    },
-                    {
-                        name: 'linkedBookOrderId';
-                        type: 'u8';
-                    },
-                    {
-                        name: 'orderDirection';
-                        type: {
-                            defined: {
-                                name: 'orderDirection';
-                            };
-                        };
-                    },
-                    {
-                        name: 'orderSide';
-                        type: {
-                            defined: {
-                                name: 'orderSide';
-                            };
-                        };
-                    }
-                ];
-            };
-        },
         {
             name: 'cancelOrderArgs';
             type: {
@@ -4694,6 +4797,38 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'placeOrderV0Args';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'shares';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'price';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'orderDirection';
+                        type: {
+                            defined: {
+                                name: 'orderDirection';
+                            };
+                        };
+                    },
+                    {
+                        name: 'orderSide';
+                        type: {
+                            defined: {
+                                name: 'orderSide';
+                            };
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'pool';
             type: {

package/dist/utils/constants.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 export declare const USDC_MINT: PublicKey;
 export declare const TRD_MINT: PublicKey;

package/dist/utils/getPriorityFee.js

@@ -8,16 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const axios_1 = __importDefault(require("axios"));
 const getPriorityFee = () => __awaiter(void 0, void 0, void 0, function* () {
     let fee = 1000;
     try {
-        const response = yield axios_1.default.get('https://solanacompass.com/api/fees');
-        fee = response.data[1].priorityTx;
+        const response = yield fetch('https://solanacompass.com/api/fees');
+        const data = yield response.json();
+        fee = data[1].priorityTx;
     }
     catch (_a) { }
     return fee;

package/dist/utils/pda.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { OrderDirection } from '../types';
 export declare const getTokenATA: (address: PublicKey, Mint: PublicKey, program?: PublicKey) => PublicKey;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "4.0.3",
+  "version": "4.0.4-beta.1",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
     "clean": "rimraf dist",
     "build": "yarn run clean && tsc",
+    "docs": "typedoc",
     "prepublishOnly": "yarn build"
   },
   "publishConfig": {
@@ -34,20 +35,12 @@
     "@coral-xyz/anchor": "0.30.1",
     "@solana/spl-token": "0.4.8",
     "@solana/web3.js": "1.95.3",
-    "axios": "1.9.0",
-    "bn.js": "5.2.2",
+    "bn.js": "5.2.3",
     "bs58": "6.0.0"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "6.7.3",
-    "@typescript-eslint/parser": "6.7.3",
     "@types/bn.js": "^5.1.0",
-    "eslint": "8.50.0",
-    "eslint-config-prettier": "9.0.0",
-    "eslint-plugin-prettier": "5.0.0",
-    "prettier": "3.2.4",
-    "rimraf": "^5.0.5",
-    "typedoc": "0.25.1",
+    "rimraf": "6.1.3",
     "typescript": "5.2.2"
   }
 }