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

Jump to bottom

L06 #19

Merged
merged 4 commits into from
Jul 31, 2023
Merged

L06 #19

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8df1b62
protected internal to private
sfeyal Jun 9, 2023
edca8ca
Merge branch 'L03' into L06
sfeyal Jun 12, 2023
79fc18a
Merge branch 'L03' into L06
Michaelr-spherex Jun 13, 2023
1baed67
Merge branch 'L03' into L06
Michaelr-spherex Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/SphereXProtected.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ abstract contract SphereXProtected {
* or a 'public' function from another address
*/
function _sphereXValidatePre(int256 num, bool isExternalCall)
internal
private
returnsIfNotActivated
returns (ModifierLocals memory locals)
{
Expand All @@ -207,7 +207,7 @@ abstract contract SphereXProtected {
* or a 'public' function from another address
*/
function _sphereXValidatePost(int256 num, bool isExternalCall, ModifierLocals memory locals)
internal
private
returnsIfNotActivated
{
uint256 gas = locals.gas - gasleft();
Expand All @@ -227,7 +227,7 @@ abstract contract SphereXProtected {
* @param num function identifier
* @return gas used before calling the original function body
*/
function _sphereXValidateInternalPre(int256 num) internal returnsIfNotActivated returns(uint256){
function _sphereXValidateInternalPre(int256 num) private returnsIfNotActivated returns(uint256){
_sphereXEngine().sphereXValidateInternalPre(num);
return gasleft();
}
Expand All @@ -238,7 +238,7 @@ abstract contract SphereXProtected {
* @param num function identifier
* @param gas the gas saved before the original function nody run
*/
function _sphereXValidateInternalPost(int256 num, uint256 gas) internal returnsIfNotActivated {
function _sphereXValidateInternalPost(int256 num, uint256 gas) private returnsIfNotActivated {
_sphereXEngine().sphereXValidateInternalPost(num, gas - gasleft());
}

Expand Down