@continuumdao/ctm-mpc-defi 0.2.64 → 0.2.66

package/dist/protocols/evm/continuum-dao/index.cjs

@@ -1,7 +1,11 @@
 'use strict';
 
 var viem = require('viem');
-var continuumNodeSdk = require('@continuumdao/continuum-node-sdk');
+var rpcUtils_js = require('@continuumdao/continuum-node-sdk/dist/evm/rpc-utils.js');
+var txParams_js = require('@continuumdao/continuum-node-sdk/dist/evm/tx-params.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 __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -370,7 +374,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);
@@ -421,7 +425,7 @@ var init_envelope = __esm({
 });
 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;
 }
@@ -429,6 +433,15 @@ var init_routerSwapGas = __esm({
   "src/chains/evm/routerSwapGas.ts"() {
   }
 });
+
+// src/chains/evm/unsignedMessageRaw.ts
+function evmUnsignedMessageRaw(serialized) {
+  return serialized.startsWith("0x") ? serialized.slice(2) : serialized;
+}
+var init_unsignedMessageRaw = __esm({
+  "src/chains/evm/unsignedMessageRaw.ts"() {
+  }
+});
 async function buildEvmMultisignBatch(args) {
   const { context, steps } = args;
   const {
@@ -449,7 +462,7 @@ async function buildEvmMultisignBatch(args) {
     rpcUrls: { default: { http: [rpcUrl] } }
   });
   const publicClient3 = 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 publicClient3.getBlock({ blockTag: "latest" })).baseFeePerGas ?? 0n : 0n;
   const gasLimitConfig = useCustomGas && chainDetail?.gasLimit != null ? Number(chainDetail.gasLimit) : void 0;
@@ -482,7 +495,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;
@@ -493,7 +506,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({
@@ -512,7 +525,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;
@@ -523,13 +536,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
@@ -552,14 +565,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,
@@ -567,9 +580,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) {
@@ -596,6 +606,7 @@ var init_buildBatch = __esm({
     init_defiEvmClient();
     init_envelope();
     init_routerSwapGas();
+    init_unsignedMessageRaw();
   }
 });
 function msgHashNo0x(digest) {
@@ -731,6 +742,10 @@ function assertContinuumDaoForumTopicKey(forumKey, forumUrl) {
   }
   return raw.replace(/\/+$/, "");
 }
+function continuumDaoForumTopicCatalogKey(forumKey, forumUrl) {
+  const absolute = assertContinuumDaoForumTopicKey(forumKey, forumUrl);
+  return new URL(absolute).pathname.replace(/^\/+/, "");
+}
 function forumError(body, status) {
   const o = body && typeof body === "object" ? body : {};
   const st = o.status && typeof o.status === "object" ? o.status : null;
@@ -2425,6 +2440,7 @@ async function buildProposeCatalog(args) {
     throw new Error("type must be 0\u20134 (Admin, Constitution, Decision, Election, Treasury).");
   }
   await assertProposalTypeMatchesForum(args.forumKey, args.type, args.forumUrl);
+  const catalogForumKey = continuumDaoForumTopicCatalogKey(args.forumKey, args.forumUrl);
   const hashed = await continuumDaoHashProposal({
     chainId: args.chainId,
     rpcUrl: args.rpcUrl,
@@ -2439,7 +2455,7 @@ async function buildProposeCatalog(args) {
     title: args.title.trim(),
     description: args.description,
     proposer: args.proposer,
-    forumKey: args.forumKey,
+    forumKey: catalogForumKey,
     type: args.type,
     configuration: args.configuration,
     pendingOnChain: true,
@@ -3011,8 +3027,10 @@ async function buildEvmMultisignBodyContinuumDaoCastVoteBravoFromMcp(args) {
   return buildEvmMultisignBodyContinuumDaoCastVoteBravo({ ...args, support });
 }
 async function continuumDaoRegisterProposal(payload) {
-  assertContinuumDaoForumTopicKey(payload.forumKey);
-  const body = JSON.stringify(payload);
+  const body = JSON.stringify({
+    ...payload,
+    forumKey: continuumDaoForumTopicCatalogKey(payload.forumKey)
+  });
   const res = await fetch(`${exports.CONTINUUM_DAO_GOVERNANCE_API}/proposals/create`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -7931,6 +7949,7 @@ exports.continuumDaoForumSections = continuumDaoForumSections;
 exports.continuumDaoForumSignInEligible = continuumDaoForumSignInEligible;
 exports.continuumDaoForumSignInNonce = continuumDaoForumSignInNonce;
 exports.continuumDaoForumSignOut = continuumDaoForumSignOut;
+exports.continuumDaoForumTopicCatalogKey = continuumDaoForumTopicCatalogKey;
 exports.continuumDaoForumUnread = continuumDaoForumUnread;
 exports.continuumDaoForumUrl = continuumDaoForumUrl;
 exports.continuumDaoForumUserPostIds = continuumDaoForumUserPostIds;