Commit Graph

98 Commits

Author SHA1 Message Date
Gerardo Nardelli 3592024219 Merge branch '119-Epic-rewards-for-bridge-validators' into 160-fee-erc-erc-posdao-chain 2019-04-22 10:49:18 -03:00
Gerardo Nardelli e605559f17 Add getAmountToBurn on erc-to-native fee manager 2019-04-18 12:44:18 -03:00
Alexander Kolotov fd5086bb33 Fee distribution events moved to the RewardableBridge contract 2019-04-18 16:47:50 +03:00
Gerardo Nardelli cf81b767ba Refactor BaseFeeManager 2019-04-16 17:05:06 -03:00
Gerardo Nardelli 4c8e664226 Emit event on fee distribution from transfer 2019-04-15 13:51:34 -03:00
Gerardo Nardelli d2bdf62296 Add fee manager for erc-to-native in posdao chain 2019-03-15 16:06:49 -03:00
Gerardo Nardelli 78d6c3b632 Refactor RewardableBridge 2019-02-04 15:07:49 -03:00
Gerardo Nardelli e1787e6309 Refactor fee into homeFee and foreignFee 2019-02-01 17:06:19 -03:00
Gerardo Nardelli a90babf2de Add getFeeManagerMode method 2019-02-01 10:08:48 -03:00
Gerardo Nardelli 0576f184e2 Add internal setFee method on RewardableBridge 2019-01-22 11:10:28 -03:00
Gerardo Nardelli 182a483436 Add rewardableInitialize on HomeBridgeErcToNative 2019-01-15 16:52:48 -03:00
Gerardo Nardelli 51708637ac Update send usage on onSignatureFeeDistribution 2019-01-11 11:46:25 -03:00
Gerardo Nardelli faf9712db2 move reward logic to RewardableBridge 2019-01-11 11:27:36 -03:00
Gerardo Nardelli 1993efcf4c Add onSignaturesCollected 2019-01-11 10:43:52 -03:00
Gerardo Nardelli e752e94ec1 Fix fee related methods 2019-01-10 15:59:24 -03:00
Gerardo Nardelli 6deecdafac Merge branch '119-Epic-rewards-for-bridge-validators' into 122-create-feemanager-basic-contract-and-its-interface
# Conflicts:
#	contracts/upgradeable_contracts/BasicHomeBridge.sol
#	test/erc_to_native/home_bridge.test.js
2019-01-10 09:06:35 -03:00
Gerardo Nardelli fbf81a83b9 Fixes on Fee related methods 2019-01-10 08:44:40 -03:00
Gerardo Nardelli 8eb4809735 Remove unused import 2019-01-09 09:31:36 -03:00
Gerardo Nardelli 97d3759dc5 Remove unused files 2019-01-09 09:23:35 -03:00
Gerardo Nardelli 9a349739fb Fix onExecuteAffirmation 2019-01-09 08:56:30 -03:00
Gerardo Nardelli 5991ef31eb Update fee contract implementation 2019-01-09 08:56:30 -03:00
fernandomg ceb8478528 Implement Fee Distribution for ERC20 to Native mode 2019-01-09 08:56:30 -03:00
Gerardo Nardelli b25c25ccae Update onlyProxyOwner modifier to onlyIfOwnerOfProxy 2018-12-14 11:44:02 -03:00
Gerardo Nardelli adb81cf1ca Update claimTokens methods modifier to onlyProxyOwner 2018-12-11 11:17:43 -03:00
Gerardo Nardelli abbde316d0 Update owner roles on bridge contracts 2018-12-10 16:22:57 -03:00
Gerardo Nardelli ab07c560c4 Fix on onFailedAffirmation method 2018-12-04 09:39:09 -03:00
Gerardo Nardelli b7991b7495 Refactor overdraw management 2018-12-03 17:09:57 -03:00
Gerardo Nardelli 12d0422ca0 Add check on ErcToNative onFailedAffirmation method 2018-12-03 16:47:41 -03:00
Gerardo Nardelli 414e437b60 Fix compile warnings 2018-11-28 14:57:38 -03:00
Gerardo Nardelli 7c07cde46d Refactor execution limits names 2018-11-28 14:42:33 -03:00
Gerardo Nardelli aa2470a208 Add fixAssetsAboveLimits method 2018-11-28 14:30:32 -03:00
Gerardo Nardelli 42a87e631c Add total executed per day 2018-11-26 15:43:22 -03:00
Gerardo Nardelli 5bd6f5d58e Add opposite side limits WIP 2018-11-23 16:37:39 -03:00
Gerardo Nardelli 629044e9b5 Check token address is contract 2018-10-24 15:12:29 -03:00
Gerardo Nardelli 49997cf481 Check validatorContract is contract on initialize 2018-10-24 14:02:54 -03:00
Alexander Kolotov 9c20897c8b
Merge pull request #91 from poanetwork/gasPrice-foreign-erc-erc-#86
Add gas price on initialization of Foreign erc-to-erc mode
2018-10-17 18:19:47 +03:00
Gerardo Nardelli 339bd4ab04 Add bridgesAllowedLength method check on setBlockRewardContract 2018-10-12 10:56:13 -03:00
Gerardo Nardelli 00b4976937 Revert "Add check for bridge address on setBlockRewardContract"
This reverts commit ad9ac7c
2018-10-12 10:29:00 -03:00
Gerardo Nardelli ad9ac7c7a4 Add check for bridge address on setBlockRewardContract 2018-10-11 16:24:16 -03:00
Gerardo Nardelli 6d4c9939e8 Remove mintedTotallyByBridge check on HomeBridgeErcToNative 2018-10-11 14:31:21 -03:00
Gerardo Nardelli a4beb53348 Remove revert reason ForeignBridgeErcToNative 2018-10-08 17:20:03 -03:00
Gerardo Nardelli 8b9858cd9b Check amount of token available on fallback HomeBridgeErcToNative 2018-10-08 16:05:53 -03:00
Franco Victorio decc4fc839 Allow initializing bridge without block reward contract 2018-10-01 09:57:28 -03:00
Franco Victorio 2b7f2b855a Remove gas price validation in home erc-to-native contract 2018-09-28 11:30:56 -03:00
Gerardo Nardelli 2a5a199152 Add gasPrice on initialize foreign erc-to-native 2018-09-24 10:23:05 -03:00
Gerardo Nardelli c36af23bf2 Fix setBlockRewardContract method 2018-09-21 16:33:33 -03:00
Gerardo Nardelli 2c7db37a6d Add erc20-to-native bridge mode method 2018-09-20 16:17:55 -03:00
Gerardo Nardelli 845dd82172 Add erc20-to-native contracts 2018-09-20 16:17:12 -03:00