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

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;
     }
@@ -10826,6 +10846,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 +10894,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";
             }
@@ -14082,7 +14106,7 @@ program
     initialize(config, skipSimulation);
     await (0, idl_1.idlCheck)(context.glamClient);
 })
-    .version("1.0.3-alpha.3");
+    .version("1.0.3-alpha.4");
 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.4",
   "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.4",
     "@switchboard-xyz/common": "^3.0.0",
     "commander": "^11.1.0",
     "decimal.js": "^10.6.0",