@carrot-protocol/http-client 0.2.6 → 0.2.7-es2020-dev-83c2b79

package/dist/index.js

@@ -1,61 +1,54 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Client = void 0;
-exports.prepareUnsignedTx = prepareUnsignedTx;
-const cross_fetch_1 = __importDefault(require("cross-fetch"));
-const anchor_1 = require("@coral-xyz/anchor");
-const bs58_1 = require("bs58");
-class Client {
+import fetch from "cross-fetch";
+import { web3, BN } from "@coral-xyz/anchor";
+import { encode } from "bs58";
+export class Client {
     constructor(baseUrl, provider) {
         this.headers = { "Content-Type": "application/json" };
         this.baseUrl = baseUrl;
         this.provider = provider;
     }
     async index() {
-        const response = await (0, cross_fetch_1.default)(this.baseUrl);
+        const response = await fetch(this.baseUrl);
         checkResponse(response);
         const body = await response.json();
         console.log(JSON.stringify(body, undefined, 2));
     }
     async getVault(vault) {
         const url = new URL(`${this.baseUrl}/vault?vault=${vault.toString()}`);
-        const response = await (0, cross_fetch_1.default)(url, {
+        const response = await fetch(url, {
             method: "GET",
             headers: this.headers,
         });
         checkResponse(response);
         const rawBody = await response.json();
         let body = JSON.parse(JSON.stringify(rawBody));
-        body.address = new anchor_1.web3.PublicKey(body.address);
-        body.authority = new anchor_1.web3.PublicKey(body.authority);
-        body.shares = new anchor_1.web3.PublicKey(body.shares);
-        body.sharesSupply = new anchor_1.BN(body.sharesSupply);
+        body.address = new web3.PublicKey(body.address);
+        body.authority = new web3.PublicKey(body.authority);
+        body.shares = new web3.PublicKey(body.shares);
+        body.sharesSupply = new BN(body.sharesSupply);
         body.assets = body.assets.map((asset) => ({
             ...asset,
             assetId: Number(asset.assetId),
             balanceUsd: Number(asset.balanceUsd),
-            mint: new anchor_1.web3.PublicKey(asset.mint),
-            ata: new anchor_1.web3.PublicKey(asset.ata),
-            oracle: new anchor_1.web3.PublicKey(asset.oracle),
-            ataAmount: new anchor_1.BN(asset.ataAmount, "hex"),
+            mint: new web3.PublicKey(asset.mint),
+            ata: new web3.PublicKey(asset.ata),
+            oracle: new web3.PublicKey(asset.oracle),
+            ataAmount: new BN(asset.ataAmount, "hex"),
         }));
         body.strategies = body.strategies.map((strategy) => ({
-            address: new anchor_1.web3.PublicKey(strategy.address),
+            address: new web3.PublicKey(strategy.address),
             record: {
                 strategyId: Number(strategy.record.strategyId),
                 assetId: Number(strategy.record.assetId),
-                balance: new anchor_1.BN(strategy.record.balance, "hex"),
+                balance: new BN(strategy.record.balance, "hex"),
                 balanceUsd: Number(strategy.record.balanceUsd),
-                netEarnings: new anchor_1.BN(strategy.record.netEarnings, "hex"),
+                netEarnings: new BN(strategy.record.netEarnings, "hex"),
             },
             metadata: {
                 ...strategy.metadata,
                 strategyId: Number(strategy.metadata.strategyId),
-                assetMint: new anchor_1.web3.PublicKey(strategy.metadata.assetMint),
-                vault: new anchor_1.web3.PublicKey(strategy.metadata.vault),
+                assetMint: new web3.PublicKey(strategy.metadata.assetMint),
+                vault: new web3.PublicKey(strategy.metadata.vault),
             },
             strategyType: strategy.strategyType,
         }));
@@ -63,7 +56,7 @@ class Client {
     }
     async getVaultPerformance(vault) {
         const url = new URL(`${this.baseUrl}/performance?vault=${vault.toString()}`);
-        const response = await (0, cross_fetch_1.default)(url, {
+        const response = await fetch(url, {
             method: "GET",
             headers: this.headers,
         });
@@ -74,26 +67,26 @@ class Client {
         for (let strats of body.strategyAPY) {
             strats.apy = Number(strats.apy);
             strats.balanceUsd = Number(strats.balanceUsd);
-            strats.strategy = new anchor_1.web3.PublicKey(strats.strategy);
+            strats.strategy = new web3.PublicKey(strats.strategy);
             strats.vaultWeight = Number(strats.vaultWeight);
-            strats.assetMint = new anchor_1.web3.PublicKey(strats.assetMint);
+            strats.assetMint = new web3.PublicKey(strats.assetMint);
         }
         return body;
     }
     async getUser(vault) {
         const url = new URL(`${this.baseUrl}/user?vault=${vault.toString()}&user=${this.provider.publicKey.toString()}`);
-        const response = await (0, cross_fetch_1.default)(url, {
+        const response = await fetch(url, {
             method: "GET",
             headers: this.headers,
         });
         checkResponse(response);
         const body = JSON.parse(JSON.stringify(await response.json()));
-        body.solAmount = new anchor_1.BN(body.solAmount, "hex");
-        body.sharesAmount = new anchor_1.BN(body.sharesAmount, "hex");
+        body.solAmount = new BN(body.solAmount, "hex");
+        body.sharesAmount = new BN(body.sharesAmount, "hex");
         body.assets = body.assets.map((asset) => ({
             ...asset,
-            mint: new anchor_1.web3.PublicKey(asset.mint),
-            amount: new anchor_1.BN(asset.amount, "hex"),
+            mint: new web3.PublicKey(asset.mint),
+            amount: new BN(asset.amount, "hex"),
         }));
         return body;
     }
@@ -105,7 +98,7 @@ class Client {
             amount,
             assetMint,
         };
-        const response = await (0, cross_fetch_1.default)(url, {
+        const response = await fetch(url, {
             method: "POST",
             headers: this.headers,
             body: JSON.stringify(body),
@@ -124,7 +117,7 @@ class Client {
             amount,
             assetMint,
         };
-        const response = await (0, cross_fetch_1.default)(url, {
+        const response = await fetch(url, {
             method: "POST",
             headers: this.headers,
             body: JSON.stringify(body),
@@ -137,7 +130,7 @@ class Client {
     }
     async send(base64Tx) {
         const txBytes = Buffer.from(base64Tx, "base64");
-        const tx = anchor_1.web3.VersionedTransaction.deserialize(new Uint8Array(txBytes));
+        const tx = 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");
@@ -145,7 +138,7 @@ class Client {
             tx: encodedAndSignedTx,
         };
         const url = new URL(`${this.baseUrl}/send`);
-        const response = await (0, cross_fetch_1.default)(url, {
+        const response = await fetch(url, {
             method: "POST",
             headers: this.headers,
             body: JSON.stringify(sendRequest),
@@ -154,11 +147,10 @@ class Client {
         if (response.status !== 200) {
             throw new Error(`unexpected http status of ${response.status}`);
         }
-        return (0, bs58_1.encode)(txSig);
+        return encode(txSig);
     }
 }
-exports.Client = Client;
-async function prepareUnsignedTx(connection, payer, ixns, lutAddr, additionalSigner) {
+export async function prepareUnsignedTx(connection, payer, ixns, lutAddr, additionalSigner) {
     const lutAccounts = [];
     if (lutAddr) {
         const account = (await connection.getAddressLookupTable(lutAddr)).value;
@@ -167,12 +159,12 @@ async function prepareUnsignedTx(connection, payer, ixns, lutAddr, additionalSig
     const recentBh = await connection.getLatestBlockhash({
         commitment: "confirmed",
     });
-    const msg = new anchor_1.web3.TransactionMessage({
+    const msg = new web3.TransactionMessage({
         payerKey: payer,
         recentBlockhash: recentBh.blockhash,
         instructions: ixns,
     }).compileToV0Message(lutAccounts);
-    const tx = new anchor_1.web3.VersionedTransaction(msg);
+    const tx = new web3.VersionedTransaction(msg);
     let base64Tx = Buffer.from(tx.serialize()).toString("base64");
     if (additionalSigner) {
         const signedTx = await additionalSigner.wallet.signTransaction(tx);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@carrot-protocol/http-client",
-  "version": "0.2.6",
+  "version": "0.2.7-es2020-dev-83c2b79",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "build": "rm -rf dist node_modules && npm ci && tsc && npm pack",
+    "build": "rm -rf dist node_modules && npm i && tsc && npm pack",
     "fmt:check": "prettier --check src/",
     "fmt": "prettier --write src/"
   },