poanetwork
/
tokenbridge-contracts
mirror of https://github.com/poanetwork/tokenbridge-contracts.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
856 Commits 58 Branches 47 Tags 18 MiB
Commit Graph

856 Commits

Author SHA1 Message Date
Alexander Kolotov 492f6d010a
Merge pull request #179 from akolotov/119-Epic-rewards-for-bridge-validators 
flattening sources of the new set of contracts
 2019-05-03 20:49:38 +03:00
Alexander Kolotov d69f8f48ec flattening of the new contract related to erc677-to-erc677 bridge mode 2019-05-03 20:38:46 +03:00
Alexander Kolotov 9a049e80f0 Merge remote-tracking branch 'upstream/119-Epic-rewards-for-bridge-validators' into 119-Epic-rewards-for-bridge-validators 2019-05-03 20:29:17 +03:00
Gerardo Nardelli 92be48b052 Fix merge deploy script 2019-05-03 14:20:23 -03:00
Alexander Kolotov f30a1da139 flattening sources of the new set of contracts 2019-05-03 20:14:06 +03:00
Gerardo Nardelli fb6b0d7821 Fix merge 2019-05-03 14:04:23 -03:00
Gerardo Nardelli 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
Alexander Kolotov 1d61c2ca1b
Merge pull request #178 from akolotov/develop 
Dynamic gas limit for the deployment/configuration transactions
 2019-05-03 18:39:16 +03:00
varasev d51914ddfe
Update ERC677BridgeTokenRewardable.sol 
Now the `mintReward` function ignores zero amount.
 2019-05-03 10:34:56 +03:00
Alexander Kolotov f9db683f1c documentation update to reflect usage of DEPLOYMENT_GAS_LIMIT_EXTRA 2019-05-03 03:34:01 +03:00
Alexander Kolotov be3e9e7928 DEPLOYMENT_GAS_LIMIT_EXTRA is used to calculate a transaction gas limit 2019-05-03 03:25:00 +03:00
Alexander Kolotov 5d315c97b7
Merge pull request #177 from poanetwork/175-ERC677-support-foreign-erc20-to-erc20 
Add ERC677 support on foreign bridge in erc20-to-erc20 bridge mode
 2019-05-02 21:47:15 +03:00
Alexander Kolotov d0ad22eb3e more common ERC677 type is used in ERC677Bridge 2019-05-02 20:47:40 +03:00
Alexander Kolotov 9aed1f1542
Merge pull request #156 from poanetwork/support-null-status-deploy-script 
Support transaction null status on deploy script
 2019-05-02 20:06:53 +03:00
Gerardo Nardelli f022bed9d1 Fix sendTx method used on deploy script utils 2019-05-02 12:56:10 -03:00
Gerardo Nardelli d92dd655fa Fix initializeValidators logs 2019-05-02 10:06:00 -03:00
Gerardo Nardelli de9ff59ff4 Fix erc-to-erc foreign unit tests 2019-04-30 15:16:05 -03:00
Gerardo Nardelli c65f1231ff Fix erc-to-erc foreign deploy script 2019-04-30 15:15:49 -03:00
Gerardo Nardelli 17b907a821 Add FOREIGN_MAX_AMOUNT_PER_TX check for all modes in loadEnv 2019-04-30 13:57:45 -03:00
Gerardo Nardelli 5d54ffb20b Refactor ForeignBridgeErc677ToErc677 2019-04-30 13:36:13 -03:00
Gerardo Nardelli 6d67fe5952 Add ForeignBridgeExtendedErcToErc to erc-to-erc deployment script 2019-04-29 15:51:28 -03:00
Gerardo Nardelli c4645dbd70 Add ERC20_EXTENDED_BY_ERC677 parameter for erc-to-erc deploy 2019-04-29 15:50:08 -03:00
Gerardo Nardelli 3e7c9e606f Add ForeignBridgeExtendedErcToErc unit tests 2019-04-29 15:48:59 -03:00
Gerardo Nardelli df9cd288bf Add ForeignBridgeExtendedErcToErc 2019-04-29 15:48:28 -03:00
Alexander Kolotov 106de6408a calculate gas limit for deployment transactions instead of dealing with a constant GAS_LIMIT 2019-04-25 01:53:13 +03:00
Alexander Kolotov c28b5d5f28 handle JSON RPC errors returned by the web3 provider 2019-04-25 01:47:45 +03:00
Gerardo Nardelli bb33eec861 Merge fix 2019-04-23 15:25:01 -03:00
Gerardo Nardelli 082d47bb2a Merge branch '119-Epic-rewards-for-bridge-validators' into support-null-status-deploy-script 
# Conflicts:
#	deploy/package-lock.json
#	deploy/package.json
#	deploy/src/erc_to_erc/home.js
#	deploy/src/native_to_erc/foreign.js
 2019-04-23 15:13:35 -03:00
Alexander Kolotov c7c84cf1d2
Merge pull request #164 from poanetwork/#159-fee-erc-native-posdao-chain 
Add Fee Manager for `erc-to-native` bridge in POSDAO chain
 2019-04-23 20:37:37 +03:00
Gerardo Nardelli 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
Gerardo Nardelli cad1cc5c2b Update .env.example 2019-04-23 14:16:53 -03:00
Alexander Kolotov 19fa684b73
Merge pull request #155 from poanetwork/#138-fee-manager-POA-bridge 
Add fee manager for Native-to-ERC that collects fees on home network
 2019-04-23 19:13:39 +03:00
Gerardo Nardelli 3f3457c278 Update FeeManagerNativeToErcBothDirections to extend ValidatorsFeeManager 2019-04-22 16:25:36 -03:00
Gerardo Nardelli e3d7fb9896 Merge fix 2019-04-22 15:43:21 -03:00
Gerardo Nardelli 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
Gerardo Nardelli a448e3d5b6 Add HOME_FEE_MANAGER_TYPE env var 2019-04-22 14:41:01 -03:00
Gerardo Nardelli 39c7d392e9 Fix FeeManagerErcToNativePOSDAO unit tests 2019-04-22 13:50:52 -03:00
Gerardo Nardelli 04069bbb7e Update FeeManagerErcToNativePOSDAO to extend BlockRewardFeeManager 2019-04-22 13:49:17 -03:00
Gerardo Nardelli 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
Alexander Kolotov 7ee814e183
Merge pull request #166 from poanetwork/160-fee-erc-erc-posdao-chain 
Add fee manager for erc-to-erc bridge in POSDAO chain
 2019-04-22 18:14:28 +03:00
Gerardo Nardelli f7cb8d253e Update getAmountToBurn method signature 2019-04-22 11:55:11 -03:00
Gerardo Nardelli 6b25ffb90c Update fee events logic on HomeBridgeErcToErc 2019-04-22 11:09:54 -03:00
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 d5c7c5ad0a Fix erc-to-erc reward schema text 2019-04-22 10:26:17 -03:00
Alexander Kolotov c9b8a68a8d
Merge pull request #176 from akolotov/119-Epic-rewards-for-bridge-validators 
Fee distribution events in the RewardableBridge contract
 2019-04-22 16:19:42 +03:00
Alexander Kolotov b6df9b37fc syncronize node.js version in TravisCI with the requirements 2019-04-19 09:15:03 +03:00
Alexander Kolotov 4326644a2d tests cover emmiting fee dsitribution event for submitSignature call in the native-to-erc mode 2019-04-19 09:14:04 +03:00
Gerardo Nardelli e605559f17 Add getAmountToBurn on erc-to-native fee manager 2019-04-18 12:44:18 -03:00
Gerardo Nardelli 1ca930ac1d Update erc-to-erc rewards schemas 2019-04-18 10:52:44 -03:00
Alexander Kolotov fd5086bb33 Fee distribution events moved to the RewardableBridge contract 2019-04-18 16:47:50 +03:00