fix: eip712 data type for nonce

fermentfan · fermentfan · commit ab252c509567 · 2023-09-07T17:36:46.000+02:00
diff --git a/contracts/RevocationRegistry.sol b/contracts/RevocationRegistry.sol
@@ -85,9 +85,9 @@ contract RevocationRegistry is Initializable, EIP712Upgradeable, PausableUpgrade
         _changeStatus(revoked, namespace, revocationList, revocationKey);
     }
 
-    function _hashChangeStatus(bool revoked, address namespace, bytes32 revocationList, bytes32 revocationKey, address signer, uint nonce) internal view returns (bytes32) {
+    function _hashChangeStatus(bool revoked, address namespace, bytes32 revocationList, bytes32 revocationKey, address signer, uint256 nonce) internal view returns (bytes32) {
         return _hashTypedDataV4(keccak256(abi.encode(
-                keccak256("ChangeStatus(bool revoked,address namespace,bytes32 revocationList,bytes32 revocationKey,address signer,uint nonce)"),
+                keccak256("ChangeStatus(bool revoked,address namespace,bytes32 revocationList,bytes32 revocationKey,address signer,uint256 nonce)"),
                 revoked,
                 namespace,
                 revocationList,
@@ -110,9 +110,9 @@ contract RevocationRegistry is Initializable, EIP712Upgradeable, PausableUpgrade
         _changeStatus(revoked, namespace, revocationList, revocationKey);
     }
 
-    function _hashChangeStatusDelegated(bool revoked, address namespace, bytes32 revocationList, bytes32 revocationKey, address signer, uint nonce) internal view returns (bytes32) {
+    function _hashChangeStatusDelegated(bool revoked, address namespace, bytes32 revocationList, bytes32 revocationKey, address signer, uint256 nonce) internal view returns (bytes32) {
         return _hashTypedDataV4(keccak256(abi.encode(
-                keccak256("ChangeStatusDelegated(bool revoked,address namespace,bytes32 revocationList,bytes32 revocationKey,address signer,uint nonce)"),
+                keccak256("ChangeStatusDelegated(bool revoked,address namespace,bytes32 revocationList,bytes32 revocationKey,address signer,uint256 nonce)"),
                 revoked,
                 namespace,
                 revocationList,
@@ -142,9 +142,9 @@ contract RevocationRegistry is Initializable, EIP712Upgradeable, PausableUpgrade
         _changeStatusesInList(revoked, namespace, revocationList, revocationKeys);
     }
 
-    function _hashChangeStatusesInList(bool[] memory revoked, address namespace, bytes32 revocationList, bytes32[] memory revocationKeys, address signer, uint nonce) internal view returns (bytes32) {
+    function _hashChangeStatusesInList(bool[] memory revoked, address namespace, bytes32 revocationList, bytes32[] memory revocationKeys, address signer, uint256 nonce) internal view returns (bytes32) {
         return _hashTypedDataV4(keccak256(abi.encode(
-                keccak256("ChangeStatusesInList(bool[] revoked,address namespace,bytes32 revocationList,bytes32[] revocationKeys,address signer,uint nonce)"),
+                keccak256("ChangeStatusesInList(bool[] revoked,address namespace,bytes32 revocationList,bytes32[] revocationKeys,address signer,uint256 nonce)"),
                 keccak256(abi.encodePacked(revoked)),
                 namespace,
                 revocationList,
@@ -167,9 +167,9 @@ contract RevocationRegistry is Initializable, EIP712Upgradeable, PausableUpgrade
         _changeStatusesInList(revoked, namespace, revocationList, revocationKeys);
     }
 
-    function _hashChangeStatusesInListDelegated(bool[] memory revoked, address namespace, bytes32 revocationList, bytes32[] memory revocationKeys, address signer, uint nonce) internal view returns (bytes32) {
+    function _hashChangeStatusesInListDelegated(bool[] memory revoked, address namespace, bytes32 revocationList, bytes32[] memory revocationKeys, address signer, uint256 nonce) internal view returns (bytes32) {
         return _hashTypedDataV4(keccak256(abi.encode(
-                keccak256("ChangeStatusesInListDelegated(bool[] revoked,address namespace,bytes32 revocationList,bytes32[] revocationKeys,address signer,uint nonce)"),
+                keccak256("ChangeStatusesInListDelegated(bool[] revoked,address namespace,bytes32 revocationList,bytes32[] revocationKeys,address signer,uint256 nonce)"),
                 keccak256(abi.encodePacked(revoked)),
                 namespace,
                 revocationList,
@@ -198,9 +198,9 @@ contract RevocationRegistry is Initializable, EIP712Upgradeable, PausableUpgrade
         _changeListOwner(namespace, newOwner, revocationList);
     }
 
-    function _hashChangeListOwner(address namespace, address newOwner, bytes32 revocationList, address signer, uint nonce) internal view returns (bytes32) {
+    function _hashChangeListOwner(address namespace, address newOwner, bytes32 revocationList, address signer, uint256 nonce) internal view returns (bytes32) {
         return _hashTypedDataV4(keccak256(abi.encode(
-                keccak256("ChangeListOwner(address namespace,address newOwner,bytes32 revocationList,address signer,uint nonce)"),
+                keccak256("ChangeListOwner(address namespace,address newOwner,bytes32 revocationList,address signer,uint256 nonce)"),
                 namespace,
                 newOwner,
                 revocationList,
@@ -227,9 +227,9 @@ contract RevocationRegistry is Initializable, EIP712Upgradeable, PausableUpgrade
         _changeListStatus(revoked, namespace, revocationList);
     }
 
-    function _hashChangeListStatus(bool revoked, address namespace, bytes32 revocationList, address signer, uint nonce) internal view returns (bytes32) {
+    function _hashChangeListStatus(bool revoked, address namespace, bytes32 revocationList, address signer, uint256 nonce) internal view returns (bytes32) {
         return _hashTypedDataV4(keccak256(abi.encode(
-                keccak256("ChangeListStatus(bool revoked,address namespace,bytes32 revocationList,address signer,uint nonce)"),
+                keccak256("ChangeListStatus(bool revoked,address namespace,bytes32 revocationList,address signer,uint256 nonce)"),
                 revoked,
                 namespace,
                 revocationList,
@@ -258,9 +258,9 @@ contract RevocationRegistry is Initializable, EIP712Upgradeable, PausableUpgrade
         _addListDelegate(namespace, delegate, revocationList, validity);
     }
 
-    function _hashAddListDelegate(address namespace, address delegate, bytes32 revocationList, uint validity, address signer, uint nonce) internal view returns (bytes32) {
+    function _hashAddListDelegate(address namespace, address delegate, bytes32 revocationList, uint validity, address signer, uint256 nonce) internal view returns (bytes32) {
         return _hashTypedDataV4(keccak256(abi.encode(
-                keccak256("AddListDelegate(address namespace,address delegate,bytes32 revocationList,uint validity,address signer,uint nonce)"),
+                keccak256("AddListDelegate(address namespace,address delegate,bytes32 revocationList,uint validity,address signer,uint256 nonce)"),
                 namespace,
                 delegate,
                 revocationList,
@@ -289,9 +289,9 @@ contract RevocationRegistry is Initializable, EIP712Upgradeable, PausableUpgrade
         _removeListDelegate(namespace, delegate, revocationList);
     }
 
-    function _hashRemoveListDelegate(address namespace, address delegate, bytes32 revocationList, address signer, uint nonce) internal view returns (bytes32) {
+    function _hashRemoveListDelegate(address namespace, address delegate, bytes32 revocationList, address signer, uint256 nonce) internal view returns (bytes32) {
         return _hashTypedDataV4(keccak256(abi.encode(
-                keccak256("RemoveListDelegate(address namespace,address delegate,bytes32 revocationList,address signer,uint nonce)"),
+                keccak256("RemoveListDelegate(address namespace,address delegate,bytes32 revocationList,address signer,uint256 nonce)"),
                 namespace,
                 delegate,
                 revocationList,
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spherity/ethr-revocation-registry",
-  "version": "1.0.13",
+  "version": "1.1.0",
   "description": "The Ethereum Revocation List types for smart contract interaction.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
diff --git a/src/util.ts b/src/util.ts
@@ -9,7 +9,7 @@ export const EIP712ChangeStatusType = {
         {name: 'revocationList', type: 'bytes32'} as TypedDataField,
         {name: 'revocationKey', type: 'bytes32'} as TypedDataField,
         {name: 'signer', type: 'address'} as TypedDataField,
-        {name: 'nonce', type: 'uint'} as TypedDataField,
+        {name: 'nonce', type: 'uint256'} as TypedDataField,
     ]
 }
 
@@ -20,7 +20,7 @@ export const EIP712ChangeStatusDelegatedType = {
         {name: 'revocationList', type: 'bytes32'} as TypedDataField,
         {name: 'revocationKey', type: 'bytes32'} as TypedDataField,
         {name: 'signer', type: 'address'} as TypedDataField,
-        {name: 'nonce', type: 'uint'} as TypedDataField,
+        {name: 'nonce', type: 'uint256'} as TypedDataField,
     ]
 }
 
@@ -31,7 +31,7 @@ export const EIP712ChangeStatusesInListType = {
         {name: 'revocationList', type: 'bytes32'},
         {name: 'revocationKeys', type: 'bytes32[]'},
         {name: 'signer', type: 'address'},
-        {name: 'nonce', type: 'uint'},
+        {name: 'nonce', type: 'uint256'},
     ]
 }
 
@@ -42,7 +42,7 @@ export const EIP712ChangeStatusesInListDelegatedType = {
         {name: 'revocationList', type: 'bytes32'},
         {name: 'revocationKeys', type: 'bytes32[]'},
         {name: 'signer', type: 'address'},
-        {name: 'nonce', type: 'uint'},
+        {name: 'nonce', type: 'uint256'},
     ]
 }
 
@@ -52,7 +52,7 @@ export const EIP712ChangeListOwnerType = {
         {name: 'newOwner', type: 'address'},
         {name: 'revocationList', type: 'bytes32'},
         {name: 'signer', type: 'address'},
-        {name: 'nonce', type: 'uint'},
+        {name: 'nonce', type: 'uint256'},
     ]
 }
 
@@ -61,9 +61,9 @@ export const EIP712AddListDelegateType = {
         {name: 'namespace', type: 'address'},
         {name: 'delegate', type: 'address'},
         {name: 'revocationList', type: 'bytes32'},
-        {name: 'validity', type: 'uint'},
+        {name: 'validity', type: 'uint256'},
         {name: 'signer', type: 'address'},
-        {name: 'nonce', type: 'uint'},
+        {name: 'nonce', type: 'uint256'},
     ]
 }
 
@@ -73,7 +73,7 @@ export const EIP712RemoveListDelegateType = {
         {name: 'delegate', type: 'address'},
         {name: 'revocationList', type: 'bytes32'},
         {name: 'signer', type: 'address'},
-        {name: 'nonce', type: 'uint'},
+        {name: 'nonce', type: 'uint256'},
     ]
 }
 
@@ -83,6 +83,6 @@ export const EIP712ChangeListStatusType = {
         {name: 'namespace', type: 'address'},
         {name: 'revocationList', type: 'bytes32'},
         {name: 'signer', type: 'address'},
-        {name: 'nonce', type: 'uint'},
+        {name: 'nonce', type: 'uint256'},
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@spherity/ethr-revocation-registry",`
`3`		`- "version": "1.0.13",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"description": "The Ethereum Revocation List types for smart contract interaction.",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"typings": "dist/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export const EIP712ChangeStatusType = {`
`9`	`9`	`{name: 'revocationList', type: 'bytes32'} as TypedDataField,`
`10`	`10`	`{name: 'revocationKey', type: 'bytes32'} as TypedDataField,`
`11`	`11`	`{name: 'signer', type: 'address'} as TypedDataField,`
`12`		`- {name: 'nonce', type: 'uint'} as TypedDataField,`
	`12`	`+ {name: 'nonce', type: 'uint256'} as TypedDataField,`
`13`	`13`	`]`
`14`	`14`	`}`
`15`	`15`
`@@ -20,7 +20,7 @@ export const EIP712ChangeStatusDelegatedType = {`
`20`	`20`	`{name: 'revocationList', type: 'bytes32'} as TypedDataField,`
`21`	`21`	`{name: 'revocationKey', type: 'bytes32'} as TypedDataField,`
`22`	`22`	`{name: 'signer', type: 'address'} as TypedDataField,`
`23`		`- {name: 'nonce', type: 'uint'} as TypedDataField,`
	`23`	`+ {name: 'nonce', type: 'uint256'} as TypedDataField,`
`24`	`24`	`]`
`25`	`25`	`}`
`26`	`26`
`@@ -31,7 +31,7 @@ export const EIP712ChangeStatusesInListType = {`
`31`	`31`	`{name: 'revocationList', type: 'bytes32'},`
`32`	`32`	`{name: 'revocationKeys', type: 'bytes32[]'},`
`33`	`33`	`{name: 'signer', type: 'address'},`
`34`		`- {name: 'nonce', type: 'uint'},`
	`34`	`+ {name: 'nonce', type: 'uint256'},`
`35`	`35`	`]`
`36`	`36`	`}`
`37`	`37`
`@@ -42,7 +42,7 @@ export const EIP712ChangeStatusesInListDelegatedType = {`
`42`	`42`	`{name: 'revocationList', type: 'bytes32'},`
`43`	`43`	`{name: 'revocationKeys', type: 'bytes32[]'},`
`44`	`44`	`{name: 'signer', type: 'address'},`
`45`		`- {name: 'nonce', type: 'uint'},`
	`45`	`+ {name: 'nonce', type: 'uint256'},`
`46`	`46`	`]`
`47`	`47`	`}`
`48`	`48`
`@@ -52,7 +52,7 @@ export const EIP712ChangeListOwnerType = {`
`52`	`52`	`{name: 'newOwner', type: 'address'},`
`53`	`53`	`{name: 'revocationList', type: 'bytes32'},`
`54`	`54`	`{name: 'signer', type: 'address'},`
`55`		`- {name: 'nonce', type: 'uint'},`
	`55`	`+ {name: 'nonce', type: 'uint256'},`
`56`	`56`	`]`
`57`	`57`	`}`
`58`	`58`
`@@ -61,9 +61,9 @@ export const EIP712AddListDelegateType = {`
`61`	`61`	`{name: 'namespace', type: 'address'},`
`62`	`62`	`{name: 'delegate', type: 'address'},`
`63`	`63`	`{name: 'revocationList', type: 'bytes32'},`
`64`		`- {name: 'validity', type: 'uint'},`
	`64`	`+ {name: 'validity', type: 'uint256'},`
`65`	`65`	`{name: 'signer', type: 'address'},`
`66`		`- {name: 'nonce', type: 'uint'},`
	`66`	`+ {name: 'nonce', type: 'uint256'},`
`67`	`67`	`]`
`68`	`68`	`}`
`69`	`69`
`@@ -73,7 +73,7 @@ export const EIP712RemoveListDelegateType = {`
`73`	`73`	`{name: 'delegate', type: 'address'},`
`74`	`74`	`{name: 'revocationList', type: 'bytes32'},`
`75`	`75`	`{name: 'signer', type: 'address'},`
`76`		`- {name: 'nonce', type: 'uint'},`
	`76`	`+ {name: 'nonce', type: 'uint256'},`
`77`	`77`	`]`
`78`	`78`	`}`
`79`	`79`
`@@ -83,6 +83,6 @@ export const EIP712ChangeListStatusType = {`
`83`	`83`	`{name: 'namespace', type: 'address'},`
`84`	`84`	`{name: 'revocationList', type: 'bytes32'},`
`85`	`85`	`{name: 'signer', type: 'address'},`
`86`		`- {name: 'nonce', type: 'uint'},`
	`86`	`+ {name: 'nonce', type: 'uint256'},`
`87`	`87`	`]`
`88`	`88`	`}`