@triadxyz/triad-protocol 0.4.1-beta → 0.4.3-beta

package/dist/index.d.ts

@@ -5,12 +5,14 @@ import Ticker from './ticker';
 import Vault from './vault';
 import Stake from './stake';
 import { CreateUserArgs, RpcOptions } from './types';
+import Ore from './ore';
 export default class TriadProtocolClient {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
     ticker: Ticker;
     vault: Vault;
     stake: Stake;
+    ore: Ore;
     constructor(connection: Connection, wallet: Wallet);
     /**
      * Get User by wallet

package/dist/index.js

@@ -19,6 +19,7 @@ const ticker_1 = __importDefault(require("./ticker"));
 const vault_1 = __importDefault(require("./vault"));
 const helpers_1 = require("./utils/helpers");
 const stake_1 = __importDefault(require("./stake"));
+const ore_1 = __importDefault(require("./ore"));
 class TriadProtocolClient {
     constructor(connection, wallet) {
         /**
@@ -118,6 +119,7 @@ class TriadProtocolClient {
         this.ticker = new ticker_1.default(this.program, this.provider);
         this.vault = new vault_1.default(this.program, this.provider);
         this.stake = new stake_1.default(this.program, this.provider);
+        this.ore = new ore_1.default(this.program, this.provider);
     }
 }
 exports.default = TriadProtocolClient;

package/dist/ore.d.ts

@@ -0,0 +1,10 @@
+import { AnchorProvider, Program } from '@coral-xyz/anchor';
+import { PublicKey } from '@solana/web3.js';
+import { TriadProtocol } from './types/triad_protocol';
+import { RpcOptions } from './types';
+export default class Ore {
+    program: Program<TriadProtocol>;
+    provider: AnchorProvider;
+    constructor(program: Program<TriadProtocol>, provider: AnchorProvider);
+    openOre: (user: PublicKey, options?: RpcOptions) => Promise<string>;
+}

package/dist/ore.js

@@ -0,0 +1,40 @@
+"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 });
+const web3_js_1 = require("@solana/web3.js");
+const helpers_1 = require("./utils/helpers");
+const constants_1 = require("./utils/constants");
+class Ore {
+    constructor(program, provider) {
+        this.openOre = (user, options) => __awaiter(this, void 0, void 0, function* () {
+            const userPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, user);
+            const proofInfoPDA = (0, helpers_1.getProofOreAddressSync)(userPDA);
+            const method = this.program.methods.openOre().accounts({
+                signer: user,
+                minerInfo: userPDA,
+                proofInfo: proofInfoPDA,
+                sysvarHashesInfo: new web3_js_1.PublicKey('SysvarS1otHashes111111111111111111111111111'),
+                oreProgram: new web3_js_1.PublicKey(constants_1.ORE_PROGRAM_ID)
+            });
+            if (options === null || options === void 0 ? void 0 : options.microLamports) {
+                method.postInstructions([
+                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                        microLamports: options.microLamports
+                    })
+                ]);
+            }
+            return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
+        });
+        this.provider = provider;
+        this.program = program;
+    }
+}
+exports.default = Ore;

package/dist/stake.js

@@ -91,7 +91,7 @@ class Stake {
      */
     getStakeByWallet(wallet, stakeVault, collections, ranks) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.getStakes(stakeVault);
+            const response = (yield this.getStakes(stakeVault)).filter((item) => item.authority === wallet.toBase58());
             const data = [];
             for (const stake of response) {
                 const getRank = (0, getRarity_1.getRarityRank)(ranks, stake.mint, stake.name);

package/dist/test.js

@@ -63,7 +63,7 @@ const getStakeVault = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.getStakeVaultByName(constants_1.STAKE_SEASON);
     console.log(response);
 });
-const getStakeaa = () => __awaiter(void 0, void 0, void 0, function* () {
+const getStakeByWallet = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'), constants_1.STAKE_SEASON, 1, rarity_json_1.default);
     console.log(response);
 });
@@ -77,11 +77,20 @@ const updateBoost = () => __awaiter(void 0, void 0, void 0, function* () {
             update.push({ name: stake.name, wallet: stake.authority });
         }
     }
-    const updateBoost = yield triadProtocol.stake.updateBoost({
+    console.log(update);
+    const updateBoostResponse = yield triadProtocol.stake.updateBoost({
         wallet: wallet.publicKey,
         stakeVault: constants_1.STAKE_SEASON,
         nfts: update,
         boost: true
     });
-    console.log(updateBoost);
+    console.log(updateBoostResponse);
 });
+const openOre = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.ore.openOre(wallet.publicKey, {
+        microLamports: 2000,
+        skipPreflight: true
+    });
+    console.log(response);
+});
+openOre();

package/dist/types/idl_triad_protocol.json

@@ -447,6 +447,52 @@
                 }
             ]
         },
+        {
+            "name": "open_ore",
+            "discriminator": [120, 233, 125, 197, 12, 153, 25, 229],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "user",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [117, 115, 101, 114]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "signer"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "miner_info",
+                    "writable": true
+                },
+                {
+                    "name": "proof_info",
+                    "writable": true
+                },
+                {
+                    "name": "ore_program"
+                },
+                {
+                    "name": "sysvar_hashes_info"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": []
+        },
         {
             "name": "open_position",
             "discriminator": [135, 128, 47, 77, 15, 152, 240, 49],

package/dist/types/triad_protocol.d.ts

@@ -426,6 +426,52 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'openOre';
+            discriminator: [120, 233, 125, 197, 12, 153, 25, 229];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'user';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [117, 115, 101, 114];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'minerInfo';
+                    writable: true;
+                },
+                {
+                    name: 'proofInfo';
+                    writable: true;
+                },
+                {
+                    name: 'oreProgram';
+                },
+                {
+                    name: 'sysvarHashesInfo';
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [];
+        },
         {
             name: 'openPosition';
             discriminator: [135, 128, 47, 77, 15, 152, 240, 49];

package/dist/utils/constants.d.ts

@@ -6,29 +6,4 @@ export declare const STAKE_SEASON = "Triad Share 1";
 export declare const TTRIAD_DECIMALS = 6;
 export declare const TTRIAD_MINT = "t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV";
 export declare const TTRIAD_FEE = 2;
-export declare const RARITY_RANK_SEASON_1: {
-    mythic: {
-        min: number;
-        max: number;
-    };
-    legendary: {
-        min: number;
-        max: number;
-    };
-    epic: {
-        min: number;
-        max: number;
-    };
-    rare: {
-        min: number;
-        max: number;
-    };
-    uncommon: {
-        min: number;
-        max: number;
-    };
-    common: {
-        min: number;
-        max: number;
-    };
-};
+export declare const ORE_PROGRAM_ID = "oreV2ZymfyeXgNgBdqMkumTqqAprVqgBWQfoYkrtKWQ";

package/dist/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RARITY_RANK_SEASON_1 = exports.TTRIAD_FEE = exports.TTRIAD_MINT = exports.TTRIAD_DECIMALS = exports.STAKE_SEASON = exports.VERIFIER = exports.ADMIN = exports.ATA_PROGRAM_ID = exports.TRIAD_PROTOCOL_PROGRAM_ID = void 0;
+exports.ORE_PROGRAM_ID = exports.TTRIAD_FEE = exports.TTRIAD_MINT = exports.TTRIAD_DECIMALS = exports.STAKE_SEASON = exports.VERIFIER = exports.ADMIN = exports.ATA_PROGRAM_ID = exports.TRIAD_PROTOCOL_PROGRAM_ID = void 0;
 exports.TRIAD_PROTOCOL_PROGRAM_ID = 'TRDwq3BN4mP3m9KsuNUWSN6QDff93VKGSwE95Jbr9Ss';
 exports.ATA_PROGRAM_ID = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
 exports.ADMIN = '';
@@ -9,11 +9,4 @@ exports.STAKE_SEASON = 'Triad Share 1';
 exports.TTRIAD_DECIMALS = 6;
 exports.TTRIAD_MINT = 't3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV';
 exports.TTRIAD_FEE = 2;
-exports.RARITY_RANK_SEASON_1 = {
-    mythic: { min: 1, max: 18 },
-    legendary: { min: 19, max: 91 },
-    epic: { min: 92, max: 275 },
-    rare: { min: 276, max: 643 },
-    uncommon: { min: 644, max: 1103 },
-    common: { min: 1104, max: 1839 }
-};
+exports.ORE_PROGRAM_ID = 'oreV2ZymfyeXgNgBdqMkumTqqAprVqgBWQfoYkrtKWQ';

package/dist/utils/helpers.d.ts

@@ -12,6 +12,7 @@ export declare const getStakeAddressSync: (programId: PublicKey, wallet: PublicK
 export declare const getNFTRewardsAddressSync: (programId: PublicKey, stake: PublicKey) => PublicKey;
 export declare const getATASync: (address: PublicKey, Mint: PublicKey) => PublicKey;
 export declare const getUserAddressSync: (programId: PublicKey, wallet: PublicKey) => PublicKey;
+export declare const getProofOreAddressSync: (wallet: PublicKey) => PublicKey;
 export declare const formatNumber: (number: bigint | BN, decimals?: number) => number;
 export declare const formatStakeVault: (stakeVault: any) => StakeVaultResponse;
 export declare const formatStake: (stake: any) => StakeResponse;

package/dist/utils/helpers.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateAPR = exports.calculateTotalMultiplier = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.formatNumber = exports.getUserAddressSync = exports.getATASync = exports.getNFTRewardsAddressSync = exports.getStakeAddressSync = exports.getStakeVaultAddressSync = exports.getUserPositionAddressSync = exports.getTokenVaultAddressSync = exports.getVaultAddressSync = exports.decodeString = exports.encodeString = exports.getTickerAddressSync = void 0;
+exports.calculateAPR = exports.calculateTotalMultiplier = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.formatNumber = exports.getProofOreAddressSync = exports.getUserAddressSync = exports.getATASync = exports.getNFTRewardsAddressSync = exports.getStakeAddressSync = exports.getStakeVaultAddressSync = exports.getUserPositionAddressSync = exports.getTokenVaultAddressSync = exports.getVaultAddressSync = exports.decodeString = exports.encodeString = exports.getTickerAddressSync = void 0;
 const stake_1 = require("./../types/stake");
 const web3_js_1 = require("@solana/web3.js");
 const anchor = __importStar(require("@coral-xyz/anchor"));
@@ -96,6 +96,11 @@ const getUserAddressSync = (programId, wallet) => {
     return StakePDA;
 };
 exports.getUserAddressSync = getUserAddressSync;
+const getProofOreAddressSync = (wallet) => {
+    const [ProofPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('proof'), wallet.toBuffer()], new web3_js_1.PublicKey(constants_1.ORE_PROGRAM_ID));
+    return ProofPDA;
+};
+exports.getProofOreAddressSync = getProofOreAddressSync;
 const formatNumber = (number, decimals = 6) => {
     return Number(number.toString()) / Math.pow(10, decimals);
 };

package/package.json

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