Skip to content

Commit 0cc8dcf

Browse files
Amxx0xsimkaarr00voronorernestognw
authored
Release v5.2 update before final release (#5418)
Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com> Co-authored-by: Simka <0xsimka@gmail.com> Co-authored-by: Arr00 <13561405+arr00@users.noreply.github.com> Co-authored-by: Voronor <129545215+voronor@users.noreply.github.com> Co-authored-by: Ernesto García <ernestognw@gmail.com>
1 parent f78e445 commit 0cc8dcf

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.changeset/cyan-taxis-travel.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'openzeppelin-solidity': minor
3+
---
4+
5+
`Address`: bubble up revert data on `sendValue` failed call

contracts/account/utils/draft-ERC4337Utils.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ library ERC4337Utils {
115115
return uint128(self.accountGasLimits.extract_32_16(0));
116116
}
117117

118-
/// @dev Returns `accountGasLimits` from the {PackedUserOperation}.
118+
/// @dev Returns `callGasLimit` from the {PackedUserOperation}.
119119
function callGasLimit(PackedUserOperation calldata self) internal pure returns (uint256) {
120120
return uint128(self.accountGasLimits.extract_32_16(16));
121121
}
@@ -155,7 +155,7 @@ library ERC4337Utils {
155155
return self.paymasterAndData.length < 52 ? 0 : uint128(bytes16(self.paymasterAndData[36:52]));
156156
}
157157

158-
/// @dev Returns the forth section of `paymasterAndData` from the {PackedUserOperation}.
158+
/// @dev Returns the fourth section of `paymasterAndData` from the {PackedUserOperation}.
159159
function paymasterData(PackedUserOperation calldata self) internal pure returns (bytes calldata) {
160160
return self.paymasterAndData.length < 52 ? _emptyCalldataBytes() : self.paymasterAndData[52:];
161161
}

contracts/interfaces/draft-IERC7579.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ interface IERC7579Execution {
121121
* MUST ensure adequate authorization control: e.g. onlyEntryPointOrSelf if used with ERC-4337
122122
* If a mode is requested that is not supported by the Account, it MUST revert
123123
*/
124-
function execute(bytes32 mode, bytes calldata executionCalldata) external;
124+
function execute(bytes32 mode, bytes calldata executionCalldata) external payable;
125125

126126
/**
127127
* @dev Executes a transaction on behalf of the account.
@@ -136,7 +136,7 @@ interface IERC7579Execution {
136136
function executeFromExecutor(
137137
bytes32 mode,
138138
bytes calldata executionCalldata
139-
) external returns (bytes[] memory returnData);
139+
) external payable returns (bytes[] memory returnData);
140140
}
141141

142142
/**

contracts/utils/Address.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ library Address {
3535
revert Errors.InsufficientBalance(address(this).balance, amount);
3636
}
3737

38-
(bool success, ) = recipient.call{value: amount}("");
38+
(bool success, bytes memory returndata) = recipient.call{value: amount}("");
3939
if (!success) {
40-
revert Errors.FailedCall();
40+
_revert(returndata);
4141
}
4242
}
4343

0 commit comments

Comments
 (0)