feat(eip712): add raw_salt attribute (#2331)

* chore: bump syn to 2.0, fix breaking changes

* chore: update ethers-contract-derive to use syn 2

* chore: move eip712 into ethers-contract-derive

* fix: temp disable prettyplease formatting

* chore: update prettyplease

* fix mergings

* fix

* ci: disable live-tests since it doesn't do anything

* update

* chore: re-add eip712 feature for backwards compatibility

* chore: bump dependencies

* feat(eip712): add raw_salt attribute

ethers-contract/ethers-contract-derive/src/eip712.rs

@@ -2,7 +2,7 @@ use crate::utils;
 use ethers_core::{
     abi::{Address, ParamType},
     macros::ethers_core_crate,
-    types::transaction::eip712::EIP712Domain,
+    types::{transaction::eip712::EIP712Domain, H256},
     utils::keccak256,
 };
 use inflector::Inflector;
@@ -109,12 +109,20 @@ fn parse_attributes(input: &DeriveInput) -> Result<EIP712Domain> {
                 litstr.value().parse().map_err(|e| Error::new(litstr.span(), e))?;
             domain.verifying_contract = Some(addr);
         }
+        // hash string
         "salt", domain.salt => {
             meta.input.parse::<Token![=]>()?;
             let litstr: LitStr = meta.input.parse()?;
             let hash = keccak256(litstr.value());
             domain.salt = Some(hash);
         }
+        // parse string as H256
+        "raw_salt", domain.salt => {
+            meta.input.parse::<Token![=]>()?;
+            let litstr: LitStr = meta.input.parse()?;
+            let bytes = litstr.value().parse::<H256>().map_err(|e| Error::new(litstr.span(), e))?;
+            domain.salt = Some(bytes.0);
+        }
     );
     Ok(domain)
 }

ethers-contract/tests/it/eip712.rs

@@ -17,7 +17,8 @@ fn derive_eip712() {
         name = "Radicle",
         version = "1",
         chain_id = 1,
-        verifying_contract = "0x0000000000000000000000000000000000000001"
+        verifying_contract = "0x0000000000000000000000000000000000000001",
+        raw_salt = "0x3000000000000000000000000000000000000000000000000000000000000000"
     )]
     pub struct Puzzle {
         pub organization: H160,