sb-i74 (#325)

Uniswap · Sep 2, 2024 · 20863db · 20863db
1 parent b11680c
commit 20863db
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/.forge-snapshots/PositionManager_permit.snap b/.forge-snapshots/PositionManager_permit.snap
@@ -1 +1 @@
-79506
+79595
diff --git a/.forge-snapshots/PositionManager_permit_secondPosition.snap b/.forge-snapshots/PositionManager_permit_secondPosition.snap
@@ -1 +1 @@
-62394
+62483
diff --git a/.forge-snapshots/PositionManager_permit_twice.snap b/.forge-snapshots/PositionManager_permit_twice.snap
@@ -1 +1 @@
-45282
+45371
diff --git a/src/base/EIP712_v4.sol b/src/base/EIP712_v4.sol
@@ -46,6 +46,11 @@ contract EIP712_v4 is IEIP712_v4 {
             mstore(add(fmp, 0x02), domainSeparator)
             mstore(add(fmp, 0x22), dataHash)
             digest := keccak256(fmp, 0x42)
+
+            // now clean the memory we used
+            mstore(fmp, 0) // fmp held "\x19\x01", domainSeparator
+            mstore(add(fmp, 0x20), 0) // fmp+0x20 held domainSeparator, dataHash
+            mstore(add(fmp, 0x40), 0) // fmp+0x40 held dataHash
         }
     }
 }
diff --git a/src/libraries/ERC721PermitHash.sol b/src/libraries/ERC721PermitHash.sol
@@ -22,6 +22,13 @@ library ERC721PermitHashLibrary {
             mstore(add(fmp, 0x60), nonce)
             mstore(add(fmp, 0x80), deadline)
             digest := keccak256(fmp, 0xa0)
+
+            // now clean the memory we used
+            mstore(fmp, 0) // fmp held PERMIT_TYPEHASH
+            mstore(add(fmp, 0x20), 0) // fmp+0x20 held spender
+            mstore(add(fmp, 0x40), 0) // fmp+0x40 held tokenId
+            mstore(add(fmp, 0x60), 0) // fmp+0x60 held nonce
+            mstore(add(fmp, 0x80), 0) // fmp+0x80 held deadline
         }
     }
 
@@ -39,6 +46,13 @@ library ERC721PermitHashLibrary {
             mstore(add(fmp, 0x60), nonce)
             mstore(add(fmp, 0x80), deadline)
             digest := keccak256(fmp, 0xa0)
+
+            // now clean the memory we used
+            mstore(fmp, 0) // fmp held PERMIT_FOR_ALL_TYPEHASH
+            mstore(add(fmp, 0x20), 0) // fmp+0x20 held operator
+            mstore(add(fmp, 0x40), 0) // fmp+0x40 held approved
+            mstore(add(fmp, 0x60), 0) // fmp+0x60 held nonce
+            mstore(add(fmp, 0x80), 0) // fmp+0x80 held deadline
         }
     }
 }