Add name sigs (#60)

* add name to delegate sig * adding token name to vote * bump version
Moloch-Mystics · Aug 24, 2022 · 54a1dbf · 54a1dbf
1 parent 1b85501
commit 54a1dbf
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 18 deletions.
diff --git a/contracts/Baal.sol b/contracts/Baal.sol
@@ -73,7 +73,7 @@ contract Baal is Module, EIP712 {
     address public multisendLibrary; /*address of multisend library*/
 
     // SIGNATURE HELPERS
-    bytes32 constant VOTE_TYPEHASH = keccak256("Vote(address voter,uint32 proposalId,bool support)");
+    bytes32 constant VOTE_TYPEHASH = keccak256("Vote(string name,address voter,uint32 proposalId,bool support)");
 
     // DATA STRUCTURES
     struct Proposal {
@@ -431,7 +431,15 @@ contract Baal is Module, EIP712 {
         bytes32 s
     ) external nonReentrant {
         /*calculate EIP-712 struct hash*/
-        bytes32 structHash = keccak256(abi.encode(VOTE_TYPEHASH, voter, id, approved));
+        bytes32 structHash = keccak256(
+            abi.encode(
+                VOTE_TYPEHASH,
+                keccak256(abi.encodePacked(sharesToken.name())),
+                voter,
+                id,
+                approved
+            )
+        );
         bytes32 hash = _hashTypedDataV4(structHash);
         address signer = ECDSA.recover(hash, v, r, s);
 

diff --git a/contracts/utils/BaalVotes.sol b/contracts/utils/BaalVotes.sol
@@ -28,8 +28,7 @@ abstract contract BaalVotes is ERC20Permit {
     mapping(address => address) public delegates; /*maps record of each account's `shares` delegate*/
 
     // SIGNATURE HELPERS
-    bytes32 constant DELEGATION_TYPEHASH =
-        keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");
+    bytes32 constant DELEGATION_TYPEHASH = keccak256("Delegation(string name,address delegatee,uint256 nonce,uint256 expiry)");
 
     event DelegateChanged(
         address indexed delegator,
@@ -82,7 +81,13 @@ abstract contract BaalVotes is ERC20Permit {
         address signer = ECDSA.recover(
             _hashTypedDataV4(
                 keccak256(
-                    abi.encode(DELEGATION_TYPEHASH, delegatee, nonce, expiry)
+                    abi.encode(
+                        DELEGATION_TYPEHASH,
+                        keccak256(abi.encodePacked(name())),
+                        delegatee,
+                        nonce,
+                        expiry
+                    )
                 )
             ),
             v,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@daohaus/baal-contracts",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Lo, also it is the time of His rain.",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

diff --git a/src/signDelegation.ts b/src/signDelegation.ts
@@ -10,25 +10,29 @@ export default async function signDelegation(
   expiry: number
 ) {
   const domain = {
-    name,
+    name: 'Shares',
     version: '1',
     chainId,
     verifyingContract: contractAddress,
   }
 
   const types = {
     Delegation: [
+      { name: 'name', type: 'string' },
       { name: 'delegatee', type: 'address' },
       { name: 'nonce', type: 'uint256' },
       { name: 'expiry', type: 'uint256' },
     ],
   }
 
-  const sig = await signer._signTypedData(domain, types, {
+  const values = {
+    name,
     delegatee,
     nonce,
     expiry,
-  })
+  }
+
+  const sig = await signer._signTypedData(domain, types, values)
 
   return sig
 }
diff --git a/src/signVote.ts b/src/signVote.ts
@@ -10,25 +10,29 @@ export default async function signVote(
 
 ) {
   const domain = {
-    name,
+    name: 'Vote',
     version: '4',
     chainId,
     verifyingContract: contractAddress,
   }
 
   const types = {
     Vote: [
+      { name: 'name', type: 'string' },
       { name: 'voter', type: 'address' },
       { name: 'proposalId', type: 'uint32' },
       { name: 'support', type: 'bool' },
     ],
   }
 
-  const sig = await signer._signTypedData(domain, types, {
+  const values = {
+    name,
     voter: signer.address,
     proposalId,
     support
-  })
+  }
+
+  const sig = await signer._signTypedData(domain, types, values)
 
   return sig
 }
diff --git a/test/BaalSafe.test.ts b/test/BaalSafe.test.ts
@@ -2331,7 +2331,7 @@ describe("Baal contract", function () {
         chainId,
         baal.address,
         summoner,
-        "Vote", // deploymentConfig.TOKEN_NAME
+        deploymentConfig.TOKEN_NAME,
         1,
         true
       );
@@ -2356,7 +2356,7 @@ describe("Baal contract", function () {
         chainId,
         baal.address,
         summoner,
-        "Vote", // deploymentConfig.TOKEN_NAME
+        deploymentConfig.TOKEN_NAME,
         1,
         true
       );
@@ -2372,7 +2372,7 @@ describe("Baal contract", function () {
         chainId,
         baal.address,
         summoner,
-        "Vote", // deploymentConfig.TOKEN_NAME
+        deploymentConfig.TOKEN_NAME,
         1,
         true
       );
@@ -2402,7 +2402,7 @@ describe("Baal contract", function () {
         chainId,
         sharesToken.address,
         summoner,
-        'Shares', // deploymentConfig.TOKEN_NAME
+        deploymentConfig.TOKEN_NAME,
         shaman.address,
         nonce,
         expiry
@@ -2421,7 +2421,7 @@ describe("Baal contract", function () {
         chainId,
         sharesToken.address,
         summoner,
-        'Shares', // deploymentConfig.TOKEN_NAME
+        deploymentConfig.TOKEN_NAME,
         shaman.address,
         nonce,
         expiry
@@ -2440,7 +2440,7 @@ describe("Baal contract", function () {
         chainId,
         sharesToken.address,
         summoner,
-        'Shares', // deploymentConfig.TOKEN_NAME
+        deploymentConfig.TOKEN_NAME,
         shaman.address,
         nonce,
         0