Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
6890efc
VestingWallet skeleton with initiate and cancel
shanefontaine Sep 26, 2018
2d47fe6
Add collectTokens
shanefontaine Sep 26, 2018
c1c60bb
Add ability to bulk upload vesting schedules for users
shanefontaine Sep 26, 2018
ba10ad0
Formatting fix
shanefontaine Sep 26, 2018
1048cc0
Add comments, formatting, and a small refactor
shanefontaine Sep 26, 2018
6157240
Add VestingEscrowWalletFactory.sol and refactor
shanefontaine Sep 26, 2018
fa06152
Removed old directory
shanefontaine Sep 26, 2018
0257564
Update styling
shanefontaine Sep 26, 2018
b26e784
Add tags
shanefontaine Sep 26, 2018
5ab925a
Add interface
shanefontaine Sep 26, 2018
459a3e3
Add ability to push tokens
shanefontaine Sep 26, 2018
0bce6a0
Add token transfers
shanefontaine Sep 28, 2018
b620851
Add check to see if total allocation is a whole multiple of number of…
shanefontaine Sep 28, 2018
11698de
Add ability to reclaim tokens from cancelled contract or to leave the…
shanefontaine Sep 28, 2018
30a1008
Update event to reflect cancellation reclaim
shanefontaine Sep 28, 2018
f3dc779
Update token distribution and logging upon cancellation and add treas…
shanefontaine Sep 28, 2018
273d787
Chagne tokensRemaining/tokensReleased to numVestedTokens/numUnvestedT…
shanefontaine Sep 28, 2018
758bcbb
Add ability to use existing tokens in contract as tokens for new vest…
shanefontaine Sep 28, 2018
4f288e9
Add templates
shanefontaine Sep 28, 2018
c3af9e8
Update formatting and deployment
shanefontaine Sep 28, 2018
693bcce
Add initial tests and update deployment file to include VestingEscrow…
shanefontaine Sep 28, 2018
28a320f
Add template creation tests
shanefontaine Sep 28, 2018
38aca0f
Update function name for clarity
shanefontaine Sep 28, 2018
7309e64
Remove requirement for tokens to have already been sent to the vestin…
shanefontaine Sep 28, 2018
e411064
Unvested token checks now happen after tokensToDistribute calculation
shanefontaine Sep 28, 2018
42f592c
Abstract _distributeVestedTokesn from collecteVestedTokens and pushVe…
shanefontaine Sep 28, 2018
ca9cc84
Add testing skeleton
shanefontaine Sep 28, 2018
34f80a0
Remove loop bug
shanefontaine Sep 28, 2018
e1c706d
WIP - Add test code
shanefontaine Sep 30, 2018
8f74d93
Remove redundant declaration of securityToken
shanefontaine Oct 2, 2018
693f615
Working test initialization
shanefontaine Oct 2, 2018
9f54aeb
Remove redundant mod check
shanefontaine Oct 2, 2018
a3e237f
Fix issue where _totalAllocation was sent during schedule deployment …
shanefontaine Oct 2, 2018
2d44a4e
Add numExcessTokens decrement in schedule creation
shanefontaine Oct 2, 2018
929c2ef
Add initiateVestingSchedule tests
shanefontaine Oct 2, 2018
4ce400c
Add initiateVestingScheduleFromTemplate tests
shanefontaine Oct 2, 2018
fa1ccd9
Check to see if there are tokens to transfer before actually transfer…
shanefontaine Oct 3, 2018
b294045
Update transferFrom to transfer for contract -> payee transactions
shanefontaine Oct 3, 2018
d75e4ad
Change transferFrom to transfer
shanefontaine Oct 5, 2018
51739e4
All tests complete
shanefontaine Oct 5, 2018
357e134
Clean up code
shanefontaine Oct 5, 2018
7059c94
Merge branch 'development-1.5.0' into development-1.5.0
shanefontaine Oct 5, 2018
e7b1a6a
Add address typecast
shanefontaine Oct 11, 2018
608686a
Merge branch 'development-1.5.0' of github.com:shanefontaine/polymath…
shanefontaine Oct 11, 2018
5c57020
Add new initialization and checks
shanefontaine Oct 11, 2018
cebe11a
Indexed templateNumber
shanefontaine Oct 11, 2018
eab0f5a
Remove event
shanefontaine Oct 11, 2018
85cabb4
Add withPerm() modifier to initiateVestingSchedule
shanefontaine Oct 11, 2018
baa5a88
Remove emitting of 0 values
shanefontaine Oct 11, 2018
e94d110
Add withPerm() to initiateVestingScheduleFromTemplate
shanefontaine Oct 11, 2018
c300610
Make initiateVestingScheduleIterate a public function with the withPe…
shanefontaine Oct 11, 2018
f9677a5
Renamed _whichVestingSchedule to _vestingScheduleIndex
shanefontaine Oct 11, 2018
ffb5587
Renamed _isReclaiming to _revokeVestingSchedule
shanefontaine Oct 11, 2018
d20c799
Add compatibleVersionRange
shanefontaine Oct 11, 2018
73d4a72
Rename getType() to getTypes()
shanefontaine Oct 11, 2018
9ea1307
Update mappings
shanefontaine Oct 11, 2018
07ec3ed
Remove extra comment
shanefontaine Oct 11, 2018
8dc4ad7
Add ternary operator
shanefontaine Oct 12, 2018
90aa0da
Update test to reflect latest standard
shanefontaine Oct 12, 2018
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
19 changes: 19 additions & 0 deletions contracts/modules/Wallet/IWallet.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
pragma solidity ^0.4.24;

import "../../Pausable.sol";
import "../Module.sol";

/**
* @title Interface to be implemented by all Wallet Manager modules
*/
contract IWallet is Pausable, Module {

function unpause() onlyOwner public {
super._unpause();
}

function pause() onlyOwner public {
super._pause();
}

}
Loading