Skip to content

Liquidation Waterfall Module #2

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

Draft
iamdefinitelyahuman wants to merge 14 commits into
base: master
Choose a base branch
from
Draft

Liquidation Waterfall Module #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
43811e2
waterfall - calculate preferred considerations
iamdefinitelyahuman Jun 14, 2019
df3d10a
cleanup
iamdefinitelyahuman Jun 14, 2019
a4dd6ac
python implementation for reference (so messy)
iamdefinitelyahuman Jun 16, 2019
5c53411
waterfall, calculate preferred considerations (deja vu?)
iamdefinitelyahuman Jun 16, 2019
a5ba58e
recursive checks for preferred conversion
iamdefinitelyahuman Jun 16, 2019
90e6036
waterfall calculation logic complete
iamdefinitelyahuman Jun 16, 2019
050023e
formatting, rename variables
iamdefinitelyahuman Jun 16, 2019
ba60f3f
logic for out-of-funds during preferred
iamdefinitelyahuman Jun 16, 2019
0709b97
change converting uint8 to notConverting bool
iamdefinitelyahuman Jun 16, 2019
df6d0f1
cleanup, comments
iamdefinitelyahuman Jun 17, 2019
4c60f78
getters
iamdefinitelyahuman Jun 19, 2019
cf066d0
change getter function name
iamdefinitelyahuman Jun 28, 2019
120dd1a
fix nested memory arrays issue (and some merge mess)
iamdefinitelyahuman Jul 1, 2019
a406c45
it works!
iamdefinitelyahuman Jul 2, 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
4 changes: 2 additions & 2 deletions contracts/modules/VestedOptions.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ contract VestedOptions is STModuleBase {
Option storage o = _saveOption(_id, _price, _iso);

uint32 _total;
uint256[2] memory _max = [t.length - 1, uint256(expirationMonths)];
uint256[2] memory _max = [t.length - 1, uint256(expirationMonths)];

for (uint256 i; i < _amount.length; i++) {
require(_monthsToVest[i] < _max[1]); // dev: vest > expiration
Expand Down Expand Up @@ -577,7 +577,7 @@ contract VestedOptions is STModuleBase {
function _accellerateOrTerminate(
OptionBase storage b,
uint32 _price,
uint32 _gracePeriod
uint32 _gracePeriod
)
internal
returns (uint32 _total)
Expand Down
Loading