@triadxyz/triad-protocol 1.1.2-beta → 1.1.4-beta

package/dist/index.d.ts

@@ -78,9 +78,8 @@ export default class TriadProtocolClient {
             pnl: import("bn.js");
         }[];
     }[]>;
-    withdrawV1({ wallet, ticker, userPosition, positionIndex }: {
+    withdrawV1({ wallet, ticker, positionIndex }: {
         wallet: PublicKey;
-        userPosition: PublicKey;
         ticker: PublicKey;
         positionIndex: number;
     }, options?: RpcOptions): Promise<any>;

package/dist/index.js

@@ -143,14 +143,15 @@ class TriadProtocolClient {
                     parseFloat(item.totalWithdrawn.toString()));
         });
     }
-    withdrawV1({ wallet, ticker, userPosition, positionIndex }, options) {
+    withdrawV1({ wallet, ticker, positionIndex }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const vaultPDA = (0, pda_1.getVaultAddressSync)(this.program.programId, ticker);
+            const userPositionPDA = (0, pda_1.getUserPositionPDA)(this.program.programId, wallet, ticker);
             const VaultTokenAccountPDA = (0, pda_1.getTokenVaultAddressSync)(this.program.programId, vaultPDA);
             const userTokenAccount = yield (0, spl_token_1.getAssociatedTokenAddress)(new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'), this.provider.wallet.publicKey);
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.withdrawV1(positionIndex).accounts({
                 signer: wallet,
-                userPosition,
+                userPosition: userPositionPDA,
                 userTokenAccount,
                 vault: vaultPDA,
                 ticker,

package/dist/local-test.js

@@ -17,6 +17,9 @@ const _1 = __importDefault(require("./"));
 const anchor_1 = require("@coral-xyz/anchor");
 const axios_1 = __importDefault(require("axios"));
 const web3_js_1 = require("@solana/web3.js");
+const spl_token_1 = require("@solana/spl-token");
+const constants_1 = require("./utils/constants");
+const pda_1 = require("./utils/pda");
 const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/triad.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())));
@@ -74,6 +77,7 @@ const getAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
     const markets = yield triadProtocol.trade.getAllMarkets();
     console.log(markets);
 });
+getAllMarkets();
 const getMarket = () => __awaiter(void 0, void 0, void 0, function* () {
     const market = yield triadProtocol.trade.getMarketById(1);
     console.log(market);
@@ -165,7 +169,27 @@ const getReferral = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(response);
 });
 const getUserPositions = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.getUserPositionsWithAmount(wallet.publicKey);
+    const response = yield triadProtocol.getUserPositionsWithAmount(new web3_js_1.PublicKey('5U4TmSUBqDaefmamimoSGak8GK5xwXoM5nAaCZJpynpL'));
     console.log(response);
 });
-getUserPositions();
+const getTickers = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.getTickers();
+    console.log(response);
+});
+// Claim 3 TRD
+const claim3Trd = (user) => __awaiter(void 0, void 0, void 0, function* () {
+    const adminATA = (0, pda_1.getTokenATA)(keypair.publicKey, constants_1.TRD_MINT);
+    const userATA = (0, pda_1.getTokenATA)(user, constants_1.TRD_MINT);
+    const ixs = [
+        (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(user, userATA, user, constants_1.TRD_MINT, spl_token_1.TOKEN_2022_PROGRAM_ID),
+        (0, spl_token_1.createTransferCheckedInstruction)(adminATA, constants_1.TRD_MINT, userATA, keypair.publicKey, 3 * Math.pow(10, 6), constants_1.TRD_DECIMALS, [], spl_token_1.TOKEN_2022_PROGRAM_ID)
+    ];
+    const tx = new web3_js_1.Transaction().add(...ixs);
+    tx.recentBlockhash = (yield connection.getLatestBlockhash()).blockhash;
+    tx.feePayer = user;
+    tx.sign(keypair);
+    // add wallet as signer FE
+    const signature = yield connection.sendRawTransaction(tx.serialize());
+    console.log(signature);
+});
+claim3Trd(new web3_js_1.PublicKey('FbegLWayrXB7pEhtNXqzLQ8KWcWALpfwetf65oBodAsc'));

package/dist/stake.d.ts

@@ -61,10 +61,10 @@ export default class Stake {
     /**
      *  Request Withdraw
      *  @param wallet - User wallet
-     *  @param name - Stake name
+     *  @param nfts - NFTs to Request withdraw
      *
      */
-    requestWithdraw({ wallet, name, mint }: RequestWithdrawArgs, options?: RpcOptions): Promise<any>;
+    requestWithdraw({ wallet, nfts }: RequestWithdrawArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Withdraw Stake
      *  @param wallet - User wallet

package/dist/stake.js

@@ -186,21 +186,28 @@ class Stake {
     /**
      *  Request Withdraw
      *  @param wallet - User wallet
-     *  @param name - Stake name
+     *  @param nfts - NFTs to Request withdraw
      *
      */
-    requestWithdraw({ wallet, name, mint }, options) {
+    requestWithdraw({ wallet, nfts }, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
             const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
-            const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, name);
             const userPDA = (0, pda_1.getUserPDA)(this.program.programId, wallet);
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.requestWithdrawStake().accounts({
-                signer: wallet,
-                mint: mint,
-                user: userPDA,
-                stake: stakePDA,
-                stakeVault: stakeVaultPDA
-            }), options);
+            for (const nft of nfts) {
+                const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, nft.name);
+                ixs.push(yield this.program.methods
+                    .requestWithdrawStake()
+                    .accounts({
+                    signer: wallet,
+                    mint: nft.mint,
+                    user: userPDA,
+                    stake: stakePDA,
+                    stakeVault: stakeVaultPDA
+                })
+                    .instruction());
+            }
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
         });
     }
     /**

package/dist/types/stake.d.ts

@@ -26,8 +26,10 @@ export type UpdateStakeVaultArgs = {
 };
 export type RequestWithdrawArgs = {
     wallet: PublicKey;
-    name: string;
-    mint: PublicKey;
+    nfts: {
+        name: string;
+        mint: PublicKey;
+    }[];
 };
 export type WithdrawArgs = {
     wallet: PublicKey;

package/dist/types/trade.d.ts

@@ -20,7 +20,6 @@ export type Market = {
     feeVault: string;
     isActive: boolean;
     marketPrice: string;
-    isOfficial: boolean;
     previousResolvedQuestion: ResolvedQuestion;
     currentQuestionId: string;
     currentQuestionStart: string;

package/dist/utils/helpers.js

@@ -86,7 +86,6 @@ const accountToMarket = (account, address) => {
         feeVault: account.feeVault.toBase58(),
         isActive: account.isActive,
         marketPrice: account.marketPrice.toString(),
-        isOfficial: account.isOfficial,
         previousResolvedQuestion: accountToResolvedQuestion(account.previousResolvedQuestion),
         currentQuestionId: account.currentQuestionId.toString(),
         currentQuestionStart: account.currentQuestionStart.toString(),

package/package.json

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