Skip to content

Commit 96c4b94

Browse files
committed
root -> proof
re-do order comment
1 parent d7da73f commit 96c4b94

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/protocol/ETHBridge.sol

+11-11
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,21 @@ abstract contract ETHBridge is IETHBridge {
3838
}
3939

4040
/// @inheritdoc IETHBridge
41-
function claimDeposit(ETHDeposit memory deposit, bytes[] memory accountProof, bytes[] memory storageRoot)
41+
function claimDeposit(ETHDeposit memory deposit, bytes[] memory accountProof, bytes[] memory storageProof)
4242
external
4343
virtual
4444
returns (bytes32 id);
4545

46+
/// @dev Processes deposit claim by id.
47+
/// @param id Identifier of the deposit
48+
/// @param deposit Deposit to process
49+
function _processClaimDepositWithId(bytes32 id, ETHDeposit memory deposit) internal virtual {
50+
require(!claimed(id), AlreadyClaimed());
51+
_claimed[id] = true;
52+
_sendETH(deposit.to, deposit.amount, deposit.data);
53+
emit ETHDepositClaimed(id, deposit);
54+
}
55+
4656
/// @dev Function to transfer ETH to the receiver but ignoring the returndata.
4757
/// @param to Address to send the ETH to
4858
/// @param value Amount of ETH to send
@@ -55,16 +65,6 @@ abstract contract ETHBridge is IETHBridge {
5565
require(success, FailedClaim());
5666
}
5767

58-
/// @dev Processes the generic deposit claim logic.
59-
/// @param id Identifier of the deposit
60-
/// @param deposit Deposit to process
61-
function _processClaimDepositWithId(bytes32 id, ETHDeposit memory deposit) internal {
62-
require(!claimed(id), AlreadyClaimed());
63-
_claimed[id] = true;
64-
_sendETH(deposit.to, deposit.amount, deposit.data);
65-
emit ETHDepositClaimed(id, deposit);
66-
}
67-
6868
/// @dev Generates a unique ID for a deposit.
6969
/// @param deposit Deposit to generate an ID for
7070
function _generateId(ETHDeposit memory deposit) internal pure returns (bytes32) {

0 commit comments

Comments
 (0)