@triadxyz/triad-protocol 1.4.5-beta → 1.4.7-beta

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { Connection, Keypair, PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import Trade from './trade';
 import Stake from './stake';
-import { CreateUserArgs, MintTicketArgs, PrizeType, RpcOptions } from './types';
+import { CreateUserArgs, MintTicketArgs, PrizeType, RpcOptions, TransferPoseidonArgs } from './types';
 export default class TriadProtocolClient {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -325,4 +325,11 @@ export default class TriadProtocolClient {
      *
      */
     buyToken(amount: number, options?: RpcOptions): Promise<string>;
+    /**
+     * Transfer Poseidon
+     * @param args - Transfer Poseidon args
+     * @param options - RPC options
+     *
+     */
+    transferPoseidon({ poseidonAsset, ticketAsset, verifier, ticketNumber }: TransferPoseidonArgs, options?: RpcOptions): Promise<string>;
 }

package/dist/index.js

@@ -148,13 +148,13 @@ class TriadProtocolClient {
         return __awaiter(this, void 0, void 0, function* () {
             const asset = web3_js_1.Keypair.generate();
             const userNftAta = (0, pda_1.getTokenATA)(this.provider.wallet.publicKey, nftMint);
-            const collectionSymbol = 'PTCKT';
-            const [collection] = yield this.program.account.collection.all();
+            const CollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.TICKET_COLLECTION_SYMBOL);
+            const collection = yield this.program.account.collection.fetch(CollectionPDA);
             const ixs = [];
             ixs.push(yield this.program.methods
                 .mintTicket({
-                number: new anchor_1.BN(collection.account.minted),
-                collectionSymbol,
+                number: new anchor_1.BN(collection.minted),
+                collectionSymbol: constants_1.TICKET_COLLECTION_SYMBOL,
                 discount: new anchor_1.BN(discount),
                 isBoosted,
                 rarity
@@ -285,5 +285,34 @@ class TriadProtocolClient {
             return (0, sendTransactionWithOptions_1.default)(method, options);
         });
     }
+    /**
+     * Transfer Poseidon
+     * @param args - Transfer Poseidon args
+     * @param options - RPC options
+     *
+     */
+    transferPoseidon({ poseidonAsset, ticketAsset, verifier, ticketNumber }, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            const PoseidonCollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL);
+            const TicketCollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.TICKET_COLLECTION_SYMBOL);
+            const NftPDA = (0, pda_1.getNftPDA)(this.program.programId, ticketNumber);
+            ixs.push(yield this.program.methods
+                .transferPoseidon()
+                .accounts({
+                signer: this.provider.wallet.publicKey,
+                nft: NftPDA,
+                poseidonAsset,
+                ticketAsset,
+                verifier: constants_1.VERIFIER,
+                poseidonCollection: PoseidonCollectionPDA,
+                ticketCollection: TicketCollectionPDA,
+                coreTicketCollection: constants_1.TICKET_CORE_COLLECTION,
+                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, [], verifier);
+        });
+    }
 }
 exports.default = TriadProtocolClient;

package/dist/local-test.js

@@ -19,10 +19,10 @@ 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/id.json');
+const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/triad-man.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');
+const connection = new web3_js_1.Connection(rpc_file.toString());
 const wallet = new anchor_1.Wallet(keypair);
 const triadProtocol = new _1.default(connection, wallet);
 const markets = [
@@ -54,6 +54,18 @@ const getStakeVault = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.getStakeVaults();
     console.log(response);
 });
+const getStakeByWallet = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('4k8qFA1i7fv6YGWJnoLZPSHj9nhLn3bokAdXWnuAteBV'), 1);
+    let sum = 0;
+    for (const stake of response) {
+        sum += stake.amount / Math.pow(10, 6);
+    }
+    console.log(sum);
+});
+const getAllStakes = () => __awaiter(void 0, void 0, void 0, function* () {
+    const stakes = yield triadProtocol.stake.getStakes();
+    console.log(stakes.length);
+});
 const getStakes = () => __awaiter(void 0, void 0, void 0, function* () {
     const stakes = yield triadProtocol.stake.getStakes();
     fs_1.default.writeFileSync('stakes.json', JSON.stringify(stakes, null, 2));
@@ -445,61 +457,61 @@ const addSpinPrize = () => __awaiter(void 0, void 0, void 0, function* () {
         //   rangeMax: 116,
         //   prizeType: { ticket: {} },
         //   availableQuantity: 2
-        // },
+        // }
         // {
         //   rangeMin: 117,
         //   rangeMax: 617,
         //   prizeType: { honeyland: {} },
-        //   availableQuantity: 7
+        //   availableQuantity: 2
+        // }
+        // {
+        //   rangeMin: 618,
+        //   rangeMax: 5618,
+        //   prizeType: { trd50: {} },
+        //   availableQuantity: 50
         // },
-        {
-            rangeMin: 618,
-            rangeMax: 5618,
-            prizeType: { trd50: {} },
-            availableQuantity: 50
-        },
         // {
         //   rangeMin: 5619,
         //   rangeMax: 15619,
         //   prizeType: { flip: {} },
-        //   availableQuantity: 30
+        //   availableQuantity: 1
         // },
         {
             rangeMin: 15620,
             rangeMax: 25620,
             prizeType: { pengu: {} },
-            availableQuantity: 100
+            availableQuantity: 3 + 7
         },
         {
             rangeMin: 25621,
             rangeMax: 65621,
             prizeType: { ore: {} },
-            availableQuantity: 500
+            availableQuantity: 13
         },
-        // {
-        //   rangeMin: 65622,
-        //   rangeMax: 165622,
-        //   prizeType: { lucksea: {} },
-        //   availableQuantity: 2000
-        // },
         {
-            rangeMin: 165623,
-            rangeMax: 285623,
-            prizeType: { trd5: {} },
-            availableQuantity: 2000
-        },
-        {
-            rangeMin: 285624,
-            rangeMax: 499999,
-            prizeType: { trident2000: {} },
-            availableQuantity: 5000000
-        },
-        {
-            rangeMin: 500000,
-            rangeMax: 1000000,
-            prizeType: { trident500: {} },
-            availableQuantity: 5000000
+            rangeMin: 65622,
+            rangeMax: 165622,
+            prizeType: { lucksea: {} },
+            availableQuantity: 18
         }
+        // {
+        //   rangeMin: 165623,
+        //   rangeMax: 285623,
+        //   prizeType: { trd5: {} },
+        //   availableQuantity: 10000
+        // },
+        // {
+        //   rangeMin: 285624,
+        //   rangeMax: 499999,
+        //   prizeType: { trident2000: {} },
+        //   availableQuantity: 5000000
+        // },
+        // {
+        //   rangeMin: 500000,
+        //   rangeMax: 1000000,
+        //   prizeType: { trident500: {} },
+        //   availableQuantity: 5000000
+        // }
     ];
     for (const item of data) {
         const response = yield triadProtocol.addSpinPrize(item);
@@ -524,8 +536,3 @@ const getSpinPrize = () => __awaiter(void 0, void 0, void 0, function* () {
     }));
     console.log(prizes.filter((prize) => !prize.prizeType.none));
 });
-const buyToken = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.buyToken(1);
-    console.log(response);
-});
-buyToken();

package/dist/stake.d.ts

@@ -2,7 +2,7 @@ import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
-import { UpdateStakeVaultArgs, RequestWithdrawArgs, WithdrawArgs, Stake as StakeResponse, ClaimStakeRewardsArgs, StakeTokenArgs } from './types/stake';
+import { UpdateStakeVaultArgs, RequestWithdrawArgs, WithdrawArgs, Stake as StakeResponse, StakeTokenArgs } from './types/stake';
 export default class Stake {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -12,10 +12,6 @@ export default class Stake {
      * Get all Stake Vaults
      */
     getStakeVaults(): Promise<import("./types/stake").StakeVault[]>;
-    /**
-     * Get Stake Rewards
-     */
-    getStakeRewards({ wallet, nftName, collections }: ClaimStakeRewardsArgs): Promise<number>;
     /**
      * Get all Stakes
      */
@@ -29,6 +25,7 @@ export default class Stake {
      * @param wallet - User wallet
      * @param collections - NFT collections
      * @param tensor rank
+     *
      */
     getStakeByWallet(wallet: PublicKey, collections: number): Promise<StakeResponse[]>;
     /**

package/dist/stake.js

@@ -35,16 +35,6 @@ class Stake {
             return response.map((stakeVault) => (0, helpers_1.formatStakeVault)(stakeVault.account));
         });
     }
-    /**
-     * Get Stake Rewards
-     */
-    getStakeRewards({ wallet, nftName, collections }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, nftName);
-            const stake = yield this.program.account.stakeV2.fetch(stakePDA);
-            return (0, helpers_1.calculateStakeRewards)((0, helpers_1.formatStake)(stake), collections);
-        });
-    }
     /**
      * Get all Stakes
      */
@@ -75,22 +65,14 @@ class Stake {
      * @param wallet - User wallet
      * @param collections - NFT collections
      * @param tensor rank
+     *
      */
     getStakeByWallet(wallet, collections) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.getUserStakes(wallet);
             const data = [];
             for (const stake of response) {
-                let available = 0;
-                try {
-                    available = yield this.getStakeRewards({
-                        wallet,
-                        nftName: stake.name,
-                        rank: 963,
-                        collections
-                    });
-                }
-                catch (_a) { }
+                let available = (0, helpers_1.calculateStakeRewards)(stake, collections);
                 data.push(Object.assign(Object.assign({}, stake), { available }));
             }
             return data;

package/dist/types/idl_triad_protocol.json

@@ -1601,6 +1601,59 @@
                 }
             ]
         },
+        {
+            "name": "transfer_poseidon",
+            "discriminator": [57, 144, 113, 75, 97, 81, 3, 98],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "verifier",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "nft",
+                    "writable": true
+                },
+                {
+                    "name": "ticket_asset",
+                    "writable": true
+                },
+                {
+                    "name": "poseidon_asset",
+                    "writable": true
+                },
+                {
+                    "name": "ticket_collection",
+                    "writable": true
+                },
+                {
+                    "name": "core_ticket_collection",
+                    "writable": true
+                },
+                {
+                    "name": "poseidon_collection",
+                    "writable": true
+                },
+                {
+                    "name": "core_poseidon_collection",
+                    "writable": true
+                },
+                {
+                    "name": "metaplex_program",
+                    "address": "CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": []
+        },
         {
             "name": "update_stake_vault",
             "discriminator": [84, 171, 100, 153, 126, 215, 229, 68],
@@ -1808,6 +1861,10 @@
         }
     ],
     "accounts": [
+        {
+            "name": "BaseAssetV1",
+            "discriminator": [0, 0, 0, 0, 0, 0, 0, 0]
+        },
         {
             "name": "BaseCollectionV1",
             "discriminator": [0, 0, 0, 0, 0, 0, 0, 0]
@@ -2045,6 +2102,48 @@
                 ]
             }
         },
+        {
+            "name": "BaseAssetV1",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "key",
+                        "type": {
+                            "defined": {
+                                "name": "Key"
+                            }
+                        }
+                    },
+                    {
+                        "name": "owner",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "update_authority",
+                        "type": {
+                            "defined": {
+                                "name": "UpdateAuthority"
+                            }
+                        }
+                    },
+                    {
+                        "name": "name",
+                        "type": "string"
+                    },
+                    {
+                        "name": "uri",
+                        "type": "string"
+                    },
+                    {
+                        "name": "seq",
+                        "type": {
+                            "option": "u64"
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "BaseCollectionV1",
             "type": {
@@ -3391,6 +3490,25 @@
                 ]
             }
         },
+        {
+            "name": "UpdateAuthority",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "None"
+                    },
+                    {
+                        "name": "Address",
+                        "fields": ["pubkey"]
+                    },
+                    {
+                        "name": "Collection",
+                        "fields": ["pubkey"]
+                    }
+                ]
+            }
+        },
         {
             "name": "UpdateStakeVaultArgs",
             "type": {

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from '@solana/web3.js';
+import { Keypair, PublicKey } from '@solana/web3.js';
 export type RpcOptions = {
     skipPreflight?: boolean;
     microLamports?: number;
@@ -74,3 +74,9 @@ export type PrizeType = {
 } | {
     trd10000: {};
 };
+export type TransferPoseidonArgs = {
+    poseidonAsset: PublicKey;
+    ticketAsset: PublicKey;
+    verifier: Keypair;
+    ticketNumber: number;
+};

package/dist/types/stake.d.ts

@@ -37,10 +37,8 @@ export type WithdrawArgs = {
     mint: PublicKey;
 };
 export type ClaimStakeRewardsArgs = {
-    wallet: PublicKey;
-    nftName: string;
+    stake: Stake;
     collections: number;
-    rank: number;
 };
 export type UpdateBoostArgs = {
     wallet: PublicKey;

package/dist/types/triad_protocol.d.ts

@@ -2303,6 +2303,59 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'transferPoseidon';
+            discriminator: [57, 144, 113, 75, 97, 81, 3, 98];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'verifier';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'nft';
+                    writable: true;
+                },
+                {
+                    name: 'ticketAsset';
+                    writable: true;
+                },
+                {
+                    name: 'poseidonAsset';
+                    writable: true;
+                },
+                {
+                    name: 'ticketCollection';
+                    writable: true;
+                },
+                {
+                    name: 'coreTicketCollection';
+                    writable: true;
+                },
+                {
+                    name: 'poseidonCollection';
+                    writable: true;
+                },
+                {
+                    name: 'corePoseidonCollection';
+                    writable: true;
+                },
+                {
+                    name: 'metaplexProgram';
+                    address: 'CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d';
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [];
+        },
         {
             name: 'updateStakeVault';
             discriminator: [84, 171, 100, 153, 126, 215, 229, 68];
@@ -2626,6 +2679,10 @@ export type TriadProtocol = {
         }
     ];
     accounts: [
+        {
+            name: 'baseAssetV1';
+            discriminator: [0, 0, 0, 0, 0, 0, 0, 0];
+        },
         {
             name: 'baseCollectionV1';
             discriminator: [0, 0, 0, 0, 0, 0, 0, 0];
@@ -2863,6 +2920,48 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'baseAssetV1';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'key';
+                        type: {
+                            defined: {
+                                name: 'key';
+                            };
+                        };
+                    },
+                    {
+                        name: 'owner';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'updateAuthority';
+                        type: {
+                            defined: {
+                                name: 'updateAuthority';
+                            };
+                        };
+                    },
+                    {
+                        name: 'name';
+                        type: 'string';
+                    },
+                    {
+                        name: 'uri';
+                        type: 'string';
+                    },
+                    {
+                        name: 'seq';
+                        type: {
+                            option: 'u64';
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'baseCollectionV1';
             type: {
@@ -4205,6 +4304,25 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'updateAuthority';
+            type: {
+                kind: 'enum';
+                variants: [
+                    {
+                        name: 'none';
+                    },
+                    {
+                        name: 'address';
+                        fields: ['pubkey'];
+                    },
+                    {
+                        name: 'collection';
+                        fields: ['pubkey'];
+                    }
+                ];
+            };
+        },
         {
             name: 'updateStakeVaultArgs';
             type: {

package/dist/utils/constants.d.ts

@@ -10,3 +10,4 @@ export declare const SPIN_NAME = "christmas";
 export declare const TCMAS_MINT: PublicKey;
 export declare const POSEIDON_COLLECTION_SYMBOL = "$PSN";
 export declare const POSEIDON_CORE_COLLECTION: PublicKey;
+export declare const TICKET_COLLECTION_SYMBOL = "PTCKT";

package/dist/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = 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;
+exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = 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;
@@ -13,3 +13,4 @@ exports.SPIN_NAME = 'christmas';
 exports.TCMAS_MINT = new web3_js_1.PublicKey('tCMraBSGHeMcQS76hNnBhnfbMzrtnnT3nbt3vAnSCE2');
 exports.POSEIDON_COLLECTION_SYMBOL = '$PSN';
 exports.POSEIDON_CORE_COLLECTION = new web3_js_1.PublicKey('69CLccefLRmvDSAJP7Er632dvn878qkpdcnvq5ZUspSm');
+exports.TICKET_COLLECTION_SYMBOL = 'PTCKT';

package/dist/utils/pda/index.d.ts

@@ -6,3 +6,5 @@ export declare const getUserPositionPDA: (programId: PublicKey, wallet: PublicKe
 export declare const getTokenVaultAddressSync: (programId: PublicKey, vault: PublicKey) => PublicKey;
 export declare const getTokenATA: (address: PublicKey, Mint: PublicKey) => PublicKey;
 export declare const getSpinPDA: (programId: PublicKey, name: string) => PublicKey;
+export declare const getCollectionPDA: (programId: PublicKey, collectionSymbol: string) => PublicKey;
+export declare const getNftPDA: (programId: PublicKey, number: number) => PublicKey;

package/dist/utils/pda/index.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSpinPDA = exports.getTokenATA = exports.getTokenVaultAddressSync = exports.getUserPositionPDA = exports.getVaultAddressSync = exports.getTickerPDA = exports.getUserPDA = void 0;
+exports.getNftPDA = exports.getCollectionPDA = exports.getSpinPDA = exports.getTokenATA = exports.getTokenVaultAddressSync = exports.getUserPositionPDA = exports.getVaultAddressSync = exports.getTickerPDA = exports.getUserPDA = void 0;
 const web3_js_1 = require("@solana/web3.js");
+const bn_js_1 = __importDefault(require("bn.js"));
 const spl_token_1 = require("@solana/spl-token");
 const getUserPDA = (programId, wallet) => {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('user'), wallet.toBuffer()], programId)[0];
@@ -31,3 +35,11 @@ const getSpinPDA = (programId, name) => {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('spin'), Buffer.from(name)], programId)[0];
 };
 exports.getSpinPDA = getSpinPDA;
+const getCollectionPDA = (programId, collectionSymbol) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('collection'), Buffer.from(collectionSymbol)], programId)[0];
+};
+exports.getCollectionPDA = getCollectionPDA;
+const getNftPDA = (programId, number) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('nft'), new bn_js_1.default(number).toArrayLike(Buffer, 'le', 8)], programId)[0];
+};
+exports.getNftPDA = getNftPDA;

package/package.json

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