@continuumdao/ctm-mpc-defi 0.2.64 → 0.2.66

package/dist/protocols/evm/morpho/index.js

@@ -1,7 +1,11 @@
 import { getAddress, parseAbi, keccak256, toBytes, isAddress, encodeAbiParameters, parseUnits, encodeFunctionData, zeroAddress, maxUint256, defineChain, createPublicClient, formatUnits, parseGwei, serializeTransaction, decodeAbiParameters, http } from 'viem';
 import { MidnightApi } from '@morpho-org/midnight-sdk/api';
 import { DEFAULT_TICK_SPACING, TickLib, midnightBundlesAbi, Offer, Tree, SetterRatifierUtils, Payload, midnightAbi } from '@morpho-org/midnight-sdk';
-import { fetchChainFeeParams, gasLimitFromEstimateAndChainConfig, gweiToDecimalString, proposalTxParamsToFeeSnapshot, alignEip1559FeesWithLatestBase, getClientIdFromKeyGenResult } from '@continuumdao/continuum-node-sdk';
+import { getClientIdFromKeyGenResult } from '@continuumdao/continuum-node-sdk/dist/evm/rpc-utils.js';
+import { fetchChainFeeParams } from '@continuumdao/continuum-node-sdk/dist/evm/chain-fees.js';
+import { alignEip1559FeesWithLatestBase } from '@continuumdao/continuum-node-sdk/dist/evm/get-sig-fee-speed.js';
+import { gweiToDecimalString } from '@continuumdao/continuum-node-sdk/dist/evm/gwei.js';
+import { gasLimitFromEstimateAndChainConfig, proposalTxParamsToFeeSnapshot } from '@continuumdao/continuum-node-sdk/dist/evm/tx-params.js';
 
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -2325,6 +2329,11 @@ function routerSwapGasLimitFromEstimate(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;
@@ -2456,7 +2465,7 @@ async function buildEvmMultisignBatch(args) {
     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,
@@ -2464,9 +2473,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) {