Skip to content
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

Add functionStaticCall and functionDelegateCall methods to Address library #2333

Merged
merged 15 commits into from
Sep 17, 2020
Merged

Add functionStaticCall and functionDelegateCall methods to Address library #2333

Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
87b5e0a
Add functionStaticCall and functionDelegateCall methods to Address li…
k06a Aug 20, 2020
f29e2eb
Update contracts/utils/Address.sol
k06a Aug 24, 2020
5b03a8d
Update contracts/utils/Address.sol
k06a Aug 24, 2020
a1551d1
Avoid code duplication
k06a Aug 26, 2020
bbe6d64
Merge branch 'feature/address-delegate-and-static' of https://github.…
k06a Aug 26, 2020
4caa9d1
add back removed documentation
frangio Sep 16, 2020
ff00a17
rearrange functions
frangio Sep 16, 2020
502190a
add documentation for new Address functionCall functions
frangio Sep 16, 2020
32eaf18
Merge branch 'master' into feature/address-delegate-and-static
frangio Sep 16, 2020
f720ec3
add tests for new Address functions
frangio Sep 17, 2020
21deb2f
fix return statements
frangio Sep 17, 2020
a98219b
add tests for non contract receivers
frangio Sep 17, 2020
9ab63fb
lint
frangio Sep 17, 2020
0bbd4b3
add changelog entry
frangio Sep 17, 2020
89720a5
increase timeout
frangio Sep 17, 2020
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
7 changes: 5 additions & 2 deletions contracts/utils/Address.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,23 @@ library Address {
function functionCallWithValue(address target, bytes memory data, uint256 value, string memory errorMessage) internal returns (bytes memory) {
require(address(this).balance >= value, "Address: insufficient balance for call");
require(isContract(target), "Address: call to non-contract");

// solhint-disable-next-line avoid-low-level-calls
(bool success, bytes memory returndata) = target.call{ value: value }(data);
return _verifyCallResult(success, returndata, errorMessage);
}

function functionStaticCall(address target, bytes memory data, string memory errorMessage) internal view returns (bytes memory) {
require(isContract(target), "Address: call to non-contract");
require(isContract(target), "Address: static call to non-contract");

// solhint-disable-next-line avoid-low-level-calls
(bool success, bytes memory returndata) = target.staticcall(data);
return _verifyCallResult(success, returndata, errorMessage);
}

function functionDelegateCall(address target, bytes memory data, string memory errorMessage) internal returns (bytes memory) {
require(isContract(target), "Address: call to non-contract");
require(isContract(target), "Address: delegate call to non-contract");

// solhint-disable-next-line avoid-low-level-calls
(bool success, bytes memory returndata) = target.delegatecall(data);
return _verifyCallResult(success, returndata, errorMessage);
Expand Down