Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
4385fd5a
Commit
4385fd5a
authored
Sep 01, 2018
by
Vyom Sharma
Committed by
Leo Arias
Aug 31, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added explicit visibility (#1261)
parent
2e0713be
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
15 deletions
+16
-15
README.md
README.md
+1
-0
SignatureBouncer.sol
contracts/access/SignatureBouncer.sol
+2
-2
ERC721ReceiverMock.sol
contracts/mocks/ERC721ReceiverMock.sol
+2
-2
RBACMock.sol
contracts/mocks/RBACMock.sol
+1
-1
SafeERC20Helper.sol
contracts/mocks/SafeERC20Helper.sol
+10
-10
No files found.
README.md
View file @
4385fd5a
...
@@ -125,6 +125,7 @@ Interested in contributing to OpenZeppelin?
...
@@ -125,6 +125,7 @@ Interested in contributing to OpenZeppelin?
-
Framework proposal and roadmap: https://medium.com/zeppelin-blog/zeppelin-framework-proposal-and-development-roadmap-fdfa9a3a32ab#.iain47pak
-
Framework proposal and roadmap: https://medium.com/zeppelin-blog/zeppelin-framework-proposal-and-development-roadmap-fdfa9a3a32ab#.iain47pak
-
Issue tracker: https://github.com/OpenZeppelin/openzeppelin-solidity/issues
-
Issue tracker: https://github.com/OpenZeppelin/openzeppelin-solidity/issues
-
Contribution guidelines: https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/CONTRIBUTING.md
-
Contribution guidelines: https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/CONTRIBUTING.md
-
Code-style guide: https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/CODE_STYLE.md
-
Wiki: https://github.com/OpenZeppelin/openzeppelin-solidity/wiki
-
Wiki: https://github.com/OpenZeppelin/openzeppelin-solidity/wiki
## License
## License
...
...
contracts/access/SignatureBouncer.sol
View file @
4385fd5a
...
@@ -33,9 +33,9 @@ contract SignatureBouncer is Ownable, RBAC {
...
@@ -33,9 +33,9 @@ contract SignatureBouncer is Ownable, RBAC {
using ECRecovery for bytes32;
using ECRecovery for bytes32;
string public constant ROLE_BOUNCER = "bouncer";
string public constant ROLE_BOUNCER = "bouncer";
uint constant METHOD_ID_SIZE = 4;
uint
internal
constant METHOD_ID_SIZE = 4;
// signature size is 65 bytes (tightly packed v + r + s), but gets padded to 96 bytes
// signature size is 65 bytes (tightly packed v + r + s), but gets padded to 96 bytes
uint constant SIGNATURE_SIZE = 96;
uint
internal
constant SIGNATURE_SIZE = 96;
/**
/**
* @dev requires that a valid signature of a bouncer was provided
* @dev requires that a valid signature of a bouncer was provided
...
...
contracts/mocks/ERC721ReceiverMock.sol
View file @
4385fd5a
...
@@ -4,8 +4,8 @@ import "../token/ERC721/IERC721Receiver.sol";
...
@@ -4,8 +4,8 @@ import "../token/ERC721/IERC721Receiver.sol";
contract ERC721ReceiverMock is IERC721Receiver {
contract ERC721ReceiverMock is IERC721Receiver {
bytes4 retval_;
bytes4
internal
retval_;
bool reverts_;
bool
internal
reverts_;
event Received(
event Received(
address _operator,
address _operator,
...
...
contracts/mocks/RBACMock.sol
View file @
4385fd5a
...
@@ -5,7 +5,7 @@ import "../examples/RBACWithAdmin.sol";
...
@@ -5,7 +5,7 @@ import "../examples/RBACWithAdmin.sol";
contract RBACMock is RBACWithAdmin {
contract RBACMock is RBACWithAdmin {
string constant ROLE_ADVISOR = "advisor";
string
internal
constant ROLE_ADVISOR = "advisor";
modifier onlyAdminOrAdvisor()
modifier onlyAdminOrAdvisor()
{
{
...
...
contracts/mocks/SafeERC20Helper.sol
View file @
4385fd5a
...
@@ -61,35 +61,35 @@ contract ERC20SucceedingMock is IERC20 {
...
@@ -61,35 +61,35 @@ contract ERC20SucceedingMock is IERC20 {
contract SafeERC20Helper {
contract SafeERC20Helper {
using SafeERC20 for IERC20;
using SafeERC20 for IERC20;
IERC20
failing
;
IERC20
internal failing_
;
IERC20
succeeding
;
IERC20
internal succeeding_
;
constructor() public {
constructor() public {
failing = new ERC20FailingMock();
failing
_
= new ERC20FailingMock();
succeeding = new ERC20SucceedingMock();
succeeding
_
= new ERC20SucceedingMock();
}
}
function doFailingTransfer() public {
function doFailingTransfer() public {
failing.safeTransfer(address(0), 0);
failing
_
.safeTransfer(address(0), 0);
}
}
function doFailingTransferFrom() public {
function doFailingTransferFrom() public {
failing.safeTransferFrom(address(0), address(0), 0);
failing
_
.safeTransferFrom(address(0), address(0), 0);
}
}
function doFailingApprove() public {
function doFailingApprove() public {
failing.safeApprove(address(0), 0);
failing
_
.safeApprove(address(0), 0);
}
}
function doSucceedingTransfer() public {
function doSucceedingTransfer() public {
succeeding.safeTransfer(address(0), 0);
succeeding
_
.safeTransfer(address(0), 0);
}
}
function doSucceedingTransferFrom() public {
function doSucceedingTransferFrom() public {
succeeding.safeTransferFrom(address(0), address(0), 0);
succeeding
_
.safeTransferFrom(address(0), address(0), 0);
}
}
function doSucceedingApprove() public {
function doSucceedingApprove() public {
succeeding.safeApprove(address(0), 0);
succeeding
_
.safeApprove(address(0), 0);
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment