Skip to content

Commit

Permalink
Add PackagedVersion. Remove abstract function and comment
Browse files Browse the repository at this point in the history
  • Loading branch information
ltyu committed Nov 2, 2024
1 parent df5731c commit 79b4f8c
Showing 3 changed files with 2 additions and 14 deletions.
3 changes: 2 additions & 1 deletion solidity/contracts/isms/ccip-read/AbstractCcipReadIsm.sol
Original file line number Diff line number Diff line change
@@ -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
12 changes: 0 additions & 12 deletions solidity/contracts/isms/ccip-read/StorageProofIsm.sol
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion solidity/contracts/libs/StateProofHelpers.sol
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 79b4f8c

Please sign in to comment.