chore: return block number

defi-wonderland · Nov 21, 2023 · 7e8fe64 · 7e8fe64
1 parent 691a227
commit 7e8fe64
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/solidity/contracts/VerifierModule.sol b/solidity/contracts/VerifierModule.sol
@@ -78,11 +78,13 @@ contract VerifierModule is IVerifierModule {
    *
    * @param _storageMirrorAccountProof The account proof of the StorageMirror contract from the latest block
    * @param _blockHeader The block header of the latest block
+   * @return _storageRoot The verified storage root
+   * @return _blockNumber The block number from the _blockHeader
    */
   function extractStorageMirrorStorageRoot(
     bytes memory _storageMirrorAccountProof,
     bytes memory _blockHeader
-  ) external view returns (bytes32 _storageRoot) {
+  ) external view returns (bytes32 _storageRoot, uint256 _blockNumber) {
     // Verify and parse the blockheader for the state root
     StateVerifier.BlockHeader memory _parsedBlockHeader = StateVerifier.verifyBlockHeader(_blockHeader);
 
@@ -95,6 +97,7 @@ contract VerifierModule is IVerifierModule {
 
     // Extract the storage root from the output of the MPT
     _storageRoot = StateVerifier.extractStorageRootFromAccount(_rlpAccount);
+    _blockNumber = _parsedBlockHeader.number;
   }
 
   /**

diff --git a/solidity/interfaces/IVerifierModule.sol b/solidity/interfaces/IVerifierModule.sol
@@ -87,11 +87,13 @@ interface IVerifierModule {
    *
    * @param _storageMirrorAccountProof The account proof of the StorageMirror contract from the latest block
    * @param _blockHeader The block header of the latest block
+   * @return _storageRoot The verified storage root
+   * @return _blockNumber The block number from the _blockHeader
    */
   function extractStorageMirrorStorageRoot(
     bytes memory _storageMirrorAccountProof,
     bytes memory _blockHeader
-  ) external view returns (bytes32 _storageRoot);
+  ) external view returns (bytes32 _storageRoot, uint256 _blockNumber);
 
   /**
    * @notice Verifies the new settings that are incoming against a storage proof from the StorageMirror on the home chain

diff --git a/solidity/test/unit/VerifierModule.t.sol b/solidity/test/unit/VerifierModule.t.sol
@@ -123,16 +123,20 @@ contract TestVerifierModule is VerifierModule {
   function extractStorageMirrorStorageRootTest(
     bytes memory _storageMirrorAccountProof,
     bytes memory _blockHeader
-  ) external view returns (bytes32 _storageRoot) {
+  ) external view returns (bytes32 _storageRoot, uint256 _blockNumber) {
+    // Verify and parse the blockheader for the state root
     StateVerifier.BlockHeader memory _parsedBlockHeader = mpt.verifyBlockHeader(_blockHeader);
 
+    // Verify the account proof against the state root
     bytes memory _rlpAccount = mpt.extractProofValue(
       _parsedBlockHeader.stateRootHash,
       abi.encodePacked(keccak256(abi.encode(STORAGE_MIRROR))),
       _storageMirrorAccountProof
     );
 
+    // Extract the storage root from the output of the MPT
     _storageRoot = mpt.extractStorageRootFromAccount(_rlpAccount);
+    _blockNumber = 500;
   }
 }
 
@@ -746,12 +750,14 @@ contract UnitStorageRoot is Base {
 
     vm.mockCall(
       address(mpt),
-      abi.encodeWithSelector(TestMPT.extractStorageRootFromAccount.selector, abi.encodePacked(_fakeAccount)),
+      abi.encodeWithSelector(TestMPT.extractStorageRootFromAccount.selector, _fakeAccount),
       abi.encode(_fakeStorageRoot)
     );
 
-    bytes32 _storageRoot = verifierModule.extractStorageMirrorStorageRootTest(_accountProof, _rlpHeader);
+    (bytes32 _storageRoot, uint256 _blockNumber) =
+      verifierModule.extractStorageMirrorStorageRootTest(_accountProof, _rlpHeader);
 
     assertEq(_storageRoot, _fakeStorageRoot, 'Storage root should match');
+    assertEq(_blockNumber, _fakeHeader.number, 'Should match the block header');
   }
 }