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

Jump to bottom

Revert escrow #46

Merged
merged 21 commits into from
Dec 11, 2017
Merged

Revert escrow #46

merged 21 commits into from
Dec 11, 2017

Conversation

benjaminbollen
Copy link
Contributor

@benjaminbollen benjaminbollen commented Dec 11, 2017 •
edited
Loading

Introduces reversion for the escrow functionality after the timeout has passed.

Fixes #27

benjaminbollen and others added 21 commits November 29, 2017 18:04
@benjaminbollen
test: Protocol.js deploy and add core
e5e9239
Adding truffle and ethereumjs-testrpc in dev dependencies
fbbcc35
@benjaminbollen
test: simple gas measurement tracker and apply to integration tests
6acf885
@benjaminbollen
test: register STP
84d30a8
test: Task Separation & Indentation Update
b4db70a
test: Initialize Transfer to ST' Contract Address
159a9e2
test: Protocol.js propose and registerd branded token
cc23267
test: Protocol.js Adding registerUtilitytoken for branded token
8316620
Test: Protocol.js changing the call method to actual call
5c11af9
test: Added Event Decoder Library for Events Assert
e7967d2
@benjaminbollen
test: stake for ST Prime
08c96fa
@benjaminbollen
test: Member details in global scope for everyone to use
9ccb894
Test: Protocol.js changing the validation based on events raised thro…
8e4290c 
…ugh function calls
@benjaminbollen
test: Protocol stake ST for ST Prime
b3f52a2
test: Member details in global scope for everyone to use
7971f95
test: Basic Skeleton for Stake and Mint
3124f6b
@benjaminbollen
contracts: revertStaking
16809b4
@benjaminbollen
contracts: OpenSTUtility.revertRedemption. Addresses #27
b9f0e5a
@benjaminbollen
contracts: OpenSTValue.revertUnstaking
bce21de
@benjaminbollen
Merge branch 'master' into benjaminbollen/gh27/revert
8700e8d
@benjaminbollen
Merge branch 'master' into benjaminbollen/gh27/revert
e2842f0
@benjaminbollen benjaminbollen merged commit 09e81ff into develop Dec 11, 2017
@benjaminbollen benjaminbollen mentioned this pull request Dec 11, 2017
Closed
@benjaminbollen benjaminbollen deleted the benjaminbollen/gh27/revert branch December 12, 2017 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@benjaminbollen