vacp2p/linea-monorepo
1
0
Fork 0
mirror of https://github.com/vacp2p/linea-monorepo.git synced 2026-01-09 04:08:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: rename completeBridge to completeBridging

Browse Source
This commit is contained in:
Andrea Franz
2025-06-27 14:56:01 +02:00
parent 3464208e46
commit 4408e5a1fb
6 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/src/bridging/eth/L1ETHBridge.sol
View File

@@ -112,7 +112,7 @@ contract L1ETHBridge is IL1ETHBridge, Initializable, UUPSUpgradeable, OwnableUpg
* @param _value The amount of ETH to transfer.
* @param _calldata The calldata to pass to the recipient.
*/
function completeBridge(
function completeBridging(
address _to,
uint256 _value,
bytes memory _calldata
@@ -137,7 +137,7 @@ contract L1ETHBridge is IL1ETHBridge, Initializable, UUPSUpgradeable, OwnableUpg
revert L1ETHBridge__YieldManagerDepositFailed();
}
bytes memory data = abi.encodeWithSelector(IL2ETHBridge.completeBridge.selector, _to, msg.value, _calldata);
bytes memory data = abi.encodeWithSelector(IL2ETHBridge.completeBridging.selector, _to, msg.value, _calldata);
messageService.sendMessage(remoteSender, 0, data);
}

5
contracts/src/bridging/eth/L2ETHBridge.sol
View File

@@ -5,6 +5,7 @@ import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/I
import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
import { IL1ETHBridge } from "./interfaces/IL1ETHBridge.sol";
import { IL2ETHBridge } from "./interfaces/IL2ETHBridge.sol";
import { MessageServiceBase } from "../../messaging/MessageServiceBase.sol";
import { IMessageService } from "../../messaging/interfaces/IMessageService.sol";
@@ -73,7 +74,7 @@ contract L2ETHBridge is IL2ETHBridge, Initializable, UUPSUpgradeable, OwnableUpg
* @param _value The amount of ETH to transfer.
* @param _calldata The calldata to pass to the recipient.
*/
function completeBridge(
function completeBridging(
address _to,
uint256 _value,
bytes memory _calldata
@@ -93,7 +94,7 @@ contract L2ETHBridge is IL2ETHBridge, Initializable, UUPSUpgradeable, OwnableUpg
address _to,
bytes memory _calldata
) external payable nonZeroAmount(msg.value) nonZeroAddress(_to) {
bytes memory data = abi.encodeWithSelector(IL2ETHBridge.completeBridge.selector, _to, msg.value, _calldata);
bytes memory data = abi.encodeWithSelector(IL1ETHBridge.completeBridging.selector, _to, msg.value, _calldata);
messageService.sendMessage(remoteSender, 0, data);
}

2
contracts/src/bridging/eth/interfaces/IL1ETHBridge.sol
View File

@@ -43,5 +43,5 @@ interface IL1ETHBridge {
function bridgeETH(address _to, bytes memory _calldata) external payable;
function completeBridge(address _to, uint256 _value, bytes calldata _calldata) external;
function completeBridging(address _to, uint256 _value, bytes calldata _calldata) external;
}

2
contracts/src/bridging/eth/interfaces/IL2ETHBridge.sol
View File

@@ -22,5 +22,5 @@ interface IL2ETHBridge {
function setMessageService(address _messageService) external;
function completeBridge(address _to, uint256 _value, bytes calldata _calldata) external;
function completeBridging(address _to, uint256 _value, bytes calldata _calldata) external;
}

14
contracts/test/foundry/bridging/eth/L1ETHBridge.t.sol
View File

@@ -115,7 +115,7 @@ contract L1ETHBridgeTest is Test {
assertEq(messageService.messagesLength(), 1);
bytes memory expectedData = abi.encodeWithSelector(
IL2ETHBridge.completeBridge.selector,
IL2ETHBridge.completeBridging.selector,
user2,
100,
"test-message"
@@ -128,25 +128,25 @@ contract L1ETHBridgeTest is Test {
assertEq(message.data, expectedData);
}
function test_CompleteBridgeRevertsIfMsgSenderIsNotL2MessageService() public {
function test_CompleteBridgingRevertsIfMsgSenderIsNotL2MessageService() public {
vm.prank(nonAuthorizedSender);
vm.expectRevert("CallerIsNotMessageService()");
bridge.completeBridge(user1, 0, "");
bridge.completeBridging(user1, 0, "");
}
function test_CompleteBridgeRevertsIfRemoteSenderIsNotL2ETHBridge() public {
function test_CompleteBridgingRevertsIfRemoteSenderIsNotL2ETHBridge() public {
messageService.setOriginalSender(nonAuthorizedSender);
vm.prank(address(messageService));
vm.expectRevert("SenderNotAuthorized()");
bridge.completeBridge(user1, 0, "");
bridge.completeBridging(user1, 0, "");
}
function test_CompleteBridge() public {
function test_CompleteBridging() public {
assertEq(bridge.nextCompletedMessageId(), 0);
messageService.setOriginalSender(remoteSender);
vm.prank(address(messageService));
bridge.completeBridge(user1, 100, "test-data");
bridge.completeBridging(user1, 100, "test-data");
assertEq(bridge.nextCompletedMessageId(), 1);
(address to, uint256 value, bytes memory callData) = bridge.completedMessages(0);

14
contracts/test/foundry/bridging/eth/L2ETHBridge.t.sol
View File

@@ -68,21 +68,21 @@ contract L2ETHBridgeTest is Test {
assertEq(bridge.remoteSender(), newRemoteSender);
}
function test_CompleteBridgeRevertsIfMsgSenderIsNotL2MessageService() public {
function test_CompleteBridgingRevertsIfMsgSenderIsNotL2MessageService() public {
vm.prank(nonAuthorizedSender);
vm.expectRevert("CallerIsNotMessageService()");
bridge.completeBridge(l1ETHBridge, 0, "");
bridge.completeBridging(l1ETHBridge, 0, "");
}
function test_CompleteBridgeRevertsIfRemoteSenderIsNotL1ETHBridge() public {
function test_CompleteBridgingRevertsIfRemoteSenderIsNotL1ETHBridge() public {
l2MessageService.setOriginalSender(nonAuthorizedSender);
vm.prank(address(l2MessageService));
vm.expectRevert("SenderNotAuthorized()");
bridge.completeBridge(user1, 0, "");
bridge.completeBridging(user1, 0, "");
}
function test_CompleteBridge() public {
function test_CompleteBridging() public {
l2MessageService.setOriginalSender(l1ETHBridge);
assertEq(recipientMock.lastCallParam(), 0);
@@ -90,7 +90,7 @@ contract L2ETHBridgeTest is Test {
vm.prank(address(l2MessageService));
bytes memory data = abi.encodeWithSelector(RecipientMock.foo.selector, 77);
bridge.completeBridge(address(recipientMock), 100, data);
bridge.completeBridging(address(recipientMock), 100, data);
assertEq(recipientMock.lastCallParam(), 77);
assertEq(address(recipientMock).balance, 100);
@@ -114,7 +114,7 @@ contract L2ETHBridgeTest is Test {
assertEq(l2MessageService.messagesLength(), 1);
bytes memory expectedData = abi.encodeWithSelector(
IL1ETHBridge.completeBridge.selector,
IL1ETHBridge.completeBridging.selector,
user2,
100,
"test-message"