@continuumdao/ctm-mpc-defi 0.2.64 → 0.2.66

package/dist/protocols/evm/uniswap-v4/index.cjs

@@ -1,7 +1,12 @@
 'use strict';
 
 var viem = require('viem');
-var continuumNodeSdk = require('@continuumdao/continuum-node-sdk');
+var nodeRead_js = require('@continuumdao/continuum-node-sdk/dist/api/node-read.js');
+var rpcUtils_js = require('@continuumdao/continuum-node-sdk/dist/evm/rpc-utils.js');
+var chainFees_js = require('@continuumdao/continuum-node-sdk/dist/evm/chain-fees.js');
+var getSigFeeSpeed_js = require('@continuumdao/continuum-node-sdk/dist/evm/get-sig-fee-speed.js');
+var gwei_js = require('@continuumdao/continuum-node-sdk/dist/evm/gwei.js');
+var txParams_js = require('@continuumdao/continuum-node-sdk/dist/evm/tx-params.js');
 
 // src/core/registry.ts
 var modules = [];
@@ -664,7 +669,7 @@ async function fetchEthereumAddressForKeyGen(managementNodeUrl, keyGenId, readAu
     throw new Error("keyGen is required");
   }
   const url = `${base}/getKeyGenResultById?id=${encodeURIComponent(id)}`;
-  const res = await continuumNodeSdk.nodeFetchWithReadAuth(url, { ...init, method: "GET", cache: "no-store" }, readAuth);
+  const res = await nodeRead_js.nodeFetchWithReadAuth(url, { ...init, method: "GET", cache: "no-store" }, readAuth);
   if (!res.ok) {
     const t = await res.text().catch(() => "");
     throw new Error(
@@ -1103,7 +1108,7 @@ function finalizeMultisign(input) {
   const ph = (keyGen.pubkeyhex ?? "").trim();
   if (!ph) throw new Error("keyGen pubKey (pubkeyhex) is required");
   const keyList = keyGen.keylist ?? [];
-  const clientId = continuumNodeSdk.getClientIdFromKeyGenResult(keyGen);
+  const clientId = rpcUtils_js.getClientIdFromKeyGenResult(keyGen);
   const first = legs[0];
   const messageHashes = legs.map((l) => l.msgHash);
   const messageRawBatch = legs.map((l) => l.msgRaw);
@@ -1149,11 +1154,16 @@ function finalizeMultisign(input) {
 }
 function routerSwapGasLimitFromEstimate(estimatedGas, chainGasLimit) {
   if (chainGasLimit != null && Number.isFinite(chainGasLimit) && chainGasLimit > 0) {
-    return continuumNodeSdk.gasLimitFromEstimateAndChainConfig(estimatedGas, chainGasLimit);
+    return txParams_js.gasLimitFromEstimateAndChainConfig(estimatedGas, chainGasLimit);
   }
   return (estimatedGas * 12n + 9n) / 10n;
 }
 
+// src/chains/evm/unsignedMessageRaw.ts
+function evmUnsignedMessageRaw(serialized) {
+  return serialized.startsWith("0x") ? serialized.slice(2) : serialized;
+}
+
 // src/chains/evm/buildBatch.ts
 async function buildEvmMultisignBatch(args) {
   const { context, steps } = args;
@@ -1175,7 +1185,7 @@ async function buildEvmMultisignBatch(args) {
     rpcUrls: { default: { http: [rpcUrl] } }
   });
   const publicClient = viem.createPublicClient({ chain: ch, transport: defiEvmTransport(rpcUrl) });
-  const feeParams = await continuumNodeSdk.fetchChainFeeParams(rpcUrl, chainId);
+  const feeParams = await chainFees_js.fetchChainFeeParams(rpcUrl, chainId);
   const legacy = Boolean(chainDetail?.legacy) || !feeParams.isEip1559;
   const latestBaseFeeWei = !legacy ? (await publicClient.getBlock({ blockTag: "latest" })).baseFeePerGas ?? 0n : 0n;
   const gasLimitConfig = useCustomGas && chainDetail?.gasLimit != null ? Number(chainDetail.gasLimit) : void 0;
@@ -1208,7 +1218,7 @@ async function buildEvmMultisignBatch(args) {
     } else if (step.routerSwap) {
       gasLimitI = routerSwapGasLimitFromEstimate(estimatedGas, chainGasLimitRouter);
     } else {
-      gasLimitI = useCustomGas ? continuumNodeSdk.gasLimitFromEstimateAndChainConfig(estimatedGas, gasLimitConfig) : estimatedGas;
+      gasLimitI = useCustomGas ? txParams_js.gasLimitFromEstimateAndChainConfig(estimatedGas, gasLimitConfig) : estimatedGas;
     }
     let proposalTxParams;
     let feeSnapshot;
@@ -1219,7 +1229,7 @@ async function buildEvmMultisignBatch(args) {
         gasPriceWei = gasPriceWei * BigInt(100 + gasFeeMultiplier) / 100n;
       }
       if (useCustomGas && chainDetail?.gasPrice != null && chainDetail.gasPrice > 0) {
-        const configured = viem.parseGwei(continuumNodeSdk.gweiToDecimalString(Number(chainDetail.gasPrice)));
+        const configured = viem.parseGwei(gwei_js.gweiToDecimalString(Number(chainDetail.gasPrice)));
         if (configured > gasPriceWei) gasPriceWei = configured;
       }
       serialized = viem.serializeTransaction({
@@ -1238,7 +1248,7 @@ async function buildEvmMultisignBatch(args) {
         txType: "legacy",
         gasPrice: gasPriceWei.toString()
       };
-      feeSnapshot = continuumNodeSdk.proposalTxParamsToFeeSnapshot(proposalTxParams);
+      feeSnapshot = txParams_js.proposalTxParamsToFeeSnapshot(proposalTxParams);
     } else {
       const fetchedBase = feeParams.baseFeeGwei ?? 0;
       const fetchedPriority = feeParams.priorityFeeGwei ?? 0;
@@ -1249,13 +1259,13 @@ async function buildEvmMultisignBatch(args) {
       const baseFeeMultiplierPct = useCustomGas && chainDetail?.baseFeeMultiplier != null ? Math.max(100, Number(chainDetail.baseFeeMultiplier)) : 100;
       const baseComponentGwei = effectiveBaseFeeGwei * baseFeeMultiplierPct / 100;
       const maxFeePerGasGwei = baseComponentGwei + effectivePriorityFeeGwei;
-      let maxPriorityFeePerGas = effectivePriorityFeeGwei > 0 ? viem.parseGwei(continuumNodeSdk.gweiToDecimalString(effectivePriorityFeeGwei)) : viem.parseGwei("1");
-      let maxFeePerGas = viem.parseGwei(continuumNodeSdk.gweiToDecimalString(maxFeePerGasGwei));
+      let maxPriorityFeePerGas = effectivePriorityFeeGwei > 0 ? viem.parseGwei(gwei_js.gweiToDecimalString(effectivePriorityFeeGwei)) : viem.parseGwei("1");
+      let maxFeePerGas = viem.parseGwei(gwei_js.gweiToDecimalString(maxFeePerGasGwei));
       if (useCustomGas && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
         maxPriorityFeePerGas = maxPriorityFeePerGas * BigInt(100 + gasFeeMultiplier) / 100n;
         maxFeePerGas = maxFeePerGas * BigInt(100 + gasFeeMultiplier) / 100n;
       }
-      ({ maxFeePerGas, maxPriorityFeePerGas } = continuumNodeSdk.alignEip1559FeesWithLatestBase(
+      ({ maxFeePerGas, maxPriorityFeePerGas } = getSigFeeSpeed_js.alignEip1559FeesWithLatestBase(
         maxFeePerGas,
         maxPriorityFeePerGas,
         latestBaseFeeWei
@@ -1278,14 +1288,14 @@ async function buildEvmMultisignBatch(args) {
         maxFeePerGas: maxFeePerGas.toString(),
         maxPriorityFeePerGas: maxPriorityFeePerGas.toString()
       };
-      feeSnapshot = i === 0 ? continuumNodeSdk.proposalTxParamsToFeeSnapshot(proposalTxParams) : {};
+      feeSnapshot = i === 0 ? txParams_js.proposalTxParamsToFeeSnapshot(proposalTxParams) : {};
     }
     const h = viem.keccak256(serialized);
     const msgHash = h.startsWith("0x") ? h.slice(2) : h;
     const batchMetaExtra = args.buildBatchMeta({ step, index: i, gasLimit: gasLimitI });
     legs.push({
       msgHash,
-      msgRaw: i === 0 && args.firstMsgRawNo0x != null ? args.firstMsgRawNo0x : serialized,
+      msgRaw: evmUnsignedMessageRaw(serialized),
       destinationAddress: step.to,
       signatureText: typeof batchMetaExtra.signatureText === "string" ? batchMetaExtra.signatureText : JSON.stringify(batchMetaExtra.signatureText ?? {}),
       audit: batchMetaExtra,
@@ -1293,9 +1303,6 @@ async function buildEvmMultisignBatch(args) {
       proposalTxParams,
       valueWei: i === 0 ? step.value : void 0
     });
-    if (i === 0 && args.firstMsgRawNo0x != null) {
-      legs[0].msgRaw = args.firstMsgRawNo0x;
-    }
   }
   const extraJSON = {};
   if (useCustomGas && customGasChainDetails && Object.keys(customGasChainDetails).length > 0) {