@triadxyz/triad-protocol 1.5.0-beta → 1.5.2-beta

package/dist/index.d.ts

@@ -57,4 +57,11 @@ export default class TriadProtocolClient {
         poseidonAsset: PublicKey;
         nft: number;
     }, options?: RpcOptions): Promise<string>;
+    /**
+     * Collect Royalty
+     * @param collection - Collection PublicKey
+     *
+     * @param options - RPC options
+     */
+    collectRoyalty(collection: PublicKey, options?: RpcOptions): Promise<string>;
 }

package/dist/index.js

@@ -152,5 +152,19 @@ class TriadProtocolClient {
             }), options);
         });
     }
+    /**
+     * Collect Royalty
+     * @param collection - Collection PublicKey
+     *
+     * @param options - RPC options
+     */
+    collectRoyalty(collection, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods.collectRoyalty().accounts({
+                signer: this.provider.wallet.publicKey,
+                collection
+            }), options);
+        });
+    }
 }
 exports.default = TriadProtocolClient;

package/dist/types/idl_triad_protocol.json

@@ -421,6 +421,31 @@
             ],
             "args": []
         },
+        {
+            "name": "collect_royalty",
+            "discriminator": [189, 235, 7, 168, 255, 50, 30, 75],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "squads",
+                    "writable": true,
+                    "address": "6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq"
+                },
+                {
+                    "name": "collection",
+                    "writable": true
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": []
+        },
         {
             "name": "create_user_trade",
             "discriminator": [232, 235, 58, 194, 135, 248, 153, 1],

package/dist/types/triad_protocol.d.ts

@@ -659,6 +659,31 @@ export type TriadProtocol = {
             ];
             args: [];
         },
+        {
+            name: 'collectRoyalty';
+            discriminator: [189, 235, 7, 168, 255, 50, 30, 75];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'squads';
+                    writable: true;
+                    address: '6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq';
+                },
+                {
+                    name: 'collection';
+                    writable: true;
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [];
+        },
         {
             name: 'createUserTrade';
             discriminator: [232, 235, 58, 194, 135, 248, 153, 1];

package/dist/utils/{priorityFee.js → getPriorityFee.js}

@@ -15,6 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
 const getPriorityFee = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield axios_1.default.get('https://solanacompass.com/api/fees');
-    return response.data[5].priorityTx || 1000;
+    return response.data[1].priorityTx || 1000;
 });
 exports.default = getPriorityFee;

package/dist/utils/sendTransactionWithOptions.js

@@ -1,7 +1,20 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 web3_js_1 = require("@solana/web3.js");
-const sendTransactionWithOptions = (method, options) => {
+const getPriorityFee_1 = __importDefault(require("./getPriorityFee"));
+const sendTransactionWithOptions = (method, options) => __awaiter(void 0, void 0, void 0, function* () {
     if (options === null || options === void 0 ? void 0 : options.microLamports) {
         method.postInstructions([
             web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
@@ -9,6 +22,14 @@ const sendTransactionWithOptions = (method, options) => {
             })
         ]);
     }
+    if (!(options === null || options === void 0 ? void 0 : options.microLamports)) {
+        const priorityFee = yield (0, getPriorityFee_1.default)();
+        method.postInstructions([
+            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                microLamports: priorityFee
+            })
+        ]);
+    }
     return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
-};
+});
 exports.default = sendTransactionWithOptions;

package/dist/utils/sendVersionedTransaction.js

@@ -8,14 +8,24 @@ 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 web3_js_1 = require("@solana/web3.js");
+const getPriorityFee_1 = __importDefault(require("./getPriorityFee"));
 const sendVersionedTransaction = (provider, ixs, options, payer, addressLookupTableAccounts, verifier) => __awaiter(void 0, void 0, void 0, function* () {
     if (options === null || options === void 0 ? void 0 : options.microLamports) {
         ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
             microLamports: options.microLamports
         }));
     }
+    if (!(options === null || options === void 0 ? void 0 : options.microLamports)) {
+        const priorityFee = yield (0, getPriorityFee_1.default)();
+        ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+            microLamports: priorityFee
+        }));
+    }
     const { blockhash } = yield provider.connection.getLatestBlockhash();
     const tx = new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
         instructions: ixs,

package/package.json

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