Skip to content

Indexing the param #500

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

Merged
merged 4 commits into from
Jan 3, 2019
+10 −10
Merged

Indexing the param #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ee0394
indexing the param
SatyamSB Jan 2, 2019
eadf4fa
Merge branch 'dev-2.1.0' into indexed-param
satyamakgec Jan 3, 2019
e3fe48b
Merge branch 'dev-2.1.0' into indexed-param
VictorVicente Jan 3, 2019
2b3af72
Merge branch 'dev-2.1.0' into indexed-param
satyamakgec Jan 3, 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
6 changes: 3 additions & 3 deletions contracts/modules/Checkpoint/ERC20DividendCheckpoint.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@ contract ERC20DividendCheckpoint is ERC20DividendCheckpointStorage, DividendChec
);
event ERC20DividendClaimed(
address indexed _payee,
uint256 _dividendIndex,
uint256 indexed _dividendIndex,
address indexed _token,
uint256 _amount,
uint256 _withheld
);
event ERC20DividendReclaimed(
address indexed _claimer,
uint256 _dividendIndex,
uint256 indexed _dividendIndex,
address indexed _token,
uint256 _claimedAmount
);
event ERC20DividendWithholdingWithdrawn(
address indexed _claimer,
uint256 _dividendIndex,
uint256 indexed _dividendIndex,
address indexed _token,
uint256 _withheldAmount
);
Expand Down
10 changes: 5 additions & 5 deletions contracts/modules/Checkpoint/EtherDividendCheckpoint.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ contract EtherDividendCheckpoint is DividendCheckpoint {
uint256 _expiry,
uint256 _amount,
uint256 _totalSupply,
uint256 _dividendIndex,
uint256 indexed _dividendIndex,
bytes32 indexed _name
);
event EtherDividendClaimed(address indexed _payee, uint256 _dividendIndex, uint256 _amount, uint256 _withheld);
event EtherDividendReclaimed(address indexed _claimer, uint256 _dividendIndex, uint256 _claimedAmount);
event EtherDividendClaimFailed(address indexed _payee, uint256 _dividendIndex, uint256 _amount, uint256 _withheld);
event EtherDividendWithholdingWithdrawn(address indexed _claimer, uint256 _dividendIndex, uint256 _withheldAmount);
event EtherDividendClaimed(address indexed _payee, uint256 indexed _dividendIndex, uint256 _amount, uint256 _withheld);
event EtherDividendReclaimed(address indexed _claimer, uint256 indexed _dividendIndex, uint256 _claimedAmount);
event EtherDividendClaimFailed(address indexed _payee, uint256 indexed _dividendIndex, uint256 _amount, uint256 _withheld);
event EtherDividendWithholdingWithdrawn(address indexed _claimer, uint256 indexed _dividendIndex, uint256 _withheldAmount);

/**
* @notice Constructor
Expand Down
4 changes: 2 additions & 2 deletions contracts/modules/TransferManager/GeneralTransferManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ contract GeneralTransferManager is GeneralTransferManagerStorage, ITransferManag
// if allowAllWhitelistTransfers is TRUE, then _toTime and _fromTime is ignored when sending or receiving tokens
// in any case, any investor sending or receiving tokens, must have a _expiryTime in the future
event ModifyWhitelist(
address _investor,
address indexed _investor,
uint256 _dateAdded,
address _addedBy,
address indexed _addedBy,
uint256 _fromTime,
uint256 _toTime,
uint256 _expiryTime,
Expand Down