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

Merging Release 3 branch into master #7183

Merged
merged 8 commits into from
Feb 22, 2021
Merged

Conversation

nambrot
Copy link
Contributor

@nambrot nambrot commented Feb 19, 2021

Description

This PR merges the audit response for release 3 into master. Note this should not be done with auto-merge or a squash merge but instead with merge commit

martinvol and others added 8 commits January 28, 2021 14:32
* Add migrations for cEUR stabletoken and exchange

* Add exchange identifier to stable token

* Update tests to work with exchange identifier

* Add fallback function

* Add unit tests for getExchangeRegistryId

Co-authored-by: yorhodes <yorhodes@cLabs.co>
* feat: make downtime grace period governable

* chore: remove async

* test: fixing tests where describe block logic runs prior to before() calls

* chore: remove console.log

* chore: invalidate circleci cache for wallet test to work

* chore: disable flake tracker

* chore: another attempt at invalidating cache

* chore: undo flake tracker changes

* chore: reverting commits

* Update major version number

* Update Validators.sol

* chore: fix typo

Co-authored-by: Martín Volpe <volpe@clabs.co>
@nambrot nambrot requested a review from asaj as a code owner February 19, 2021 10:44
@nambrot nambrot requested a review from a team February 19, 2021 10:44
@nambrot nambrot merged commit 16d35bc into master Feb 22, 2021
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.

3 participants