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

package/main.js

@@ -3773,15 +3773,14 @@ class BaseClient {
         }).compileToV0Message(lookupTableAccounts));
     }
     async sendAndConfirm(tx, additionalSigners = []) {
-        const connection = this.provider.connection;
         // Mainnet only: use dedicated connection for sending transactions if available
         const txConnection = this.cluster === clientConfig_1.ClusterNetwork.Mainnet
             ? new web3_js_1.Connection(process.env?.NEXT_PUBLIC_TX_RPC ||
-                process.env.TX_RPC ||
-                connection.rpcEndpoint, {
-                commitment: "confirmed",
+                process.env?.TX_RPC ||
+                this.connection.rpcEndpoint, {
+                commitment: this.connection.commitment,
             })
-            : connection;
+            : this.connection;
         // This is just a convenient method so that in tests we can send legacy
         // txs, for example transfer SOL, create ATA, etc.
         if (tx instanceof web3_js_1.Transaction) {
@@ -3789,38 +3788,59 @@ class BaseClient {
                 skipPreflight: true,
             });
         }
-        let serializedTx;
         // Anchor provider.sendAndConfirm forces a signature with the wallet, which we don't want
         // https://github.com/coral-xyz/anchor/blob/v0.30.0/ts/packages/anchor/src/provider.ts#L159
-        const wallet = this.wallet;
-        const signedTx = await wallet.signTransaction(tx);
+        const signedTx = await this.wallet.signTransaction(tx);
         if (additionalSigners && additionalSigners.length > 0) {
             signedTx.sign(additionalSigners);
         }
-        serializedTx = signedTx.serialize();
+        const serializedTx = signedTx.serialize();
+        // skip simulation since we just did it to compute CUs
+        // however this means that we need to reconstruct the error, if
+        // the tx fails onchain execution.
         const txSig = await txConnection.sendRawTransaction(serializedTx, {
-            // skip simulation since we just did it to compute CUs
-            // however this means that we need to reconstruct the error, if
-            // the tx fails on chain execution.
             skipPreflight: true,
         });
         if (process.env.NODE_ENV === "development") {
             console.log("Confirming tx:", txSig);
         }
-        const latestBlockhash = await this.blockhashWithCache.get();
-        const res = await connection.confirmTransaction({
-            ...latestBlockhash,
-            signature: txSig,
-        });
+        const res = await this.confirmTransaction(txSig);
         // if the tx fails, throw an error including logs
         if (res.value.err) {
-            const errTx = await connection.getTransaction(txSig, {
+            const errTx = await this.connection.getTransaction(txSig, {
                 maxSupportedTransactionVersion: 0,
             });
             throw new error_1.GlamError((0, transaction_1.parseProgramLogs)(errTx?.meta?.logMessages), errTx?.meta?.err || undefined, errTx?.meta?.logMessages || []);
         }
         return txSig;
     }
+    async confirmTransaction(txSig) {
+        const useWebSocket = !(process.env?.NEXT_PUBLIC_WEBSOCKET_DISABLED ||
+            process.env?.WEBSOCKET_DISABLED);
+        if (useWebSocket) {
+            const latestBlockhash = await this.blockhashWithCache.get();
+            return await this.connection.confirmTransaction({
+                ...latestBlockhash,
+                signature: txSig,
+            });
+        }
+        if (process.env.NODE_ENV === "development") {
+            console.warn("WebSocket disabled, falling back to polling signature status");
+        }
+        const maxRetries = 60;
+        const retryDelayMs = 1000;
+        for (let i = 0; i < maxRetries; i++) {
+            const status = await this.connection.getSignatureStatus(txSig);
+            if (status?.value?.confirmationStatus === "confirmed" ||
+                status?.value?.confirmationStatus === "finalized" ||
+                status?.value?.err) {
+                return { value: { err: status.value.err } };
+            }
+            await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
+        }
+        const expiry = (maxRetries * retryDelayMs) / 1000;
+        throw new Error(`Transaction confirmation timeout after ${expiry} seconds.`);
+    }
     get connection() {
         return this.provider.connection;
     }
@@ -8461,7 +8481,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();
@@ -8489,7 +8509,9 @@ class PriceClient {
         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 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));
@@ -10448,9 +10470,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");
@@ -10654,7 +10684,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;
     }
     /**
@@ -10826,6 +10863,7 @@ class CliConfig {
         this.cluster = config.cluster || "";
         this.json_rpc_url = config.json_rpc_url || "";
         this.tx_rpc_url = config.tx_rpc_url || "";
+        this.websocket_disabled = config.websocket_disabled || false;
         this.keypair_path = config.keypair_path || "";
         this.glam_api = config.glam_api;
         this.priority_fee = config.priority_fee;
@@ -10873,6 +10911,9 @@ class CliConfig {
             if (cliConfig.tx_rpc_url) {
                 process.env.TX_RPC = cliConfig.tx_rpc_url;
             }
+            if (cliConfig.websocket_disabled) {
+                process.env.WEBSOCKET_DISABLED = "1";
+            }
             if (cliConfig.glam_api) {
                 process.env.GLAM_API = cliConfig.glam_api || "https://api.glam.systems";
             }
@@ -13043,37 +13084,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")
@@ -13295,6 +13305,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")
@@ -13642,15 +13704,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")
@@ -14082,7 +14150,7 @@ program
     initialize(config, skipSimulation);
     await (0, idl_1.idlCheck)(context.glamClient);
 })
-    .version("1.0.3-alpha.3");
+    .version("1.0.3-alpha.5");
 program
     .command("env")
     .description("Display current environment setup")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glamsystems/glam-cli",
-  "version": "1.0.3-alpha.3",
+  "version": "1.0.3-alpha.5",
   "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.3",
+    "@glamsystems/glam-sdk": "1.0.3-alpha.5",
     "@switchboard-xyz/common": "^3.0.0",
     "commander": "^11.1.0",
     "decimal.js": "^10.6.0",