From 79b4f8cad7f39db35e3829f89195e2a66f056c1d Mon Sep 17 00:00:00 2001
From: Le Yu <6251863+ltyu@users.noreply.github.com>
Date: Sat, 2 Nov 2024 11:29:10 -0400
Subject: [PATCH] Add PackagedVersion. Remove abstract function and comment

---
 .../contracts/isms/ccip-read/AbstractCcipReadIsm.sol |  3 ++-
 .../contracts/isms/ccip-read/StorageProofIsm.sol     | 12 ------------
 solidity/contracts/libs/StateProofHelpers.sol        |  1 -
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/solidity/contracts/isms/ccip-read/AbstractCcipReadIsm.sol b/solidity/contracts/isms/ccip-read/AbstractCcipReadIsm.sol
index df6da22c7..78d21b438 100644
--- a/solidity/contracts/isms/ccip-read/AbstractCcipReadIsm.sol
+++ b/solidity/contracts/isms/ccip-read/AbstractCcipReadIsm.sol
@@ -7,6 +7,7 @@ import {ICcipReadIsm} from "../../interfaces/isms/ICcipReadIsm.sol";
 import {IMailbox} from "../../interfaces/IMailbox.sol";
 import {Message} from "../../libs/Message.sol";
 import {AbstractMultisigIsm} from "../multisig/AbstractMultisigIsm.sol";
+import {PackageVersioned} from "contracts/PackageVersioned.sol";
 
 /**
  * @title AbstractCcipReadIsm
@@ -23,7 +24,7 @@ import {AbstractMultisigIsm} from "../multisig/AbstractMultisigIsm.sol";
  *    message. This functions selector should be provided as the `callbackFunction` payload
  *    for the OffchainLookup error
  */
-abstract contract AbstractCcipReadIsm is ICcipReadIsm {
+abstract contract AbstractCcipReadIsm is ICcipReadIsm, PackageVersioned {
     // ============ Constants ============
 
     // solhint-disable-next-line const-name-snakecase
diff --git a/solidity/contracts/isms/ccip-read/StorageProofIsm.sol b/solidity/contracts/isms/ccip-read/StorageProofIsm.sol
index 9eeaa9e59..c6a68d367 100644
--- a/solidity/contracts/isms/ccip-read/StorageProofIsm.sol
+++ b/solidity/contracts/isms/ccip-read/StorageProofIsm.sol
@@ -145,18 +145,6 @@ abstract contract StorageProofIsm is AbstractCcipReadIsm, OwnableUpgradeable {
      */
     function getHeadStateSlot() public view virtual returns (uint256);
 
-    /**
-     * @notice Reverts with the data needed to query for header proofs
-     * @dev See https://eips.ethereum.org/EIPS/eip-3668 for more information
-     * @param _message encoded Message that will be included in offchain query
-     *
-     * @dev In the future, check if fees have been paid before request a proof from.
-     * For now this feature is not complete according to the team.
-     */
-    function getOffchainVerifyInfo(
-        bytes calldata _message
-    ) external view virtual;
-
     /**
      * @notice Calculates storage key of the source chain DispatchedHook.dispatched mapping
      * @param _messageNonce message nonce
diff --git a/solidity/contracts/libs/StateProofHelpers.sol b/solidity/contracts/libs/StateProofHelpers.sol
index 4673c7ac1..e8e20f303 100644
--- a/solidity/contracts/libs/StateProofHelpers.sol
+++ b/solidity/contracts/libs/StateProofHelpers.sol
@@ -5,7 +5,6 @@ import {RLPReader} from "@eth-optimism/contracts-bedrock/src/libraries/rlp/RLPRe
 import {RLPWriter} from "@eth-optimism/contracts-bedrock/src/libraries/rlp/RLPWriter.sol";
 import {MerkleTrie} from "@eth-optimism/contracts-bedrock/src/libraries/trie/MerkleTrie.sol";
 
-/// @notice Storage Proof library inspired by Succinct (https://github.com/succinctlabs)
 library StorageProof {
     using RLPReader for RLPReader.RLPItem;
     using RLPReader for bytes;