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

upgrade master minter contracts to v.0.6.12, merge multi-issuer branch to master #327

Merged
merged 92 commits into from
Jun 3, 2021

Conversation

walkerq
Copy link
Contributor

@walkerq walkerq commented May 28, 2021

Changes:

  1. Merges multi-issuer branch to master. That branch contains the contracts used for multi-issuer minting.
  2. Updates solidity version of multi-issuer contracts to v0.6.12 (from v4.x)

Testing:
Incorporates tests originally written on the multi-issuer branch. Since there has been significant test restructuring since these tests were originally written, there was a bit of refactoring, linting, etc. needed in order to get those tests running in the current test suite on master.

eztierney and others added 30 commits September 7, 2018 16:51
All tests use global Accounts object from AccountUtils.
Changed MintController MintableTokenInterface token to MinterManagementInterface minterManager
* add ControllerState object to ControllerTestUtils.js

* checkVariables takes as input either FiatTokenV1 or MintController

* replaced literal objects with actual objects

* Using library funciton clone(), removing logObject, and creating checkMINTp0 function for unit tests

* removed unused clone code

* Updated yarn.lock and package.json to use yarn 1.10.1
* Wrote 15 BasicTests

* Finish writing BasicTests, added ABITests

* Removed unused variables, fixed comments, and deleted quotation marks from csv file

* returning quatation marks
@walkerq walkerq changed the title merge multi-issuer branch, upgrade master minter contracts to v.0.6.12 upgrade master minter contracts to v.0.6.12, merge multi-issuer branch to master May 28, 2021
@mboorstin-circle
Copy link

@walkerq is this ready for review?

@walkerq
Copy link
Contributor Author

walkerq commented May 29, 2021

@walkerq is this ready for review?

@mboorstin-circle almost, but there's still some cruft I'd like to cleanup, can post for review tomorrow

@walkerq walkerq marked this pull request as draft May 29, 2021 01:55
@mboorstin-circle
Copy link

@walkerq is this ready for review?

@mboorstin-circle almost, but there's still some cruft I'd like to cleanup, can post for review tomorrow

No rush, just wanted to make sure I wasn't blocking it. Thanks!

scripts/start-ganache.sh Outdated Show resolved Hide resolved
@walkerq walkerq force-pushed the multi-issuer-upgrade-to-sol-0.6 branch from 29d0f54 to 89bf348 Compare June 1, 2021 13:22
@walkerq walkerq marked this pull request as ready for review June 1, 2021 15:58
@walkerq walkerq requested a review from eztierney June 1, 2021 16:49
contracts/minting/Controller.sol Outdated Show resolved Hide resolved
contracts/minting/MasterMinter.sol Outdated Show resolved Hide resolved
contracts/minting/MintController.sol Outdated Show resolved Hide resolved
contracts/minting/MinterManagementInterface.sol Outdated Show resolved Hide resolved
@eztierney eztierney merged commit 0d3cab1 into circlefin:master Jun 3, 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.

8 participants