Commit Graph

856 Commits

Author SHA1 Message Date
Kirill Fedoseev 443ad4c3db Possibility of increasing/decreasing allowance in ERC677 (#328)
* Added increaseAllowance and decreaseAllowance methods to ERC677 token contract
* Added simple test cases for updating allowance
2019-12-12 17:22:59 +03:00
Gerardo Nardelli 9504b832b1 Add support for two tokens in erc to native (#319) 2019-12-11 23:18:32 +03:00
Alexander Kolotov 6fb7e592b3
Wording changes in the erc677-to-erc677 bridge deployment scripts (#321)
* example of .env file updated
* Changed output labels to reflect AMB specific
2019-11-28 17:52:16 +03:00
Alexander Kolotov 20d262702d
Bump version to 3.2.0 (#316) 2019-11-07 18:35:28 +01:00
Alexander Kolotov fdaab2777e
Merge the develop branch to the master branch, preparation to v3.2.0 2019-11-07 17:27:02 +01:00
Gerardo Nardelli 61d40db8e5 Update interfaces version (#314) 2019-11-07 04:12:33 +03:00
Gerardo Nardelli cc7718284d Add method to migrate from SCD to MCD (#311) 2019-11-05 09:07:19 +03:00
Gerardo Nardelli 7bf4e0629a Fix setTotalSpentPerDay called twice in AMB-ERC-TO-ERC (#309) 2019-10-30 22:16:28 +03:00
Gerardo Nardelli 39910b771b Add alternative receiver for transfer in erc20 to erc20 mode (#305)
* Add alternative receiver for transfer in erc20 to erc20 mode
* Check limits in foreign erc20-to-erc20 relayRequest
* Add relayRequest unit test for foreign erc20-to-erc20
* Update initialize parameters in foreign erc20-to-erc20
2019-10-25 15:33:40 +03:00
Gerardo Nardelli c0ee60806d Add alternative receiver for transfer in native to erc20 mode (#302) 2019-10-23 18:46:48 +03:00
Gerardo Nardelli 7d033bde33 Add alternative receiver for ERC677-to-ERC677 on top of AMB (#301)
* Add alternative receiver for amb-erc677-to-erc677
2019-10-17 21:34:16 +03:00
Gerardo Nardelli 36afcf0019 Add alternative receiver for transfer in erc20 to native mode (#294)
* Add alternative receiver for erc20-to-native transfers
* Check limits in foreign erc20-to-native relayRequest
* Update initialize parameters in foreign erc20-to-native
2019-10-17 17:06:09 +03:00
varasev 6de4ca4580 Simplify mintReward function (#304) 2019-10-12 06:32:14 +03:00
Max Alekseenko 165d828437 Use hex-identifiers directly instead of runtime hash calculation (#303) 2019-10-11 11:36:37 +03:00
Gerardo Nardelli f4ebf8b053 Remove deployed at block information in mediators contracts (#292) 2019-09-27 22:05:46 +03:00
Harry Liu 5ca35e5cdc Update README.md (#289) 2019-09-27 21:12:34 +03:00
Harry Liu a2df53f8c7 Update README.md (#290) 2019-09-27 12:03:58 +03:00
Alexander Kolotov 86b35f8382
Merge pull request #288 from poanetwork/bump-version-to-3.1.0
Bump version to 3.1.0
2019-09-16 23:48:56 +03:00
Alexander Kolotov 55df011769 Bump version to 3.1.0 2019-09-16 18:20:22 +03:00
Alexander Kolotov ec8feef110
Merge the develop branch to the master branch, preparation to v3.1.0 2019-09-16 18:09:54 +03:00
Gerardo Nardelli f48c36647f Add methods to fix failed messages in erc677 to erc677 (#284) 2019-09-13 16:51:54 +03:00
Gerardo Nardelli de50f6f819 Add result information for AMB message call (#282)
* Remove duplicate IAMB
* Add message call status, data hash, receiver and sender in AMB message processor
* Index parameter of AMB message completed events
2019-09-11 17:41:30 +03:00
Gerardo Nardelli f7265bfee4 Update project dependencies to latest versions (#283)
* Update dependencies
* Apply prettier format
2019-09-10 00:27:45 +03:00
Gerardo Nardelli 83900ea971 Add erc677 to erc677 bridge on top of AMB (#273)
Closes #267
2019-09-09 16:07:24 +03:00
Alexander Kolotov 7d259b9871
Bump version to 3.0.0 (#279) 2019-09-09 16:01:53 +03:00
Alexander Kolotov 9c19ec51ac
Merge the develop branch to the master branch, preparation to v3.0.0 (#277) 2019-09-06 23:15:12 +03:00
Gerardo Nardelli 9dd1625c5a Update project dependencies (#276)
Closes #275
2019-09-06 22:38:04 +03:00
Gerardo Nardelli f6d275a0c1 Add arbitrary message bridging contracts (#77) 2019-09-05 20:13:52 +03:00
fbranciard 63c11df4b5 decimal shift feature (#268)
* implementation proposal for decimal shift feature issue #243
2019-09-03 19:51:20 +03:00
varasev 1841968dce Enhance setStakingContract function (#274)
* Enhance setStakingContract function
* Update poa20_test.js
2019-08-17 15:55:03 +03:00
Gerardo Nardelli de8effef6d Process validator's reward accounts only when used in deploy script (#272)
* Avoid processing VALIDATORS_REWARD_ACCOUNTS if it is not used in deploy script
2019-08-16 17:37:26 +03:00
Alexander Kolotov 048f51e0e8
Bump version to 2.4.0 (#269) 2019-08-08 16:32:53 +02:00
Alexander Kolotov 37793f5bca
Merge pull request #266 from poanetwork/develop
Merge the develop branch to the master branch, preparation to v2.4.0
2019-08-08 15:19:05 +02:00
dependabot[bot] 33ea6fa567 Bump lodash from 4.17.11 to 4.17.15 in /deploy (#265)
Bump lodash from 4.17.11 to 4.17.15 as per the GitHub security alert
2019-08-08 15:03:23 +02:00
Gerardo Nardelli b219246942 Add eth-gas-reporter codecheck for gas usage report on CI (#264)
* Update eth-gas-reporter
* Add codechecks report on CI
2019-08-07 23:25:56 +02:00
Gerardo Nardelli 907bde5d21 Fix Travis coverage test run issue (#263)
* Fix FeeManagerMock directory
* Use web3 provider engine exposed by sol-coverage
2019-08-07 06:57:51 +02:00
Gerardo Nardelli 79de6a6319 Add missing events in initialize methods (#262) 2019-08-06 20:31:34 +02:00
Gerardo Nardelli 3a1d4d87b7 Move mappings key to constants (#261) 2019-08-05 22:10:53 +02:00
Gerardo Nardelli ab0e1c1ec4 Minor fixes on contracts (#260)
* Remove unused SafeMath in BasicForeignBridge
* Add name to mint parameters for consistency in IBurnableMintableERC677Token
* Fix return comment in version method of UpgradeabilityStorage
2019-08-01 23:35:56 +02:00
Gerardo Nardelli 8b3c898c38 Update ERC677Bridge to inherit from ERC677Receiver (#259) 2019-08-01 23:35:02 +02:00
Gerardo Nardelli 523112b97d Improve validator initialize gas usage (#257) 2019-08-01 14:47:57 +02:00
Gerardo Nardelli b20968c16c Check proxy upgrade contract code (#256)
* Remove isContract methods in favor of openzeppelin-solidity AddressUtils
* Check proxy implementation is contract
2019-08-01 14:44:51 +02:00
Gerardo Nardelli c28f956b6a Add param check in setDailyLimit and setExecutionDailyLimit methods (#255) 2019-08-01 14:40:29 +02:00
Gerardo Nardelli 7990addf17 Increase code coverage (#250)
* 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
2019-08-01 14:36:46 +02:00
Gerardo Nardelli 73c01b2d91 Allow fixAssetsAboveLimits to fix partial amounts (#247)
* Allow fixAssetsAboveLimits to fix partial amounts
* Emit event in fixAssetsAboveLimits
* Increase patch version in BasicBridge
2019-07-31 17:33:18 +02:00
Gerardo Nardelli 6a7e0d25ba Fix EternalStorageProxy inheritance (#254) 2019-07-31 08:32:37 +02:00
varasev 52ca7680c3 Remove redundant code from ERC677BridgeTokenRewardable contract (#249) 2019-07-31 08:31:52 +02:00
Przemyslaw Rzad 629af964f7 Update readme with new travis link (#253) 2019-07-30 11:27:37 +02:00
Gerardo Nardelli cd7bdda2da Increase project version (#252) 2019-07-29 22:37:56 +02:00
Alexander Kolotov 95e864a82e
Merge pull request #248 from poanetwork/develop
Merge the develop branch to the master branch, preparation to v2.3.3
2019-07-29 18:44:20 +02:00