feat: Migrate to solidity 0.8.23

bcnmy · Dec 26, 2023 · 5b93e4f · 5b93e4f
1 parent 1833664
commit 5b93e4f
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 25 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/registry"]
+	path = lib/registry
+	url = https://github.com/rhinestonewtf/registry
diff --git a/contracts/smart-account/modules/MultichainECDSAValidator.sol b/contracts/smart-account/modules/MultichainECDSAValidator.sol
@@ -43,7 +43,7 @@ contract MultichainECDSAValidator is EcdsaOwnershipRegistryModule {
 
         address sender;
         // read sender from userOp, which is first userOp member (saves gas)
-        assembly {
+        assembly ("memory-safe") {
             sender := calldataload(userOp)
         }
 
@@ -70,16 +70,19 @@ contract MultichainECDSAValidator is EcdsaOwnershipRegistryModule {
                 moduleSignature,
                 (uint48, uint48, bytes32, bytes32[], bytes)
             );
+        {
+            // make a leaf out of userOpHash, validUntil and validAfter
+            bytes32 leaf = keccak256(
+                abi.encodePacked(validUntil, validAfter, userOpHash)
+            );
 
-        // make a leaf out of userOpHash, validUntil and validAfter
-        bytes32 leaf = keccak256(
-            abi.encodePacked(validUntil, validAfter, userOpHash)
-        );
-
-        if (!MerkleProof.verify(merkleProof, merkleTreeRoot, leaf)) {
-            revert("Invalid UserOp");
+            if (!MerkleProof.verify(merkleProof, merkleTreeRoot, leaf)) {
+                revert("Invalid UserOp");
+            }
         }
 
+        validUntil = validUntil == 0 ? type(uint48).max : validUntil;
+
         return
             _verifySignature(
                 merkleTreeRoot,
@@ -88,7 +91,7 @@ contract MultichainECDSAValidator is EcdsaOwnershipRegistryModule {
             )
                 ? _packValidationData(
                     false, //sigVerificationFailed = false
-                    validUntil == 0 ? type(uint48).max : validUntil,
+                    validUntil,
                     validAfter
                 )
                 : SIG_VALIDATION_FAILED;

diff --git a/foundry.toml b/foundry.toml
@@ -15,6 +15,7 @@ remappings = [
 via_ir = true
 evm_version = "paris"
 auto_detect_solc = true
+# auto_detect_remappings = false
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config
 

diff --git a/lib/registry b/lib/registry
diff --git a/remappings.txt b/remappings.txt
@@ -14,4 +14,6 @@ interfaces=contracts/smart-account/interfaces/
 libs=contracts/smart-account/libs/
 modules=contracts/smart-account/modules/
 paymasters=contracts/smart-account/paymasters/
-test-contracts=contracts/smart-account/test/
+test-contracts=contracts/smart-account/test/
+
+solady/=lib/registry/lib/solady/src
diff --git a/test/foundry/base/RhinestoneTestBase.sol b/test/foundry/base/RhinestoneTestBase.sol
@@ -10,6 +10,6 @@ contract RhinestoneTestBase is SATestBase, BaseTest {
         SATestBase.setUp();
         BaseTest.setUp();
 
-        vm.label(address(instancel1.registry), "Rhinestone Registry");
+        vm.label(address(instance.registry), "Rhinestone Registry");
     }
 }
diff --git a/test/foundry/module/SecurityPolicy/ERC7484SecurityPolicyPlugin.t.sol b/test/foundry/module/SecurityPolicy/ERC7484SecurityPolicyPlugin.t.sol
@@ -62,7 +62,7 @@ contract ERC7484SecurityPolicyPluginTest is
 
         // Deploy ERC7484SecurityPolicyPlugin
         erc7484SecurityPolicyPlugin = new ERC7484SecurityPolicyPlugin(
-            instancel1.registry
+            instance.registry
         );
 
         // Enable the Security Policy
@@ -107,7 +107,7 @@ contract ERC7484SecurityPolicyPluginTest is
 
         // Deploy and register MultichainValidator with registry
         validator = MultichainECDSAValidator(
-            instancel1.deployAndRegister(
+            instance.deployAndRegister(
                 defaultResolver,
                 type(MultichainECDSAValidator).creationCode,
                 abi.encode(0)
@@ -162,7 +162,7 @@ contract ERC7484SecurityPolicyPluginTest is
         external
     {
         // Create 3 attestations for the multichain validator module
-        instancel1.newAttestation(
+        instance.newDelegatedAttestation(
             defaultSchema1,
             bob.privateKey,
             AttestationRequestData({
@@ -172,7 +172,7 @@ contract ERC7484SecurityPolicyPluginTest is
                 value: 0
             })
         );
-        instancel1.newAttestation(
+        instance.newDelegatedAttestation(
             defaultSchema1,
             charlie.privateKey,
             AttestationRequestData({
@@ -182,7 +182,7 @@ contract ERC7484SecurityPolicyPluginTest is
                 value: 0
             })
         );
-        instancel1.newAttestation(
+        instance.newDelegatedAttestation(
             defaultSchema1,
             dan.privateKey,
             AttestationRequestData({
@@ -234,7 +234,7 @@ contract ERC7484SecurityPolicyPluginTest is
         vm.stopPrank();
 
         // Create 3 attestations for the multichain validator module
-        instancel1.newAttestation(
+        instance.newDelegatedAttestation(
             defaultSchema1,
             bob.privateKey,
             AttestationRequestData({
@@ -244,7 +244,7 @@ contract ERC7484SecurityPolicyPluginTest is
                 value: 0
             })
         );
-        instancel1.newAttestation(
+        instance.newDelegatedAttestation(
             defaultSchema1,
             charlie.privateKey,
             AttestationRequestData({
@@ -254,7 +254,7 @@ contract ERC7484SecurityPolicyPluginTest is
                 value: 0
             })
         );
-        instancel1.newAttestation(
+        instance.newDelegatedAttestation(
             defaultSchema1,
             dan.privateKey,
             AttestationRequestData({
@@ -315,7 +315,7 @@ contract ERC7484SecurityPolicyPluginTest is
         external
     {
         // Create 2 attestations for the multichain validator module
-        instancel1.newAttestation(
+        instance.newDelegatedAttestation(
             defaultSchema1,
             bob.privateKey,
             AttestationRequestData({
@@ -325,7 +325,7 @@ contract ERC7484SecurityPolicyPluginTest is
                 value: 0
             })
         );
-        instancel1.newAttestation(
+        instance.newDelegatedAttestation(
             defaultSchema1,
             charlie.privateKey,
             AttestationRequestData({
@@ -381,7 +381,7 @@ contract ERC7484SecurityPolicyPluginTest is
         external
     {
         // Create 3 attestations for the multichain validator module
-        instancel1.newAttestation(
+        instance.newDelegatedAttestation(
             defaultSchema1,
             bob.privateKey,
             AttestationRequestData({
@@ -391,7 +391,7 @@ contract ERC7484SecurityPolicyPluginTest is
                 value: 0
             })
         );
-        instancel1.newAttestation(
+        instance.newDelegatedAttestation(
             defaultSchema1,
             charlie.privateKey,
             AttestationRequestData({
@@ -401,7 +401,7 @@ contract ERC7484SecurityPolicyPluginTest is
                 value: 0
             })
         );
-        instancel1.newAttestation(
+        instance.newDelegatedAttestation(
             defaultSchema1,
             dan.privateKey,
             AttestationRequestData({
@@ -413,7 +413,7 @@ contract ERC7484SecurityPolicyPluginTest is
         );
 
         // Revoke one of the attestations
-        instancel1.revokeAttestation(
+        instance.delegatedRevokeAttestation(
             address(validator),
             defaultSchema1,
             bob.privateKey