@glamsystems/glam-sdk 1.0.3-alpha.4 → 1.0.3-alpha.5

package/index.cjs.js

@@ -29641,7 +29641,7 @@ class PriceClient {
             ...kaminoPubkeys.values()
         ].map((v)=>Array.from(v.pkValues())).flat();
         // Dedupe keys and fetch all accounts in a single RPC call
-        const pubkeys = Array.from(new PkSet(tokenPubkeys.concat(...driftUsers, ...driftSpotMarkets, ...kaminoObligations, ...kaminoReserves)));
+        const pubkeys = Array.from(new PkSet(tokenPubkeys.concat(...driftUsers, ...driftSpotMarkets, ...kaminoObligations, ...kaminoReserves, web3_js.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 PkMap();
@@ -29669,7 +29669,7 @@ 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.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));
@@ -31443,9 +31443,15 @@ 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(MESSAGE_TRANSMITTER_V2, TOKEN_MESSENGER_MINTER_V2, USDC, burnToken, sourceDomain.toString(), eventNonce);
+        const pdas = await this.getReceiveMessagePdas(MESSAGE_TRANSMITTER_V2, TOKEN_MESSENGER_MINTER_V2, 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");
@@ -31712,7 +31718,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;
     }
     /**

package/index.esm.js

@@ -29621,7 +29621,7 @@ class PriceClient {
             ...kaminoPubkeys.values()
         ].map((v)=>Array.from(v.pkValues())).flat();
         // Dedupe keys and fetch all accounts in a single RPC call
-        const pubkeys = Array.from(new PkSet(tokenPubkeys.concat(...driftUsers, ...driftSpotMarkets, ...kaminoObligations, ...kaminoReserves)));
+        const pubkeys = Array.from(new PkSet(tokenPubkeys.concat(...driftUsers, ...driftSpotMarkets, ...kaminoObligations, ...kaminoReserves, 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 PkMap();
@@ -29649,7 +29649,7 @@ 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(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));
@@ -31423,9 +31423,15 @@ 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(MESSAGE_TRANSMITTER_V2, TOKEN_MESSENGER_MINTER_V2, USDC, burnToken, sourceDomain.toString(), eventNonce);
+        const pdas = await this.getReceiveMessagePdas(MESSAGE_TRANSMITTER_V2, TOKEN_MESSENGER_MINTER_V2, 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");
@@ -31692,7 +31698,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;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glamsystems/glam-sdk",
-  "version": "1.0.3-alpha.4",
+  "version": "1.0.3-alpha.5",
   "description": "TypeScript SDK for the GLAM Protocol",
   "main": "./index.cjs.js",
   "module": "./index.esm.js",