7bf4e0629a
Fix setTotalSpentPerDay called twice in AMB-ERC-TO-ERC ( #309 )
2019-10-30 22:16:28 +03:00
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
c0ee60806d
Add alternative receiver for transfer in native to erc20 mode ( #302 )
2019-10-23 18:46:48 +03:00
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
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
165d828437
Use hex-identifiers directly instead of runtime hash calculation ( #303 )
2019-10-11 11:36:37 +03:00
f4ebf8b053
Remove deployed at block information in mediators contracts ( #292 )
2019-09-27 22:05:46 +03:00
f48c36647f
Add methods to fix failed messages in erc677 to erc677 ( #284 )
2019-09-13 16:51:54 +03:00
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
f7265bfee4
Update project dependencies to latest versions ( #283 )
...
* Update dependencies
* Apply prettier format
2019-09-10 00:27:45 +03:00
83900ea971
Add erc677 to erc677 bridge on top of AMB ( #273 )
...
Closes #267
2019-09-09 16:07:24 +03:00
f6d275a0c1
Add arbitrary message bridging contracts ( #77 )
2019-09-05 20:13:52 +03:00
63c11df4b5
decimal shift feature ( #268 )
...
* implementation proposal for decimal shift feature issue #243
2019-09-03 19:51:20 +03:00
79de6a6319
Add missing events in initialize methods ( #262 )
2019-08-06 20:31:34 +02:00
3a1d4d87b7
Move mappings key to constants ( #261 )
2019-08-05 22:10:53 +02:00
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
8b3c898c38
Update ERC677Bridge to inherit from ERC677Receiver ( #259 )
2019-08-01 23:35:02 +02:00
523112b97d
Improve validator initialize gas usage ( #257 )
2019-08-01 14:47:57 +02:00
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
c28f956b6a
Add param check in setDailyLimit and setExecutionDailyLimit methods ( #255 )
2019-08-01 14:40:29 +02:00
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
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
b66a678648
Fix random method visibility in BaseFeeManager ( #246 )
...
* Reduce random visibility
* Add FeeManagerMock to test random method
* Fix lint:sol:prettier:fix npm script
2019-07-25 22:55:57 +02:00
dc099b872b
Add Solhint solidity linter ( #240 )
...
* Add solhint and prettier for solidity
* Apply prettier styles on contracts
* Fix solhint warnings
* Run js and solidity linter on travis
2019-07-22 07:19:24 +03:00
e8217f1276
Use external modifier instead of public ( #236 )
2019-07-17 15:03:02 +03:00
a747842c95
Add validators amount limit ( #239 )
2019-07-16 23:25:35 +03:00
786be68cd6
Improve revert pattern ( #235 )
2019-07-16 12:53:18 +03:00
87d50dfc6f
Support zero fallback gas price in erc-to-erc mode ( #234 )
2019-07-16 12:50:33 +03:00
df1fa67513
Fix missing required block confirmation check in ForeignBridgeNativeToErc ( #229 )
2019-07-12 18:49:41 +03:00
155f2e4def
Improve contracts names ( #226 )
...
* Rename POSDAOHomeBridgeErcToErc
* Rename OwnedUpgradeability
* Rename IOwnedUpgradeabilityProxy
* Update flatten script
2019-07-05 17:35:18 +03:00
4ae49f1cba
Remove duplicated checks of contracts ( #225 )
2019-07-03 19:19:01 +03:00
b65ae7572e
Remove redundant fallback method on HomeBridgeErcToErc ( #224 )
2019-07-03 18:16:30 +03:00
27458bfc90
Remove duplicated logic on top of withinExecutionLimit ( #223 )
...
* Replace affirmationWithinLimits with withinExecutionLimit on BasicHomeBridge
* Replace messageWithinLimits with withinExecutionLimit on BasicForeignBridge
2019-07-03 18:14:06 +03:00
90a7a80112
Use OpenZeppelin SafeMath ( #222 )
...
* Fix openzeppelin-solidity version
* Remove own SafeMath library in favor of openzeppelin
2019-07-03 14:10:21 +03:00
cc47af2a79
Remove returns from internal initialize method on HomeBridgeErcToErc ( #221 )
2019-07-02 19:06:34 +03:00
79f8277347
Add claimTokensFromErc677 on erc20-to-erc20 contracts ( #219 )
...
* Fix claimTokensFromErc677 unit test
* Add claimTokensFromErc677 on HomeBridgeErcToErc
2019-07-01 22:41:23 +03:00
5a92a57c8f
fix fixAssetsAboveLimits imbalance if feeManager used ( #218 )
2019-07-01 20:26:25 +03:00
e32ef6e1f2
Fix claimTokens to support all token transfers ( #213 )
...
* Add contract `Claimable` to contain functionality related ability to claim tokens
* The new contract is used in the bridge contracts and the erc677 token implementation
* Fix claimTokens to support all token transfers
2019-06-28 19:00:10 +03:00
5e845af7c9
Add fee value check ( #209 )
...
* Add fee value check
2019-06-28 16:36:37 +03:00
c28770b1f6
Refactoring as per comments received on the security audit ( #203 )
...
* Remove duplicate modifier on claimTokens method
* Fix multiple reads of totalBurntCoins
* Remove parameter on setInitialize
* Remove status parameter on setFixedAssets
* Remove unused fireEventOnTokenTransfer on HomeBridgeErcToNative
* Redefine empty block methods on BasicHomeBridge
* Simplify signature method on BasicHomeBridge
* Add abi.encodePacked to deployedAtBlock on validators contracts
* Extract fallback implementation into separate method on HomeBridgeErcToNative and HomeBridgeNativeToErc
2019-06-28 16:22:05 +03:00
a1f64ca6c5
Remove proxyOwner method from proxy contract ( #198 )
...
* Remove proxyOwner method from proxy
* Rename onlyProxyOwner
* Remove upgradeabilityAdmin
* Rename onlyIfOwnerOfProxy to onlyIfUpgradeabilityOwner
2019-06-27 23:44:09 +03:00
eb75d2d674
Ignore contract interfaces on test coverage report ( #200 )
...
* Move interfaces to separate folder
* Ignore interfaces folder on coverage report
2019-06-27 22:41:45 +03:00
942e6c4513
Update setBlockRewardContract method validations ( #197 )
...
* Update setBlockReward checks
2019-06-19 18:41:03 +03:00
964d104958
Apply contract changes from `develop-for-classic`
2019-05-08 09:09:10 -03:00
fb6b0d7821
Fix merge
2019-05-03 14:04:23 -03:00
786529ae9b
Merge branch 'develop' into 119-Epic-rewards-for-bridge-validators
...
# Conflicts:
# contracts/upgradeable_contracts/BasicHomeBridge.sol
# contracts/upgradeable_contracts/erc20_to_erc20/ForeignBridgeErcToErc.sol
# contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErc.sol
# contracts/upgradeable_contracts/native_to_erc20/ForeignBridgeNativeToErc.sol
# deploy/.env.example
# deploy/src/erc_to_erc/foreign.js
# deploy/src/loadEnv.js
2019-05-03 13:13:17 -03:00
d0ad22eb3e
more common ERC677 type is used in ERC677Bridge
2019-05-02 20:47:40 +03:00
5d54ffb20b
Refactor ForeignBridgeErc677ToErc677
2019-04-30 13:36:13 -03:00
df9cd288bf
Add ForeignBridgeExtendedErcToErc
2019-04-29 15:48:28 -03:00
91eeb64bd7
Merge branch '119-Epic-rewards-for-bridge-validators' into #159-fee-erc-native-posdao-chain
...
# Conflicts:
# deploy/.env.example
# deploy/src/erc_to_native/home.js
# deploy/src/loadEnv.js
2019-04-23 14:26:03 -03:00
3f3457c278
Update FeeManagerNativeToErcBothDirections to extend ValidatorsFeeManager
2019-04-22 16:25:36 -03:00
e3d7fb9896
Merge fix
2019-04-22 15:43:21 -03:00
3ba8ea1d22
Merge branch '119-Epic-rewards-for-bridge-validators' into #138-fee-manager-POA-bridge
...
# Conflicts:
# contracts/upgradeable_contracts/native_to_erc20/ForeignBridgeNativeToErc.sol
# contracts/upgradeable_contracts/native_to_erc20/HomeBridgeNativeToErc.sol
2019-04-22 15:40:51 -03:00
04069bbb7e
Update FeeManagerErcToNativePOSDAO to extend BlockRewardFeeManager
2019-04-22 13:49:17 -03:00
1f57b24ef8
Merge branch '119-Epic-rewards-for-bridge-validators' into #159-fee-erc-native-posdao-chain
...
# Conflicts:
# contracts/IBlockReward.sol
# contracts/test/BlockReward.sol
# deploy/.env.example
2019-04-22 12:58:34 -03:00
f7cb8d253e
Update getAmountToBurn method signature
2019-04-22 11:55:11 -03:00
6b25ffb90c
Update fee events logic on HomeBridgeErcToErc
2019-04-22 11:09:54 -03:00
3592024219
Merge branch '119-Epic-rewards-for-bridge-validators' into 160-fee-erc-erc-posdao-chain
2019-04-22 10:49:18 -03:00
e605559f17
Add getAmountToBurn on erc-to-native fee manager
2019-04-18 12:44:18 -03:00
fd5086bb33
Fee distribution events moved to the RewardableBridge contract
2019-04-18 16:47:50 +03:00
8ab76b9044
Add POSDAOHomeBridgeErcToErc
2019-04-17 11:22:33 -03:00
ffdd595747
Merge pull request #169 from poanetwork/update-rewardable-validator
...
Update RewardableValidators to be compatible with BridgeValidators
2019-04-16 23:41:24 +03:00
63fbd12a65
Move ValidatorsFeeManager constants
2019-04-16 17:28:26 -03:00
95f236205b
Fix _initialize on HomeBridgeErcToErc
2019-04-16 17:09:09 -03:00
cf81b767ba
Refactor BaseFeeManager
2019-04-16 17:05:06 -03:00
16be3f8229
Add event on fee distribution
2019-04-16 16:13:21 -03:00
2bc4bd7d18
Merge branch '119-Epic-rewards-for-bridge-validators' into 160-fee-erc-erc-posdao-chain
...
# Conflicts:
# contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErc.sol
2019-04-16 15:14:24 -03:00
9be3f38bdf
Move validator events to BaseBridgeValidators
2019-04-16 11:44:39 -03:00
8f551d1931
Merge pull request #171 from poanetwork/add-transfer-fee-events
...
Emit event on fee distribution from transfer
2019-04-16 09:54:24 +03:00
4c8e664226
Emit event on fee distribution from transfer
2019-04-15 13:51:34 -03:00
7581f1241a
Increase validator interface version
2019-04-15 09:10:40 -03:00
d2f6b0ac3a
Update addValidator method and ValidatorAdded event
2019-04-12 14:11:42 -03:00
745eeb0493
Add validatorList on BaseBridgeValidators
2019-04-11 12:10:23 -03:00
905bac8cea
call onExecuteAffirmation if non zero value
2019-04-01 12:28:32 -03:00
595315d6af
Avoid calling blockReward if zero value from foreign transfer on erc-to-native
2019-04-01 11:48:51 -03:00
04ab82f62a
Add fee manager erc-to-erc
2019-03-26 17:03:53 -03:00
d2bdf62296
Add fee manager for erc-to-native in posdao chain
2019-03-15 16:06:49 -03:00
30e0ae82c8
Revert "140-erc-to-erc-multiple"
2019-03-12 09:45:29 -03:00
e414d6640a
Remove onRequestForSignature and onSignaturesCollected from FeeManager
2019-02-25 12:36:22 -03:00
84dc9ac4d4
unit tests & gas consumption ( #1 )
...
* unit tests - factories
* unit tests - mapper
* added bridge factories and mapper to gas consumption doc
* typo
* rename event to fix "[ethjs-abi] while decoding address data, invalid address data" in tests
2019-02-21 19:32:34 +02:00
e245268d15
Add both-directions fee manager for native-to-erc
2019-02-19 16:24:40 -03:00
102fcf254c
unify events of bridge maper
2019-02-17 11:58:50 +02:00
5a69e97ffa
Fix rewardableInitialize methods
2019-02-04 15:33:05 -03:00
78d6c3b632
Refactor RewardableBridge
2019-02-04 15:07:49 -03:00
f822d5f5cb
* add initialize checkers to the factories and mapper contracts
...
* set owner to be `msg.sender` at the start of the initialize method and then to the `_owner` param to alow setting deferent owner then `msg.sender`
* update the .env.example file to support the new variables and remove the redundet ones.
* extract similar logic from the factories to a new `BasicBridgeFactory` contract.
* update deply readme.
2019-02-03 16:28:39 +02:00
e1787e6309
Refactor fee into homeFee and foreignFee
2019-02-01 17:06:19 -03:00
a90babf2de
Add getFeeManagerMode method
2019-02-01 10:08:48 -03:00
8d995fb72b
Fix rewardableInitialize on NativeToErc contracts
2019-01-23 10:52:36 -03:00
164c8e662f
Add Native-to-Erc fee manager
2019-01-23 10:25:15 -03:00
0576f184e2
Add internal setFee method on RewardableBridge
2019-01-22 11:10:28 -03:00
dd6417f46c
change `bridgeFactory` requirments.
...
change`bridgeFactory` event to emit block number and home token.
2019-01-20 16:10:17 +02:00
ca2c8a2e7c
Merge remote-tracking branch 'origin/master' into Many2ManyERC20
...
# Conflicts:
# deploy/.env.example
2019-01-20 13:50:03 +02:00
b092a355c7
move `setOwner` to `initialize` instead of constractor inbridgeMapper
2019-01-16 14:19:40 +02:00
182a483436
Add rewardableInitialize on HomeBridgeErcToNative
2019-01-15 16:52:48 -03:00
161c24fb62
both home and foreign bridge factory (wih deployment scripts)
2019-01-15 16:01:12 +02:00
71870e0076
Add random fee distribution on remaining fee difference
2019-01-14 12:16:32 -03:00
4b8f53a014
Refactor BaseFeeManager fee direction
2019-01-14 10:19:03 -03:00
ee666a15f3
Update setFee modifier to onlyOwner
2019-01-14 09:42:19 -03:00
687afe8e13
update BridgMapper contract
2019-01-14 14:40:06 +02:00
6b9ce95bcc
Update getFee to use callcode
2019-01-14 09:34:09 -03:00
86de261ebd
first version of BridgeMapper conract
2019-01-14 10:58:43 +02:00
98dfc8becf
Replace delegatecall with callcode on calculateFee
2019-01-11 12:31:24 -03:00
51708637ac
Update send usage on onSignatureFeeDistribution
2019-01-11 11:46:25 -03:00
faf9712db2
move reward logic to RewardableBridge
2019-01-11 11:27:36 -03:00
1993efcf4c
Add onSignaturesCollected
2019-01-11 10:43:52 -03:00
8876e15fff
Refactor getFee
2019-01-11 10:19:22 -03:00
e752e94ec1
Fix fee related methods
2019-01-10 15:59:24 -03:00
9ee9ce4a61
Fixes after merge
2019-01-10 09:37:36 -03:00
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
c48b650e29
Merge branch 'develop' into 119-Epic-rewards-for-bridge-validators
2019-01-10 09:01:38 -03:00
fbf81a83b9
Fixes on Fee related methods
2019-01-10 08:44:40 -03:00
8eb4809735
Remove unused import
2019-01-09 09:31:36 -03:00
97d3759dc5
Remove unused files
2019-01-09 09:23:35 -03:00
9bbaf56aa5
Fix rewardableValidatorContract method on BaseFeeManager
2019-01-09 09:11:23 -03:00
515f23ac74
Update delegateCall usage on calculateFee method
2019-01-09 08:56:30 -03:00
9a349739fb
Fix onExecuteAffirmation
2019-01-09 08:56:30 -03:00
5991ef31eb
Update fee contract implementation
2019-01-09 08:56:30 -03:00
ceb8478528
Implement Fee Distribution for ERC20 to Native mode
2019-01-09 08:56:30 -03:00
e008b244fa
Create FeeManager related contracts
2019-01-09 08:56:30 -03:00
5bf54405c9
Add zero address check for getNextValidator
2019-01-09 08:38:08 -03:00
a3b947a507
Remove onlyOwner modifier on BaseBridgeValidators methods
2019-01-09 08:17:55 -03:00
fa36918944
Move validatorList method to RewardableValidators
2019-01-08 17:24:08 -03:00
212d796412
Add zero address check on getNextValidator usage
2019-01-08 14:36:52 -03:00
6912fdcad9
Rename setValidator to setNextValidator
2019-01-08 14:08:31 -03:00
b743602564
Refactor addValidator and RemoveValidator methods
2019-01-08 13:59:16 -03:00
1d7456cf77
Add end of list check on removeValidator
2019-01-08 12:25:20 -03:00
5c553e06eb
Update ValidatorAdded event on RewardableValidators
2019-01-07 15:42:38 -03:00
4e9db7b626
Refactor BridgeValidators
2019-01-07 15:25:26 -03:00
349bbbb355
Update BridgeValidators version
2019-01-07 11:03:49 -03:00
76d45e2861
Add validatorList method
2019-01-03 13:07:21 -03:00
e25f0ffc2e
Extend BridgeValidators interface and make F_ADDR public
2018-12-27 15:12:42 -03:00
9d219727c6
Fix/Add `require`s for `validator` and `reward` addresses
2018-12-27 15:11:05 -03:00
058335f54c
Add `_reward` param to `addValidator` method
2018-12-27 15:09:23 -03:00
94947ebc3d
Update BridgeValidator to support linked-list
...
- Store validators as a linked-list
- Store reward address as a map [validator] -> rewardAddr
2018-12-26 17:19:14 -03:00
06a9dcfe83
Add execution limits to NATIVE-TO-ERC20 mode
2018-12-21 10:28:11 -03:00
8bf7c1ae73
Add OverdrawManagement to ERC20-TO-ERC20 contracts
2018-12-20 15:58:24 -03:00
8ea03335e3
Fix incorrect storage reference on setExecutionMaxPerTx
2018-12-17 09:03:49 -03:00
b25c25ccae
Update onlyProxyOwner modifier to onlyIfOwnerOfProxy
2018-12-14 11:44:02 -03:00
ac0e671aeb
Refactor onlyProxyOwner modifier
2018-12-14 10:46:09 -03:00
adb81cf1ca
Update claimTokens methods modifier to onlyProxyOwner
2018-12-11 11:17:43 -03:00
6c7320de64
Remove Validatable from OverdrawManagement
2018-12-11 10:58:18 -03:00
abbde316d0
Update owner roles on bridge contracts
2018-12-10 16:22:57 -03:00
60695559b1
Fix OverdrawManagement inheritance
2018-12-10 11:10:41 -03:00
4612b7ba86
Update contract version
2018-12-04 14:24:43 -03:00
e4a3cf4d9d
Update fixAssetsAboveLimits modifier to onlyProxyOwner
2018-12-04 11:31:44 -03:00
ab07c560c4
Fix on onFailedAffirmation method
2018-12-04 09:39:09 -03:00
6ad631b02d
Refactor storage of out of limit values
2018-12-04 09:34:52 -03:00
b7991b7495
Refactor overdraw management
2018-12-03 17:09:57 -03:00
12d0422ca0
Add check on ErcToNative onFailedAffirmation method
2018-12-03 16:47:41 -03:00
414e437b60
Fix compile warnings
2018-11-28 14:57:38 -03:00
Gerardo Nardelli
Max Alekseenko
fbranciard
Alexander Kolotov
Lior Rabin
Tal Beja
fernandomg