@carrot-protocol/http-client 0.2.78-drift-apy-fix-dev-f27de8d → 0.2.78-drift-apy-fix-dev-b2f26a9

package/dist/index.d.ts

@@ -26,6 +26,7 @@ export declare class Client {
     getReferralCodes(wallet: anchor.web3.PublicKey): Promise<GetReferralCodesResponse>;
     getCarrotBoostJitDepositIxns(request: GetCarrotBoostJitDepositIxnsRequest): Promise<GetCarrotBoostJitDepositIxnsResponse>;
     getCarrotBoostJitWithdrawIxns(request: GetCarrotBoostJitWithdrawIxnsRequest): Promise<GetCarrotBoostJitWithdrawIxnsResponse>;
-    send(base64Tx: string): Promise<string>;
+    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

@@ -228,7 +228,7 @@ class Client {
         // error if provider is undefined
         requireProvider(this.provider);
         const issueResponse = await this.prepareIssue(vault, assetMint, amount, this.provider.publicKey);
-        const txSig = await this.send(issueResponse.tx);
+        const txSig = await this.signAndSend(issueResponse.tx);
         return txSig;
     }
     async prepareIssue(vault, assetMint, amount, user) {
@@ -254,7 +254,7 @@ class Client {
         // error if provider is undefined
         requireProvider(this.provider);
         const redeemResponse = await this.prepareRedeem(vault, assetMint, amount, this.provider.publicKey);
-        const txSig = await this.send(redeemResponse.tx);
+        const txSig = await this.signAndSend(redeemResponse.tx);
         return txSig;
     }
     // Redeems assets from a specified vault
@@ -383,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, {
@@ -406,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-f27de8d",
+  "version": "0.2.78-drift-apy-fix-dev-b2f26a9",
   "description": "interact with carrot api",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",