@carrot-protocol/boost-http-client 0.4.4-handoff-dev-9a1c50a → 0.4.4-handoff-dev-6fafd92

package/dist/index.d.ts

@@ -67,13 +67,13 @@ export declare class Client extends ApiClient {
      * @param request Adjust leverage request parameters
      * @returns Adjust leverage operation result
      */
-    adjustLeverage(clendAccount: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, leverage: number, slippageBps: number, useJito: boolean): Promise<string>;
+    adjustLeverage(clendAccount: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, leverage: number, slippageBps: number, useJito: boolean, isHandoff: boolean): Promise<string>;
     /**
      * Withdraw from or close a leveraged position
      * @param request Withdraw leverage request parameters
      * @returns Withdraw leverage operation result
      */
-    withdrawLeverage(clendAccount: web3.PublicKey, outputTokenMint: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, uiAmount: number, slippageBps: number, withdrawAll: boolean, useJito: boolean): Promise<string>;
+    withdrawLeverage(clendAccount: web3.PublicKey, outputTokenMint: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, uiAmount: number, slippageBps: number, withdrawAll: boolean, useJito: boolean, isHandoff: boolean): Promise<string>;
     /**
      * Withdraw emissions from a bank
      * @returns Withdraw emissions operation result

package/dist/index.js

@@ -80,6 +80,9 @@ class Client extends api_1.ApiClient {
             console.log("dry run enabled, exiting before sending tx");
             return "";
         }
+        console.log("unsignedBase64Tx", unsignedBase64Tx);
+        if (handoffTxns.length > 0)
+            console.log("handoffTxns", handoffTxns);
         // 1. Sign the primary transaction (User Transaction)
         const txBytes = Buffer.from(unsignedBase64Tx, "base64");
         const tx = anchor_1.web3.VersionedTransaction.deserialize(new Uint8Array(txBytes));
@@ -340,7 +343,7 @@ class Client extends api_1.ApiClient {
         };
         const body = await this.handleApiCall(() => this.http.post("deposit", JSON.stringify(req)));
         const depositResponse = JSON.parse(body);
-        const txSig = await this.send(depositResponse.unsignedBase64Tx, depositResponse.userRequestId, false);
+        const txSig = await this.send(depositResponse.unsignedBase64Tx, depositResponse.userRequestId, req.useJito);
         return txSig;
     }
     async withdraw(clendAccount, outputTokenMint, uiAmount, withdrawAll, useJito) {
@@ -353,7 +356,7 @@ class Client extends api_1.ApiClient {
         };
         const body = await this.handleApiCall(() => this.http.post("withdraw", JSON.stringify(req)));
         const withdrawResponse = JSON.parse(body);
-        const txSig = await this.send(withdrawResponse.unsignedBase64Tx, withdrawResponse.userRequestId, false);
+        const txSig = await this.send(withdrawResponse.unsignedBase64Tx, withdrawResponse.userRequestId, req.useJito);
         return txSig;
     }
     /**
@@ -384,14 +387,13 @@ class Client extends api_1.ApiClient {
         const userTx = depositLeverageResponse.txns[0];
         const txSig = await this.send(userTx, depositLeverageResponse.userRequestId, req.useJito, handoffTxns);
         return txSig;
-        return txSig;
     }
     /**
      * Adjust the leverage of an existing position
      * @param request Adjust leverage request parameters
      * @returns Adjust leverage operation result
      */
-    async adjustLeverage(clendAccount, assetTokenMint, liabilityTokenMint, leverage, slippageBps, useJito) {
+    async adjustLeverage(clendAccount, assetTokenMint, liabilityTokenMint, leverage, slippageBps, useJito, isHandoff) {
         const req = {
             clendAccount,
             assetTokenMint,
@@ -399,10 +401,16 @@ class Client extends api_1.ApiClient {
             leverage,
             slippageBps,
             useJito,
+            isHandoff,
         };
         const body = await this.handleApiCall(() => this.http.post("leverage/adjust", JSON.stringify(req)));
         const adjustLeverageResponse = JSON.parse(body);
-        const txSig = await this.send(adjustLeverageResponse.unsignedBase64Tx, adjustLeverageResponse.userRequestId, false);
+        let handoffTxns = [];
+        if (adjustLeverageResponse.txns.length > 1) {
+            handoffTxns = adjustLeverageResponse.txns.slice(1);
+        }
+        const userTx = adjustLeverageResponse.txns[0];
+        const txSig = await this.send(userTx, adjustLeverageResponse.userRequestId, req.useJito, handoffTxns);
         return txSig;
     }
     /**
@@ -410,7 +418,7 @@ class Client extends api_1.ApiClient {
      * @param request Withdraw leverage request parameters
      * @returns Withdraw leverage operation result
      */
-    async withdrawLeverage(clendAccount, outputTokenMint, assetTokenMint, liabilityTokenMint, uiAmount, slippageBps, withdrawAll, useJito) {
+    async withdrawLeverage(clendAccount, outputTokenMint, assetTokenMint, liabilityTokenMint, uiAmount, slippageBps, withdrawAll, useJito, isHandoff) {
         const req = {
             clendAccount,
             outputTokenMint,
@@ -420,10 +428,16 @@ class Client extends api_1.ApiClient {
             slippageBps,
             withdrawAll,
             useJito,
+            isHandoff,
         };
         const body = await this.handleApiCall(() => this.http.post("leverage/withdraw", JSON.stringify(req)));
         const withdrawLeverageResponse = JSON.parse(body);
-        const txSig = await this.send(withdrawLeverageResponse.unsignedBase64Tx, withdrawLeverageResponse.userRequestId, true);
+        let handoffTxns = [];
+        if (withdrawLeverageResponse.txns.length > 1) {
+            handoffTxns = withdrawLeverageResponse.txns.slice(1);
+        }
+        const userTx = withdrawLeverageResponse.txns[0];
+        const txSig = await this.send(userTx, withdrawLeverageResponse.userRequestId, req.useJito, handoffTxns);
         return txSig;
     }
     /**
@@ -437,7 +451,7 @@ class Client extends api_1.ApiClient {
         };
         const body = await this.handleApiCall(() => this.http.post("emissions/withdraw", JSON.stringify(req)));
         const withdrawEmissionsResponse = JSON.parse(body);
-        const txSig = await this.send(withdrawEmissionsResponse.unsignedBase64Tx, withdrawEmissionsResponse.userRequestId, false);
+        const txSig = await this.send(withdrawEmissionsResponse.unsignedBase64Tx, withdrawEmissionsResponse.userRequestId, req.useJito);
         return txSig;
     }
     async getPerformanceChartingExtension(clendAccount) {

package/dist/types.d.ts

@@ -70,13 +70,14 @@ export interface AdjustLeverageRequest {
     leverage: number;
     slippageBps: number;
     useJito: boolean;
+    isHandoff: boolean;
 }
 /**
  * Response for adjust leverage operation
  */
 export interface AdjustLeverageResponse {
     userRequestId: string;
-    unsignedBase64Tx: string;
+    txns: string[];
 }
 /**
  * Request to withdraw from a leveraged position
@@ -90,13 +91,14 @@ export interface WithdrawLeverageRequest {
     slippageBps: number;
     withdrawAll: boolean;
     useJito: boolean;
+    isHandoff: boolean;
 }
 /**
  * Response for withdraw leverage operation
  */
 export interface WithdrawLeverageResponse {
     userRequestId: string;
-    unsignedBase64Tx: string;
+    txns: string[];
 }
 /**
  * Request to withdraw emissions from a bank

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.4.4-handoff-dev-9a1c50a",
+  "version": "0.4.4-handoff-dev-6fafd92",
   "description": "HTTP client for Carrot Boost",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -84,6 +84,8 @@ export class Client extends ApiClient {
       console.log("dry run enabled, exiting before sending tx");
       return "";
     }
+    console.log("unsignedBase64Tx", unsignedBase64Tx);
+    if (handoffTxns.length > 0) console.log("handoffTxns", handoffTxns);
 
     // 1. Sign the primary transaction (User Transaction)
     const txBytes = Buffer.from(unsignedBase64Tx, "base64");
@@ -435,7 +437,7 @@ export class Client extends ApiClient {
     const txSig = await this.send(
       depositResponse.unsignedBase64Tx,
       depositResponse.userRequestId,
-      false,
+      req.useJito,
     );
 
     return txSig;
@@ -465,7 +467,7 @@ export class Client extends ApiClient {
     const txSig = await this.send(
       withdrawResponse.unsignedBase64Tx,
       withdrawResponse.userRequestId,
-      false,
+      req.useJito,
     );
 
     return txSig;
@@ -521,8 +523,6 @@ export class Client extends ApiClient {
     );
 
     return txSig;
-
-    return txSig;
   }
 
   /**
@@ -537,6 +537,7 @@ export class Client extends ApiClient {
     leverage: number,
     slippageBps: number,
     useJito: boolean,
+    isHandoff: boolean,
   ): Promise<string> {
     const req: AdjustLeverageRequest = {
       clendAccount,
@@ -545,6 +546,7 @@ export class Client extends ApiClient {
       leverage,
       slippageBps,
       useJito,
+      isHandoff,
     };
     const body = await this.handleApiCall(() =>
       this.http.post("leverage/adjust", JSON.stringify(req)),
@@ -552,10 +554,17 @@ export class Client extends ApiClient {
 
     const adjustLeverageResponse: AdjustLeverageResponse = JSON.parse(body);
 
+    let handoffTxns: string[] = [];
+    if (adjustLeverageResponse.txns.length > 1) {
+      handoffTxns = adjustLeverageResponse.txns.slice(1);
+    }
+    const userTx = adjustLeverageResponse.txns[0];
+
     const txSig = await this.send(
-      adjustLeverageResponse.unsignedBase64Tx,
+      userTx,
       adjustLeverageResponse.userRequestId,
-      false,
+      req.useJito,
+      handoffTxns,
     );
 
     return txSig;
@@ -575,6 +584,7 @@ export class Client extends ApiClient {
     slippageBps: number,
     withdrawAll: boolean,
     useJito: boolean,
+    isHandoff: boolean,
   ): Promise<string> {
     const req: WithdrawLeverageRequest = {
       clendAccount,
@@ -585,6 +595,7 @@ export class Client extends ApiClient {
       slippageBps,
       withdrawAll,
       useJito,
+      isHandoff,
     };
     const body = await this.handleApiCall(() =>
       this.http.post("leverage/withdraw", JSON.stringify(req)),
@@ -592,10 +603,17 @@ export class Client extends ApiClient {
 
     const withdrawLeverageResponse: WithdrawLeverageResponse = JSON.parse(body);
 
+    let handoffTxns: string[] = [];
+    if (withdrawLeverageResponse.txns.length > 1) {
+      handoffTxns = withdrawLeverageResponse.txns.slice(1);
+    }
+    const userTx = withdrawLeverageResponse.txns[0];
+
     const txSig = await this.send(
-      withdrawLeverageResponse.unsignedBase64Tx,
+      userTx,
       withdrawLeverageResponse.userRequestId,
-      true,
+      req.useJito,
+      handoffTxns,
     );
 
     return txSig;
@@ -621,7 +639,7 @@ export class Client extends ApiClient {
     const txSig = await this.send(
       withdrawEmissionsResponse.unsignedBase64Tx,
       withdrawEmissionsResponse.userRequestId,
-      false,
+      req.useJito,
     );
 
     return txSig;

package/src/types.ts

@@ -79,6 +79,7 @@ export interface AdjustLeverageRequest {
   leverage: number;
   slippageBps: number;
   useJito: boolean;
+  isHandoff: boolean;
 }
 
 /**
@@ -86,7 +87,7 @@ export interface AdjustLeverageRequest {
  */
 export interface AdjustLeverageResponse {
   userRequestId: string;
-  unsignedBase64Tx: string;
+  txns: string[];
 }
 
 /**
@@ -101,6 +102,7 @@ export interface WithdrawLeverageRequest {
   slippageBps: number;
   withdrawAll: boolean;
   useJito: boolean;
+  isHandoff: boolean;
 }
 
 /**
@@ -108,7 +110,7 @@ export interface WithdrawLeverageRequest {
  */
 export interface WithdrawLeverageResponse {
   userRequestId: string;
-  unsignedBase64Tx: string;
+  txns: string[];
 }
 
 /**