Skip to content
This repository has been archived by the owner on Jul 9, 2021. It is now read-only.

Merge development into 3.0 #2174

Closed
wants to merge 1,149 commits into from
Closed

Merge development into 3.0 #2174

wants to merge 1,149 commits into from

Conversation

xianny
Copy link
Contributor

@xianny xianny commented Sep 18, 2019

Description

Testing instructions

Types of changes

Checklist:

  • Prefix PR title with [WIP] if necessary.
  • Add tests to cover changes as needed.
  • Update documentation as needed.
  • Add new entries to the relevant CHANGELOG.jsons.

abandeali1 and others added 30 commits August 27, 2019 23:42
…cate-code

Remove duplicate code from staking contracts
* This commit also squashed some bugs in the reference functions.
Thankfully, combinatorial testing had our back!
* This commit also squashed some bugs in the reference functions.
Thankfully, combinatorial testing had our back!
…uild.

This is not a real to update to `payProtocolFee`. Rather, the interface
was updated to it's finished state. This will be addressed in my next
PR.
hysz and others added 8 commits September 17, 2019 17:36
This merge resolves conflicts in contracts/* packages and abi-gen

Tests in contracts/* are passing

Tests in packages/* are failing. The main issue is refactoring the SignedOrder type
to conform with the v3 spec. There may be other smaller refactors needed to get
tests passing again.
@xianny xianny mentioned this pull request Sep 18, 2019
4 tasks
@xianny xianny closed this Sep 21, 2019
@xianny xianny deleted the merge-development-into-3.0 branch October 8, 2019 00:18
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.

7 participants