@glamsystems/glam-cli 1.0.3-alpha.5 → 1.0.3-alpha.6

package/main.js

@@ -5240,6 +5240,9 @@ async function fetchTokenPrices(pubkeys) {
 async function fetchTokensList() {
     const response = await fetch(`${JUPITER_API}/tokens/v2/tag?query=verified`);
     const data = await response.json();
+    if (!response.ok) {
+        throw new Error(`Failed to fetch tokens list and prices from Jupiter: ${response.status} ${data?.message}`);
+    }
     const tokenList = data?.map((t) => ({
         address: t.id,
         name: t.name,
@@ -5248,6 +5251,7 @@ async function fetchTokensList() {
         logoURI: t.icon,
         tags: t.tags,
         usdPrice: t.usdPrice,
+        slot: t.priceBlockId,
     }));
     return tokenList;
 }
@@ -8363,11 +8367,12 @@ const spl_token_1 = __webpack_require__(17);
 const constants_1 = __webpack_require__(25);
 const jupiter_1 = __webpack_require__(57);
 class Holding {
-    constructor(mintAddress, decimals, amount, price, protocol, protocolMeta = {}) {
+    constructor(mintAddress, decimals, amount, price, priceMeta = {}, protocol, protocolMeta = {}) {
         this.mintAddress = mintAddress;
         this.decimals = decimals;
         this.amount = amount;
         this.price = price;
+        this.priceMeta = priceMeta;
         this.protocol = protocol;
         this.protocolMeta = protocolMeta;
         this.uiAmount = (0, utils_1.toUiAmount)(this.amount, this.decimals);
@@ -8506,9 +8511,9 @@ class PriceClient {
             const tokenMint = new web3_js_1.PublicKey(item.address);
             tokenPricesMap.set(tokenMint, item);
         });
-        const tokenHoldings = this.getTokenHoldings(tokenPubkeys, accountsDataMap, tokenPricesMap);
-        const driftSpotHoldings = this.getDriftSpotHoldings(driftPubkeys.pkKeys(), driftSpotMarketsMap, accountsDataMap, tokenPricesMap);
-        const kaminoLendHoldings = this.getKaminoLendHoldings(kaminoPubkeys.pkKeys(), kaminoReservesMap, accountsDataMap, tokenPricesMap);
+        const tokenHoldings = this.getTokenHoldings(tokenPubkeys, accountsDataMap, tokenPricesMap, "Jupiter");
+        const driftSpotHoldings = this.getDriftSpotHoldings(driftPubkeys.pkKeys(), driftSpotMarketsMap, accountsDataMap, tokenPricesMap, "Jupiter");
+        const kaminoLendHoldings = this.getKaminoLendHoldings(kaminoPubkeys.pkKeys(), kaminoReservesMap, accountsDataMap, tokenPricesMap, "Jupiter");
         const timestamp = accountsDataMap
             .get(web3_js_1.SYSVAR_CLOCK_PUBKEY)
             .readUInt32LE(32);
@@ -8569,7 +8574,7 @@ class PriceClient {
         }
         return obligationReservesMap;
     }
-    getTokenHoldings(tokenAccountPubkeys, accountsDataMap, tokenPricesMap) {
+    getTokenHoldings(tokenAccountPubkeys, accountsDataMap, tokenPricesMap, priceSource) {
         const holdings = [];
         if (tokenAccountPubkeys.length === 0) {
             return holdings;
@@ -8579,7 +8584,10 @@ class PriceClient {
             const tokenInfo = tokenPricesMap.get(mint);
             if (tokenInfo) {
                 const { decimals, usdPrice } = tokenInfo;
-                const holding = new Holding(mint, decimals, new anchor_1.BN(amount), usdPrice, "Token", {
+                const holding = new Holding(mint, decimals, new anchor_1.BN(amount), usdPrice, {
+                    slot: tokenInfo.slot,
+                    source: priceSource,
+                }, "Token", {
                     tokenAccount: pubkey,
                 });
                 holdings.push(holding);
@@ -8587,7 +8595,7 @@ class PriceClient {
         }
         return holdings;
     }
-    getDriftSpotHoldings(userPubkeys, spotMarketsMap, accountsDataMap, tokenPricesMap) {
+    getDriftSpotHoldings(userPubkeys, spotMarketsMap, accountsDataMap, tokenPricesMap, priceSource) {
         const holdings = [];
         for (const userPda of userPubkeys) {
             const { spotPositions } = (0, utils_1.decodeUser)(accountsDataMap.get(userPda));
@@ -8599,7 +8607,10 @@ class PriceClient {
                     : cumulativeDepositInterest;
                 const amount = this.drift.calcSpotBalanceBn(scaledBalance, decimals, interest);
                 const direction = Object.keys(balanceType)[0];
-                const holding = new Holding(mint, decimals, amount, tokenPricesMap.get(mint).usdPrice, "DriftProtocol", {
+                const holding = new Holding(mint, decimals, amount, tokenPricesMap.get(mint).usdPrice, {
+                    slot: tokenPricesMap.get(mint).slot,
+                    source: priceSource,
+                }, "DriftProtocol", {
                     user: userPda,
                     marketIndex: marketIndex,
                     direction: direction,
@@ -8609,7 +8620,7 @@ class PriceClient {
         }
         return holdings;
     }
-    getKaminoLendHoldings(obligationPubkeys, reservesMap, accountsDataMap, tokenPricesMap) {
+    getKaminoLendHoldings(obligationPubkeys, reservesMap, accountsDataMap, tokenPricesMap, priceSource) {
         const holdings = [];
         for (const obligation of obligationPubkeys) {
             const { deposits, borrows } = this.klend.parseObligation(obligation, accountsDataMap.get(obligation));
@@ -8619,7 +8630,10 @@ class PriceClient {
                     .div(parsedReserve.collateralExchangeRate)
                     .floor();
                 const amount = new anchor_1.BN(supplyAmount.toString());
-                const holding = new Holding(parsedReserve.liquidityMint, parsedReserve.liquidityMintDecimals, amount, tokenPricesMap.get(parsedReserve.liquidityMint).usdPrice, "KaminoLend", {
+                const holding = new Holding(parsedReserve.liquidityMint, parsedReserve.liquidityMintDecimals, amount, tokenPricesMap.get(parsedReserve.liquidityMint).usdPrice, {
+                    slot: tokenPricesMap.get(parsedReserve.liquidityMint).slot,
+                    source: priceSource,
+                }, "KaminoLend", {
                     obligation,
                     market: parsedReserve.market,
                     reserve,
@@ -8636,7 +8650,10 @@ class PriceClient {
                     .div(obligationCumulativeBorrowRate)
                     .ceil();
                 const amount = new anchor_1.BN(borrowAmount.toString());
-                const holding = new Holding(parsedReserve.liquidityMint, parsedReserve.liquidityMintDecimals, amount, tokenPricesMap.get(parsedReserve.liquidityMint).usdPrice, "KaminoLend", {
+                const holding = new Holding(parsedReserve.liquidityMint, parsedReserve.liquidityMintDecimals, amount, tokenPricesMap.get(parsedReserve.liquidityMint).usdPrice, {
+                    slot: tokenPricesMap.get(parsedReserve.liquidityMint).slot,
+                    source: priceSource,
+                }, "KaminoLend", {
                     obligation,
                     market: parsedReserve.market,
                     reserve,
@@ -10418,7 +10435,8 @@ class CctpClient {
             const ix = await this.buildReceiveMessageIx(sourceDomain, message);
             receiveMessageIxs.push(ix);
         }
-        const tx = new web3_js_1.Transaction().add(...receiveMessageIxs);
+        const createUsdcAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(this.base.signer, this.base.getVaultAta(constants_1.USDC), this.base.vaultPda, constants_1.USDC);
+        const tx = new web3_js_1.Transaction().add(createUsdcAtaIx, ...receiveMessageIxs);
         const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return await this.base.sendAndConfirm(vTx);
     }
@@ -14150,7 +14168,7 @@ program
     initialize(config, skipSimulation);
     await (0, idl_1.idlCheck)(context.glamClient);
 })
-    .version("1.0.3-alpha.5");
+    .version("1.0.3-alpha.6");
 program
     .command("env")
     .description("Display current environment setup")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glamsystems/glam-cli",
-  "version": "1.0.3-alpha.5",
+  "version": "1.0.3-alpha.6",
   "description": "CLI for interacting with the GLAM Protocol",
   "main": "./main.js",
   "bin": {
@@ -21,7 +21,7 @@
     "node": ">=20.18.0"
   },
   "dependencies": {
-    "@glamsystems/glam-sdk": "1.0.3-alpha.5",
+    "@glamsystems/glam-sdk": "1.0.3-alpha.6",
     "@switchboard-xyz/common": "^3.0.0",
     "commander": "^11.1.0",
     "decimal.js": "^10.6.0",