@zoralabs/protocol-deployments 0.3.5-COMMENTS.1 → 0.3.5-COMMENTS.3

package/src/typedData.ts

@@ -434,6 +434,7 @@ const permitCommentTypedDataType = {
     { name: "text", type: "string" },
     { name: "deadline", type: "uint256" },
     { name: "nonce", type: "bytes32" },
+    { name: "commenterSmartWallet", type: "address" },
     { name: "referrer", type: "address" },
     { name: "sourceChainId", type: "uint32" },
     { name: "destinationChainId", type: "uint32" },
@@ -445,7 +446,7 @@ const permitSparkCommentTypedDataType = {
   PermitSparkComment: [
     { name: "comment", type: "CommentIdentifier" },
     { name: "sparker", type: "address" },
-    { name: "sparksQuantity", type: "uint64" },
+    { name: "sparksQuantity", type: "uint256" },
     { name: "deadline", type: "uint256" },
     { name: "nonce", type: "bytes32" },
     { name: "referrer", type: "address" },
@@ -481,12 +482,16 @@ const commentsDomain = ({
  * but be valid to be executed on the destination chain.
  *
  * @param message - The {@link PermitComment} containing the details of the comment permit.
+ * @param signingAccount - (optional) The account that is signing the message, if different thatn the commentor.
+ * Only needed if the commentor is a smart wallet; in this case the signing account should be an account
+ * that is one of the smart wallet owners.
  * @returns A {@link TypedDataDefinition} object compatible with EIP-712 for structured data hashing and signing,
  * including types, message, primary type, domain, and the signer's account address, which is
  * the commenter's address.
  */
 export const permitCommentTypedDataDefinition = (
   message: PermitComment,
+  signingAccount?: Address,
 ): TypedDataDefinition<typeof permitCommentTypedDataType, "PermitComment"> & {
   account: Address;
 } => ({
@@ -498,7 +503,7 @@ export const permitCommentTypedDataDefinition = (
     destinationChainId:
       message.destinationChainId as keyof typeof commentsAddress,
   }),
-  account: message.commenter,
+  account: signingAccount || message.commenter,
 });
 
 /**
@@ -514,12 +519,16 @@ export const permitCommentTypedDataDefinition = (
  * but be valid to be executed on the destination chain.
  *
  * @param message - The {@link PermitSparkComment} containing the details of the spark comment permit.
+ * @param signingAccount - (optional) The account that is signing the message, if different than the commenter.
+ * Only needed if the commenter is a smart wallet; in this case the signing account should be an account
+ * that is one of the smart wallet owners.
  * @returns A {@link TypedDataDefinition} object compatible with EIP-712 for structured data hashing and signing,
  * including types, message, primary type, domain, and the signer's account address, which is
  * the sparker's address.
  */
 export const permitSparkCommentTypedDataDefinition = (
   message: PermitSparkComment,
+  signingAccount?: Address,
 ): TypedDataDefinition<
   typeof permitSparkCommentTypedDataType,
   "PermitSparkComment"
@@ -532,7 +541,7 @@ export const permitSparkCommentTypedDataDefinition = (
     destinationChainId:
       message.destinationChainId as keyof typeof commentsAddress,
   }),
-  account: message.sparker,
+  account: signingAccount || message.sparker,
 });
 
 // todo: explain