Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ contract GovernorSpoke is Lockable, ChildMessengerConsumerInterface {

/**
* @notice Executes governance transaction created on Ethereum.
* @dev Can only called by ChildMessenger contract that wants to execute governance action on this child chain that
* @dev Can only be called by ChildMessenger contract that wants to execute governance action on this child chain that
* originated from DVM voters on root chain. ChildMessenger should only receive communication from ParentMessenger
* on mainnet.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import "../../common/implementation/Lockable.sol";
* @notice A version of the child messenger that allows an admin to relay messages on its behalf.
* @dev No parent messenger is needed for this case, as the admin could be trusted to manually send DVM requests on
* mainnet. This is intended to be used as a "beta" deployment compatible with any EVM-compatible chains before
* impleenting a full bridge adapter. Put simply, it is meant as a stop-gap.
* implementing a full bridge adapter. Put simply, it is meant as a stop-gap.
*/
contract Admin_ChildMessenger is Ownable, Lockable, ChildMessengerInterface {
// The only child network contract that can send messages over the bridge via the messenger is the oracle spoke.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import "../../common/implementation/Lockable.sol";

/**
* @notice Sends cross chain messages from Optimism L2 to Ethereum L1 network.
* @dev This contract is ownable via the onlyCrossDomainAccount modifier, restricting ownership to the cross-domain
* @dev This contract is ownable via the onlyFromCrossDomainAccount. modifier, restricting ownership to the cross-domain
* parent messenger contract that lives on L1.
*/
contract Optimism_ChildMessenger is CrossDomainEnabled, ChildMessengerInterface, Lockable {
Expand Down Expand Up @@ -95,7 +95,7 @@ contract Optimism_ChildMessenger is CrossDomainEnabled, ChildMessengerInterface,
* @dev The caller must be the the parent messenger, sent over the canonical message bridge.
* @param data data message sent from the L1 messenger. Should be an encoded function call or packed data.
* @param target desired recipient of `data`. Target must implement the `processMessageFromParent` function. Having
* this as a param enables the L1 Messenger to send messages to arbitrary addresses on the L1. This is primarily
* this as a param enables the L1 Messenger to send messages to arbitrary addresses on the L2. This is primarily
* used to send messages to the OracleSpoke and GovernorSpoke on L2.
*/
function processMessageFromCrossChainParent(bytes memory data, address target)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ abstract contract OptimisticRewarderBase is Lockable, MultiCaller {
bytes32 redemptionId = getRedemptionId(tokenId, cumulativeRedemptions);

// This automatically checks that redemptions[redemptionId] != 0.
// Check that it has not passed liveness liveness.
// Check that it has not passed liveness.
Redemption storage redemption = redemptions[redemptionId];
require(getCurrentTime() < redemption.expiryTime, "redemption expired or nonexistent");

Expand Down