@glamsystems/glam-sdk 1.0.9 → 1.0.11

package/index.cjs.js

@@ -36,7 +36,7 @@ var borsh__namespace = /*#__PURE__*/_interopNamespaceDefault(borsh);
 var address$f = "GLAMpaME8wdTEzxtiYEAa5yD8fZbxZiz2hNtV58RZiEz";
 var metadata$f = {
     name: "glam_protocol",
-    version: "1.0.2",
+    version: "1.0.3",
     spec: "0.1.0",
     description: "Glam Protocol"
 };
@@ -1807,6 +1807,9 @@ var types$f = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -3298,6 +3301,57 @@ var instructions$e = [
             }
         ]
     },
+    {
+        name: "update_fee_authority",
+        discriminator: [
+            31,
+            223,
+            200,
+            21,
+            114,
+            158,
+            65,
+            61
+        ],
+        accounts: [
+            {
+                name: "global_config",
+                writable: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                103,
+                                108,
+                                111,
+                                98,
+                                97,
+                                108,
+                                45,
+                                99,
+                                111,
+                                110,
+                                102,
+                                105,
+                                103
+                            ]
+                        }
+                    ]
+                }
+            },
+            {
+                name: "fee_authority",
+                signer: true
+            }
+        ],
+        args: [
+            {
+                name: "fee_authority",
+                type: "pubkey"
+            }
+        ]
+    },
     {
         name: "update_protocol_fees",
         discriminator: [
@@ -3580,18 +3634,30 @@ var types$e = [
                 },
                 {
                     name: "referrer",
+                    docs: [
+                        "Default GLAM referrer"
+                    ],
                     type: "pubkey"
                 },
                 {
                     name: "base_fee_bps",
+                    docs: [
+                        "Default protocol base fee applied to all vaults"
+                    ],
                     type: "u16"
                 },
                 {
                     name: "flow_fee_bps",
+                    docs: [
+                        "Default protocol flow fee applied to all vaults"
+                    ],
                     type: "u16"
                 },
                 {
                     name: "asset_metas",
+                    docs: [
+                        "List of assets and their oracle configs supported by the protocol"
+                    ],
                     type: {
                         vec: {
                             defined: {
@@ -3687,7 +3753,7 @@ var GlamConfigIdlJson = {
 var address$d = "GM1NtvvnSXUptTrMCqbogAdZJydZSNv98DoU5AZVLmGh";
 var metadata$d = {
     name: "glam_mint",
-    version: "1.0.1",
+    version: "1.0.2",
     spec: "0.1.0",
     description: "GLAM mint program"
 };
@@ -6503,6 +6569,167 @@ var instructions$d = [
             }
         ]
     },
+    {
+        name: "price_single_asset_vault",
+        docs: [
+            "Prices a single asset vault."
+        ],
+        discriminator: [
+            93,
+            213,
+            219,
+            25,
+            38,
+            74,
+            9,
+            167
+        ],
+        accounts: [
+            {
+                name: "glam_state",
+                writable: true
+            },
+            {
+                name: "glam_vault",
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                118,
+                                97,
+                                117,
+                                108,
+                                116
+                            ]
+                        },
+                        {
+                            kind: "account",
+                            path: "glam_state"
+                        }
+                    ],
+                    program: {
+                        kind: "const",
+                        value: [
+                            227,
+                            199,
+                            235,
+                            230,
+                            176,
+                            132,
+                            243,
+                            117,
+                            43,
+                            131,
+                            173,
+                            18,
+                            78,
+                            255,
+                            26,
+                            50,
+                            209,
+                            135,
+                            86,
+                            219,
+                            140,
+                            126,
+                            61,
+                            255,
+                            0,
+                            218,
+                            252,
+                            224,
+                            172,
+                            8,
+                            223,
+                            207
+                        ]
+                    }
+                }
+            },
+            {
+                name: "signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "base_asset_ata"
+            },
+            {
+                name: "integration_authority",
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                105,
+                                110,
+                                116,
+                                101,
+                                103,
+                                114,
+                                97,
+                                116,
+                                105,
+                                111,
+                                110,
+                                45,
+                                97,
+                                117,
+                                116,
+                                104,
+                                111,
+                                114,
+                                105,
+                                116,
+                                121
+                            ]
+                        }
+                    ]
+                }
+            },
+            {
+                name: "glam_protocol",
+                address: "GLAMpaME8wdTEzxtiYEAa5yD8fZbxZiz2hNtV58RZiEz"
+            },
+            {
+                name: "event_authority",
+                optional: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                95,
+                                95,
+                                101,
+                                118,
+                                101,
+                                110,
+                                116,
+                                95,
+                                97,
+                                117,
+                                116,
+                                104,
+                                111,
+                                114,
+                                105,
+                                116,
+                                121
+                            ]
+                        }
+                    ]
+                }
+            },
+            {
+                name: "event_program",
+                optional: true,
+                address: "GM1NtvvnSXUptTrMCqbogAdZJydZSNv98DoU5AZVLmGh"
+            }
+        ],
+        args: []
+    },
     {
         name: "price_stake_accounts",
         discriminator: [
@@ -8315,6 +8542,9 @@ var types$d = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -8390,7 +8620,7 @@ var types$d = [
                 },
                 {
                     name: "priority",
-                    type: "u8"
+                    type: "i8"
                 },
                 {
                     name: "padding",
@@ -8885,18 +9115,30 @@ var types$d = [
                 },
                 {
                     name: "referrer",
+                    docs: [
+                        "Default GLAM referrer"
+                    ],
                     type: "pubkey"
                 },
                 {
                     name: "base_fee_bps",
+                    docs: [
+                        "Default protocol base fee applied to all vaults"
+                    ],
                     type: "u16"
                 },
                 {
                     name: "flow_fee_bps",
+                    docs: [
+                        "Default protocol flow fee applied to all vaults"
+                    ],
                     type: "u16"
                 },
                 {
                     name: "asset_metas",
+                    docs: [
+                        "List of assets and their oracle configs supported by the protocol"
+                    ],
                     type: {
                         vec: {
                             defined: {
@@ -10075,6 +10317,9 @@ var types$c = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -13649,6 +13894,9 @@ var types$b = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -17107,6 +17355,9 @@ var types$a = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -18804,6 +19055,9 @@ var types$9 = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -20400,6 +20654,9 @@ var types$8 = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -21641,6 +21898,9 @@ var types$7 = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -22684,7 +22944,7 @@ var ExtCctpIdlJson = {
 var address$6 = "gstgptmbgJVi5f8ZmSRVZjZkDQwqKa3xWuUtD5WmJHz";
 var metadata$6 = {
     name: "glam_protocol",
-    version: "1.0.2",
+    version: "1.0.3",
     spec: "0.1.0",
     description: "Glam Protocol"
 };
@@ -24530,6 +24790,9 @@ var types$6 = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -25796,7 +26059,7 @@ var GlamProtocolIdlJsonStaging = {
 var address$5 = "gstgm1M39mhgnvgyScGUDRwNn5kNVSd97hTtyow1Et5";
 var metadata$5 = {
     name: "glam_mint",
-    version: "1.0.1",
+    version: "1.0.2",
     spec: "0.1.0",
     description: "GLAM mint program"
 };
@@ -28612,6 +28875,167 @@ var instructions$5 = [
             }
         ]
     },
+    {
+        name: "price_single_asset_vault",
+        docs: [
+            "Prices a single asset vault."
+        ],
+        discriminator: [
+            93,
+            213,
+            219,
+            25,
+            38,
+            74,
+            9,
+            167
+        ],
+        accounts: [
+            {
+                name: "glam_state",
+                writable: true
+            },
+            {
+                name: "glam_vault",
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                118,
+                                97,
+                                117,
+                                108,
+                                116
+                            ]
+                        },
+                        {
+                            kind: "account",
+                            path: "glam_state"
+                        }
+                    ],
+                    program: {
+                        kind: "const",
+                        value: [
+                            10,
+                            55,
+                            49,
+                            193,
+                            142,
+                            247,
+                            75,
+                            193,
+                            33,
+                            61,
+                            5,
+                            218,
+                            254,
+                            219,
+                            143,
+                            206,
+                            156,
+                            138,
+                            14,
+                            32,
+                            89,
+                            232,
+                            248,
+                            173,
+                            46,
+                            77,
+                            46,
+                            206,
+                            189,
+                            171,
+                            68,
+                            237
+                        ]
+                    }
+                }
+            },
+            {
+                name: "signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "base_asset_ata"
+            },
+            {
+                name: "integration_authority",
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                105,
+                                110,
+                                116,
+                                101,
+                                103,
+                                114,
+                                97,
+                                116,
+                                105,
+                                111,
+                                110,
+                                45,
+                                97,
+                                117,
+                                116,
+                                104,
+                                111,
+                                114,
+                                105,
+                                116,
+                                121
+                            ]
+                        }
+                    ]
+                }
+            },
+            {
+                name: "glam_protocol",
+                address: "gstgptmbgJVi5f8ZmSRVZjZkDQwqKa3xWuUtD5WmJHz"
+            },
+            {
+                name: "event_authority",
+                optional: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                95,
+                                95,
+                                101,
+                                118,
+                                101,
+                                110,
+                                116,
+                                95,
+                                97,
+                                117,
+                                116,
+                                104,
+                                111,
+                                114,
+                                105,
+                                116,
+                                121
+                            ]
+                        }
+                    ]
+                }
+            },
+            {
+                name: "event_program",
+                optional: true,
+                address: "gstgm1M39mhgnvgyScGUDRwNn5kNVSd97hTtyow1Et5"
+            }
+        ],
+        args: []
+    },
     {
         name: "price_stake_accounts",
         discriminator: [
@@ -30424,6 +30848,9 @@ var types$5 = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -30499,7 +30926,7 @@ var types$5 = [
                 },
                 {
                     name: "priority",
-                    type: "u8"
+                    type: "i8"
                 },
                 {
                     name: "padding",
@@ -30994,18 +31421,30 @@ var types$5 = [
                 },
                 {
                     name: "referrer",
+                    docs: [
+                        "Default GLAM referrer"
+                    ],
                     type: "pubkey"
                 },
                 {
                     name: "base_fee_bps",
+                    docs: [
+                        "Default protocol base fee applied to all vaults"
+                    ],
                     type: "u16"
                 },
                 {
                     name: "flow_fee_bps",
+                    docs: [
+                        "Default protocol flow fee applied to all vaults"
+                    ],
                     type: "u16"
                 },
                 {
                     name: "asset_metas",
+                    docs: [
+                        "List of assets and their oracle configs supported by the protocol"
+                    ],
                     type: {
                         vec: {
                             defined: {
@@ -32184,6 +32623,9 @@ var types$4 = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -35758,6 +36200,9 @@ var types$3 = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -39216,6 +39661,9 @@ var types$2 = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -40912,6 +41360,9 @@ var types$1 = [
                 },
                 {
                     name: "Mint"
+                },
+                {
+                    name: "SingleAssetVault"
                 }
             ]
         }
@@ -45251,6 +45702,20 @@ function getGlobalConfigPda() {
     const { permissions } = parseProtocolPermissionsBitmask(integrationProgram, protocolBitflag, permissionsBitmask);
     return permissions.map((p)=>p.name);
 }
+/**
+ * Compare current and staged PublicKey arrays and return added/removed keys
+ */ function comparePublicKeyArrays(current, staged) {
+    const currentSet = new PkSet(current || []);
+    const stagedSet = new PkSet(staged);
+    return {
+        added: [
+            ...stagedSet
+        ].filter((pk)=>!currentSet.has(pk)),
+        removed: [
+            ...currentSet
+        ].filter((pk)=>!stagedSet.has(pk))
+    };
+}
 /**
  * Compare current and staged integrationAcls and return the differences
  */ function compareIntegrationAcls(current, staged) {
@@ -45434,13 +45899,12 @@ const JUPITER_SWAP_ERRORS = {
  */ function parseProgramLogs(logs) {
     // "Error Message:" indicates an anchor program error
     // Other messages are manually sourced & handled
-    const errorMsgLog = (logs || []).find((log)=>log.includes("Error Message:") || log.includes("Error: insufficient funds"));
+    const errorMsgLog = (logs || []).find((log)=>log.includes("Error Message:") || log.includes("Error: insufficient funds") || log.includes("Transfer: insufficient lamports"));
     if (errorMsgLog) {
         if (errorMsgLog.includes("Error Message:")) {
             return errorMsgLog.split("Error Message:")[1].trim();
-        } else {
-            return "Insufficient funds";
         }
+        return errorMsgLog;
     }
     // Match the following pattern to find Jupiter error code in logs
     // "Program JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4 failed: custom program error: 0x1788"
@@ -46412,7 +46876,7 @@ class JupiterApiClient {
         return new Date(createdAt * 1000).toISOString().split("T")[0] || "Unknown";
     }
     get sparkleKey() {
-        const pubkey = (this.mint?.equals(web3_js.PublicKey.default) ? this.id : this.mint) || web3_js.PublicKey.default;
+        const pubkey = (this.mint && !this.mint.equals(web3_js.PublicKey.default) ? this.mint : this.vault) || web3_js.PublicKey.default;
         return pubkey.toBase58();
     }
     get baseAssetTokenProgramId() {
@@ -46570,6 +47034,9 @@ class StateAccountType {
         if (s === "tokenizedVault") {
             return StateAccountType.TOKENIZED_VAULT;
         }
+        if (s === "singleAssetVault") {
+            return StateAccountType.SINGLE_ASSET_VAULT;
+        }
         if (s === "mint") {
             return StateAccountType.MINT;
         }
@@ -46585,6 +47052,9 @@ StateAccountType.TOKENIZED_VAULT = {
 StateAccountType.MINT = {
     mint: {}
 };
+StateAccountType.SINGLE_ASSET_VAULT = {
+    singleAssetVault: {}
+};
 
 class IntegrationPermissions {
     constructor(obj){
@@ -52384,6 +52854,16 @@ class PriceClient {
     async priceVaultIxs() {
         // Cache state model
         this.cachedStateModel = await this.base.fetchStateModel();
+        if (StateAccountType.equals(this.cachedStateModel.accountType, StateAccountType.SINGLE_ASSET_VAULT)) {
+            const baseAssetAta = this.base.getVaultAta(this.cachedStateModel.baseAssetMint, this.cachedStateModel.baseAssetTokenProgramId);
+            const ix = await this.base.mintProgram.methods.priceSingleAssetVault().accounts({
+                glamState: this.base.statePda,
+                baseAssetAta
+            }).instruction();
+            return [
+                ix
+            ];
+        }
         const priceVaultIx = await this.priceVaultTokensIx();
         // If there are no external assets, we don't need to price DeFi positions
         if ((this.cachedStateModel.externalPositions || []).length === 0) {
@@ -52848,6 +53328,10 @@ let TxBuilder$5 = class TxBuilder extends BaseTxBuilder {
         const mintProgram = this.client.base.mintProgram;
         const mintPda = getMintPda(glamState, 0, mintProgram.programId);
         const extraMetasPda = getExtraMetasPda(mintPda);
+        // Use glam hosted metadata as a fallback if uri is not provided
+        if (!initMintParams.uri) {
+            initMintParams.uri = `https://static.glam.systems/v0/token/metadata?key=${mintPda}`;
+        }
         const ix = await mintProgram.methods.initializeMint(new MintIdlModel(initMintParams), stateInitKey, initMintParams.accountType, decimals).accounts({
             glamState,
             signer: glamSigner,
@@ -53726,13 +54210,13 @@ let TxBuilder = class TxBuilder extends BaseTxBuilder {
     /**
    * Returns a transaction that calls CCTP's `depositForBurn` instruction that bridges USDC to another chain.
    * A keypair is generated for the message sent event account, which must be included as a transaction signer.
-   */ async bridgeUsdcIx(amount, domain, recipient, params, glamSigner) {
+   */ async bridgeUsdcIx(amount, domain, destinationAddress, params, glamSigner) {
         const usdcAddress = this.client.base.isMainnet ? USDC : USDC_DEVNET;
         const pdas = this.client.getDepositForBurnPdas(MESSAGE_TRANSMITTER_V2, TOKEN_MESSENGER_MINTER_V2, usdcAddress, domain);
         const depositForBurnParams = {
             amount,
             destinationDomain: domain,
-            mintRecipient: recipient,
+            mintRecipient: destinationAddress,
             destinationCaller: params.destinationCaller || web3_js.PublicKey.default,
             ...params
         };
@@ -53741,12 +54225,12 @@ let TxBuilder = class TxBuilder extends BaseTxBuilder {
             this.client.base.vaultPda.toBuffer()
         ], TOKEN_MESSENGER_MINTER_V2)[0];
         const messageSentEventAccountKeypair = web3_js.Keypair.generate();
-        const burnTokenAccount = this.client.base.getVaultAta(usdcAddress);
+        const senderUsdcAta = this.client.base.getVaultAta(usdcAddress);
         const ix = await this.client.base.extCctpProgram.methods.depositForBurn(depositForBurnParams).accounts({
             glamState: this.client.base.statePda,
             glamSigner,
             senderAuthorityPda: pdas.authorityPda,
-            burnTokenAccount,
+            burnTokenAccount: senderUsdcAta,
             denylistAccount,
             messageTransmitter: pdas.messageTransmitterAccount,
             tokenMessenger: pdas.tokenMessengerAccount,
@@ -53762,9 +54246,9 @@ let TxBuilder = class TxBuilder extends BaseTxBuilder {
             messageSentEventAccountKeypair
         ];
     }
-    async bridgeUsdcTx(amount, domain, recipient, params, txOptions) {
+    async bridgeUsdcTx(amount, domain, destinationAddress, params, txOptions) {
         const signer = txOptions.signer || this.client.base.signer;
-        const [ix, messageSentEventAccountKeypair] = await this.bridgeUsdcIx(amount, domain, recipient, params, signer);
+        const [ix, messageSentEventAccountKeypair] = await this.bridgeUsdcIx(amount, domain, destinationAddress, params, signer);
         const tx = await this.buildVersionedTx([
             ix
         ], txOptions);
@@ -53781,6 +54265,7 @@ let TxBuilder = class TxBuilder extends BaseTxBuilder {
         if (!decodedMessage || !decodedMessage?.decodedMessageBody || !decodedMessage?.decodedMessageBody?.burnToken) {
             throw new Error("Invalid message object: missing burnToken in decodedMessage");
         }
+        const recipientUsdcAta = this.client.base.getVaultAta(USDC);
         // message, attestation, eventNonce, burnToken are hex strings
         const pdas = await this.client.getReceiveMessagePdas(MESSAGE_TRANSMITTER_V2, TOKEN_MESSENGER_MINTER_V2, USDC, decodedMessage.decodedMessageBody.burnToken, sourceDomain.toString(), eventNonce);
         // raw ix data: [discriminator][message][attestation]
@@ -53867,7 +54352,7 @@ let TxBuilder = class TxBuilder extends BaseTxBuilder {
             {
                 isSigner: false,
                 isWritable: true,
-                pubkey: this.client.base.getVaultAta(USDC)
+                pubkey: recipientUsdcAta
             },
             {
                 isSigner: false,
@@ -53915,7 +54400,9 @@ let TxBuilder = class TxBuilder extends BaseTxBuilder {
             const ix = await this.receiveMessageIx(sourceDomain, message);
             receiveMessageIxs.push(ix);
         }
-        const createUsdcAtaIx = splToken.createAssociatedTokenAccountIdempotentInstruction(this.client.base.signer, this.client.base.getVaultAta(USDC), this.client.base.vaultPda, USDC);
+        const recipientWallet = this.client.base.vaultPda;
+        const recipientUsdcAta = this.client.base.getVaultAta(USDC);
+        const createUsdcAtaIx = splToken.createAssociatedTokenAccountIdempotentInstruction(this.client.base.signer, recipientUsdcAta, recipientWallet, USDC);
         return await this.buildVersionedTx([
             createUsdcAtaIx,
             ...receiveMessageIxs
@@ -53928,11 +54415,11 @@ class CctpClient {
    *
    * @param amount Amount of USDC to bridge (in smallest units)
    * @param domain Destination domain (e.g., 0 for Ethereum, 1 for Avalanche)
-   * @param recipient Recipient address on destination chain
+   * @param destinationAddress Destination address on target chain (EVM address as PublicKey)
    * @param params Additional parameters (maxFee, minFinalityThreshold)
    * @param txOptions Transaction options
-   */ async bridgeUsdc(amount, domain, recipient, params, txOptions = {}) {
-        const [tx, keypair] = await this.txBuilder.bridgeUsdcTx(new anchor.BN(amount), domain, recipient, params, txOptions);
+   */ async bridgeUsdc(amount, domain, destinationAddress, params, txOptions = {}) {
+        const [tx, keypair] = await this.txBuilder.bridgeUsdcTx(new anchor.BN(amount), domain, destinationAddress, params, txOptions);
         return await this.base.sendAndConfirm(tx, [
             keypair
         ]);
@@ -54051,10 +54538,10 @@ class CctpClient {
         };
     }
     /**
-   * Find all message accounts onchain for a given sender
+   * Find all message accounts onchain for a given sender wallet
    *
    * TODO: filter by burned token mint
-   */ async findV2Messages(sender, options) {
+   */ async findV2Messages(senderWallet, options) {
         const accounts = await getProgramAccounts(this.base.connection, MESSAGE_TRANSMITTER_V2, {
             ...options.commitment ? {
                 commitment: options.commitment
@@ -54066,7 +54553,7 @@ class CctpClient {
                 {
                     memcmp: {
                         offset: 300,
-                        bytes: sender.toBase58()
+                        bytes: senderWallet.toBase58()
                     }
                 }
             ]
@@ -54505,6 +54992,7 @@ exports.bytesToHex = bytesToHex;
 exports.charsToString = charsToString;
 exports.compareDelegateAcls = compareDelegateAcls;
 exports.compareIntegrationAcls = compareIntegrationAcls;
+exports.comparePublicKeyArrays = comparePublicKeyArrays;
 exports.evmAddressToBytes32 = evmAddressToBytes32;
 exports.evmAddressToPublicKey = evmAddressToPublicKey;
 exports.fetchAddressLookupTableAccounts = fetchAddressLookupTableAccounts;