@oydual31/more-vaults-sdk 0.2.5 → 0.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oydual31/more-vaults-sdk",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "TypeScript SDK for MoreVaults protocol — viem/wagmi and ethers.js",
   "type": "module",
   "exports": {

package/src/viem/crossChainFlows.ts

@@ -766,12 +766,18 @@ export async function quoteComposeFee(
  * @param fee              ETH to send (from quoteComposeFee). Covers readFee for D7.
  * @returns                Transaction hash of the compose execution
  */
+/**
+ * Event topic0 emitted by the escrow when initVaultActionRequest creates a new request.
+ * topic1 = GUID (bytes32). Used to extract the async request GUID from executeCompose receipts.
+ */
+const ESCROW_REQUEST_TOPIC = '0x304ac8b57de34b9e6118fb049ba362689cfcfab98c30c9d78e3e2e14be7e0972' as const
+
 export async function executeCompose(
   walletClient: WalletClient,
   hubPublicClient: PublicClient,
   composeData: ComposeData,
   fee: bigint,
-): Promise<{ txHash: Hash }> {
+): Promise<{ txHash: Hash; guid?: `0x${string}` }> {
   const account = walletClient.account!
   const endpoint = getAddress(composeData.endpoint)
 
@@ -811,5 +817,21 @@ export async function executeCompose(
     gas: 5_000_000n, // initVaultActionRequest + LZ Read is gas-heavy
   })
 
-  return { txHash }
+  // Parse the GUID from the escrow's event in the TX receipt.
+  // The composer calls initVaultActionRequest internally, which emits an event
+  // with topic1 = GUID. We need this GUID to poll finalization via waitForAsyncRequest.
+  let guid: `0x${string}` | undefined
+  try {
+    const receipt = await hubPublicClient.waitForTransactionReceipt({ hash: txHash, timeout: 60_000 })
+    for (const log of receipt.logs) {
+      if (log.topics[0] === ESCROW_REQUEST_TOPIC && log.topics[1]) {
+        guid = log.topics[1] as `0x${string}`
+        break
+      }
+    }
+  } catch {
+    // Receipt timeout — guid will be undefined, caller can still poll by balance
+  }
+
+  return { txHash, guid }
 }

package/src/viem/userHelpers.ts

@@ -625,17 +625,29 @@ export async function getUserPositionMultiChain(
             return { chainId: spokeChainId, balance: 0n }
           }
 
-          // Read balance on spoke chain
+          // Read balance + decimals on spoke chain
           const spokeClient = createChainClient(spokeChainId)
           if (!spokeClient) return { chainId: spokeChainId, balance: 0n }
 
-          const balance = await (spokeClient as PublicClient).readContract({
-            address: spokeOft,
-            abi: ERC20_ABI,
-            functionName: 'balanceOf',
-            args: [u],
+          const [rawBalance, spokeOftDecimals] = await (spokeClient as PublicClient).multicall({
+            contracts: [
+              { address: spokeOft, abi: ERC20_ABI, functionName: 'balanceOf', args: [u] },
+              { address: spokeOft, abi: METADATA_ABI, functionName: 'decimals' },
+            ],
+            allowFailure: false,
           })
 
+          // Normalize SHARE_OFT balance to vault decimals
+          // Spoke OFTs may use different decimals (e.g. 18) than the vault shares (e.g. 8)
+          let balance: bigint
+          if (spokeOftDecimals > decimals) {
+            balance = rawBalance / (10n ** BigInt(spokeOftDecimals - decimals))
+          } else if (spokeOftDecimals < decimals) {
+            balance = rawBalance * (10n ** BigInt(decimals - spokeOftDecimals))
+          } else {
+            balance = rawBalance
+          }
+
           return { chainId: spokeChainId, balance }
         } catch {
           return { chainId: spokeChainId, balance: 0n }