Skip to content

Commit 6517014

Browse files
committed
remove unnecessary import from state validator
1 parent 6ee1d6a commit 6517014

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

contracts/src/libraries/StateValidator.sol

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
pragma solidity ^0.8.0;
33

44
import {RLPReader} from "optimism/packages/contracts-bedrock/src/libraries/rlp/RLPReader.sol";
5-
import {MerkleTrie} from "optimism/packages/contracts-bedrock/src/libraries/trie/MerkleTrie.sol";
65
import {SecureMerkleTrie} from "optimism/packages/contracts-bedrock/src/libraries/trie/SecureMerkleTrie.sol";
76

87
import {SSZ} from "./SSZ.sol";
@@ -113,10 +112,12 @@ library StateValidator {
113112
bytes32 stateRoot,
114113
AccountProofParameters memory accountProofParams
115114
) internal pure returns (bool) {
116-
// Derive the account key that shows up in the execution client's merkle trie
117-
bytes memory accountKey = abi.encodePacked(keccak256(abi.encodePacked(account)));
118115
// Use the account proof to derive the RLP-encoded account metadata
119-
bytes memory encodedAccount = MerkleTrie.get(accountKey, accountProofParams.accountProof, stateRoot);
116+
bytes memory encodedAccount = SecureMerkleTrie.get({
117+
_key: abi.encodePacked(account),
118+
_proof: accountProofParams.accountProof,
119+
_root: stateRoot
120+
});
120121

121122
// Extract storage root from account data
122123
bytes32 storageRoot = _extractStorageRoot(encodedAccount);

0 commit comments

Comments
 (0)