@triadxyz/triad-protocol 1.3.2-beta → 1.3.3-beta

package/dist/index.d.ts

@@ -77,10 +77,10 @@ export default class TriadProtocolClient {
      */
     claimSpinToken(amount: number, verifier: Keypair, options?: RpcOptions): Promise<string>;
     /**
-     * Spin Roulette
+     * Spin Wheel
      * @param isSol - Whether to pay with SOL or token
      * @param verifier - Verifier keypair
      * @param options - RPC options
      */
-    spinRoulette(isSol: boolean, options?: RpcOptions): Promise<string>;
+    spinWheel(isSol: boolean, options?: RpcOptions): Promise<any>;
 }

package/dist/index.js

@@ -208,34 +208,45 @@ class TriadProtocolClient {
      */
     claimSpinToken(amount, verifier, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const spinPDA = (0, pda_1.getSpinPDA)(this.program.programId, 'christmas');
+            const spinPDA = (0, pda_1.getSpinPDA)(this.program.programId, constants_1.SPIN_NAME);
             const ix = yield this.program.methods
                 .claimSpinToken(new anchor_1.BN(amount))
                 .accounts({
                 signer: this.provider.wallet.publicKey,
                 verifier: verifier.publicKey,
                 spin: spinPDA,
-                mint: new web3_js_1.PublicKey('9LGNCsQsoeJK2jBMKNiX8UGJv5NPyBHhouTcQLLqWTt9')
+                mint: constants_1.TCMAS_MINT
             })
                 .instruction();
             return (0, sendVersionedTransaction_1.default)(this.provider, [ix], options, undefined, [], verifier);
         });
     }
     /**
-     * Spin Roulette
+     * Spin Wheel
      * @param isSol - Whether to pay with SOL or token
      * @param verifier - Verifier keypair
      * @param options - RPC options
      */
-    spinRoulette(isSol, options) {
+    spinWheel(isSol, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const spinPDA = (0, pda_1.getSpinPDA)(this.program.programId, 'christmas');
-            const method = this.program.methods.spinRoulette(isSol).accounts({
+            const spinPDA = (0, pda_1.getSpinPDA)(this.program.programId, constants_1.SPIN_NAME);
+            const method = this.program.methods.spinWheel(isSol).accounts({
                 signer: this.provider.wallet.publicKey,
                 spin: spinPDA,
                 mint: new web3_js_1.PublicKey('9LGNCsQsoeJK2jBMKNiX8UGJv5NPyBHhouTcQLLqWTt9')
             });
-            return (0, sendTransactionWithOptions_1.default)(method, options);
+            const tx = yield (0, sendTransactionWithOptions_1.default)(method, options);
+            const txLogs = yield this.provider.connection.getTransaction(tx, {
+                commitment: 'confirmed',
+                maxSupportedTransactionVersion: 0
+            });
+            const eventLog = txLogs.meta.logMessages.find((log) => log.includes('RouletteSpinResult'));
+            if (!eventLog) {
+                throw new Error('Spin result not found in transaction logs');
+            }
+            const prizeType = JSON.parse(eventLog.split('RouletteSpinResult')[1]).data
+                .prize;
+            return prizeType;
         });
     }
 }

package/dist/local-test.js

@@ -19,7 +19,7 @@ const web3_js_1 = require("@solana/web3.js");
 const trade_1 = require("./types/trade");
 const spl_token_1 = require("@solana/spl-token");
 const constants_1 = require("./utils/constants");
-const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/triad.json');
+const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/id.json');
 const rpc_file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/rpc.txt');
 const keypair = web3_js_1.Keypair.fromSecretKey(new Uint8Array(JSON.parse(file.toString())));
 const connection = new web3_js_1.Connection('https://mainnet.helius-rpc.com/?api-key=05843ded-2085-4567-aff3-85af84ea71d2');
@@ -412,3 +412,44 @@ const getMinteds = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.program.account.collection.all();
     console.log(response);
 });
+// let prize_ranges = [
+//   (1, 14, PrizeType::Undead), // 0.0014%
+//   (15, 114, PrizeType::Ticket), // 0.01%
+//   (115, 614, PrizeType::Honeyland), // 0.05%
+//   (615, 1614, PrizeType::Trd100), // 0.1%
+//   (1615, 6614, PrizeType::Trd50), // 0.5%
+//   (6615, 16614, PrizeType::Flip), // 1%
+//   (16615, 26614, PrizeType::Pengu), // 1%
+//   (26615, 66614, PrizeType::Ore), // 4%
+//   (66615, 166614, PrizeType::Lucksea), // 10%
+//   (166615, 286614, PrizeType::Trd5), // 12%
+//   (286615, 499999, PrizeType::Trident2000), // 21.3385%
+//   (500000, 1000000, PrizeType::Trident500), // 50%
+// ];
+const addSpinPrize = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.addSpinPrize({
+        rangeMin: 66615,
+        rangeMax: 166614,
+        prizeType: { lucksea: {} },
+        availableQuantity: 2000
+    });
+    console.log(response);
+});
+const getSpinPrize = () => __awaiter(void 0, void 0, void 0, function* () {
+    let response = yield triadProtocol.program.account.spin.fetch(new web3_js_1.PublicKey('EQ6ZJbdT2V8ZYcHRpJx6wBkGWmM1e3mimtPKshTVuw8h'));
+    const prizes = response.prizes.map((prize) => ({
+        rangeMin: prize.rangeMin.toNumber(),
+        rangeMax: prize.rangeMax.toNumber(),
+        prizeType: prize.prizeType,
+        availableQuantity: prize.availableQuantity.toNumber()
+    }));
+    console.log(prizes);
+});
+const spinWheel = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.spinWheel(false, {
+        skipPreflight: true,
+        microLamports: 5000
+    });
+    console.log(response);
+});
+spinWheel();

package/dist/types/idl_triad_protocol.json

@@ -1313,8 +1313,8 @@
             ]
         },
         {
-            "name": "spin_roulette",
-            "discriminator": [6, 130, 248, 38, 161, 155, 17, 30],
+            "name": "spin_wheel",
+            "discriminator": [25, 214, 214, 83, 131, 150, 190, 91],
             "accounts": [
                 {
                     "name": "signer",
@@ -1408,7 +1408,12 @@
                     "name": "is_sol",
                     "type": "bool"
                 }
-            ]
+            ],
+            "returns": {
+                "defined": {
+                    "name": "PrizeType"
+                }
+            }
         },
         {
             "name": "stake_token",
@@ -1809,8 +1814,8 @@
             "discriminator": [222, 51, 180, 226, 165, 188, 203, 54]
         },
         {
-            "name": "RouletteSpinResult",
-            "discriminator": [200, 199, 199, 61, 248, 4, 45, 42]
+            "name": "SpinWheelResult",
+            "discriminator": [98, 31, 244, 65, 124, 192, 160, 79]
         },
         {
             "name": "StakeRewards",
@@ -3061,30 +3066,6 @@
                 ]
             }
         },
-        {
-            "name": "RouletteSpinResult",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "player",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "prize",
-                        "type": {
-                            "defined": {
-                                "name": "PrizeType"
-                            }
-                        }
-                    },
-                    {
-                        "name": "amount",
-                        "type": "u64"
-                    }
-                ]
-            }
-        },
         {
             "name": "Spin",
             "type": {
@@ -3124,6 +3105,30 @@
                 ]
             }
         },
+        {
+            "name": "SpinWheelResult",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "player",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "prize",
+                        "type": {
+                            "defined": {
+                                "name": "PrizeType"
+                            }
+                        }
+                    },
+                    {
+                        "name": "amount",
+                        "type": "u64"
+                    }
+                ]
+            }
+        },
         {
             "name": "StakeRewards",
             "type": {

package/dist/types/triad_protocol.d.ts

@@ -1841,8 +1841,8 @@ export type TriadProtocol = {
             ];
         },
         {
-            name: 'spinRoulette';
-            discriminator: [6, 130, 248, 38, 161, 155, 17, 30];
+            name: 'spinWheel';
+            discriminator: [25, 214, 214, 83, 131, 150, 190, 91];
             accounts: [
                 {
                     name: 'signer';
@@ -1995,6 +1995,11 @@ export type TriadProtocol = {
                     type: 'bool';
                 }
             ];
+            returns: {
+                defined: {
+                    name: 'prizeType';
+                };
+            };
         },
         {
             name: 'stakeToken';
@@ -2569,8 +2574,8 @@ export type TriadProtocol = {
             discriminator: [222, 51, 180, 226, 165, 188, 203, 54];
         },
         {
-            name: 'rouletteSpinResult';
-            discriminator: [200, 199, 199, 61, 248, 4, 45, 42];
+            name: 'spinWheelResult';
+            discriminator: [98, 31, 244, 65, 124, 192, 160, 79];
         },
         {
             name: 'stakeRewards';
@@ -3817,30 +3822,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'rouletteSpinResult';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'player';
-                        type: 'pubkey';
-                    },
-                    {
-                        name: 'prize';
-                        type: {
-                            defined: {
-                                name: 'prizeType';
-                            };
-                        };
-                    },
-                    {
-                        name: 'amount';
-                        type: 'u64';
-                    }
-                ];
-            };
-        },
         {
             name: 'spin';
             type: {
@@ -3880,6 +3861,30 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'spinWheelResult';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'player';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'prize';
+                        type: {
+                            defined: {
+                                name: 'prizeType';
+                            };
+                        };
+                    },
+                    {
+                        name: 'amount';
+                        type: 'u64';
+                    }
+                ];
+            };
+        },
         {
             name: 'stakeRewards';
             type: {

package/dist/utils/constants.d.ts

@@ -6,3 +6,5 @@ export declare const TRD_MINT: PublicKey;
 export declare const TRIAD_ADMIN: PublicKey;
 export declare const SOL_MINT: PublicKey;
 export declare const TICKET_CORE_COLLECTION: PublicKey;
+export declare const SPIN_NAME = "christmas";
+export declare const TCMAS_MINT: PublicKey;

package/dist/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = exports.STAKE_VAULT_NAME = void 0;
+exports.TCMAS_MINT = exports.SPIN_NAME = exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = exports.STAKE_VAULT_NAME = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.STAKE_VAULT_NAME = 'Triad Share 1';
 exports.TRD_DECIMALS = 6;
@@ -9,3 +9,5 @@ exports.TRD_MINT = new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQ
 exports.TRIAD_ADMIN = new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR');
 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');

package/package.json

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