@continuumdao/ctm-mpc-defi 0.2.28 → 0.2.30

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

@@ -1639,57 +1639,60 @@ function eip712SignatureText(domain, primaryType) {
 function jsonStringifyForAudit(value) {
   return JSON.stringify(value, (_, v) => typeof v === "bigint" ? v.toString() : v);
 }
-function eip712MsgRawHex(typedData, delivery) {
-  const envelope = {
+function eip712LegEnvelope(typedData, delivery, digest) {
+  return {
     version: 1,
-    ...typedData,
-    delivery
-  };
-  return stringToHex(jsonStringifyForAudit(envelope));
-}
-function buildEip712MultisignBody(args) {
-  const { typedData, delivery } = args;
-  const digest = hashTypedData({
+    digest,
     domain: typedData.domain,
     types: typedData.types,
     primaryType: typedData.primaryType,
-    message: typedData.message
-  });
-  const extraJSON = {
-    signRequestKind: EIP712_SIGN_REQUEST_KIND,
-    eip712: {
-      version: 1,
-      digest,
-      domain: typedData.domain,
-      types: typedData.types,
-      primaryType: typedData.primaryType,
-      message: typedData.message
-    },
+    message: typedData.message,
     delivery
   };
+}
+function eip712MsgRawHex(envelope) {
+  return stringToHex(jsonStringifyForAudit(envelope));
+}
+function buildEip712Multisign(args) {
+  if (args.legs.length < 1) {
+    throw new Error("buildEip712Multisign requires at least one leg");
+  }
+  const eip712 = [];
+  const legs = args.legs.map((leg) => {
+    const digest = hashTypedData({
+      domain: leg.typedData.domain,
+      types: leg.typedData.types,
+      primaryType: leg.typedData.primaryType,
+      message: leg.typedData.message
+    });
+    const envelope = eip712LegEnvelope(leg.typedData, leg.delivery, digest);
+    eip712.push(envelope);
+    return {
+      msgHash: msgHashNo0x(digest),
+      msgRaw: eip712MsgRawHex(envelope),
+      destinationAddress: args.destinationAddress,
+      signatureText: eip712SignatureText(leg.typedData.domain, leg.typedData.primaryType),
+      audit: {
+        kind: "EIP712",
+        primaryType: leg.typedData.primaryType,
+        deliveryKind: leg.delivery.kind,
+        ...leg.audit ?? {}
+      },
+      feeSnapshot: {}
+    };
+  });
   return finalizeMultisign({
     keyGen: args.keyGen,
     purposeText: args.purposeText,
     purposeSuffix: args.purposeSuffix,
     destinationChainID: args.destinationChainID,
     destinationAddress: args.destinationAddress,
-    extraJSON,
+    extraJSON: {
+      signRequestKind: EIP712_SIGN_REQUEST_KIND,
+      eip712
+    },
     expiryDate: args.expiryDate,
-    legs: [
-      {
-        msgHash: msgHashNo0x(digest),
-        msgRaw: eip712MsgRawHex(typedData, delivery),
-        destinationAddress: args.destinationAddress,
-        signatureText: eip712SignatureText(typedData.domain, typedData.primaryType),
-        audit: {
-          kind: "EIP712",
-          primaryType: typedData.primaryType,
-          deliveryKind: delivery.kind,
-          ...args.audit ?? {}
-        },
-        feeSnapshot: {}
-      }
-    ]
+    legs
   });
 }
 
@@ -1809,27 +1812,31 @@ async function buildArcusWithdrawMultisign(args) {
   if (typed.message.amount < minQuantums) {
     throw new Error(`Arcus withdraw must be at least ${ARCUS_MIN_WITHDRAW_USD} USD`);
   }
-  return buildEip712MultisignBody({
+  return buildEip712Multisign({
     keyGen: args.keyGen,
     purposeText: args.purposeText,
     destinationChainID: String(args.chainId),
     destinationAddress: getAddress(args.executorAddress),
-    typedData: typed,
-    delivery: {
-      kind: "arcus_withdraw",
-      chainId: args.chainId,
-      product: args.product,
-      accountIndex: typed.message.accountIndex,
-      body: typed.requestBody
-    },
-    audit: {
-      protocol: ARCUS_PROTOCOL_ID,
-      action: "withdraw",
-      product: args.product,
-      usdHuman: args.usdHuman,
-      accountIndex: typed.message.accountIndex,
-      nonce: typed.message.nonce
-    }
+    legs: [
+      {
+        typedData: typed,
+        delivery: {
+          kind: "arcus_withdraw",
+          chainId: args.chainId,
+          product: args.product,
+          accountIndex: typed.message.accountIndex,
+          body: typed.requestBody
+        },
+        audit: {
+          protocol: ARCUS_PROTOCOL_ID,
+          action: "withdraw",
+          product: args.product,
+          usdHuman: args.usdHuman,
+          accountIndex: typed.message.accountIndex,
+          nonce: typed.message.nonce
+        }
+      }
+    ]
   });
 }
 async function buildEvmMultisignBodyArcusDepositBatch(args) {