Merge pull request #1 from scroll-tech/feat-add-solutions

feat: add solutions
scroll-tech · Nov 11, 2024 · 6a2c7fb · 6a2c7fb
2 parents 5c4c2a2 + 3c8d4ca
commit 6a2c7fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -39,7 +39,7 @@ jobs:
           forge build --sizes
         id: build
 
-      # - name: Run Forge tests
-      #   run: |
-      #     forge test -vvv
-      #   id: test
+      - name: Run Forge tests
+        run: |
+          forge test -vvv
+        id: test
diff --git a/src/Part1_Counter.sol b/src/Part1_Counter.sol
@@ -28,6 +28,8 @@ contract CounterReader {
     /// @notice Reads `number` and `map[123]` from L1 using L1SLOAD
     /// @dev This function reads values from L1
     function readCounter() external view returns (uint256, uint256) {
-        // TODO: complete this function
+        bytes32 mappingSlot = keccak256(abi.encode( /* mapping key: */ 123, /* mapping slot: */ 1));
+        (uint256 val0, uint256 val1) = L1SLOAD.readUint256(counter, bytes32(uint256(0)), mappingSlot);
+        return (val0, val1);
     }
 }
diff --git a/src/Part3_Keystore.sol b/src/Part3_Keystore.sol
@@ -60,6 +60,8 @@ contract L2Wallet is Wallet {
     /// @inheritdoc Wallet
     /// @dev This function reads the signer value from L1
     function isAuthorized(address signer) public view override returns (bool) {
-        // TODO: complete this function
+        bytes32 mappingSlot = keccak256(abi.encode( /* mapping key: */ signer, /* mapping slot: */ 0));
+        bool authorized = L1SLOAD.readBool(l1Wallet, mappingSlot);
+        return authorized;
     }
 }