@triadxyz/poseidons-protocol 0.4.4 → 0.4.6

package/dist/game/index.d.ts

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

package/dist/game/index.js

@@ -30,9 +30,10 @@ class Game {
      * @param spins - The number of spins to add
      * @returns The transaction signature or versioned transaction
      */
-    addSpin({ users, refer }) {
+    addSpin({ users, refer, isUsdc }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
+            const addressLookupTableAccounts = [];
             for (const user of users) {
                 const userPDA = (0, pda_1.getUserPDA)(user.user);
                 try {
@@ -48,14 +49,17 @@ class Game {
                         .instruction());
                 }
                 ixs.push(yield this.program.methods
-                    .addSpin(new anchor_1.BN(user.spins))
+                    .addSpin({
+                    isUsdc,
+                    spins: new anchor_1.BN(user.spins)
+                })
                     .accounts({
                     signer: this.program.provider.publicKey,
                     user: userPDA
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions, addressLookupTableAccounts);
         });
     }
 }

package/dist/game/wheel.d.ts

@@ -44,10 +44,13 @@ export default class Wheel {
      * @param available - The available quantity of the prize
      * @returns The transaction signature or versioned transaction
      */
-    addWheelPrize({ id, available }: {
+    addWheelPrize(prizes: {
         id: number;
         available: number;
-    }): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+        rangeMin: number;
+        rangeMax: number;
+        wheelId: number;
+    }[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Spin a wheel
      * @param id - The id of the wheel

package/dist/game/wheel.js

@@ -81,20 +81,23 @@ class Wheel {
      * @param available - The available quantity of the prize
      * @returns The transaction signature or versioned transaction
      */
-    addWheelPrize({ id, available }) {
+    addWheelPrize(prizes) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
+            const ixs = [];
+            for (const prize of prizes) {
+                ixs.push(yield this.program.methods
                     .addWheelPrize({
-                    id,
-                    available: new anchor_1.BN(available)
+                    id: prize.id,
+                    available: new anchor_1.BN(prize.available),
+                    rangeMin: new anchor_1.BN(prize.rangeMin),
+                    rangeMax: new anchor_1.BN(prize.rangeMax)
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
-                    wheel: (0, pda_1.getWheelPDA)(0)
+                    wheel: (0, pda_1.getWheelPDA)(prize.wheelId)
                 })
-                    .instruction()
-            ];
+                    .instruction());
+            }
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }

package/dist/types/idl_poseidons_protocol.json

@@ -290,6 +290,75 @@
                     "name": "user",
                     "writable": true
                 },
+                {
+                    "name": "mint",
+                    "writable": true,
+                    "address": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
+                },
+                {
+                    "name": "user_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "signer"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "squads_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "squads"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "token_program",
+                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                },
+                {
+                    "name": "associated_token_program",
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -297,8 +366,12 @@
             ],
             "args": [
                 {
-                    "name": "spins",
-                    "type": "u64"
+                    "name": "args",
+                    "type": {
+                        "defined": {
+                            "name": "AddSpinArgs"
+                        }
+                    }
                 }
             ]
         },
@@ -1104,6 +1177,22 @@
                 ]
             }
         },
+        {
+            "name": "AddSpinArgs",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "is_usdc",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "spins",
+                        "type": "u64"
+                    }
+                ]
+            }
+        },
         {
             "name": "AddWheelPrizeArgs",
             "type": {
@@ -1116,6 +1205,14 @@
                     {
                         "name": "available",
                         "type": "u64"
+                    },
+                    {
+                        "name": "range_min",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "range_max",
+                        "type": "u64"
                     }
                 ]
             }

package/dist/types/poseidons_protocol.d.ts

@@ -395,6 +395,133 @@ export type PoseidonsProtocol = {
                     name: 'user';
                     writable: true;
                 },
+                {
+                    name: 'mint';
+                    writable: true;
+                    address: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
+                },
+                {
+                    name: 'userAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'tokenProgram';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'mint';
+                            }
+                        ];
+                        program: {
+                            kind: 'const';
+                            value: [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
+                {
+                    name: 'squadsAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'squads';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'tokenProgram';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'mint';
+                            }
+                        ];
+                        program: {
+                            kind: 'const';
+                            value: [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
+                {
+                    name: 'tokenProgram';
+                    address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
+                },
+                {
+                    name: 'associatedTokenProgram';
+                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
+                },
                 {
                     name: 'systemProgram';
                     address: '11111111111111111111111111111111';
@@ -402,8 +529,12 @@ export type PoseidonsProtocol = {
             ];
             args: [
                 {
-                    name: 'spins';
-                    type: 'u64';
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'addSpinArgs';
+                        };
+                    };
                 }
             ];
         },
@@ -1395,6 +1526,22 @@ export type PoseidonsProtocol = {
                 ];
             };
         },
+        {
+            name: 'addSpinArgs';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'isUsdc';
+                        type: 'bool';
+                    },
+                    {
+                        name: 'spins';
+                        type: 'u64';
+                    }
+                ];
+            };
+        },
         {
             name: 'addWheelPrizeArgs';
             type: {
@@ -1407,6 +1554,14 @@ export type PoseidonsProtocol = {
                     {
                         name: 'available';
                         type: 'u64';
+                    },
+                    {
+                        name: 'rangeMin';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'rangeMax';
+                        type: 'u64';
                     }
                 ];
             };

package/dist/utils/constants.d.ts

@@ -1,3 +1,5 @@
 import { PublicKey } from '@solana/web3.js';
+export declare const SOL_MINT: PublicKey;
 export declare const POSEIDON_VAULT_PROGRAM_ID: PublicKey;
 export declare const CORE_POSEIDON_COLLECTION: PublicKey;
+export declare const USDC_MINT: PublicKey;

package/dist/utils/constants.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CORE_POSEIDON_COLLECTION = exports.POSEIDON_VAULT_PROGRAM_ID = void 0;
+exports.USDC_MINT = exports.CORE_POSEIDON_COLLECTION = exports.POSEIDON_VAULT_PROGRAM_ID = exports.SOL_MINT = void 0;
 const web3_js_1 = require("@solana/web3.js");
+exports.SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');
 exports.POSEIDON_VAULT_PROGRAM_ID = new web3_js_1.PublicKey('E65MHJjJT2ihTLgMfHdWtsNYMA6iJsCjraf7UrxU2sDP');
 exports.CORE_POSEIDON_COLLECTION = new web3_js_1.PublicKey('69CLccefLRmvDSAJP7Er632dvn878qkpdcnvq5ZUspSm');
+exports.USDC_MINT = new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');

package/dist/utils/getTokenBalance.d.ts

@@ -0,0 +1,3 @@
+import type { Connection } from '@solana/web3.js';
+export declare function getTokenBalance(tokenAddress: string, wallet: string, connection: Connection): Promise<number>;
+export declare function getBalanceSol(wallet: string, connection: Connection): Promise<number | undefined>;

package/dist/utils/getTokenBalance.js

@@ -0,0 +1,47 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBalanceSol = exports.getTokenBalance = void 0;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const formatBigNumber = (number, decimals = 6) => Number(number.toString()) / Math.pow(10, decimals);
+function getTokenBalance(tokenAddress, wallet, connection) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!wallet)
+            return 0;
+        try {
+            const token = yield (0, spl_token_1.getAssociatedTokenAddress)(new web3_js_1.PublicKey(tokenAddress), new web3_js_1.PublicKey(wallet));
+            const mint = yield (0, spl_token_1.getMint)(connection, new web3_js_1.PublicKey(tokenAddress));
+            const account = yield (0, spl_token_1.getAccount)(connection, token);
+            const formattedAmount = formatBigNumber(account.amount, mint.decimals);
+            return formattedAmount;
+        }
+        catch (error) {
+            return 0;
+        }
+    });
+}
+exports.getTokenBalance = getTokenBalance;
+function getBalanceSol(wallet, connection) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!wallet)
+            return;
+        try {
+            const balanceSol = yield connection.getBalance(new web3_js_1.PublicKey(wallet));
+            const amountInSol = balanceSol / web3_js_1.LAMPORTS_PER_SOL;
+            return amountInSol;
+        }
+        catch (error) {
+            /* empty */
+        }
+    });
+}
+exports.getBalanceSol = getBalanceSol;

package/dist/utils/swap.d.ts

@@ -0,0 +1,16 @@
+import { AddressLookupTableAccount, Connection, TransactionInstruction } from '@solana/web3.js';
+export declare const swap: ({ connection, wallet, inToken, outToken, amount, payer }: {
+    connection: Connection;
+    wallet: string;
+    inToken: string;
+    outToken: string;
+    amount: number;
+    payer: string;
+}) => Promise<{
+    swapIxs: TransactionInstruction[];
+    closeAccountIxs: TransactionInstruction[];
+    addressLookupTableAccounts: AddressLookupTableAccount[];
+    setupInstructions: any[];
+    outAmount: any;
+}>;
+export declare const getPrice: (token: string) => Promise<any>;

package/dist/utils/swap.js

@@ -0,0 +1,108 @@
+"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 });
+exports.getPrice = exports.swap = void 0;
+const axios_1 = __importDefault(require("axios"));
+const web3_js_1 = require("@solana/web3.js");
+const spl_token_1 = require("@solana/spl-token");
+const pda_1 = require("./pda");
+const constants_1 = require("./constants");
+const swap = ({ connection, wallet, inToken, outToken, amount, payer }) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const token = TOKENS[inToken];
+        if (!token) {
+            throw new Error('Token not found');
+        }
+        const formattedAmountIn = Math.round(amount * Math.pow(10, token.decimals));
+        const quoteResponse = yield axios_1.default.get(`https://lite-api.jup.ag/swap/v1/quote?inputMint=${inToken}&outputMint=${outToken}&amount=${formattedAmountIn}&slippageBps=20&onlyDirectRoutes=true&platformFeeBps=60`);
+        const { data: quoteData } = quoteResponse;
+        const swapResponse = yield axios_1.default.post('https://lite-api.jup.ag/swap/v1/swap-instructions', {
+            quoteResponse: quoteData,
+            userPublicKey: wallet,
+            payer,
+            feeAccount: inToken === constants_1.USDC_MINT.toString() ? getFeeAccount() : undefined,
+            wrapAndUnwrapSol: false
+        });
+        const { setupInstructions, swapInstruction, addressLookupTableAddresses } = swapResponse.data;
+        const swapIxs = [
+            deserializeInstruction(swapInstruction)
+        ];
+        const closeAccountIxs = [];
+        if (outToken === constants_1.SOL_MINT.toString()) {
+            const wsolATA = (0, pda_1.getTokenATA)(new web3_js_1.PublicKey(wallet), constants_1.SOL_MINT, spl_token_1.TOKEN_PROGRAM_ID);
+            closeAccountIxs.push((0, spl_token_1.createCloseAccountInstruction)(wsolATA, new web3_js_1.PublicKey(wallet), new web3_js_1.PublicKey(wallet), [], spl_token_1.TOKEN_PROGRAM_ID));
+        }
+        return {
+            swapIxs,
+            closeAccountIxs,
+            addressLookupTableAccounts: yield getAddressLookupTableAccounts(connection, addressLookupTableAddresses),
+            setupInstructions: setupInstructions.length > 0
+                ? [...setupInstructions.map(deserializeInstruction)]
+                : [],
+            outAmount: quoteData.otherAmountThreshold
+        };
+    }
+    catch (error) {
+        throw error;
+    }
+});
+exports.swap = swap;
+const getPrice = (token) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    const response = yield axios_1.default.get(`https://lite-api.jup.ag/price/v3?ids=${token}`);
+    return (_b = (_a = response.data[token]) === null || _a === void 0 ? void 0 : _a.usdPrice) !== null && _b !== void 0 ? _b : 0;
+});
+exports.getPrice = getPrice;
+const deserializeInstruction = (instruction) => {
+    return new web3_js_1.TransactionInstruction({
+        programId: new web3_js_1.PublicKey(instruction.programId),
+        keys: instruction.accounts.map((key) => ({
+            pubkey: new web3_js_1.PublicKey(key.pubkey),
+            isSigner: key.isSigner,
+            isWritable: key.isWritable
+        })),
+        data: Buffer.from(instruction.data, 'base64')
+    });
+};
+const getAddressLookupTableAccounts = (connection, keys) => __awaiter(void 0, void 0, void 0, function* () {
+    const addressLookupTableAccountInfos = yield connection.getMultipleAccountsInfo(keys.map((key) => new web3_js_1.PublicKey(key)));
+    return addressLookupTableAccountInfos.reduce((acc, accountInfo, index) => {
+        const addressLookupTableAddress = keys[index];
+        if (accountInfo) {
+            const addressLookupTableAccount = new web3_js_1.AddressLookupTableAccount({
+                key: new web3_js_1.PublicKey(addressLookupTableAddress),
+                state: web3_js_1.AddressLookupTableAccount.deserialize(new Uint8Array(accountInfo.data))
+            });
+            acc.push(addressLookupTableAccount);
+        }
+        return acc;
+    }, new Array());
+});
+const TOKENS = {
+    So11111111111111111111111111111111111111112: {
+        mint: 'So11111111111111111111111111111111111111112',
+        decimals: 9
+    },
+    EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v: {
+        mint: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+        decimals: 6
+    },
+    t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV: {
+        mint: 't3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV',
+        decimals: 6
+    }
+};
+const getFeeAccount = () => {
+    return (0, pda_1.getTokenATA)(new web3_js_1.PublicKey('Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4'), constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/poseidons-protocol",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -30,9 +30,9 @@
     "bs58": "6.0.0"
   },
   "devDependencies": {
+    "@types/bn.js": "^5.1.0",
     "@typescript-eslint/eslint-plugin": "6.7.3",
     "@typescript-eslint/parser": "6.7.3",
-    "@types/bn.js": "^5.1.0",
     "eslint": "8.50.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-prettier": "5.0.0",