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.

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

Merge the develop branch to the master branch, preparation to v2.4.0 #266

Merged
merged 14 commits into from
Aug 8, 2019
Merged

Merge the develop branch to the master branch, preparation to v2.4.0 #266

merged 14 commits into from
Aug 8, 2019

Conversation

akolotov
Copy link
Collaborator

@akolotov akolotov commented Aug 7, 2019 •
edited
Loading

This merge contains the following set of improvements and fixes:

varasev and others added 13 commits July 31, 2019 08:31
@varasev @akolotov
Remove redundant code from ERC677BridgeTokenRewardable contract (#249)
52ca768
@patitonar @akolotov
Fix EternalStorageProxy inheritance (#254)
6a7e0d2
@patitonar @akolotov
Allow fixAssetsAboveLimits to fix partial amounts (#247)
73c01b2 
* Allow fixAssetsAboveLimits to fix partial amounts
* Emit event in fixAssetsAboveLimits
* Increase patch version in BasicBridge
@patitonar @akolotov
Increase code coverage (#250)
7990add 
* Refactor mocks contract structure
* Add solcov ignore on covered lines not reported
* Lint fixes
* Ignore abstract methods in coverage report
* Add unit test for not covered methods
@patitonar @akolotov
Add param check in setDailyLimit and setExecutionDailyLimit methods (#…
c28f956 
…255)
@patitonar @akolotov
Check proxy upgrade contract code (#256)
b20968c 
* Remove isContract methods in favor of openzeppelin-solidity AddressUtils
* Check proxy implementation is contract
@patitonar @akolotov
Improve validator initialize gas usage (#257)
523112b
@patitonar @akolotov
Update ERC677Bridge to inherit from ERC677Receiver (#259)
8b3c898
@patitonar @akolotov
Minor fixes on contracts (#260)
ab0e1c1 
* Remove unused SafeMath in BasicForeignBridge
* Add name to mint parameters for consistency in IBurnableMintableERC677Token
* Fix return comment in version method of UpgradeabilityStorage
@patitonar @akolotov
Move mappings key to constants (#261)
3a1d4d8
@patitonar @akolotov
Add missing events in initialize methods (#262)
79de6a6
@patitonar @akolotov
Fix Travis coverage test run issue (#263)
907bde5 
* Fix FeeManagerMock directory
* Use web3 provider engine exposed by sol-coverage
@patitonar @akolotov
Add eth-gas-reporter codecheck for gas usage report on CI (#264)
b219246 
* Update eth-gas-reporter
* Add codechecks report on CI
@akolotov akolotov requested a review from patitonar August 7, 2019 21:45
@dependabot @akolotov
Bump lodash from 4.17.11 to 4.17.15 in /deploy (#265)
33ea6fa 
Bump lodash from 4.17.11 to 4.17.15 as per the GitHub security alert
@akolotov akolotov merged commit 37793f5 into master Aug 8, 2019
@akolotov akolotov mentioned this pull request Aug 8, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@patitonar patitonar patitonar approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@akolotov @patitonar @varasev