@triadxyz/triad-protocol 0.4.3-beta → 0.4.4-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, 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,5 @@ export default class TriadProtocolClient {
      *
      */
     createUser: ({ wallet, name, referral }: CreateUserArgs, options?: RpcOptions) => Promise<string>;
+    openOre: ({ user, payer, name, referralName }: OpenOreArgs, 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,55 @@ 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.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.js

@@ -86,11 +86,3 @@ const updateBoost = () => __awaiter(void 0, void 0, void 0, function* () {
     });
     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/index.d.ts

@@ -8,3 +8,9 @@ export type CreateUserArgs = {
     name: string;
     referral?: PublicKey;
 };
+export type OpenOreArgs = {
+    user: PublicKey;
+    payer: PublicKey;
+    name: string;
+    referralName: string;
+};

package/package.json

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

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;