Skip to content
This repository was archived by the owner on Jun 15, 2021. It is now read-only.

Dev - #36

Merged
dOrgJelli merged 19 commits into
masterfrom
dev
Sep 7, 2019
Merged

Dev#36
dOrgJelli merged 19 commits into
masterfrom
dev

Conversation

@tspoff

@tspoff tspoff commented Aug 25, 2019

Copy link
Copy Markdown
Collaborator

No description provided.

tspoff and others added 19 commits July 23, 2019 19:06
* add daostack test / imports

* add babel

* add merkle payment pool
* remove DAOStack integration tests

* zos -> oz update

* test update
* add deploy script

* update scripts
* update openzep dependencies

* convert tests to use web3 contracts

* test refactor add splitOnPay variant tests

* update gitignore

* add solcover settings

* Add setup settings for coverage network
* separate deploy parameters

* change oz manager
* add RewardsDistributor

* wrapper, first unit tests

* fix tests

* more tests

* better tests

* bring back sender address for distribute events

* comments

* (spelling) reminder -> remainder
@sethfork
sethfork self-requested a review September 4, 2019 20:48

@sethfork sethfork left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's move the scalable dividends implementation to a feature branch and merge stale changes from dev.

@tspoff @bogdanbatog

@tspoff

tspoff commented Sep 5, 2019

Copy link
Copy Markdown
Collaborator Author

The scalable_dividends branch is already merged to dev.

Agreed on feature branches going forward - how do you think we should do feature branches? I usually just do feat/<name>

@tspoff

tspoff commented Sep 5, 2019

Copy link
Copy Markdown
Collaborator Author

Down to merge dev to master here, pending 1 review approval.

@dOrgJelli
dOrgJelli merged commit efaab25 into master Sep 7, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants