@carrot-protocol/http-client 0.2.78-drift-apy-fix-dev-2256d2a → 0.2.78-drift-apy-fix-dev-9ad3029

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as anchor from "@coral-xyz/anchor";
 import { Vault, VaultPerformance } from "@carrot-protocol/common";
-import { CheckWalletResponse, ClaimReferralCodeResponse, GetCarrotBoostJitDepositIxnsRequest, GetCarrotBoostJitDepositIxnsResponse, GetCarrotBoostJitWithdrawIxnsRequest, GetCarrotBoostJitWithdrawIxnsResponse, GetLatestPoolApyResponse, GetReferralCodesResponse, HistoricalVaultApyResponse, HistoricalVaultNavResponse, UserPerformanceResponse, UserResponse, VaultHistoricalInterval, VaultOhlcResponse } from "./types";
+import { CheckWalletResponse, ClaimReferralCodeResponse, GetCarrotBoostJitDepositIxnsRequest, GetCarrotBoostJitDepositIxnsResponse, GetCarrotBoostJitWithdrawIxnsRequest, GetCarrotBoostJitWithdrawIxnsResponse, GetLatestPoolApyResponse, GetReferralCodesResponse, HistoricalVaultApyResponse, HistoricalVaultNavResponse, IssueResponse, RedeemResponse, UserPerformanceResponse, UserResponse, VaultHistoricalInterval, VaultOhlcResponse } from "./types";
 export * as Common from "@carrot-protocol/common";
 export * from "./types";
 export declare class Client {
@@ -17,13 +17,16 @@ export declare class Client {
     getHistoricalVaultNav(vault: anchor.web3.PublicKey, interval: VaultHistoricalInterval): Promise<HistoricalVaultNavResponse>;
     getVaultOhlc(vault: anchor.web3.PublicKey): Promise<VaultOhlcResponse>;
     issue(vault: anchor.web3.PublicKey, assetMint: anchor.web3.PublicKey, amount: anchor.BN): Promise<string>;
+    prepareIssue(vault: anchor.web3.PublicKey, assetMint: anchor.web3.PublicKey, amount: anchor.BN, user: anchor.web3.PublicKey): Promise<IssueResponse>;
     redeem(vault: anchor.web3.PublicKey, assetMint: anchor.web3.PublicKey, amount: anchor.BN): Promise<string>;
+    prepareRedeem(vault: anchor.web3.PublicKey, assetMint: anchor.web3.PublicKey, amount: anchor.BN, user: anchor.web3.PublicKey): Promise<RedeemResponse>;
     getLatestPoolApy(poolNames: string[]): Promise<GetLatestPoolApyResponse>;
     checkWallet(wallet: anchor.web3.PublicKey): Promise<CheckWalletResponse>;
     claimReferralCode(wallet: anchor.web3.PublicKey, code: string): Promise<ClaimReferralCodeResponse>;
     getReferralCodes(wallet: anchor.web3.PublicKey): Promise<GetReferralCodesResponse>;
     getCarrotBoostJitDepositIxns(request: GetCarrotBoostJitDepositIxnsRequest): Promise<GetCarrotBoostJitDepositIxnsResponse>;
     getCarrotBoostJitWithdrawIxns(request: GetCarrotBoostJitWithdrawIxnsRequest): Promise<GetCarrotBoostJitWithdrawIxnsResponse>;
-    private send;
+    sendSignedTx(signedBase64Tx: string): Promise<string>;
+    private signAndSend;
 }
 export declare function prepareUnsignedTx(connection: anchor.web3.Connection, payer: anchor.web3.PublicKey, ixns: anchor.web3.TransactionInstruction[], lutAddr?: anchor.web3.PublicKey, additionalSigner?: anchor.AnchorProvider): Promise<string>;

package/dist/index.js

@@ -227,9 +227,14 @@ class Client {
     async issue(vault, assetMint, amount) {
         // error if provider is undefined
         requireProvider(this.provider);
+        const issueResponse = await this.prepareIssue(vault, assetMint, amount, this.provider.publicKey);
+        const txSig = await this.signAndSend(issueResponse.tx);
+        return txSig;
+    }
+    async prepareIssue(vault, assetMint, amount, user) {
         const url = new URL(`${this.baseUrl}/issue`);
         const body = {
-            user: this.provider.publicKey,
+            user,
             vault,
             amount,
             assetMint,
@@ -242,16 +247,21 @@ class Client {
         checkResponse(response);
         const responseBody = await response.json();
         const issueResponse = JSON.parse(JSON.stringify(responseBody));
-        const txSig = await this.send(issueResponse.tx);
-        return txSig;
+        return issueResponse;
     }
     // Redeems assets from a specified vault
     async redeem(vault, assetMint, amount) {
         // error if provider is undefined
         requireProvider(this.provider);
+        const redeemResponse = await this.prepareRedeem(vault, assetMint, amount, this.provider.publicKey);
+        const txSig = await this.signAndSend(redeemResponse.tx);
+        return txSig;
+    }
+    // Redeems assets from a specified vault
+    async prepareRedeem(vault, assetMint, amount, user) {
         const url = new URL(`${this.baseUrl}/redeem`);
         const body = {
-            user: this.provider.publicKey,
+            user,
             vault,
             amount,
             assetMint,
@@ -264,8 +274,7 @@ class Client {
         checkResponse(response);
         const responseBody = await response.json();
         const redeemResponse = JSON.parse(JSON.stringify(responseBody));
-        const txSig = await this.send(redeemResponse.tx);
-        return txSig;
+        return redeemResponse;
     }
     async getLatestPoolApy(poolNames) {
         const url = new URL(`${this.baseUrl}/latestPoolApy?poolNames=${poolNames.join(",")}`);
@@ -374,16 +383,14 @@ class Client {
         return getCarrotBoostJitWithdrawIxnsResponse;
     }
     // Sends a signed transaction to the network
-    async send(base64Tx) {
-        // error if provider is undefined
-        requireProvider(this.provider);
-        const txBytes = Buffer.from(base64Tx, "base64");
+    // expects a versioned tx
+    async sendSignedTx(signedBase64Tx) {
+        // extract txSig for caller
+        const txBytes = Buffer.from(signedBase64Tx, "base64");
         const tx = anchor.web3.VersionedTransaction.deserialize(new Uint8Array(txBytes));
-        const signedTx = await this.provider.wallet.signTransaction(tx);
-        const txSig = signedTx.signatures[0];
-        const encodedAndSignedTx = Buffer.from(signedTx.serialize()).toString("base64");
+        const txSig = tx.signatures[0];
         const sendRequest = {
-            tx: encodedAndSignedTx,
+            tx: signedBase64Tx,
         };
         const url = new URL(`${this.baseUrl}/send`);
         const response = await (0, cross_fetch_1.default)(url, {
@@ -397,6 +404,18 @@ class Client {
         }
         return (0, bs58_1.encode)(txSig);
     }
+    // Sends a signed transaction to the network
+    async signAndSend(base64Tx) {
+        // error if provider is undefined
+        requireProvider(this.provider);
+        const txBytes = Buffer.from(base64Tx, "base64");
+        const tx = anchor.web3.VersionedTransaction.deserialize(new Uint8Array(txBytes));
+        const signedTx = await this.provider.wallet.signTransaction(tx);
+        const txSig = signedTx.signatures[0];
+        const signedBase64Tx = Buffer.from(signedTx.serialize()).toString("base64");
+        await this.sendSignedTx(signedBase64Tx);
+        return (0, bs58_1.encode)(txSig);
+    }
 }
 exports.Client = Client;
 // Prepares an unsigned transaction for submission

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/http-client",
-  "version": "0.2.78-drift-apy-fix-dev-2256d2a",
+  "version": "0.2.78-drift-apy-fix-dev-9ad3029",
   "description": "interact with carrot api",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",