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

Identity transfer eth #145

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Identity transfer eth #145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82055eb
add onlyAction modifier
Apr 11, 2019
02791e3
add transferEth method
Apr 11, 2019
49c1c44
add comment to onlyAction
Apr 11, 2019
6c8caf5
add payable to execute, upgrade Ganache(stuff costs more) and test ba…
Apr 12, 2019
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
2 changes: 2 additions & 0 deletions contracts/Identity.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ contract Identity is KeyManager {
bytes memory data
) onlyAction
public
payable
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥇

returns (bool success)
{
// solium-disable-next-line security/no-inline-assembly
Expand All @@ -90,6 +91,7 @@ contract Identity is KeyManager {
bytes memory data
) onlyAction
public
payable
returns (bool success)
{
// solium-disable-next-line security/no-inline-assembly
Expand Down
18 changes: 18 additions & 0 deletions contracts/mock/TestProxyExecution.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,36 @@ contract TextProxyExecution {

// Counts calls by msg.sender
mapping(address => uint) public numCalls;
mapping(address => uint) public paidCalls;

function callMe()
external
payable
{
numCalls[msg.sender] += 1;
}

function callMeWithMoney()
external
payable
{
require(msg.value > 0);
paidCalls[msg.sender] += 1;
}

function getCallsFrom(address caller)
external
view
returns (uint noOfCalls)
{
return numCalls[caller];
}

function getPayedCallsFrom(address caller)
external
view
returns (uint noOfCalls)
{
return paidCalls[caller];
}
}
Loading