Skip to content

Merge the develop branch to the master branch, preparation to v3.3.0-rc0 #341

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.

Sign up for GitHub

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

Jump to bottom
Merged
akolotov merged 9 commits into from
Dec 19, 2019
Merged

Merge the develop branch to the master branch, preparation to v3.3.0-rc0 #341

akolotov merged 9 commits into from
Dec 19, 2019

Conversation

@akolotov
Copy link
Collaborator

@akolotov akolotov commented Dec 19, 2019 •
edited
Loading

This merge contains the following set of improvements and fixes:

akolotov and others added 9 commits November 28, 2019 17:52
@akolotov
Wording changes in the erc677-to-erc677 bridge deployment scripts (#321)
6fb7e59 
* example of .env file updated
* Changed output labels to reflect AMB specific
@patitonar @akolotov
Add support for two tokens in erc to native (#319)
9504b83
@k1rill-fedoseev @akolotov
Possibility of increasing/decreasing allowance in ERC677 (#328)
443ad4c 
* Added increaseAllowance and decreaseAllowance methods to ERC677 token contract
* Added simple test cases for updating allowance
@k1rill-fedoseev @akolotov
Hardcoded max validators limit (#331)
1a7a91e 
* Added internal contract limit on validators list size
* Updated validators contracts tests. Testing possible out-of-gas situation.
@k1rill-fedoseev @akolotov
Consistent checks for setMaxPerTx and setMinPerTx (#330)
c8e0f48
@patitonar @akolotov
Add upgrade scripts (#337)
e30cb98 
* Add scripts for xDai bridge upgrade
@patitonar @akolotov
Update nvm node version to 10.18 (npm v6.13.4) (#339)
13eb092
@patitonar @akolotov
Add docs in Bytes library (#340)
7970b90
@k1rill-fedoseev @akolotov
Tests to cover max number of signatures (#335)
06e4565 
* Fixed Message library bug
* Added tests for covering max number of signatures
* Increased heap memory limit for coverage script
@akolotov akolotov requested a review from patitonar December 19, 2019 09:33
patitonar
patitonar reviewed Dec 19, 2019
View reviewed changes
Copy link
Contributor

@patitonar patitonar left a comment

Choose a reason for hiding this comment

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

Does it make sense to also include #342 ?

@akolotov
Copy link
Collaborator Author

akolotov commented Dec 19, 2019

Does it make sense to also include #342 ?

It is not necessary, the rc0 is planned to be replaced by final release shortly. The idea to have rc0 is to include changes related to migration to new release of the oracle that will be deployed on the validators node as the 2 phase of migration to MCD.

@akolotov akolotov merged commit 1234b87 into master Dec 19, 2019
@akolotov akolotov mentioned this pull request Dec 19, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@patitonar patitonar patitonar approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

4 participants

@akolotov @patitonar @k1rill-fedoseev