@triadxyz/triad-protocol 0.4.4-beta → 0.4.6-beta

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { TriadProtocol } from './types/triad_protocol';
 import Ticker from './ticker';
 import Vault from './vault';
 import Stake from './stake';
-import { CreateUserArgs, OpenOreArgs, RpcOptions } from './types';
+import { CreateUserArgs, MineOreArgs, OpenOreArgs, RpcOptions } from './types';
 export default class TriadProtocolClient {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -42,4 +42,5 @@ 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

@@ -149,6 +149,45 @@ class TriadProtocolClient {
                 }));
             }
             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.publicKey
+            }).compileToV0Message()), [payer], {
+                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(new web3_js_1.TransactionInstruction({
+                keys: [],
+                programId: new web3_js_1.PublicKey(constants_1.NOOP_PROGRAM_ID),
+                data: Buffer.from(proofInfoPDA.toBytes())
+            }));
+            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,

package/dist/test.js

@@ -86,3 +86,18 @@ const updateBoost = () => __awaiter(void 0, void 0, void 0, function* () {
     });
     console.log(updateBoostResponse);
 });
+const mineOre = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.mineOre({
+        user: wallet.publicKey,
+        payer: wallet.publicKey,
+        bus: new web3_js_1.PublicKey('BZJ2xppmny6ME3NkAgu2SMZB2mwS5xboX9n6VsSyGYFJ'),
+        digest: [
+            149, 32, 37, 176, 97, 139, 13, 182, 108, 28, 66, 160, 137, 156, 204, 249
+        ],
+        nonce: [217, 46, 186, 232, 162, 139, 46, 186]
+    }, {
+        skipPreflight: true,
+        microLamports: 10000
+    });
+    console.log(response);
+});

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": "proof_info",
+                    "writable": true
+                },
+                {
+                    "name": "bus",
+                    "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,26 @@
                 ]
             }
         },
+        {
+            "name": "MineArgs",
+            "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

@@ -1,4 +1,4 @@
-import { PublicKey } from '@solana/web3.js';
+import { Keypair, PublicKey } from '@solana/web3.js';
 export type RpcOptions = {
     skipPreflight?: boolean;
     microLamports?: number;
@@ -10,7 +10,14 @@ export type CreateUserArgs = {
 };
 export type OpenOreArgs = {
     user: PublicKey;
-    payer: PublicKey;
+    payer: Keypair;
     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: 'proofInfo';
+                    writable: true;
+                },
+                {
+                    name: 'bus';
+                    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,26 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'mineArgs';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'digest';
+                        type: {
+                            array: ['u8', 16];
+                        };
+                    },
+                    {
+                        name: 'nonce';
+                        type: {
+                            array: ['u8', 8];
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'openPositionArgs';
             type: {

package/dist/utils/constants.d.ts

@@ -7,3 +7,4 @@ export declare const TTRIAD_DECIMALS = 6;
 export declare const TTRIAD_MINT = "t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV";
 export declare const TTRIAD_FEE = 2;
 export declare const ORE_PROGRAM_ID = "oreV2ZymfyeXgNgBdqMkumTqqAprVqgBWQfoYkrtKWQ";
+export declare const NOOP_PROGRAM_ID = "noop8ytexvkpCuqbf6FB89BSuNemHtPRqaNC31GWivW";

package/dist/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.NOOP_PROGRAM_ID = 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 = '';
@@ -10,3 +10,4 @@ exports.TTRIAD_DECIMALS = 6;
 exports.TTRIAD_MINT = 't3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV';
 exports.TTRIAD_FEE = 2;
 exports.ORE_PROGRAM_ID = 'oreV2ZymfyeXgNgBdqMkumTqqAprVqgBWQfoYkrtKWQ';
+exports.NOOP_PROGRAM_ID = 'noop8ytexvkpCuqbf6FB89BSuNemHtPRqaNC31GWivW';

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.4-beta",
+  "version": "0.4.6-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",