diff --git a/.changeset/thin-horses-change.md b/.changeset/thin-horses-change.md new file mode 100644 index 000000000000..70a323982f50 --- /dev/null +++ b/.changeset/thin-horses-change.md @@ -0,0 +1,5 @@ +--- +'@eth-optimism/contracts': patch +--- + +Removed verifyExclusionProof function from MerkleTrie library. diff --git a/packages/contracts/contracts/optimistic-ethereum/libraries/trie/Lib_MerkleTrie.sol b/packages/contracts/contracts/optimistic-ethereum/libraries/trie/Lib_MerkleTrie.sol index b1f8a8d19eb7..2997f704b7c5 100644 --- a/packages/contracts/contracts/optimistic-ethereum/libraries/trie/Lib_MerkleTrie.sol +++ b/packages/contracts/contracts/optimistic-ethereum/libraries/trie/Lib_MerkleTrie.sol @@ -92,34 +92,6 @@ library Lib_MerkleTrie { ); } - /** - * @notice Verifies a proof that a given key is *not* present in - * the Merkle trie. - * @param _key Key of the node to search for, as a hex string. - * @param _proof Merkle trie inclusion proof for the node *nearest* the - * target node. - * @param _root Known root of the Merkle trie. Used to verify that the - * included proof is correctly constructed. - * @return _verified `true` if the key is absent in the trie, `false` otherwise. - */ - function verifyExclusionProof( - bytes memory _key, - bytes memory _proof, - bytes32 _root - ) - internal - pure - returns ( - bool _verified - ) - { - ( - bool exists, - ) = get(_key, _proof, _root); - - return exists == false; - } - /** * @notice Updates a Merkle trie and returns a new root hash. * @param _key Key of the node to update, as a hex string. diff --git a/packages/contracts/contracts/optimistic-ethereum/libraries/trie/Lib_SecureMerkleTrie.sol b/packages/contracts/contracts/optimistic-ethereum/libraries/trie/Lib_SecureMerkleTrie.sol index 80a6702540d6..ba6aba7f0993 100644 --- a/packages/contracts/contracts/optimistic-ethereum/libraries/trie/Lib_SecureMerkleTrie.sol +++ b/packages/contracts/contracts/optimistic-ethereum/libraries/trie/Lib_SecureMerkleTrie.sol @@ -42,31 +42,6 @@ library Lib_SecureMerkleTrie { return Lib_MerkleTrie.verifyInclusionProof(key, _value, _proof, _root); } - /** - * @notice Verifies a proof that a given key is *not* present in - * the Merkle trie. - * @param _key Key of the node to search for, as a hex string. - * @param _proof Merkle trie inclusion proof for the node *nearest* the - * target node. - * @param _root Known root of the Merkle trie. Used to verify that the - * included proof is correctly constructed. - * @return _verified `true` if the key is not present in the trie, `false` otherwise. - */ - function verifyExclusionProof( - bytes memory _key, - bytes memory _proof, - bytes32 _root - ) - internal - pure - returns ( - bool _verified - ) - { - bytes memory key = _getSecureKey(_key); - return Lib_MerkleTrie.verifyExclusionProof(key, _proof, _root); - } - /** * @notice Updates a Merkle trie and returns a new root hash. * @param _key Key of the node to update, as a hex string. diff --git a/packages/contracts/contracts/test-libraries/trie/TestLib_MerkleTrie.sol b/packages/contracts/contracts/test-libraries/trie/TestLib_MerkleTrie.sol index 36335db39f14..3775c0ba9885 100644 --- a/packages/contracts/contracts/test-libraries/trie/TestLib_MerkleTrie.sol +++ b/packages/contracts/contracts/test-libraries/trie/TestLib_MerkleTrie.sol @@ -29,24 +29,6 @@ contract TestLib_MerkleTrie { ); } - function verifyExclusionProof( - bytes memory _key, - bytes memory _proof, - bytes32 _root - ) - public - pure - returns ( - bool - ) - { - return Lib_MerkleTrie.verifyExclusionProof( - _key, - _proof, - _root - ); - } - function update( bytes memory _key, bytes memory _value, diff --git a/packages/contracts/contracts/test-libraries/trie/TestLib_SecureMerkleTrie.sol b/packages/contracts/contracts/test-libraries/trie/TestLib_SecureMerkleTrie.sol index 5ab749a42647..49bf74216a01 100644 --- a/packages/contracts/contracts/test-libraries/trie/TestLib_SecureMerkleTrie.sol +++ b/packages/contracts/contracts/test-libraries/trie/TestLib_SecureMerkleTrie.sol @@ -30,24 +30,6 @@ contract TestLib_SecureMerkleTrie { ); } - function verifyExclusionProof( - bytes memory _key, - bytes memory _proof, - bytes32 _root - ) - public - pure - returns ( - bool - ) - { - return Lib_SecureMerkleTrie.verifyExclusionProof( - _key, - _proof, - _root - ); - } - function update( bytes memory _key, bytes memory _value,