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.

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

Disable DCO for members of UMA team #440

Merged
merged 2 commits into from May 21, 2019
Merged

Disable DCO for members of UMA team #440

merged 2 commits into from May 21, 2019

Conversation

mrice32
Copy link
Member

@mrice32 mrice32 commented May 21, 2019

This allows UMA members to refrain from signing off commits.

Signed-off-by: Matt Rice <matthewcrice32@gmail.com>
Signed-off-by: Matthew Rice <matthewcrice32@gmail.com>
@mrice32 mrice32 changed the title [TEST] DCO TEST Disable DCO for members of UMA team May 21, 2019
@mrice32 mrice32 merged commit 10c0180 into master May 21, 2019
@mrice32 mrice32 deleted the test_dco branch May 21, 2019 21:11
ptare pushed a commit that referenced this pull request May 21, 2019
* WIP

Signed-off-by: Matt Rice <matthewcrice32@gmail.com>

* remove DCO requirement for members of UMA

Signed-off-by: Matthew Rice <matthewcrice32@gmail.com>
Signed-off-by: Prasad Tare <prasad.tare@gmail.com>
rosalindstengle pushed a commit that referenced this pull request May 22, 2019
* WIP

Signed-off-by: Matt Rice <matthewcrice32@gmail.com>

* remove DCO requirement for members of UMA

Signed-off-by: Matthew Rice <matthewcrice32@gmail.com>
Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>
rosalindstengle added a commit that referenced this pull request May 28, 2019
* Version bump (#375)

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Fees fix (#379)

* updated financials table to incl fees

* Fixes #371

* forgot prettier again

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* MultiRole Contract (#380)



Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* WIP

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Fix typo in a comment in MultiRoleTest (#386)

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Directory Reorg to incorporate v1 contracts (#387)

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Add Finder contract that looks up implementations of interfaces (#388)



Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Emit an event when an interface address changes (#391)

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Fix publishPrices.sh to not automatically provide keys (#394)

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Fix BN operations in PublishPrices.js (#396)

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Add basic implementation to commit votes (#393)

Parts of this implementation will have to change when prices can
actually be requested and when results can actually be computed.

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Add Voting contract to migrations (#399)

As discussed offline, we may want to rename the contract Voting.sol to
something like Oracle.sol, DecentralizedOracle.sol, v2Oracle.sol, etc.

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Add basic API and placeholder implementation of fixed point library (#401)

See comments for some cases that aren't handled.

Explicitly declaring a fixed point uint as the Unsigned type helps with
readability. It's also helpful to bury all this functionality in a
common place, where we can add more specialized methods or improve these
computations as needed.

Issue #351


Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* rebase

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Bugfix, need a couple of awaits in unit test (#406)

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* WIP

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* WIP

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* WIP

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Delete 2_deploy_store.js

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Add mixed operations to fixed point library for uints (#404)



Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Add UMA token contract (#408)

This token uses OpenZeppelin's ERC20Snapshot implementation for
snapshotting. It further allows a given address to mint or burn tokens.

I had to remove uninitialized-state-variables Slither detector because it falsely fires on OpenZeppelin's ERC20Snapshot contract.



Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Update solidity-coverage

Updated to the new solidity-coverage beta version now that it's being updated again. This should fix our parsing issues seen in #409 and allow us to remove some of the hacky patching that was being done before.

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* WIP

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Copy over Registry contract and use MultiRole (#409)

I went back and forth on whether to manage approved derivative creators via a MultiRole or keep what v0/Registry.sol did. Here's what it would look using MultiRole, let me know if you prefer another way.

It might be easiest to look at commit 1683dbb, which contains the actual changes from v0/contracts/Registry.sol.

Further improvements that we could make to the Registry in either this PR or in follow up PRs:

Remove PointerValidity enum
Add formatted documentation
Add to migrations

Issue #409

Needed a weird workaround for getting the coverage tool to work.

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Basic Price Requests (#402)



Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* WIP

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Slight improvements to Registry (#412)



Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* WIP

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* WIP

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Add Finder contract to migration (#416)



Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Store calculates regular and final fees

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* cleaned up

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Add ResultComputation library based on mode computation (#415)



Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Don't estimate #tokens that can be created if no underlying price (#419)

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* fixed import issue hopefully

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Delete 3_deploy_store.js

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* more cleanup

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* addressing slither

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* more slither fixes

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* more slither

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* ok even more slither updates

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Readme Updates (#414)

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Copy node_modules over when running Slither (#426)



Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Add a backup Infura API key (#431)

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* added governance permissioning and fixed point numbers

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* prettier etc

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Rename v1/ to core/ and remove v0/ from CI (#437)



Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* addressing linter

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* added weird method for coverage issue

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* more coverage issues

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Move Testable into core/contracts from common/contracts (#439)

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Disable DCO for members of UMA team (#440)

* WIP

Signed-off-by: Matt Rice <matthewcrice32@gmail.com>

* remove DCO requirement for members of UMA

Signed-off-by: Matthew Rice <matthewcrice32@gmail.com>
Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Add functions to enable computing rewards (#420)

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* addressed comment issues, separated tests

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* forgot to clean up for ci as usual

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* very ugly rebase to get DCO working, should be resolved

* removed weird duplicates

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* oops

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* finally removed FP converter

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* appeasing linter

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* comment cleanup

* WIP

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* removed files causing conflicts

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* fixing up Store comments

* store now implements withdrawable

Signed-off-by: Roz Stengle <rosalind.stengle@gmail.com>

* Revert "merge conflicts"

This reverts commit 8a92b1b, reversing
changes made to 8e88475.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants