@triadxyz/triad-protocol 1.3.7-beta → 1.3.9-beta

package/dist/index.d.ts

@@ -82,5 +82,5 @@ export default class TriadProtocolClient {
      * @param verifier - Verifier keypair
      * @param options - RPC options
      */
-    spinWheel(isSol: boolean, options?: RpcOptions): Promise<number>;
+    spinWheel(isSol: boolean, amount: number, options?: RpcOptions): Promise<string>;
 }

package/dist/index.js

@@ -14,7 +14,6 @@ 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,26 +227,21 @@ class TriadProtocolClient {
      * @param verifier - Verifier keypair
      * @param options - RPC options
      */
-    spinWheel(isSol, options) {
-        var _a, _b, _c;
+    spinWheel(isSol, amount, options) {
         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({
-                signer: this.provider.wallet.publicKey,
-                spin: spinPDA,
-                mint: constants_1.TCMAS_MINT
-            });
-            const tx = yield (0, sendTransactionWithOptions_1.default)(method, options);
-            const txResult = (yield this.provider.connection.getTransaction(tx, {
-                commitment: 'confirmed',
-                maxSupportedTransactionVersion: 0
-            }));
-            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 ixs = [];
+            for (let i = 0; i < amount; i++) {
+                ixs.push(yield this.program.methods
+                    .spinWheel(isSol)
+                    .accounts({
+                    signer: this.provider.wallet.publicKey,
+                    spin: spinPDA,
+                    mint: constants_1.TCMAS_MINT
+                })
+                    .instruction());
             }
-            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();
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
         });
     }
 }

package/dist/local-test.js

@@ -445,9 +445,3 @@ 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, {
-        skipPreflight: false
-    });
-    console.log(response);
-});

package/dist/stake.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
 const helpers_1 = require("./utils/helpers");
 const stake_1 = require("./utils/pda/stake");
-const pda_1 = require("./utils/pda");
 const constants_1 = require("./utils/constants");
 const getRarityRank_1 = __importDefault(require("./utils/getRarityRank"));
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
@@ -106,7 +105,6 @@ class Stake {
      */
     stakeToken({ name, wallet, amount }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const userPDA = (0, pda_1.getUserPDA)(this.program.programId, wallet);
             return (0, sendTransactionWithOptions_1.default)(this.program.methods
                 .stakeToken({
                 name,
@@ -115,8 +113,7 @@ class Stake {
             })
                 .accounts({
                 signer: wallet,
-                mint: constants_1.TRD_MINT,
-                user: userPDA
+                mint: constants_1.TRD_MINT
             }), options);
         });
     }
@@ -151,7 +148,6 @@ class Stake {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
-            const userPDA = (0, pda_1.getUserPDA)(this.program.programId, wallet);
             for (const nft of nfts) {
                 const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, nft.name);
                 ixs.push(yield this.program.methods
@@ -159,7 +155,6 @@ class Stake {
                     .accounts({
                     signer: wallet,
                     mint: nft.mint,
-                    user: userPDA,
                     stake: stakePDA,
                     stakeVault: stakeVaultPDA
                 })
@@ -178,15 +173,13 @@ class Stake {
     withdrawStake({ wallet, name, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
-            const userPDA = (0, pda_1.getUserPDA)(this.program.programId, wallet);
             const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, name);
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.withdrawStake().accounts({
                 signer: wallet,
                 stake: stakePDA,
                 stakeVault: stakeVaultPDA,
                 admin: constants_1.TRIAD_ADMIN,
-                mint: mint,
-                user: userPDA
+                mint: mint
             }), options);
         });
     }

package/dist/trade.js

@@ -128,8 +128,7 @@ class Trade {
                 ixs.push(yield this.program.methods
                     .createUserTrade()
                     .accounts({
-                    signer: this.provider.publicKey,
-                    user: userPDA
+                    signer: this.provider.publicKey
                 })
                     .instruction());
             }

package/dist/types/idl_triad_protocol.json

@@ -647,10 +647,6 @@
                     "writable": true,
                     "signer": true
                 },
-                {
-                    "name": "user",
-                    "writable": true
-                },
                 {
                     "name": "user_trade",
                     "writable": true,
@@ -1089,10 +1085,6 @@
                     "name": "stake_vault",
                     "writable": true
                 },
-                {
-                    "name": "user",
-                    "writable": true
-                },
                 {
                     "name": "stake",
                     "writable": true
@@ -1366,10 +1358,6 @@
                         ]
                     }
                 },
-                {
-                    "name": "user",
-                    "writable": true
-                },
                 {
                     "name": "stake",
                     "writable": true,
@@ -1596,10 +1584,6 @@
                     "name": "stake_vault",
                     "writable": true
                 },
-                {
-                    "name": "user",
-                    "writable": true
-                },
                 {
                     "name": "stake",
                     "writable": true

package/dist/types/triad_protocol.d.ts

@@ -943,10 +943,6 @@ export type TriadProtocol = {
                     writable: true;
                     signer: true;
                 },
-                {
-                    name: 'user';
-                    writable: true;
-                },
                 {
                     name: 'userTrade';
                     writable: true;
@@ -1559,10 +1555,6 @@ export type TriadProtocol = {
                     name: 'stakeVault';
                     writable: true;
                 },
-                {
-                    name: 'user';
-                    writable: true;
-                },
                 {
                     name: 'stake';
                     writable: true;
@@ -1952,10 +1944,6 @@ export type TriadProtocol = {
                         ];
                     };
                 },
-                {
-                    name: 'user';
-                    writable: true;
-                },
                 {
                     name: 'stake';
                     writable: true;
@@ -2298,10 +2286,6 @@ export type TriadProtocol = {
                     name: 'stakeVault';
                     writable: true;
                 },
-                {
-                    name: 'user';
-                    writable: true;
-                },
                 {
                     name: 'stake';
                     writable: true;

package/package.json

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