@triadxyz/triad-protocol 1.3.4-beta → 1.3.6-beta

package/dist/index.d.ts

@@ -82,7 +82,7 @@ export default class TriadProtocolClient {
      * @param verifier - Verifier keypair
      * @param options - RPC options
      */
-    spinWheel(isSol: boolean, options?: RpcOptions): Promise<any>;
+    spinWheel(isSol: boolean, options?: RpcOptions): Promise<number>;
     /**
      * Mint Poseidon
      * @param number - Poseidon number
@@ -90,11 +90,5 @@ export default class TriadProtocolClient {
      * @param options - RPC options
      *
      */
-    mintPoseidon(items: {
-        number: number;
-        attributes: {
-            key: string;
-            value: string;
-        }[];
-    }[], options?: RpcOptions): Promise<string>;
+    mintPoseidon(items: number[], options?: RpcOptions): Promise<string>;
 }

package/dist/index.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
+const base64_js_1 = require("base64-js");
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
 const trade_1 = __importDefault(require("./trade"));
 const helpers_1 = require("./utils/helpers");
@@ -228,6 +229,7 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     spinWheel(isSol, options) {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const spinPDA = (0, pda_1.getSpinPDA)(this.program.programId, constants_1.SPIN_NAME);
             const method = this.program.methods.spinWheel(isSol).accounts({
@@ -236,17 +238,16 @@ class TriadProtocolClient {
                 mint: constants_1.TCMAS_MINT
             });
             const tx = yield (0, sendTransactionWithOptions_1.default)(method, options);
-            const txLogs = yield this.provider.connection.getTransaction(tx, {
+            const txResult = (yield this.provider.connection.getTransaction(tx, {
                 commitment: 'confirmed',
                 maxSupportedTransactionVersion: 0
-            });
-            const eventLog = txLogs.meta.logMessages.find((log) => log.includes('SpinWheelResult'));
-            if (!eventLog) {
-                throw new Error('Spin result not found in transaction logs');
+            }));
+            const returnData = (_b = (_a = txResult.meta) === null || _a === void 0 ? void 0 : _a.returnData) === null || _b === void 0 ? void 0 : _b.data;
+            if (!returnData) {
+                throw new Error('No return data found in transaction');
             }
-            const prizeType = JSON.parse(eventLog.split('RouletteSpinResult')[1]).data
-                .prize;
-            return prizeType;
+            let value = (_c = txResult.meta) === null || _c === void 0 ? void 0 : _c.returnData.data[0];
+            return new anchor_1.BN((0, base64_js_1.toByteArray)(value), 'le').toNumber();
         });
     }
     /**
@@ -266,14 +267,12 @@ class TriadProtocolClient {
                 ixs.push(yield this.program.methods
                     .mintPoseidon({
                     collectionSymbol: constants_1.POSEIDON_COLLECTION_SYMBOL,
-                    number: new anchor_1.BN(item.number),
-                    attributes: item.attributes
+                    number: new anchor_1.BN(item)
                 })
                     .accounts({
                     signer: this.provider.wallet.publicKey,
                     asset: asset.publicKey,
-                    coreCollection: constants_1.POSEIDON_CORE_COLLECTION,
-                    nftMint: new web3_js_1.PublicKey('EzhK3EPW5PfWBRdyNaZbxTBfnYE5M2JSordnCBdMoCvp')
+                    coreCollection: constants_1.POSEIDON_CORE_COLLECTION
                 })
                     .instruction());
             }

package/dist/local-test.js

@@ -446,11 +446,11 @@ const getSpinPrize = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(prizes);
 });
 const spinWheel = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.spinWheel(false);
+    const response = yield triadProtocol.spinWheel(false, { skipPreflight: false });
     console.log(response);
 });
 spinWheel();
 const mintPoseidon = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.mintPoseidon([]);
+    const response = yield triadProtocol.mintPoseidon([1]);
     console.log(response);
 });

package/dist/types/idl_triad_protocol.json

@@ -785,10 +785,6 @@
                     "writable": true,
                     "signer": true
                 },
-                {
-                    "name": "nft_mint",
-                    "writable": true
-                },
                 {
                     "name": "collection",
                     "writable": true,
@@ -2538,19 +2534,6 @@
                     {
                         "name": "number",
                         "type": "u64"
-                    },
-                    {
-                        "name": "attributes",
-                        "type": {
-                            "array": [
-                                {
-                                    "defined": {
-                                        "name": "PoseidonAttribute"
-                                    }
-                                },
-                                7
-                            ]
-                        }
                     }
                 ]
             }
@@ -2814,22 +2797,6 @@
                 ]
             }
         },
-        {
-            "name": "PoseidonAttribute",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "key",
-                        "type": "string"
-                    },
-                    {
-                        "name": "value",
-                        "type": "string"
-                    }
-                ]
-            }
-        },
         {
             "name": "PriceUpdate",
             "type": {

package/dist/types/triad_protocol.d.ts

@@ -1110,10 +1110,6 @@ export type TriadProtocol = {
                     writable: true;
                     signer: true;
                 },
-                {
-                    name: 'nftMint';
-                    writable: true;
-                },
                 {
                     name: 'collection';
                     writable: true;
@@ -3294,19 +3290,6 @@ export type TriadProtocol = {
                     {
                         name: 'number';
                         type: 'u64';
-                    },
-                    {
-                        name: 'attributes';
-                        type: {
-                            array: [
-                                {
-                                    defined: {
-                                        name: 'poseidonAttribute';
-                                    };
-                                },
-                                7
-                            ];
-                        };
                     }
                 ];
             };
@@ -3570,22 +3553,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'poseidonAttribute';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'key';
-                        type: 'string';
-                    },
-                    {
-                        name: 'value';
-                        type: 'string';
-                    }
-                ];
-            };
-        },
         {
             name: 'priceUpdate';
             type: {

package/dist/utils/constants.js

@@ -10,6 +10,6 @@ exports.TRIAD_ADMIN = new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWX
 exports.SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');
 exports.TICKET_CORE_COLLECTION = new web3_js_1.PublicKey('BaqopH1VXYUCT6VsojbTibVcd3k5jpGGT6296HFb6fVa');
 exports.SPIN_NAME = 'christmas';
-exports.TCMAS_MINT = new web3_js_1.PublicKey('9LGNCsQsoeJK2jBMKNiX8UGJv5NPyBHhouTcQLLqWTt9');
+exports.TCMAS_MINT = new web3_js_1.PublicKey('tCMraBSGHeMcQS76hNnBhnfbMzrtnnT3nbt3vAnSCE2');
 exports.POSEIDON_COLLECTION_SYMBOL = '$PSN';
 exports.POSEIDON_CORE_COLLECTION = new web3_js_1.PublicKey('69CLccefLRmvDSAJP7Er632dvn878qkpdcnvq5ZUspSm');

package/package.json

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