@oydual31/more-vaults-sdk 1.1.24 → 1.1.26

package/dist/ethers/index.cjs

@@ -344,6 +344,13 @@ var UNISWAP_V3_ROUTERS = {
   [747]: "0xeEDC6Ff75e1b10B903D9013c358e446a73d35341"
   // Flow EVM — FlowSwap V3 SwapRouter
 };
+var DEFAULT_LZ_ENDPOINT = "0x1a44076050125825900e736c501f859c50fe728c";
+var LZ_ENDPOINT_BY_CHAIN = {
+  [CHAIN_IDS.flowEVMMainnet]: "0xcb566e3b6934fa77258d68ea18e931fa75e1aaaa"
+};
+function getLzEndpoint(chainId) {
+  return LZ_ENDPOINT_BY_CHAIN[chainId] ?? DEFAULT_LZ_ENDPOINT;
+}
 var PUBLIC_RPCS = {
   1: ["https://ethereum-rpc.publicnode.com", "https://eth.drpc.org", "https://eth.llamarpc.com"],
   10: ["https://mainnet.optimism.io", "https://optimism-rpc.publicnode.com"],
@@ -1017,9 +1024,13 @@ async function detectStargateOft(provider, oft) {
     return false;
   }
 }
-var LZ_ENDPOINT = "0x1a44076050125825900e736c501f859c50fe728c";
+var LZ_ENDPOINT = DEFAULT_LZ_ENDPOINT;
 var EMPTY_HASH = "0x0000000000000000000000000000000000000000000000000000000000000000";
 var RECEIVED_HASH = "0x0000000000000000000000000000000000000000000000000000000000000001";
+var COMPOSE_SENT_TOPIC = "0x0c68e6a0b0fb0f33c52455a8da89b21fc640a3dd4a1b21d9bfcc8aeee4a43e84";
+var COMPOSE_SCAN_WINDOW_BLOCKS = 200000n;
+var COMPOSE_SCAN_CHUNK_SIZE = 2000n;
+var EXECUTE_COMPOSE_GAS_LIMIT = 5000000n;
 async function ensureAllowance2(signer, token, spender, amount) {
   const owner = await signer.getAddress();
   const erc20 = new ethers.Contract(token, ERC20_ABI, signer);
@@ -1147,8 +1158,13 @@ async function quoteComposeFee(provider, vault, spokeEid, receiver) {
     return 500000000000000n;
   }
 }
-async function executeCompose(signer, from, to, guid, message, fee, index = 0) {
-  const endpoint = new ethers.Contract(LZ_ENDPOINT, LZ_ENDPOINT_ABI, signer);
+async function executeCompose(signer, from, to, guid, message, fee, index = 0, hubChainId) {
+  let resolvedChainId = hubChainId;
+  if (resolvedChainId === void 0 && signer.provider) {
+    resolvedChainId = Number((await signer.provider.getNetwork()).chainId);
+  }
+  const endpointAddr = resolvedChainId ? getLzEndpoint(resolvedChainId) : LZ_ENDPOINT;
+  const endpoint = new ethers.Contract(endpointAddr, LZ_ENDPOINT_ABI, signer);
   const hash = await endpoint.composeQueue(from, to, guid, index);
   if (hash === EMPTY_HASH) {
     throw new Error("Compose not found in queue (hash = 0). Never sent or wrong parameters.");
@@ -1158,7 +1174,7 @@ async function executeCompose(signer, from, to, guid, message, fee, index = 0) {
   }
   const tx = await endpoint.lzCompose(from, to, guid, index, message, "0x", {
     value: fee,
-    gasLimit: 5000000n
+    gasLimit: EXECUTE_COMPOSE_GAS_LIMIT
   });
   const receipt = await tx.wait();
   return { receipt };
@@ -1183,7 +1199,6 @@ async function waitForCompose(hubProvider, composeData, receiver, pollIntervalMs
   );
   const knownFromAddresses = stargateChecks.filter((c) => c.isSg).map((c) => c.addr);
   const endpointContract = new ethers.Contract(endpoint, LZ_ENDPOINT_ABI, hubProvider);
-  const COMPOSE_SENT_TOPIC = "0x0c68e6a0b0fb0f33c52455a8da89b21fc640a3dd4a1b21d9bfcc8aeee4a43e84";
   let attempt = 0;
   let scannedUpTo = startBlock - 1n;
   while (Date.now() < deadline) {
@@ -1277,6 +1292,132 @@ async function waitForCompose(hubProvider, composeData, receiver, pollIntervalMs
     `Timeout waiting for compose after ${timeoutMs / 6e4} min. Check LayerZero scan for composer ${composeData.to}.`
   );
 }
+function decodeComposeMessage(message) {
+  const hex = message.startsWith("0x") ? message.slice(2) : message;
+  const srcEid = parseInt(hex.slice(16, 24), 16);
+  const amountLD = BigInt("0x" + hex.slice(24, 88));
+  const depositor = ethers.getAddress("0x" + hex.slice(112, 152));
+  let dstEid;
+  let receiver;
+  try {
+    const payload = "0x" + hex.slice(152);
+    const coder = ethers.AbiCoder.defaultAbiCoder();
+    const [sendParam] = coder.decode(
+      [
+        "tuple(uint32 dstEid, bytes32 to, uint256 amountLD, uint256 minAmountLD, bytes extraOptions, bytes composeMsg, bytes oftCmd)",
+        "uint256"
+      ],
+      payload
+    );
+    dstEid = Number(sendParam.dstEid);
+    receiver = ethers.getAddress("0x" + sendParam.to.slice(26));
+  } catch {
+  }
+  return { srcEid, amountLD, depositor, dstEid, receiver };
+}
+async function findComposeByGuid(hubProvider, endpoint, composer, guid, fromBlock, hubChainId, chunkSize = COMPOSE_SCAN_CHUNK_SIZE) {
+  const currentBlock = BigInt(await hubProvider.getBlockNumber());
+  const scanFrom = fromBlock ?? (currentBlock > COMPOSE_SCAN_WINDOW_BLOCKS ? currentBlock - COMPOSE_SCAN_WINDOW_BLOCKS : 0n);
+  const endpointContract = new ethers.Contract(endpoint, LZ_ENDPOINT_ABI, hubProvider);
+  const coder = ethers.AbiCoder.defaultAbiCoder();
+  const composerLc = composer.toLowerCase();
+  let from = scanFrom;
+  while (from <= currentBlock) {
+    const chunkEnd = from + chunkSize > currentBlock ? currentBlock : from + chunkSize;
+    const logs = await hubProvider.getLogs({
+      address: endpoint,
+      topics: [COMPOSE_SENT_TOPIC],
+      fromBlock: `0x${from.toString(16)}`,
+      toBlock: `0x${chunkEnd.toString(16)}`
+    });
+    for (const log of logs) {
+      let decoded;
+      try {
+        decoded = coder.decode(["address", "address", "bytes32", "uint16", "bytes"], log.data);
+      } catch {
+        continue;
+      }
+      const logFrom = decoded[0];
+      const logTo = decoded[1].toLowerCase();
+      const logGuid = decoded[2];
+      const logIndex = Number(decoded[3]);
+      const logMessage = decoded[4];
+      if (logGuid.toLowerCase() === guid.toLowerCase() && logTo === composerLc) {
+        const hash = await endpointContract.composeQueue(logFrom, composer, guid, logIndex);
+        if (hash === RECEIVED_HASH) throw new ComposeAlreadyExecutedError();
+        if (hash === EMPTY_HASH) {
+          throw new Error(`Compose ${guid} found in events but composeQueue hash is empty \u2014 may have been cleared externally.`);
+        }
+        const chainId = hubChainId ?? Number((await hubProvider.getNetwork()).chainId);
+        return {
+          endpoint,
+          from: logFrom,
+          to: composer,
+          guid,
+          index: logIndex,
+          message: logMessage,
+          isStargate: false,
+          hubChainId: chainId,
+          hubBlockStart: scanFrom
+        };
+      }
+    }
+    from = chunkEnd + 1n;
+  }
+  throw new Error(
+    `Compose GUID ${guid} not found in ComposeSent events on blocks ${scanFrom}\u2192${currentBlock}. Pass a lower fromBlock to scan further back.`
+  );
+}
+async function listPendingComposes(hubProvider, endpoint, composer, fromBlock, chunkSize = COMPOSE_SCAN_CHUNK_SIZE) {
+  const currentBlock = BigInt(await hubProvider.getBlockNumber());
+  const scanFrom = fromBlock ?? (currentBlock > COMPOSE_SCAN_WINDOW_BLOCKS ? currentBlock - COMPOSE_SCAN_WINDOW_BLOCKS : 0n);
+  const endpointContract = new ethers.Contract(endpoint, LZ_ENDPOINT_ABI, hubProvider);
+  const coder = ethers.AbiCoder.defaultAbiCoder();
+  const composerLc = composer.toLowerCase();
+  const pending = [];
+  for (let from = scanFrom; from <= currentBlock; from += chunkSize + 1n) {
+    const chunkEnd = from + chunkSize > currentBlock ? currentBlock : from + chunkSize;
+    try {
+      const logs = await hubProvider.getLogs({
+        address: endpoint,
+        topics: [COMPOSE_SENT_TOPIC],
+        fromBlock: `0x${from.toString(16)}`,
+        toBlock: `0x${chunkEnd.toString(16)}`
+      });
+      for (const log of logs) {
+        let decoded;
+        try {
+          decoded = coder.decode(["address", "address", "bytes32", "uint16", "bytes"], log.data);
+        } catch {
+          continue;
+        }
+        const logFrom = decoded[0];
+        const logTo = decoded[1].toLowerCase();
+        const logGuid = decoded[2];
+        const logIndex = Number(decoded[3]);
+        const logMessage = decoded[4];
+        if (logTo !== composerLc) continue;
+        try {
+          const hash = await endpointContract.composeQueue(logFrom, composer, logGuid, logIndex);
+          if (hash !== EMPTY_HASH && hash !== RECEIVED_HASH) {
+            pending.push({
+              guid: logGuid,
+              blockNumber: BigInt(log.blockNumber),
+              from: logFrom,
+              index: logIndex,
+              message: logMessage,
+              decoded: decodeComposeMessage(logMessage)
+            });
+          }
+        } catch {
+        }
+      }
+    } catch {
+      continue;
+    }
+  }
+  return pending;
+}
 
 // src/ethers/preflight.ts
 async function preflightAsync(provider, vault, escrow) {
@@ -1777,6 +1918,23 @@ function getAllVaultChainIds(topology) {
   return [topology.hubChainId, ...topology.spokeChainIds];
 }
 
+// src/common/gasBuffer.ts
+var DEFAULT_GAS_BUFFER_BPS = 4000n;
+var BPS_DENOMINATOR = 10000n;
+var currentDefaultBps = DEFAULT_GAS_BUFFER_BPS;
+function setDefaultGasBufferBps(bps) {
+  if (bps < 0n) throw new RangeError(`gas buffer bps must be >= 0, got ${bps}`);
+  currentDefaultBps = bps;
+}
+function getDefaultGasBufferBps() {
+  return currentDefaultBps;
+}
+function applyGasBuffer(estimate, bufferBps) {
+  const bps = bufferBps ?? currentDefaultBps;
+  if (bps < 0n) throw new RangeError(`gas buffer bps must be >= 0, got ${bps}`);
+  return estimate * (BPS_DENOMINATOR + bps) / BPS_DENOMINATOR;
+}
+
 // src/ethers/redeemFlows.ts
 async function ensureAllowance4(signer, token, spender, amount) {
   const owner = await signer.getAddress();
@@ -1957,7 +2115,7 @@ async function estimateRedeemCost(provider, addresses, shares, receiver, owner,
         extraOptions,
         { value: lzFee, from: owner }
       );
-      requestGas = BigInt(raw.toString()) * 130n / 100n;
+      requestGas = applyGasBuffer(BigInt(raw.toString()));
     } catch {
     }
     const approveGas = 60000n;
@@ -3771,6 +3929,8 @@ exports.BRIDGE_FACET_ABI = BRIDGE_FACET_ABI;
 exports.CCManagerNotConfiguredError = CCManagerNotConfiguredError;
 exports.CHAIN_IDS = CHAIN_IDS;
 exports.CHAIN_ID_TO_EID = CHAIN_ID_TO_EID;
+exports.COMPOSE_SCAN_CHUNK_SIZE = COMPOSE_SCAN_CHUNK_SIZE;
+exports.COMPOSE_SCAN_WINDOW_BLOCKS = COMPOSE_SCAN_WINDOW_BLOCKS;
 exports.CONFIG_ABI = CONFIG_ABI;
 exports.CURATOR_CONFIG_ABI = CURATOR_CONFIG_ABI;
 exports.CantProcessWithdrawRequestError = CantProcessWithdrawRequestError;
@@ -3778,11 +3938,14 @@ exports.CapacityFullError = CapacityFullError;
 exports.ComposeAlreadyExecutedError = ComposeAlreadyExecutedError;
 exports.ComposeTimeoutError = ComposeTimeoutError;
 exports.ComposerNotConfiguredError = ComposerNotConfiguredError;
+exports.DEFAULT_GAS_BUFFER_BPS = DEFAULT_GAS_BUFFER_BPS;
+exports.DEFAULT_LZ_ENDPOINT = DEFAULT_LZ_ENDPOINT;
 exports.DEX_ABI = DEX_ABI;
 exports.EID_TO_CHAIN_ID = EID_TO_CHAIN_ID;
 exports.ERC20_ABI = ERC20_ABI;
 exports.ERC4626_FACET_ABI = ERC4626_FACET_ABI;
 exports.ERC7540_FACET_ABI = ERC7540_FACET_ABI;
+exports.EXECUTE_COMPOSE_GAS_LIMIT = EXECUTE_COMPOSE_GAS_LIMIT;
 exports.EscrowNotConfiguredError = EscrowNotConfiguredError;
 exports.InsufficientBalanceError = InsufficientBalanceError;
 exports.InsufficientLiquidityError = InsufficientLiquidityError;
@@ -3790,6 +3953,7 @@ exports.InvalidInputError = InvalidInputError;
 exports.LZ_ADAPTER_ABI = LZ_ADAPTER_ABI;
 exports.LZ_EIDS = LZ_EIDS;
 exports.LZ_ENDPOINT_ABI = LZ_ENDPOINT_ABI;
+exports.LZ_ENDPOINT_BY_CHAIN = LZ_ENDPOINT_BY_CHAIN;
 exports.LZ_TIMEOUTS = LZ_TIMEOUTS;
 exports.METADATA_ABI = METADATA_ABI;
 exports.MULTICALL_ABI = MULTICALL_ABI;
@@ -3822,6 +3986,7 @@ exports.WrongChainError = WrongChainError;
 exports.acceptOwnership = acceptOwnership;
 exports.addAvailableAsset = addAvailableAsset;
 exports.addAvailableAssets = addAvailableAssets;
+exports.applyGasBuffer = applyGasBuffer;
 exports.asSdkSigner = asSdkSigner;
 exports.bridgeAssetsToSpoke = bridgeAssetsToSpoke;
 exports.bridgeSharesToHub = bridgeSharesToHub;
@@ -3829,6 +3994,7 @@ exports.buildCuratorBatch = buildCuratorBatch;
 exports.buildUniswapV3Swap = buildUniswapV3Swap;
 exports.canDeposit = canDeposit;
 exports.checkProtocolWhitelist = checkProtocolWhitelist;
+exports.decodeComposeMessage = decodeComposeMessage;
 exports.depositAsync = depositAsync;
 exports.depositCrossChainOracleOn = depositCrossChainOracleOn;
 exports.depositFromSpoke = depositFromSpoke;
@@ -3849,13 +4015,16 @@ exports.executeActions = executeActions;
 exports.executeCompose = executeCompose;
 exports.executeCuratorBridge = executeCuratorBridge;
 exports.findBridgeRoute = findBridgeRoute;
+exports.findComposeByGuid = findComposeByGuid;
 exports.getAllVaultChainIds = getAllVaultChainIds;
 exports.getAsyncRequestStatus = getAsyncRequestStatus;
 exports.getAsyncRequestStatusLabel = getAsyncRequestStatusLabel;
 exports.getCuratorVaultStatus = getCuratorVaultStatus;
+exports.getDefaultGasBufferBps = getDefaultGasBufferBps;
 exports.getERC7540RequestStatus = getERC7540RequestStatus;
 exports.getFullVaultTopology = getFullVaultTopology;
 exports.getInboundRoutes = getInboundRoutes;
+exports.getLzEndpoint = getLzEndpoint;
 exports.getMaxWithdrawable = getMaxWithdrawable;
 exports.getOutboundRoutes = getOutboundRoutes;
 exports.getPendingActions = getPendingActions;
@@ -3880,6 +4049,7 @@ exports.getWithdrawalRequest = getWithdrawalRequest;
 exports.isAsyncMode = isAsyncMode;
 exports.isCurator = isCurator;
 exports.isOnHubChain = isOnHubChain;
+exports.listPendingComposes = listPendingComposes;
 exports.mintAsync = mintAsync;
 exports.pauseVault = pauseVault;
 exports.preflightAsync = preflightAsync;
@@ -3902,6 +4072,7 @@ exports.redeemAsync = redeemAsync;
 exports.redeemShares = redeemShares;
 exports.requestRedeem = requestRedeem;
 exports.resolveRedeemAddresses = resolveRedeemAddresses;
+exports.setDefaultGasBufferBps = setDefaultGasBufferBps;
 exports.setDepositCapacity = setDepositCapacity;
 exports.setDepositWhitelist = setDepositWhitelist;
 exports.setFeeRecipient = setFeeRecipient;