Commit Graph

180 Commits

Author SHA1 Message Date
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
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
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
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 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
Gerardo Nardelli 851c0b92f5 Fix erc_to_erc home deploy script 2019-04-17 15:24:02 -03:00
Alexander Kolotov 8ed024e73d
Merge pull request #172 from andogro/ag-deploy-update
update FOREIGN_DAILY_LIMIT & FOREIGN_MAX_AMOUNT_PER_TX for bridge modes
2019-04-16 09:44:08 +03:00
Andrew Gross 93fca5b975
review comments 2019-04-15 16:18:16 -06:00
Andrew Gross aa5721ae21
update FOREIGN_DAILY_LIMIT & FOREIGN_MAX_AMOUNT_PER_TX for bridge modes 2019-04-15 11:53:42 -06:00
Gerardo Nardelli 05d5a2bdc2 Fix merge conflicts 2019-04-03 14:02:38 -03:00
Gerardo Nardelli 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
Gerardo Nardelli 88a503bf00 Use ERC677BridgeTokenRewardable if rewards distributed on erc-to-erc 2019-04-01 15:06:21 -03:00
Gerardo Nardelli bf2222da95 Add fee manager on erc-to-erc deploy script 2019-03-29 16:09:44 -03:00
Gerardo Nardelli 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
Gerardo Nardelli 9a1ce93948 Add FeeManagerErcToNativePOSDAO on deploy script 2019-03-21 10:16:12 -03:00
Vadim b043eb0df2 Fix misprint 2019-03-05 08:52:27 +03:00
Vadim 4d50918a29 Rename ValidatorSet contract to Staking contract 2019-03-05 08:43:21 +03:00
Gerardo Nardelli b419821b4b Add promise-retry for state asserts on deploy scripts 2019-02-28 12:14:56 -03:00
Gerardo Nardelli 4cc175c6b3 Update erc-to-native deploy script 2019-02-27 16:22:26 -03:00
Gerardo Nardelli afe5407387 Update erc-to-erc deploy script 2019-02-27 14:06:12 -03:00
Gerardo Nardelli f016a25075 update foreign native-to-erc deploy script 2019-02-27 12:19:51 -03:00
Gerardo Nardelli 70cc7351a0 update home native-to-erc deploy script 2019-02-27 10:19:29 -03:00
Gerardo Nardelli e414d6640a Remove onRequestForSignature and onSignaturesCollected from FeeManager 2019-02-25 12:36:22 -03:00
Gerardo Nardelli 289e09f256 Fix native-to-erc deploy script 2019-02-20 15:36:02 -03:00
Gerardo Nardelli 94f5d39c3c Update deploy script 2019-02-20 14:14:45 -03:00
Gerardo Nardelli f1b8a3061f Refactor rewardable env variables 2019-02-20 14:13:51 -03:00
Gerardo Nardelli 02de67af72 Upgrade node version to 10.15 2019-02-18 14:55:01 -03:00
Gerardo Nardelli 5a69e97ffa Fix rewardableInitialize methods 2019-02-04 15:33:05 -03:00
Gerardo Nardelli b54cd53c87 Update fee parameter docs 2019-02-04 14:24:53 -03:00
Alexander Kolotov 98a09a4c31
Merge pull request #152 from vbaranov/master
Replace poa.infura.io with core.poa.network
2019-02-04 14:59:17 +03:00
Victor Baranov 63d1b1788b Replace poa.infura.io with core.poa.network 2019-02-04 13:35:07 +03:00
Gerardo Nardelli 34a4960a46 Update deploy script to use home and foreign fee on rewardableInitialize 2019-02-01 17:07:43 -03:00
Gerardo Nardelli 41216b5e3c Add rewardable bridge options on deploy script for native-to-erc mode 2019-01-23 13:41:02 -03:00
Gerardo Nardelli e56b51d669 Update home bridge initialization log on erc-to-native deploy script 2019-01-22 12:55:39 -03:00
Gerardo Nardelli e0bf48958f Improve validators and reward address log on deploy script 2019-01-22 12:55:39 -03:00
Gerardo Nardelli bdc24f976f Add HOME_TRANSACTIONS_FEE and FOREIGN_TRANSACTIONS_FEE env vars 2019-01-22 12:55:39 -03:00
Gerardo Nardelli 228aaf183a Add HOME_REWARDABLE and FOREIGN_REWARDABLE env vars 2019-01-22 11:51:08 -03:00
Gerardo Nardelli 51a31be31f Rename variable on erc-to-native home deploy script 2019-01-22 11:20:55 -03:00
Gerardo Nardelli 38ebcf16ba Add rewardable bridge options on deploy script for erc-to-native mode 2019-01-15 16:55:21 -03:00
Vadim Arasev 40b4f89ad4
Merge branch 'master' into update-ERC677BridgeToken 2019-01-04 10:03:19 +03:00
Alexander Kolotov 416a35d335
Merge pull request #117 from poanetwork/111-security-roles-2.2
This set of changes addresses two issues:
  * Meaning of security roles for accounts that could perform management operations over the bridge contracts was changed
  * Security limits are introduced to reduce the impact of the validator's malicious behavior
2019-01-03 21:34:44 +02:00
Vadim Arasev 47f766b6c9 Validate new config variables 2018-12-27 18:49:51 +03:00
Vadim Arasev bc289bd2db Add `DEPLOY_REWARDABLE_TOKEN` and `VALIDATOR_SET_ADDRESS` config options 2018-12-27 10:12:47 +03:00
Gerardo Nardelli b4c1a8edcd Fix linter errors on deploy scripts 2018-12-21 15:50:14 -03:00
Gerardo Nardelli e5d152275c Update ERC20-TO-ERC20 deploy script 2018-12-21 15:31:28 -03:00
Gerardo Nardelli 6bf96d36e4 Update ERC20-To-Native deploy script 2018-12-21 15:02:42 -03:00
Gerardo Nardelli 34f88f9af8 Update Native-to-Erc20 deploy script 2018-12-21 12:11:17 -03:00
Gerardo Nardelli ba4b62c547 Update documentation with new roles 2018-12-21 11:04:49 -03:00
Alexander Kolotov 30bfcc145b
Merge pull request #115 from akolotov/fixes-in-env-example
Fixes in format of configuration parameters declaration
2018-12-03 16:40:33 +03:00
Alexander Kolotov 4acb11a800 fixed formatting for .env examples in README 2018-12-01 14:15:51 +03:00
Alexander Kolotov 6ece5f7889 correct formatting for configuration examples 2018-12-01 14:12:49 +03:00
Alexander Kolotov 492735b766 check status of the contract deployment operation as integer 2018-12-01 13:22:32 +03:00
Alexander Kolotov 865eba310e
Merge pull request #106 from akolotov/handle-status-as-integer
Handle status of deployment transaction
2018-11-06 17:00:35 +03:00
Alexander Kolotov d19e51e8cf
Merge pull request #105 from akolotov/unify-resulting-json
Unification for bridgeDeploymentResults.json
2018-11-06 16:57:11 +03:00
Gerardo Nardelli 7877b08086
avoid storing the result of the deployToken method in the token variable
Co-Authored-By: akolotov <alexandr.kolotov@gmail.com>
2018-11-06 14:38:41 +03:00
Alexander Kolotov 917a119775 Clarifications in README
* Description for the parameters related to the gas price was updated
* Ambiguity for unused parameters was eliminated
2018-11-06 01:26:54 +03:00
Alexander Kolotov 8533008ed6 Modified the way to check the status of transactions 2018-11-06 01:22:42 +03:00
Alexander Kolotov 7c21c90425 Merge branch 'deploy-in-docker' into unify-resulting-json 2018-11-05 21:20:16 +03:00
Alexander Kolotov f464c1b544 Fixed comments raised on the code review 2018-11-05 21:10:50 +03:00
Alexander Kolotov 9404b8f105 Made format unification for bridgeDeploymentResults.json 2018-11-05 20:16:27 +03:00
Alexander Kolotov 7ae734d966 added a script to simplify deployment by using Docker 2018-11-02 22:35:13 +03:00
Gerardo Nardelli 7f5949ba29
Merge pull request #82 from poanetwork/erc20-to-native-#79
Add ERC20 to Native bridge mode
2018-10-19 12:11:59 -03:00
Gerardo Nardelli eea722bd06 Merge branch 'master' into refactor_v1
# Conflicts:
#	README.md
#	deploy/README.md
2018-10-04 11:11:17 -03:00
Gerardo Nardelli 38565d2050 Add gas price on initialize foreign erc-to-erc 2018-10-03 14:08:51 -03:00
Gerardo Nardelli 7cf71cb1b3
Merge pull request #90 from poanetwork/fix-transfer-lock-#89
Fix ERC677BridgeToken Transfer lock
2018-10-01 11:25:17 -03:00
Franco Victorio ef8a7d850d Add script for setting block reward address 2018-10-01 09:57:28 -03:00
Franco Victorio bcde71f341 Use different env variables validations for each mode 2018-09-28 11:28:17 -03:00
Gerardo Nardelli ac473ca5dc Add bridge contract reference on ERC677BridgeToken 2018-09-27 16:39:06 -03:00
Franco Victorio 5892b37929 Fix bridge mode choices not being correctly passed 2018-09-27 11:39:29 -03:00
Franco Victorio e80fe12280 Move dependent env checks to deploy script 2018-09-25 17:12:06 -03:00
Gerardo Nardelli 89bd60c469 Add eslint plugin missing dependencies 2018-09-25 15:47:33 -03:00
Gerardo Nardelli 985b48deae Update env var checks for ERC_TO_NATIVE 2018-09-25 15:46:24 -03:00
Gerardo Nardelli 2f29a1e673 Remove gasPrice from options on deploymentUtils 2018-09-25 15:41:34 -03:00
Gerardo Nardelli 2b071da2cb Fix erc-to-native deploy/README 2018-09-25 13:26:47 -03:00
Gerardo Nardelli df307f6a20 Merge branch 'refactor_v1' into erc20-to-native-#79
# Conflicts:
#	README.md
#	deploy/README.md
2018-09-25 13:24:38 -03:00
Gerardo Nardelli 30f328a3c1 Update deployment gas price on deploy/README 2018-09-25 12:32:07 -03:00
Franco Victorio 1aba9481ed Expose sendRawTx again 2018-09-25 07:51:59 -03:00
Andrew Gross 97941bec04 README doc updates, added CONTRIBUTING file 2018-09-24 15:24:11 -06:00
Franco Victorio bf6a0d923c Fix linter errors 2018-09-24 15:31:45 -03:00
Franco Victorio 51c98dc5f1 Move block reward deploy to separate script 2018-09-24 15:15:01 -03:00
Franco Victorio bcacf21266 Use gasPrice argument in sendRawTx 2018-09-24 14:18:15 -03:00
Franco Victorio 2260da2384 Make deploy script work from anywhere 2018-09-24 13:40:14 -03:00
Franco Victorio caf0b78942 Set all env gas variables in wei 2018-09-24 13:37:28 -03:00
Gerardo Nardelli 1992d11ce9 Update erc-to-native config deploy/README 2018-09-24 12:33:42 -03:00
Gerardo Nardelli ebcd752039 Update README and deploy/README 2018-09-24 11:12:51 -03:00
Gerardo Nardelli 1987b44c9c Merge branch 'refactor_v1' into erc20-to-native-#79 2018-09-24 10:32:17 -03:00
Gerardo Nardelli 2a5a199152 Add gasPrice on initialize foreign erc-to-native 2018-09-24 10:23:05 -03:00
Alexander Kolotov ae783fc6d2 fixed documentation issues 2018-09-22 00:32:17 +03:00
Franco Victorio 195f23c613 Add support for deploying ERC_TO_NATIVE mode 2018-09-21 17:46:01 -03:00
Alexander Kolotov 4af6ff70e1 fixes to close comments in deploy/README.md raised during PR review 2018-09-21 22:29:57 +03:00
Alexander Kolotov 82a1f76803 minor correction in deployment README.md 2018-09-21 00:06:19 +03:00
Alexander Kolotov 1a5a12fcdd README.md related to deployment process updated 2018-09-20 23:56:20 +03:00
Franco Victorio 401a1dbecc Allow setting different gas price for each network 2018-09-20 17:06:21 -03:00
Franco Victorio 4aa8f6ce4f Improve environment variables validation 2018-09-20 16:41:44 -03:00