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
4def1fdff7
Merge branch '119-Epic-rewards-for-bridge-validators' into 160-fee-erc-erc-posdao-chain
...
# Conflicts:
# deploy/src/erc_to_erc/home.js
# package-lock.json
# package.json
2019-04-03 11:56:17 -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
b117b21728
Merge branch 'develop' into 119-Epic-rewards-for-bridge-validators
...
# Conflicts:
# deploy/.env.example
# deploy/src/loadEnv.js
# deploy/src/native_to_erc/foreign.js
2019-03-22 10:59:00 -03:00
d2bdf62296
Add fee manager for erc-to-native in posdao chain
2019-03-15 16:06:49 -03:00
4d50918a29
Rename ValidatorSet contract to Staking contract
2019-03-05 08:43:21 +03:00
e414d6640a
Remove onRequestForSignature and onSignaturesCollected from FeeManager
2019-02-25 12:36:22 -03:00
e245268d15
Add both-directions fee manager for native-to-erc
2019-02-19 16:24:40 -03:00
27db88f489
Override `transfer` and `transferFrom` in `ERC677BridgeTokenRewardable`
...
To deny transfer tokens to ValidatorSet contract directly.
2019-02-11 10:39:34 +03:00
5a69e97ffa
Fix rewardableInitialize methods
2019-02-04 15:33:05 -03:00
78d6c3b632
Refactor RewardableBridge
2019-02-04 15:07:49 -03: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
182a483436
Add rewardableInitialize on HomeBridgeErcToNative
2019-01-15 16:52:48 -03: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
6b9ce95bcc
Update getFee to use callcode
2019-01-14 09:34:09 -03: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
40b4f89ad4
Merge branch 'master' into update-ERC677BridgeToken
2019-01-04 10:03:19 +03:00
76d45e2861
Add validatorList method
2019-01-03 13:07:21 -03:00
45a094f5dd
Extend poa20 tests
2018-12-28 16:37:20 +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
60644ade3f
Add `ERC677BridgeTokenRewardable` contract
2018-12-26 18:10:58 +03:00
87b7a780eb
Add `mintReward()`, `stake()`, `withdraw()` into ERC677BridgeToken
2018-12-26 14:34:57 +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
7c07cde46d
Refactor execution limits names
2018-11-28 14:42:33 -03:00
aa2470a208
Add fixAssetsAboveLimits method
2018-11-28 14:30:32 -03:00
42a87e631c
Add total executed per day
2018-11-26 15:43:22 -03:00
5bd6f5d58e
Add opposite side limits WIP
2018-11-23 16:37:39 -03:00
629044e9b5
Check token address is contract
2018-10-24 15:12:29 -03:00
49997cf481
Check validatorContract is contract on initialize
2018-10-24 14:02:54 -03:00
0c2fe216b0
Merge pull request #101 from akolotov/flattening-for-erc-to-native
...
Flattening for erc20-to-native contracts
2018-10-23 16:53:03 +03:00
8605f8949f
README with a note to update the flattening script added
2018-10-20 09:50:00 +03:00
2465bc82f8
Merge branch 'develop' into fix-interface-version-#92
...
# Conflicts:
# contracts/ERC677BridgeToken.sol
# contracts/upgradeable_contracts/BasicBridge.sol
2018-10-19 12:20:17 -03:00
e4888ff3d9
Fix interface version methods
2018-10-19 10:49:14 -03:00
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
339bd4ab04
Add bridgesAllowedLength method check on setBlockRewardContract
2018-10-12 10:56:13 -03:00
00b4976937
Revert "Add check for bridge address on setBlockRewardContract"
...
This reverts commit ad9ac7c
2018-10-12 10:29:00 -03:00
ad9ac7c7a4
Add check for bridge address on setBlockRewardContract
2018-10-11 16:24:16 -03:00
6d4c9939e8
Remove mintedTotallyByBridge check on HomeBridgeErcToNative
2018-10-11 14:31:21 -03:00
a4beb53348
Remove revert reason ForeignBridgeErcToNative
2018-10-08 17:20:03 -03:00
205a7c3d12
Remove revert reason ForeignBridgeErcToErc
2018-10-08 17:19:44 -03:00
8b9858cd9b
Check amount of token available on fallback HomeBridgeErcToNative
2018-10-08 16:05:53 -03:00
38565d2050
Add gas price on initialize foreign erc-to-erc
2018-10-03 14:08:51 -03:00
7cf71cb1b3
Merge pull request #90 from poanetwork/fix-transfer-lock-#89
...
Fix ERC677BridgeToken Transfer lock
2018-10-01 11:25:17 -03:00
decc4fc839
Allow initializing bridge without block reward contract
2018-10-01 09:57:28 -03:00
ae48ece332
Add ContractFallbackCallFailed event
2018-09-28 12:45:49 -03:00
2b7f2b855a
Remove gas price validation in home erc-to-native contract
2018-09-28 11:30:56 -03:00
7b629ea7a3
Add bridge contract checks on ERC677BridgeToken
2018-09-28 10:28:33 -03:00
45db0ff5ae
Revert token transfer if bridge method call fails
2018-09-27 17:22:30 -03:00
ac473ca5dc
Add bridge contract reference on ERC677BridgeToken
2018-09-27 16:39:06 -03:00
750d2e2b9f
Update mintedTotally method name on block reward contract
2018-09-25 15:50:58 -03:00
353a429831
Add totalMintedCoins method on BlockReward contract
2018-09-25 14:59:11 -03:00
817d1c73c9
Add totalMintedCoins to IBlockReward
2018-09-25 13:06:45 -03:00
2a5a199152
Add gasPrice on initialize foreign erc-to-native
2018-09-24 10:23:05 -03:00
fdf9d39abd
Update BasicBridge version to 2.1.0
2018-09-24 09:09:53 -03:00
c36af23bf2
Fix setBlockRewardContract method
2018-09-21 16:33:33 -03:00
2c7db37a6d
Add erc20-to-native bridge mode method
2018-09-20 16:17:55 -03:00
845dd82172
Add erc20-to-native contracts
2018-09-20 16:17:12 -03:00
04a0e2a5dc
Add BlockReward test contract
2018-09-20 16:16:59 -03:00
2cc71aa4b4
Update contract versions
2018-09-18 10:47:33 -03:00
efd3796134
Rename Token version variable
2018-09-18 10:36:06 -03:00
75af893dc8
Rename BridgeValidators version variable
2018-09-18 10:32:25 -03:00
0e8f8b3f08
Remove unused var
2018-09-18 10:28:21 -03:00
4bb8e9df21
Fix variable name on validators and token contract
2018-09-17 16:34:25 -03:00
bfec92ae12
Remove bridge mode field from eternalStorage
2018-09-17 16:22:34 -03:00
af7cc8dcbb
Add version field on bridge, validators and token contracts
2018-09-17 15:33:16 -03:00
2c22760538
Add bridge mode field
2018-09-14 15:58:57 -03:00
5d91e0f55f
1.Add requireBlockConfirmations to initialize ForeingBridgeErcToErc
...
2. Pass BRIDGEABLE_TOKEN_NAME, Symbol, Decimals as env vars to Native to erc mode
3. Update docs
4. Update tests
2018-08-20 22:47:27 -07:00
3edf7837a7
Add requiredMessageLength method to BasicHomeBridge contract
2018-08-16 15:03:55 -03:00
57d16f2b81
Merge pull request #57 from rstormsf/double_spending
...
Double spending fix
2018-08-03 11:53:47 -07:00
b74003c96e
add additional check for contract address
2018-07-31 16:01:42 -07:00
1e237e16d4
Merge pull request #51 from rstormsf/patch234
...
Prevent an attack to send cross chain transfer using contract without payable fallback
2018-07-26 14:04:07 -07:00
2c0e9dd2c2
Update BridgeValidators contract
2018-07-26 14:34:47 -03:00
57dfe2285f
Double spending fix
2018-07-23 19:58:08 -07:00
bb1611b468
remove code dublication
2018-07-11 13:12:48 -07:00
0c01b48f46
audit request
2018-07-09 21:19:45 -07:00
3e7560d08e
add feature on token transfer invoke contractFallback silently
2018-07-06 16:50:27 -07:00
aeb2e1dd7e
Audit enhacements
2018-07-02 18:45:58 -07:00
078014e499
Add more abstraction for ERC677Bridge
2018-06-18 21:05:47 -07:00
1da503d7f0
fix npm run test build
2018-06-11 22:59:51 -07:00
e9a4c8ec05
rename POA20
2018-06-11 22:36:29 -07:00
0da0ade2fd
finish refactoring
2018-06-11 20:33:16 -07:00
7d9065124f
refactor foreign bridge
2018-06-11 19:56:01 -07:00
f34620e8ae
WIP: refactor v1
2018-06-11 18:56:07 -07:00
362e9860c6
clean up
2018-05-21 20:14:51 -07:00
91f501563d
Merge branch 'v2' of github.com:poanetwork/poa-parity-bridge-contracts into v2
2018-05-21 20:13:44 -07:00
87f6d54f87
changes applied under PR #40 propagated to submitSignature method
2018-05-21 16:57:46 +03:00
ed3db608cd
provide number of required signatures in CollectedSignatures event
...
CollectedSignatures event extended to provide number of signatures used to confirm a particular deposit transaction as so the bridge instance could use this number to fetch the corresponding number of signatures from the contract
2018-05-21 16:50:40 +03:00
9de3aa03ab
Fixed #39 .
2018-05-19 21:09:51 -07:00
6ba32e2866
hide requiredSignatures
2018-05-18 17:05:14 -07:00
c7b3b1fe3e
shorten message length
2018-05-17 09:58:35 -07:00
a49b1bd74c
make tests happy
2018-05-16 20:12:16 -07:00
4cd20a7756
add some changes
2018-05-10 18:19:01 -04:00
188357798c
dirty reverse bridge for v2
2018-05-10 16:53:19 -04:00
4698f7c67c
remove unused return var
2018-05-08 11:05:37 -04:00
564fdd9d85
0.4.23 bump and deployment logging optimization
2018-05-07 00:31:16 -07:00
ff5b49753b
Merge branch 'proxy'
2018-05-06 11:38:26 -07:00
ae4126a9d4
apply comments from PR
2018-05-06 10:38:51 -07:00
e323377953
fix compiler warning,
...
convert this to address(this)
2018-05-05 21:13:29 -07:00
0c2e5e2d61
add check for requiredSignatures
2018-05-05 20:59:33 -07:00
35e5b7b08b
add safety memory allocation
2018-05-05 20:58:49 -07:00
277cdabe07
optmize gas usage in Proxy.sol
...
Closes #29
2018-05-05 20:39:07 -07:00
b928a0eb0c
add gasPrice, required Confirmations, add events
...
update deployment script
2018-05-05 19:05:29 -07:00
5d35780388
optimize gas cost
2018-05-05 19:04:35 -07:00
27123afdf9
1. Upgrade openzeppelin to 1.9.0
...
2. Fix claimTokens on Foreign side
3. Fix compiler warnings
2018-04-27 16:34:53 -07:00
7bd9ac3f81
1. Handle deposits and signatures if requiredSignatures is changed
...
2. Update deployment strategy. Use plain json http request and wait for receipt.
2018-04-27 10:26:24 -07:00
73a01cebf0
apply PR comments
2018-04-26 17:21:43 -07:00
b572717af8
Apply comments from PR#20
2018-04-26 11:28:05 -07:00
75c8338a07
Audit feedback. Multiple change requests
2018-04-25 22:15:11 -07:00
7ab6c35e21
fix bridge and deployment
2018-04-25 21:00:36 -07:00
6910bfc882
Audit feedback
...
add msg.data.length == 0
2018-04-24 15:46:37 -07:00
af0b337a79
don't call super
2018-04-24 15:37:34 -07:00
810470ebae
Audit feedback: fix bug when requiredSignatures has changed
2018-04-24 15:30:43 -07:00
303218cf9e
add claimTokens func to POA20 and ForeignBridge
2018-04-23 12:15:27 -07:00
1f1281ed8c
Audit feedback:
...
Fix upgradeToAndCall
2018-04-19 12:03:46 -07:00
848656d61f
remove unneccesary modifiers for finishminting
2018-04-18 12:58:44 -07:00
d4e9d831dc
Audit feedback
...
1. fix transferAndCall returns bool
2. Remove finishMinting method
2018-04-18 12:45:53 -07:00
ea0915eb0e
make messagesSigned public
2018-04-17 14:31:24 -07:00
3d184533e3
make depositsSigned public so the parity-bridge can check before sending a tx
2018-04-17 13:47:40 -07:00
e7880e4946
use `emit`
2018-04-16 13:21:33 -07:00
e98134ba7f
bump version
2018-04-16 13:11:35 -07:00
a22b8713a1
add check in BridgeValidators and remove it from Ownable
2018-04-13 14:22:41 -07:00
69b97796f6
closes #12
2018-04-13 14:22:12 -07:00
abccf2b63a
Audit feedback: remove unneccesary check in Bridges in initialize
2018-04-13 14:10:57 -07:00
bcd608479f
Audit feedback:
...
remove unneccesary check and add check for Ownable
2018-04-13 14:10:22 -07:00
3a4c663d84
remove PausableTOken from POA20
2018-04-13 14:09:38 -07:00
987dc06cbb
Add MIN_PER_TX into Home and Foreign bridges
2018-04-06 18:40:09 -04:00
de8ac84efc
LevelK auditors pointed out an unnecessary contract variables that were inherited from zeppelinos
...
https://github.com/zeppelinos/labs/pull/49/files
2018-03-30 17:50:51 -07:00
40a07ebd12
Add tests for BridgeValidators
2018-03-28 20:27:41 -07:00
807f2a9526
add maxPerTx limit on Foreign Side
2018-03-27 21:25:54 -07:00
7daaee86e6
Add max per tx
2018-03-27 16:38:30 -07:00
4c8c1063cd
Fix an issue with wrong submittion of setNumDepositsSigned wrong hash was passed in.
...
Add more unit tests
2018-03-27 15:52:10 -07:00
7c00bd163f
1. flatten EternalProxy contract
...
2. Tests for POA20 token
2018-03-22 21:07:31 -07:00
e49979600b
Fix consistency in event params
2018-03-19 21:39:28 -07:00
a390ac95be
Add param for Withdrawal on Home
2018-03-18 18:22:24 -07:00
6ef828c7b0
Add tx hash to the deposit event
2018-03-15 16:13:16 -07:00
fb28fd067c
make contracts upgradeable
2018-03-13 23:21:54 -07:00
5eaa480b23
Make BridgeValidators upgradeable
2018-03-13 00:30:51 -07:00
f99f21a02c
Fix hasEnoughSignatures method.
2018-03-12 22:05:50 -07:00
7d1df24f03
remove homeGasPrice from HomeBridge
2018-03-12 15:02:50 -07:00
48c782f5e5
Add hasEnoughSignatures back to working condition
2018-03-12 14:52:51 -07:00
a3e884c6a6
Add daily Limits
2018-03-11 13:12:49 -07:00
54e34c578d
Apply comments enhancements
2018-03-11 12:37:37 -07:00
cb33ddbb3b
Fix #9 . Extend tracebility of deposits transactions
2018-03-03 14:20:05 +01:00
b0344021b4
1. Add ERC677 support
...
2. Add governance for validators
3. Make Home and Foreign Bridges operated from ValidatorsContract
2018-03-03 00:38:42 +01:00
d597765865
WIP add Validators
2018-02-21 21:52:11 -08:00
c499d7f936
WIP - Add POA20, change ForeignBridge
2018-02-13 00:30:29 -08:00
56bd7ce067
Init
2018-02-12 21:11:21 -08:00
Gerardo Nardelli
Vadim
fernandomg
Vadim Arasev
Alexander Kolotov
Alexander Kolotov
Franco Victorio
Roman Storm
Roman Storm