@triadxyz/poseidons-protocol 0.3.5 → 0.3.7

package/dist/game/chest.js

@@ -52,7 +52,7 @@ class Chest {
      */
     createChest({ id, price, amount }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const instructions = [
+            const ixs = [
                 yield this.program.methods
                     .createChest({
                     id: new anchor_1.BN(id),
@@ -64,7 +64,7 @@ class Chest {
                 })
                     .instruction()
             ];
-            return (0, sendVersionedTransaction_1.default)(this.program, instructions, this.rpcOptions);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
@@ -76,7 +76,7 @@ class Chest {
      */
     placeChestBid({ id, coins }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const instructions = [
+            const ixs = [
                 yield this.program.methods
                     .placeChestBid({
                     id: new anchor_1.BN(id),
@@ -88,7 +88,7 @@ class Chest {
                 })
                     .instruction()
             ];
-            return (0, sendVersionedTransaction_1.default)(this.program, instructions, this.rpcOptions);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
@@ -100,7 +100,7 @@ class Chest {
      */
     addChestWinners({ id, grandWinner, top10 }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const instructions = [
+            const ixs = [
                 yield this.program.methods
                     .addChestWinners({
                     id: new anchor_1.BN(id),
@@ -118,7 +118,7 @@ class Chest {
                 })
                     .instruction()
             ];
-            return (0, sendVersionedTransaction_1.default)(this.program, instructions, this.rpcOptions);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
 }

package/dist/game/index.d.ts

@@ -17,8 +17,10 @@ export default class Game {
      * @param spins - The number of spins to add
      * @returns The transaction signature or versioned transaction
      */
-    addSpin({ user, spins }: {
+    addSpin({ user, spins, refer, newUser }: {
         user: PublicKey;
         spins: number;
+        refer: PublicKey;
+        newUser: boolean;
     }): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/game/index.js

@@ -30,19 +30,27 @@ class Game {
      * @param spins - The number of spins to add
      * @returns The transaction signature or versioned transaction
      */
-    addSpin({ user, spins }) {
+    addSpin({ user, spins, refer, newUser }) {
         return __awaiter(this, void 0, void 0, function* () {
             const userPDA = (0, pda_1.getUserPDA)(user);
-            const instructions = [
-                yield this.program.methods
-                    .addSpin(new anchor_1.BN(spins))
+            const ixs = [];
+            if (newUser) {
+                ixs.push(yield this.program.methods
+                    .createUser(refer)
                     .accounts({
                     signer: this.program.provider.publicKey,
-                    user: userPDA
+                    payer: this.rpcOptions.payer
                 })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, instructions, this.rpcOptions);
+                    .instruction());
+            }
+            ixs.push(yield this.program.methods
+                .addSpin(new anchor_1.BN(spins))
+                .accounts({
+                signer: this.program.provider.publicKey,
+                user: userPDA
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
 }

package/dist/game/wheel.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
-import { PublicKey } from '@solana/web3.js';
+import { PublicKey, VersionedTransaction } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import { PoseidonsProtocol } from './../types/poseidons_protocol';
 import { RpcOptions } from './../types';
@@ -9,7 +8,7 @@ export default class Wheel {
     constructor(program: Program<PoseidonsProtocol>, rpcOptions: RpcOptions);
     /**
      * Get all wheels
-     * @returns The chests
+     * @returns The wheels
      */
     getAllWheel(): Promise<import("./../types").Wheel[]>;
     /**
@@ -36,7 +35,7 @@ export default class Wheel {
             rangeMax: number;
             unit: number;
         }[];
-    }): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    }): Promise<string | VersionedTransaction>;
     /**
      * Add a prize to a wheel
      * @param id - The id of the chest
@@ -46,7 +45,7 @@ export default class Wheel {
     addWheelPrize({ id, available }: {
         id: number;
         available: number;
-    }): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    }): Promise<string | VersionedTransaction>;
     /**
      * Spin a wheel
      * @param id - The id of the wheel
@@ -59,14 +58,11 @@ export default class Wheel {
         spins: number;
         refer: PublicKey;
         newUser: boolean;
-    }): Promise<{
-        transaction: string;
-        prize: number[];
-    }>;
+    }): Promise<string | VersionedTransaction>;
     /**
      * Close a wheel
      * @param id - The id of the wheel
      * @returns The transaction signature or versioned transaction
      */
-    closeWheel(id: number): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    closeWheel(id: number): Promise<string | VersionedTransaction>;
 }

package/dist/game/wheel.js

@@ -23,7 +23,7 @@ class Wheel {
     }
     /**
      * Get all wheels
-     * @returns The chests
+     * @returns The wheels
      */
     getAllWheel() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -52,7 +52,7 @@ class Wheel {
      */
     createWheel({ id, name, prizes }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const instructions = [
+            const ixs = [
                 yield this.program.methods
                     .createWheel({
                     id,
@@ -71,7 +71,7 @@ class Wheel {
                 })
                     .instruction()
             ];
-            return (0, sendVersionedTransaction_1.default)(this.program, instructions, this.rpcOptions);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
@@ -82,7 +82,7 @@ class Wheel {
      */
     addWheelPrize({ id, available }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const instructions = [
+            const ixs = [
                 yield this.program.methods
                     .addWheelPrize({
                     id,
@@ -93,7 +93,7 @@ class Wheel {
                 })
                     .instruction()
             ];
-            return (0, sendVersionedTransaction_1.default)(this.program, instructions, this.rpcOptions);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
@@ -106,9 +106,9 @@ class Wheel {
         return __awaiter(this, void 0, void 0, function* () {
             const userPDA = (0, pda_1.getUserPDA)(user);
             const wheelPDA = (0, pda_1.getWheelPDA)(id);
-            const instructions = [];
+            const ixs = [];
             if (newUser) {
-                instructions.push(yield this.program.methods
+                ixs.push(yield this.program.methods
                     .createUser(refer)
                     .accounts({
                     signer: this.program.provider.publicKey,
@@ -117,7 +117,7 @@ class Wheel {
                     .instruction());
             }
             for (let i = 0; i < spins; i++) {
-                instructions.push(yield this.program.methods
+                ixs.push(yield this.program.methods
                     .spinWheel()
                     .accounts({
                     signer: this.program.provider.publicKey,
@@ -126,17 +126,7 @@ class Wheel {
                 })
                     .instruction());
             }
-            const transaction = (yield (0, sendVersionedTransaction_1.default)(this.program, instructions, this.rpcOptions));
-            const { blockhash, lastValidBlockHeight } = yield this.program.provider.connection.getLatestBlockhash();
-            yield this.program.provider.connection.confirmTransaction({
-                signature: transaction,
-                blockhash,
-                lastValidBlockHeight
-            }, 'finalized');
-            return {
-                transaction,
-                prize: yield (0, helpers_1.getPrize)(this.program, transaction)
-            };
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
@@ -147,7 +137,7 @@ class Wheel {
     closeWheel(id) {
         return __awaiter(this, void 0, void 0, function* () {
             const wheelPDA = (0, pda_1.getWheelPDA)(id);
-            const instructions = [
+            const ixs = [
                 yield this.program.methods
                     .closeWheel()
                     .accounts({
@@ -156,7 +146,7 @@ class Wheel {
                 })
                     .instruction()
             ];
-            return (0, sendVersionedTransaction_1.default)(this.program, instructions, this.rpcOptions);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
 }

package/dist/utils/helpers.d.ts

@@ -8,4 +8,5 @@ export declare const formatPoseidon: (account: IdlAccounts<PoseidonsProtocol>['p
 export declare const formatUser: (account: IdlAccounts<PoseidonsProtocol>['user'], address: PublicKey) => User;
 export declare const formatChest: (account: IdlAccounts<PoseidonsProtocol>['chest'], address: PublicKey) => Chest;
 export declare const formatWheel: (account: IdlAccounts<PoseidonsProtocol>['wheel'], address: PublicKey) => Wheel;
+export declare const getPrizeFromLogs: (program: Program<PoseidonsProtocol>, logMessages: string[]) => number[];
 export declare const getPrize: (program: Program<PoseidonsProtocol>, transaction: string) => Promise<number[]>;

package/dist/utils/helpers.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPrize = exports.formatWheel = exports.formatChest = exports.formatUser = exports.formatPoseidon = exports.formatPoseidonVault = void 0;
+exports.getPrize = exports.getPrizeFromLogs = exports.formatWheel = exports.formatChest = exports.formatUser = exports.formatPoseidon = exports.formatPoseidonVault = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const formatPoseidonVault = (account, address) => {
     return {
@@ -89,25 +89,31 @@ const formatWheel = (account, address) => {
     };
 };
 exports.formatWheel = formatWheel;
-const getPrize = (program, transaction) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+const getPrizeFromLogs = (program, logMessages) => {
     const prize = [];
-    const tx = yield program.provider.connection.getParsedTransaction(transaction, {
-        maxSupportedTransactionVersion: 0
-    });
-    if ((_a = tx === null || tx === void 0 ? void 0 : tx.meta) === null || _a === void 0 ? void 0 : _a.logMessages) {
-        const eventParser = new anchor_1.EventParser(program.programId, new anchor_1.BorshCoder(program.idl));
-        const events = eventParser.parseLogs((_b = tx === null || tx === void 0 ? void 0 : tx.meta) === null || _b === void 0 ? void 0 : _b.logMessages);
-        for (let event of events) {
-            switch (event.name) {
-                case 'spinWheelEvent':
-                    prize.push(event.data.prizeId);
-                    break;
-                default:
-                    break;
-            }
+    const eventParser = new anchor_1.EventParser(program.programId, new anchor_1.BorshCoder(program.idl));
+    const events = eventParser.parseLogs(logMessages);
+    for (let event of events) {
+        switch (event.name) {
+            case 'spinWheelEvent':
+                prize.push(event.data.prizeId);
+                break;
+            default:
+                break;
         }
     }
     return prize;
+};
+exports.getPrizeFromLogs = getPrizeFromLogs;
+const getPrize = (program, transaction) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const tx = yield program.provider.connection.getParsedTransaction(transaction, {
+        maxSupportedTransactionVersion: 0,
+        commitment: 'confirmed'
+    });
+    if (!((_a = tx === null || tx === void 0 ? void 0 : tx.meta) === null || _a === void 0 ? void 0 : _a.logMessages)) {
+        return [];
+    }
+    return (0, exports.getPrizeFromLogs)(program, tx.meta.logMessages);
 });
 exports.getPrize = getPrize;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/poseidons-protocol",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",