@glamsystems/glam-cli 1.0.3-alpha.4 → 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);
@@ -8481,7 +8486,7 @@ class PriceClient {
             .map((v) => Array.from(v.pkValues()))
             .flat();
         // Dedupe keys and fetch all accounts in a single RPC call
-        const pubkeys = Array.from(new utils_1.PkSet(tokenPubkeys.concat(...driftUsers, ...driftSpotMarkets, ...kaminoObligations, ...kaminoReserves)));
+        const pubkeys = Array.from(new utils_1.PkSet(tokenPubkeys.concat(...driftUsers, ...driftSpotMarkets, ...kaminoObligations, ...kaminoReserves, web3_js_1.SYSVAR_CLOCK_PUBKEY)));
         const { context: { slot }, value: accountsInfo, } = await this.base.provider.connection.getMultipleAccountsInfoAndContext(pubkeys, commitment);
         // Build a map of pubkey to account data for quick lookup
         const accountsDataMap = new utils_1.PkMap();
@@ -8506,10 +8511,12 @@ 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 timestamp = await this.base.connection.getBlockTime(slot);
+        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);
         const ret = new VaultHoldings(this.base.statePda, this.base.vaultPda, priceBaseAssetMint, slot, timestamp, commitment);
         tokenHoldings.forEach((holding) => ret.add(holding));
         driftSpotHoldings.forEach((holding) => ret.add(holding));
@@ -8567,7 +8574,7 @@ class PriceClient {
         }
         return obligationReservesMap;
     }
-    getTokenHoldings(tokenAccountPubkeys, accountsDataMap, tokenPricesMap) {
+    getTokenHoldings(tokenAccountPubkeys, accountsDataMap, tokenPricesMap, priceSource) {
         const holdings = [];
         if (tokenAccountPubkeys.length === 0) {
             return holdings;
@@ -8577,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);
@@ -8585,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));
@@ -8597,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,
@@ -8607,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));
@@ -8617,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,
@@ -8634,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,
@@ -10416,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);
     }
@@ -10468,9 +10488,17 @@ class CctpClient {
         ];
     }
     async buildReceiveMessageIx(sourceDomain, messageObj) {
-        const { message, attestation, eventNonce, decodedMessage: { decodedMessageBody: { burnToken }, }, } = messageObj;
+        const { message, attestation, eventNonce, decodedMessage, status } = messageObj;
+        if (status !== "complete") {
+            throw new Error(`Attestation status is ${status}, expected "complete"`);
+        }
+        if (!decodedMessage ||
+            !decodedMessage?.decodedMessageBody ||
+            !decodedMessage?.decodedMessageBody?.burnToken) {
+            throw new Error("Invalid message object: missing burnToken in decodedMessage");
+        }
         // message, attestation, eventNonce, burnToken are hex strings
-        const pdas = await this.getReceiveMessagePdas(constants_1.MESSAGE_TRANSMITTER_V2, constants_1.TOKEN_MESSENGER_MINTER_V2, constants_1.USDC, burnToken, sourceDomain.toString(), eventNonce);
+        const pdas = await this.getReceiveMessagePdas(constants_1.MESSAGE_TRANSMITTER_V2, constants_1.TOKEN_MESSENGER_MINTER_V2, constants_1.USDC, decodedMessage.decodedMessageBody.burnToken, sourceDomain.toString(), eventNonce);
         // raw ix data: [discriminator][message][attestation]
         const messageBuffer = Buffer.from(message.replace("0x", ""), "hex");
         const attestationBuffer = Buffer.from(attestation.replace("0x", ""), "hex");
@@ -10674,7 +10702,14 @@ class CctpClient {
             queryParams.set("transactionHash", txHash);
         }
         const resonse = await fetch(`https://iris-api.circle.com/v2/messages/${sourceDomain}?${queryParams}`);
+        if (resonse.status !== 200) {
+            const { error } = await resonse.json();
+            throw new Error(`Failed to fetch messages from Circle API: ${resonse.status} ${error}`);
+        }
         const { messages } = await resonse.json();
+        if (!(messages instanceof Array)) {
+            throw new Error("Invalid response from Circle API: messages not found");
+        }
         return messages;
     }
     /**
@@ -13067,37 +13102,6 @@ function installVaultCommands(program, context) {
             process.exit(1);
         }
     });
-    program
-        .command("add-asset")
-        .argument("<asset>", "Asset mint public key", utils_1.validatePublicKey)
-        .description("Add a new asset to allowlist")
-        .action(async (asset) => {
-        const stateModel = await context.glamClient.fetchStateModel();
-        const assetsSet = new Set([...stateModel.assets, asset].map((a) => a.toBase58()));
-        const assets = Array.from(assetsSet).map((a) => new web3_js_1.PublicKey(a));
-        const txSig = await context.glamClient.state.update({ assets }, context.txOptions);
-        console.log(`Added asset ${asset}: ${txSig}`);
-    });
-    program
-        .command("delete-asset")
-        .argument("<asset>", "Asset mint public key", utils_1.validatePublicKey)
-        .description("Delete an asset from allowlist")
-        .action(async (asset) => {
-        const stateModel = await context.glamClient.fetchStateModel();
-        if (asset.equals(stateModel.baseAssetMint)) {
-            console.error("Base asset cannot be deleted from allowlist");
-            process.exit(1);
-        }
-        const assetsSet = new Set(stateModel.assets.map((a) => a.toBase58()));
-        let removed = assetsSet.delete(asset.toBase58());
-        if (!removed) {
-            console.error("Asset not found in allowlist, nothing to delete");
-            process.exit(1);
-        }
-        const assets = Array.from(assetsSet).map((a) => new web3_js_1.PublicKey(a));
-        const txSig = await context.glamClient.state.update({ assets }, context.txOptions);
-        console.log(`Deleted asset ${asset}: ${txSig}`);
-    });
     program
         .command("set-enabled <enabled>")
         .description("Set GLAM state enabled or disabled")
@@ -13319,6 +13323,58 @@ function installVaultCommands(program, context) {
             }
         });
     });
+    program
+        .command("asset-allowlist")
+        .description("Get asset allowlist and corresponding token account")
+        .action(async () => {
+        const state = await context.glamClient.fetchStateAccount();
+        const mints = await (0, glam_sdk_1.fetchMintsAndTokenPrograms)(context.glamClient.connection, state.assets);
+        const data = mints.map(({ mint: { address, decimals }, tokenProgram }) => {
+            const tokenAccount = context.glamClient.getVaultAta(address, tokenProgram);
+            return {
+                assetMint: address,
+                decimals,
+                tokenAccount,
+                tokenProgram,
+            };
+        });
+        console.log(JSON.stringify(data, null, 2));
+    });
+    program
+        .command("add-asset")
+        .argument("<asset>", "Asset mint public key", utils_1.validatePublicKey)
+        .description("Add a new asset to allowlist")
+        .action(async (asset) => {
+        const state = await context.glamClient.fetchStateAccount();
+        const assetsSet = new glam_sdk_1.PkSet(state.assets);
+        if (assetsSet.has(asset)) {
+            console.error(`Asset ${asset} already allowlisted`);
+            process.exit(1);
+        }
+        const assets = Array.from(assetsSet.add(asset));
+        const txSig = await context.glamClient.state.update({ assets }, context.txOptions);
+        console.log(`Allowlisted asset ${asset}: ${txSig}`);
+    });
+    program
+        .command("delete-asset")
+        .argument("<asset>", "Asset mint public key", utils_1.validatePublicKey)
+        .description("Delete an asset from allowlist")
+        .action(async (asset) => {
+        const state = await context.glamClient.fetchStateAccount();
+        if (asset.equals(state.baseAssetMint)) {
+            console.error("Base asset should not be deleted from allowlist");
+            process.exit(1);
+        }
+        const assetsSet = new glam_sdk_1.PkSet(state.assets);
+        let removed = assetsSet.delete(asset);
+        if (!removed) {
+            console.error(`${asset} not found in allowlist, nothing to delete`);
+            process.exit(1);
+        }
+        const assets = Array.from(assetsSet);
+        const txSig = await context.glamClient.state.update({ assets }, context.txOptions);
+        console.log(`Deleted asset ${asset} from allowlist: ${txSig}`);
+    });
     program
         .command("holdings")
         .description("Get vault holdings")
@@ -13666,15 +13722,21 @@ function installCctpCommands(program, context) {
         .option("-n, --nonce <nonce>", "Nonce hex string (start with 0x)")
         .description("Receive USDC from an EVM chain. Either txHash or nonce is required.")
         .action(async (sourceDomain, { txHash, nonce }) => {
-        await context.glamClient.cctp.receiveUsdc(sourceDomain, {
-            txHash,
-            nonce,
-        }, {
-            ...context.txOptions,
-            lookupTables: [
-                new web3_js_1.PublicKey("qj4EYgsGpnRdt9rvQW3wWZR8JVaKPg9rG9EB8DNgfz8"), // CCTP lookup table
-            ],
-        });
+        try {
+            await context.glamClient.cctp.receiveUsdc(sourceDomain, {
+                txHash,
+                nonce,
+            }, {
+                ...context.txOptions,
+                lookupTables: [
+                    new web3_js_1.PublicKey("qj4EYgsGpnRdt9rvQW3wWZR8JVaKPg9rG9EB8DNgfz8"), // CCTP lookup table
+                ],
+            });
+        }
+        catch (e) {
+            console.error((0, utils_1.parseTxError)(e));
+            process.exit(1);
+        }
     });
     program
         .command("list")
@@ -14106,7 +14168,7 @@ program
     initialize(config, skipSimulation);
     await (0, idl_1.idlCheck)(context.glamClient);
 })
-    .version("1.0.3-alpha.4");
+    .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.4",
+  "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.4",
+    "@glamsystems/glam-sdk": "1.0.3-alpha.6",
     "@switchboard-xyz/common": "^3.0.0",
     "commander": "^11.1.0",
     "decimal.js": "^10.6.0",