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

package/dist/index.d.ts

@@ -4,15 +4,13 @@ import { TriadProtocol } from './types/triad_protocol';
 import Ticker from './ticker';
 import Vault from './vault';
 import Stake from './stake';
-import { CreateUserArgs, RpcOptions } from './types';
-import Ore from './ore';
+import { CreateUserArgs, MineOreArgs, OpenOreArgs, RpcOptions } from './types';
 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
@@ -43,4 +41,6 @@ export default class TriadProtocolClient {
      *
      */
     createUser: ({ wallet, name, referral }: CreateUserArgs, options?: RpcOptions) => Promise<string>;
+    openOre: ({ user, payer, name, referralName }: OpenOreArgs, options?: RpcOptions) => Promise<string>;
+    mineOre: ({ user, payer, bus, digest, nonce }: MineOreArgs, options?: RpcOptions) => Promise<string>;
 }

package/dist/index.js

@@ -19,7 +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"));
+const constants_1 = require("./utils/constants");
 class TriadProtocolClient {
     constructor(connection, wallet) {
         /**
@@ -114,12 +114,89 @@ class TriadProtocolClient {
             }
             return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
         };
+        this.openOre = ({ user, payer, name, referralName }, options) => __awaiter(this, void 0, void 0, function* () {
+            const userPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, user);
+            const ixs = [];
+            try {
+                yield this.program.account.user.fetch(userPDA);
+            }
+            catch (_d) {
+                const referral = yield this.getRefferal(referralName);
+                ixs.push(yield this.program.methods
+                    .createUser({
+                    name
+                })
+                    .accounts({
+                    signer: user,
+                    referral
+                })
+                    .instruction());
+            }
+            const proofInfoPDA = (0, helpers_1.getProofOreAddressSync)(userPDA);
+            ixs.push(yield 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)
+            })
+                .instruction());
+            if (options === null || options === void 0 ? void 0 : options.microLamports) {
+                ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                    microLamports: options.microLamports
+                }));
+            }
+            const { blockhash } = yield this.provider.connection.getLatestBlockhash();
+            return this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
+                instructions: ixs,
+                recentBlockhash: blockhash,
+                payerKey: payer
+            }).compileToV0Message()), [], {
+                skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
+                commitment: 'confirmed'
+            });
+        });
+        this.mineOre = ({ user, payer, bus, digest, nonce }, 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 ixs = [];
+            ixs.push(yield this.program.methods
+                .mineOre({
+                digest,
+                nonce
+            })
+                .accounts({
+                signer: user,
+                bus,
+                configProgram: (0, helpers_1.configOreProgramAddressSync)(),
+                proofInfo: proofInfoPDA,
+                sysvarHashesInfo: new web3_js_1.PublicKey('SysvarS1otHashes111111111111111111111111111'),
+                sysvarInstructionsInfo: new web3_js_1.PublicKey('Sysvar1nstructions1111111111111111111111111'),
+                oreProgram: new web3_js_1.PublicKey(constants_1.ORE_PROGRAM_ID)
+            })
+                .instruction());
+            if (options === null || options === void 0 ? void 0 : options.microLamports) {
+                ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                    microLamports: options.microLamports
+                }));
+            }
+            const { blockhash } = yield this.provider.connection.getLatestBlockhash();
+            return this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
+                instructions: ixs,
+                recentBlockhash: blockhash,
+                payerKey: payer
+            }).compileToV0Message()), [], {
+                skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
+                commitment: 'confirmed'
+            });
+        });
         this.provider = new anchor_1.AnchorProvider(connection, wallet, anchor_1.AnchorProvider.defaultOptions());
         this.program = new anchor_1.Program(idl_triad_protocol_json_1.default, this.provider);
         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/test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/test.js

@@ -1,96 +0,0 @@
-"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 });
-const fs_1 = __importDefault(require("fs"));
-const web3_js_1 = require("@solana/web3.js");
-const index_1 = __importDefault(require("./index"));
-const anchor_1 = require("@coral-xyz/anchor");
-const constants_1 = require("./utils/constants");
-const rarity_json_1 = __importDefault(require("./utils/stake-season-1/rarity.json"));
-const getRarity_1 = require("./utils/getRarity");
-const axios_1 = __importDefault(require("axios"));
-const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/id.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(rpc_file.toString(), 'confirmed');
-const wallet = new anchor_1.Wallet(keypair);
-const triadProtocol = new index_1.default(connection, wallet);
-const getStake = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.getStakes(constants_1.STAKE_SEASON);
-    let available = 0;
-    let items = 0;
-    for (const stake of response) {
-        const getRank = (0, getRarity_1.getRarityRank)(rarity_json_1.default, stake.mint, stake.name);
-        try {
-            available += yield triadProtocol.stake.getStakeRewards({
-                wallet: new web3_js_1.PublicKey(stake.authority),
-                nftName: stake.name,
-                stakeVault: constants_1.STAKE_SEASON,
-                rank: getRank,
-                collections: 1
-            });
-            items += 1;
-            console.log(items);
-            console.log(available);
-        }
-        catch (e) { }
-    }
-    console.log(available);
-    console.log(items);
-    console.log(response.length);
-});
-const deposit = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.depositStakeRewards({
-        wallet: wallet.publicKey,
-        stakeVault: constants_1.STAKE_SEASON,
-        mint: new web3_js_1.PublicKey(constants_1.TTRIAD_MINT),
-        amount: new anchor_1.BN(192388 * Math.pow(10, 6))
-    });
-    console.log(response);
-});
-const getStakeVault = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.getStakeVaultByName(constants_1.STAKE_SEASON);
-    console.log(response);
-});
-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);
-});
-const updateBoost = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = (yield axios_1.default.get('https://api.triadfi.co/boost'))
-        .data;
-    const stakes = yield triadProtocol.stake.getStakes(constants_1.STAKE_SEASON);
-    const update = [];
-    for (const stake of stakes) {
-        if (response.includes(stake.mint) && !stake.boost) {
-            update.push({ name: stake.name, wallet: stake.authority });
-        }
-    }
-    console.log(update);
-    const updateBoostResponse = yield triadProtocol.stake.updateBoost({
-        wallet: wallet.publicKey,
-        stakeVault: constants_1.STAKE_SEASON,
-        nfts: update,
-        boost: true
-    });
-    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,67 @@
                 }
             ]
         },
+        {
+            "name": "mine_ore",
+            "discriminator": [170, 66, 140, 123, 15, 20, 224, 194],
+            "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": "bus",
+                    "writable": true
+                },
+                {
+                    "name": "proof_info",
+                    "writable": true
+                },
+                {
+                    "name": "ore_program"
+                },
+                {
+                    "name": "config_program"
+                },
+                {
+                    "name": "sysvar_hashes_info"
+                },
+                {
+                    "name": "sysvar_instructions_info"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "args",
+                    "type": {
+                        "defined": {
+                            "name": "MineArgs"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "open_ore",
             "discriminator": [120, 233, 125, 197, 12, 153, 25, 229],
@@ -1302,6 +1363,29 @@
                 ]
             }
         },
+        {
+            "name": "MineArgs",
+            "repr": {
+                "kind": "c"
+            },
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "digest",
+                        "type": {
+                            "array": ["u8", 16]
+                        }
+                    },
+                    {
+                        "name": "nonce",
+                        "type": {
+                            "array": ["u8", 8]
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "OpenPositionArgs",
             "type": {

package/dist/types/index.d.ts

@@ -8,3 +8,16 @@ export type CreateUserArgs = {
     name: string;
     referral?: PublicKey;
 };
+export type OpenOreArgs = {
+    user: PublicKey;
+    payer: PublicKey;
+    name: string;
+    referralName: string;
+};
+export type MineOreArgs = {
+    user: PublicKey;
+    payer: PublicKey;
+    bus: PublicKey;
+    digest: number[];
+    nonce: number[];
+};

package/dist/types/triad_protocol.d.ts

@@ -426,6 +426,67 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'mineOre';
+            discriminator: [170, 66, 140, 123, 15, 20, 224, 194];
+            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: 'bus';
+                    writable: true;
+                },
+                {
+                    name: 'proofInfo';
+                    writable: true;
+                },
+                {
+                    name: 'oreProgram';
+                },
+                {
+                    name: 'configProgram';
+                },
+                {
+                    name: 'sysvarHashesInfo';
+                },
+                {
+                    name: 'sysvarInstructionsInfo';
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'mineArgs';
+                        };
+                    };
+                }
+            ];
+        },
         {
             name: 'openOre';
             discriminator: [120, 233, 125, 197, 12, 153, 25, 229];
@@ -1214,6 +1275,29 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'mineArgs';
+            repr: {
+                kind: 'c';
+            };
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'digest';
+                        type: {
+                            array: ['u8', 16];
+                        };
+                    },
+                    {
+                        name: 'nonce';
+                        type: {
+                            array: ['u8', 8];
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'openPositionArgs';
             type: {

package/dist/utils/helpers.d.ts

@@ -13,6 +13,7 @@ export declare const getNFTRewardsAddressSync: (programId: PublicKey, stake: Pub
 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 configOreProgramAddressSync: () => 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.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;
+exports.calculateAPR = exports.calculateTotalMultiplier = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.formatNumber = exports.configOreProgramAddressSync = 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"));
@@ -101,6 +101,11 @@ const getProofOreAddressSync = (wallet) => {
     return ProofPDA;
 };
 exports.getProofOreAddressSync = getProofOreAddressSync;
+const configOreProgramAddressSync = () => {
+    const [ProofPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('config')], new web3_js_1.PublicKey(constants_1.ORE_PROGRAM_ID));
+    return ProofPDA;
+};
+exports.configOreProgramAddressSync = configOreProgramAddressSync;
 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.3-beta",
+  "version": "0.4.5-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -33,7 +33,7 @@
   "license": "ISC",
   "dependencies": {
     "@coral-xyz/anchor": "0.30.0",
-    "@solana/spl-token": "0.4.6",
+    "@solana/spl-token": "0.4.1",
     "@solana/web3.js": "1.89.1",
     "axios": "^1.5.1",
     "base64-js": "^1.5.1",

package/dist/ore.d.ts

@@ -1,10 +0,0 @@
-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

@@ -1,40 +0,0 @@
-"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;