@glamsystems/glam-cli 1.0.3-alpha.2 → 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;
     }
@@ -8427,9 +8447,31 @@ class PriceClient {
      * @returns VaultHoldings object containing all holdings
      */
     async getVaultHoldings(commitment, priceBaseAssetMint = web3_js_1.PublicKey.default) {
+        const vaultState = await this.base.fetchStateAccount(); // fetch state account only, don't need to build entire state model
+        const integrationAcls = vaultState.integrationAcls;
+        let driftPubkeys = new utils_1.PkMap(); // user -> markets map
+        let kaminoPubkeys = new utils_1.PkMap(); // obligation -> reserves map
+        const driftIntegrationAcl = integrationAcls.find((acl) => acl.integrationProgram.equals(this.base.extDriftProgram.programId));
+        if (driftIntegrationAcl) {
+            // drift protocol
+            if (driftIntegrationAcl.protocolsBitmask & 0b01) {
+                driftPubkeys = await this.getPubkeysForSpotHoldings(commitment);
+            }
+            // TODO: parse drift vaults holdings
+            if (driftIntegrationAcl.protocolsBitmask & 0b10) {
+            }
+        }
+        const kaminoIntegrationAcl = integrationAcls.find((acl) => acl.integrationProgram.equals(this.base.extKaminoProgram.programId));
+        if (kaminoIntegrationAcl) {
+            // kamino lending
+            if (kaminoIntegrationAcl.protocolsBitmask & 0b01) {
+                kaminoPubkeys = await this.getPubkeysForKaminoHoldings(commitment);
+            }
+            // TODO: parse kamino vaults holdings
+            if (kaminoIntegrationAcl.protocolsBitmask & 0b10) {
+            }
+        }
         const tokenPubkeys = await this.getPubkeysForTokenHoldings(commitment);
-        const driftPubkeys = await this.getPubkeysForSpotHoldings(commitment); // user -> markets map
-        const kaminoPubkeys = await this.getPubkeysForKaminoHoldings(commitment); // obligation -> reserves map
         const driftUsers = Array.from(driftPubkeys.pkKeys());
         const driftSpotMarkets = [...driftPubkeys.values()]
             .map((v) => Array.from(v.pkValues()))
@@ -8439,9 +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(
-        // cctpPubkeys,
-        ...driftUsers, ...driftSpotMarkets, ...kaminoObligations, ...kaminoReserves)));
+        const pubkeys = Array.from(new utils_1.PkSet(tokenPubkeys.concat(...driftUsers, ...driftSpotMarkets, ...kaminoObligations, ...kaminoReserves)));
         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();
@@ -10338,7 +10378,7 @@ const MESSAGE_RECEIVED_EVENT_DISCM = new Uint8Array([
     0xe7, 0x44, 0x2f, 0x4d, 0xad, 0xf1, 0x9d, 0xa6,
 ]);
 class CctpBridgeEvent {
-    constructor(amount, sourceDomain, sourceAddress, destinationDomain, destinationAddress, attestation, nonce, status) {
+    constructor(amount, sourceDomain, sourceAddress, destinationDomain, destinationAddress, attestation, nonce, status, txHash) {
         this.amount = amount;
         this.sourceDomain = sourceDomain;
         this.sourceAddress = sourceAddress;
@@ -10347,6 +10387,7 @@ class CctpBridgeEvent {
         this.attestation = attestation;
         this.nonce = nonce;
         this.status = status;
+        this.txHash = txHash;
         this.uiAmount = (0, utils_1.toUiAmount)(this.amount, 6);
     }
 }
@@ -10626,12 +10667,12 @@ class CctpClient {
             throw new Error("txHash or nonce is required");
         }
         const queryParams = new URLSearchParams();
-        if (txHash) {
-            queryParams.set("transactionHash", txHash);
-        }
-        else if (nonce) {
+        if (nonce) {
             queryParams.set("nonce", nonce);
         }
+        else if (txHash) {
+            queryParams.set("transactionHash", txHash);
+        }
         const resonse = await fetch(`https://iris-api.circle.com/v2/messages/${sourceDomain}?${queryParams}`);
         const { messages } = await resonse.json();
         return messages;
@@ -10660,7 +10701,7 @@ class CctpClient {
             if (sourceDomain === 5 && token !== constants_1.USDC.toBase58()) {
                 throw new Error("Invalid message, expected burn token to be USDC");
             }
-            return new CctpBridgeEvent(new anchor_1.BN(amount), sourceDomain, sourceAddress, destinationDomain, destinationAddress, attestation, nonce, status);
+            return new CctpBridgeEvent(new anchor_1.BN(amount), sourceDomain, sourceAddress, destinationDomain, destinationAddress, attestation, nonce, status, txHash ?? "");
         });
     }
     /**
@@ -10723,6 +10764,7 @@ class CctpClient {
                 for (const [sourceDomain, nonce] of sourceAndNonce) {
                     const events = await this.parseEventsFromAttestion(sourceDomain, {
                         nonce,
+                        txHash,
                     });
                     allEvents.push(...events);
                 }
@@ -10804,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;
@@ -10851,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";
             }
@@ -13632,17 +13678,19 @@ function installCctpCommands(program, context) {
     });
     program
         .command("list")
-        .option("-s, --since-slot <slot>", "Only fetch events since this slot", parseInt)
-        .description("List CCTP events of incoming & outgoing bridge transfers")
-        .action(async ({ sinceSlot }) => {
+        .option("-s, --since-slot <slot>", "Fetch events since this slot", parseInt)
+        .option("-b, --batch-size <size>", "Batch size of RPC requests. Higher values reduce latency but need higher RPC limits", parseInt)
+        .option("-c, --commitment <commitment>", "Commitment level", "confirmed")
+        .description("List CCTP events of incoming and outgoing bridge transfers")
+        .action(async ({ sinceSlot, commitment, batchSize }) => {
         const incomingEvents = await context.glamClient.cctp.getIncomingBridgeEvents({
-            batchSize: 5,
-            commitment: "confirmed",
+            batchSize,
+            commitment,
             minSlot: sinceSlot,
         });
         const outgoingEvents = await context.glamClient.cctp.getOutgoingBridgeEvents({
-            batchSize: 5,
-            commitment: "confirmed",
+            batchSize,
+            commitment,
             minSlot: sinceSlot,
         });
         console.log(JSON.stringify({
@@ -14058,7 +14106,7 @@ program
     initialize(config, skipSimulation);
     await (0, idl_1.idlCheck)(context.glamClient);
 })
-    .version("1.0.3-alpha.2");
+    .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.2",
+  "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.2",
+    "@glamsystems/glam-sdk": "1.0.3-alpha.4",
     "@switchboard-xyz/common": "^3.0.0",
     "commander": "^11.1.0",
     "decimal.js": "^10.6.0",

package/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1.  Definitions.
-
-    "License" shall mean the terms and conditions for use, reproduction,
-    and distribution as defined by Sections 1 through 9 of this document.
-
-    "Licensor" shall mean the copyright owner or entity authorized by
-    the copyright owner that is granting the License.
-
-    "Legal Entity" shall mean the union of the acting entity and all
-    other entities that control, are controlled by, or are under common
-    control with that entity. For the purposes of this definition,
-    "control" means (i) the power, direct or indirect, to cause the
-    direction or management of such entity, whether by contract or
-    otherwise, or (ii) ownership of fifty percent (50%) or more of the
-    outstanding shares, or (iii) beneficial ownership of such entity.
-
-    "You" (or "Your") shall mean an individual or Legal Entity
-    exercising permissions granted by this License.
-
-    "Source" form shall mean the preferred form for making modifications,
-    including but not limited to software source code, documentation
-    source, and configuration files.
-
-    "Object" form shall mean any form resulting from mechanical
-    transformation or translation of a Source form, including but
-    not limited to compiled object code, generated documentation,
-    and conversions to other media types.
-
-    "Work" shall mean the work of authorship, whether in Source or
-    Object form, made available under the License, as indicated by a
-    copyright notice that is included in or attached to the work
-    (an example is provided in the Appendix below).
-
-    "Derivative Works" shall mean any work, whether in Source or Object
-    form, that is based on (or derived from) the Work and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship. For the purposes
-    of this License, Derivative Works shall not include works that remain
-    separable from, or merely link (or bind by name) to the interfaces of,
-    the Work and Derivative Works thereof.
-
-    "Contribution" shall mean any work of authorship, including
-    the original version of the Work and any modifications or additions
-    to that Work or Derivative Works thereof, that is intentionally
-    submitted to Licensor for inclusion in the Work by the copyright owner
-    or by an individual or Legal Entity authorized to submit on behalf of
-    the copyright owner. For the purposes of this definition, "submitted"
-    means any form of electronic, verbal, or written communication sent
-    to the Licensor or its representatives, including but not limited to
-    communication on electronic mailing lists, source code control systems,
-    and issue tracking systems that are managed by, or on behalf of, the
-    Licensor for the purpose of discussing and improving the Work, but
-    excluding communication that is conspicuously marked or otherwise
-    designated in writing by the copyright owner as "Not a Contribution."
-
-    "Contributor" shall mean Licensor and any individual or Legal Entity
-    on behalf of whom a Contribution has been received by Licensor and
-    subsequently incorporated within the Work.
-
-2.  Grant of Copyright License. Subject to the terms and conditions of
-    this License, each Contributor hereby grants to You a perpetual,
-    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-    copyright license to reproduce, prepare Derivative Works of,
-    publicly display, publicly perform, sublicense, and distribute the
-    Work and such Derivative Works in Source or Object form.
-
-3.  Grant of Patent License. Subject to the terms and conditions of
-    this License, each Contributor hereby grants to You a perpetual,
-    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-    (except as stated in this section) patent license to make, have made,
-    use, offer to sell, sell, import, and otherwise transfer the Work,
-    where such license applies only to those patent claims licensable
-    by such Contributor that are necessarily infringed by their
-    Contribution(s) alone or by combination of their Contribution(s)
-    with the Work to which such Contribution(s) was submitted. If You
-    institute patent litigation against any entity (including a
-    cross-claim or counterclaim in a lawsuit) alleging that the Work
-    or a Contribution incorporated within the Work constitutes direct
-    or contributory patent infringement, then any patent licenses
-    granted to You under this License for that Work shall terminate
-    as of the date such litigation is filed.
-
-4.  Redistribution. You may reproduce and distribute copies of the
-    Work or Derivative Works thereof in any medium, with or without
-    modifications, and in Source or Object form, provided that You
-    meet the following conditions:
-
-    (a) You must give any other recipients of the Work or
-    Derivative Works a copy of this License; and
-
-    (b) You must cause any modified files to carry prominent notices
-    stating that You changed the files; and
-
-    (c) You must retain, in the Source form of any Derivative Works
-    that You distribute, all copyright, patent, trademark, and
-    attribution notices from the Source form of the Work,
-    excluding those notices that do not pertain to any part of
-    the Derivative Works; and
-
-    (d) If the Work includes a "NOTICE" text file as part of its
-    distribution, then any Derivative Works that You distribute must
-    include a readable copy of the attribution notices contained
-    within such NOTICE file, excluding those notices that do not
-    pertain to any part of the Derivative Works, in at least one
-    of the following places: within a NOTICE text file distributed
-    as part of the Derivative Works; within the Source form or
-    documentation, if provided along with the Derivative Works; or,
-    within a display generated by the Derivative Works, if and
-    wherever such third-party notices normally appear. The contents
-    of the NOTICE file are for informational purposes only and
-    do not modify the License. You may add Your own attribution
-    notices within Derivative Works that You distribute, alongside
-    or as an addendum to the NOTICE text from the Work, provided
-    that such additional attribution notices cannot be construed
-    as modifying the License.
-
-    You may add Your own copyright statement to Your modifications and
-    may provide additional or different license terms and conditions
-    for use, reproduction, or distribution of Your modifications, or
-    for any such Derivative Works as a whole, provided Your use,
-    reproduction, and distribution of the Work otherwise complies with
-    the conditions stated in this License.
-
-5.  Submission of Contributions. Unless You explicitly state otherwise,
-    any Contribution intentionally submitted for inclusion in the Work
-    by You to the Licensor shall be under the terms and conditions of
-    this License, without any additional terms or conditions.
-    Notwithstanding the above, nothing herein shall supersede or modify
-    the terms of any separate license agreement you may have executed
-    with Licensor regarding such Contributions.
-
-6.  Trademarks. This License does not grant permission to use the trade
-    names, trademarks, service marks, or product names of the Licensor,
-    except as required for reasonable and customary use in describing the
-    origin of the Work and reproducing the content of the NOTICE file.
-
-7.  Disclaimer of Warranty. Unless required by applicable law or
-    agreed to in writing, Licensor provides the Work (and each
-    Contributor provides its Contributions) on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-    implied, including, without limitation, any warranties or conditions
-    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-    PARTICULAR PURPOSE. You are solely responsible for determining the
-    appropriateness of using or redistributing the Work and assume any
-    risks associated with Your exercise of permissions under this License.
-
-8.  Limitation of Liability. In no event and under no legal theory,
-    whether in tort (including negligence), contract, or otherwise,
-    unless required by applicable law (such as deliberate and grossly
-    negligent acts) or agreed to in writing, shall any Contributor be
-    liable to You for damages, including any direct, indirect, special,
-    incidental, or consequential damages of any character arising as a
-    result of this License or out of the use or inability to use the
-    Work (including but not limited to damages for loss of goodwill,
-    work stoppage, computer failure or malfunction, or any and all
-    other commercial damages or losses), even if such Contributor
-    has been advised of the possibility of such damages.
-
-9.  Accepting Warranty or Additional Liability. While redistributing
-    the Work or Derivative Works thereof, You may choose to offer,
-    and charge a fee for, acceptance of support, warranty, indemnity,
-    or other liability obligations and/or rights consistent with this
-    License. However, in accepting such obligations, You may act only
-    on Your own behalf and on Your sole responsibility, not on behalf
-    of any other Contributor, and only if You agree to indemnify,
-    defend, and hold each Contributor harmless for any liability
-    incurred by, or claims asserted against, such Contributor by reason
-    of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.