Skip to content

Temporarily disable unsafe retryable entrypoints #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PlasmaPower merged 1 commit into from
Jun 23, 2022
Merged

Temporarily disable unsafe retryable entrypoints #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions contracts/src/bridge/IInbox.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ interface IInbox is IDelayedMessageProvider {
bytes calldata data
) external payable returns (uint256);

/// @notice TEMPORARILY DISABLED as exact mechanics are being worked out
/// @dev Gas limit and maxFeePerGas should not be set to 1 as that is used to trigger the RetryableData error
function unsafeCreateRetryableTicket(
address to,
Expand Down
19 changes: 16 additions & 3 deletions contracts/src/bridge/Inbox.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ contract Inbox is DelegateCallAware, PausableUpgradeable, IInbox {
}

return
unsafeCreateRetryableTicket(
unsafeCreateRetryableTicketInternal(
to,
l2CallValue,
maxSubmissionCost,
Expand Down Expand Up @@ -398,7 +398,7 @@ contract Inbox is DelegateCallAware, PausableUpgradeable, IInbox {
* @param data ABI encoded data of L2 message
* @return unique id for retryable transaction (keccak256(requestID, uint(0) )
*/
function unsafeCreateRetryableTicket(
function unsafeCreateRetryableTicketInternal(
address to,
uint256 l2CallValue,
uint256 maxSubmissionCost,
Expand All @@ -407,7 +407,7 @@ contract Inbox is DelegateCallAware, PausableUpgradeable, IInbox {
uint256 gasLimit,
uint256 maxFeePerGas,
bytes calldata data
) public payable virtual override whenNotPaused onlyAllowed returns (uint256) {
) internal virtual whenNotPaused onlyAllowed returns (uint256) {
// gas price and limit of 1 should never be a valid input, so instead they are used as
// magic values to trigger a revert in eth calls that surface data without requiring a tx trace
if (gasLimit == 1 || maxFeePerGas == 1)
Expand Down Expand Up @@ -447,6 +447,19 @@ contract Inbox is DelegateCallAware, PausableUpgradeable, IInbox {
);
}

function unsafeCreateRetryableTicket(
address,
uint256,
uint256,
address,
address,
uint256,
uint256,
bytes calldata
) public payable override returns (uint256) {
revert("UNSAFE_RETRYABLES_TEMPORARILY_DISABLED");
}

function _deliverMessage(
uint8 _kind,
address _sender,
Expand Down