From 61e4067467426cd6b0f3d2f587f4df03802430fc Mon Sep 17 00:00:00 2001 From: Kirill Fedoseev Date: Wed, 4 Sep 2019 13:30:26 +0300 Subject: [PATCH] Changes in deploy configs --- .gitignore | 11 +++++----- src/deploy/deploy-home/.env.development | 20 +++++++------------ src/deploy/deploy-home/.env.staging | 2 +- .../deploy-home/migrations/1_deployment.js | 6 +++--- src/deploy/deploy-home/truffle-config.js | 10 +++------- src/deploy/deploy-side/.env.development | 6 ++---- src/deploy/deploy-side/truffle-config.js | 10 +++------- src/deploy/deploy-test/.env.development | 6 ++---- src/deploy/deploy-test/.env.staging | 2 +- src/deploy/deploy-test/truffle-config.js | 10 +++------- 10 files changed, 31 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index 8eb0daa..dbdbc43 100644 --- a/.gitignore +++ b/.gitignore @@ -5,14 +5,15 @@ node_modules/ **/signature **/params data/ -demo/validator*/db -demo/validator*/keys -demo/validator*/queue -demo/validator*/.keys +demo/validator*/development +demo/validator*/staging +demo/validator*/.keys.staging demo/ganache_home_db/ demo/ganache_side_db/ src/deploy/deploy-home/build/ src/deploy/deploy-side/build/ src/deploy/deploy-test/build/ -src/deploy/.keys +src/deploy/.keys.staging +src/test-services/.keys.staging +src/test-services/.keys.development test.js diff --git a/src/deploy/deploy-home/.env.development b/src/deploy/deploy-home/.env.development index de438ed..390b68f 100644 --- a/src/deploy/deploy-home/.env.development +++ b/src/deploy/deploy-home/.env.development @@ -1,18 +1,12 @@ -RPC_URL=https://kovan.infura.io/v3/5d7bd94c50ed43fab1cb8e74f58678b0 -RPC_URL_DEV=http://ganache_home:8545 +HOME_RPC_URL=http://ganache_home:8545 -#PRIVATE_KEY is taken from PRIVATE_KEY_KOVAN in src/deploy/.keys -PRIVATE_KEY_DEV=e2aeb24eaa63102d0c0821717c3b6384abdabd7af2ad4ec8e650dce300798b27 +HOME_PRIVATE_KEY=e2aeb24eaa63102d0c0821717c3b6384abdabd7af2ad4ec8e650dce300798b27 -#Set to '0x' for redeployment of token contract in staging environment -TOKEN_ADDRESS=0xbE9f77e3644e2CF311287921E9307Ee97607Bf66 +HOME_TOKEN_ADDRESS=0xd5fE0D28e058D375b0b038fFbB446Da37E85fFdc -TOKEN_ADDRESS_DEV=0xd5fE0D28e058D375b0b038fFbB446Da37E85fFdc - -VALIDATOR_ADDRESS_1=0xaaaaB15630f63cA01bb50943AaAb4008CB53748D -VALIDATOR_ADDRESS_2=0xbbbb63D6Fc58bD14dAF9eeF653650c4D10f3dBC8 -VALIDATOR_ADDRESS_3=0xcccc27ae510b63E30eC3C68AAD7DdD2578bD62ed -#VALIDATOR_ADDRESS_4=0xdddd9300e32fe162bA420f7313651Fd901C2ed71 +VALIDATOR_ADDRESS_1=0x99eb3d86663c6db090effdbc20510ca9f836dce3 +VALIDATOR_ADDRESS_2=0xaa006899b0ec407de930ba8a166defe59bbfd3dc +VALIDATOR_ADDRESS_3=0x6352e3e6038e05b9da00c84ae851308f9774f883 +#VALIDATOR_ADDRESS_4=0x4db6b4bd0a3fdc03b027a60f1c48f05c572312aa THRESHOLD=1 -#PARTIES=3 diff --git a/src/deploy/deploy-home/.env.staging b/src/deploy/deploy-home/.env.staging index 5de49ae..4f00803 100644 --- a/src/deploy/deploy-home/.env.staging +++ b/src/deploy/deploy-home/.env.staging @@ -1,6 +1,6 @@ HOME_RPC_URL=https://kovan.infura.io/v3/5d7bd94c50ed43fab1cb8e74f58678b0 -#HOME_PRIVATE_KEY is taken from src/deploy/.keys.$TARGET_NETWORK +#HOME_PRIVATE_KEY is taken from src/deploy/.keys.staging #Set to '0x' for redeployment of token contract in staging environment HOME_TOKEN_ADDRESS=0xbE9f77e3644e2CF311287921E9307Ee97607Bf66 diff --git a/src/deploy/deploy-home/migrations/1_deployment.js b/src/deploy/deploy-home/migrations/1_deployment.js index c73d59d..b3b67f0 100644 --- a/src/deploy/deploy-home/migrations/1_deployment.js +++ b/src/deploy/deploy-home/migrations/1_deployment.js @@ -5,14 +5,14 @@ const addresses = Object.entries(process.env) .map(([ , value ]) => value) const { - THRESHOLD, TOKEN_ADDRESS, TOKEN_ADDRESS_DEV + THRESHOLD, HOME_TOKEN_ADDRESS } = process.env -module.exports = (deployer, network) => { +module.exports = deployer => { deployer.deploy( Bridge, THRESHOLD, addresses, - network === 'development' ? TOKEN_ADDRESS_DEV : TOKEN_ADDRESS + HOME_TOKEN_ADDRESS ) } diff --git a/src/deploy/deploy-home/truffle-config.js b/src/deploy/deploy-home/truffle-config.js index ab0e079..a58673b 100644 --- a/src/deploy/deploy-home/truffle-config.js +++ b/src/deploy/deploy-home/truffle-config.js @@ -1,15 +1,11 @@ const PrivateKeyProvider = require('truffle-hdwallet-provider') -const { RPC_URL, PRIVATE_KEY, RPC_URL_DEV, PRIVATE_KEY_DEV } = process.env +const { HOME_RPC_URL, HOME_PRIVATE_KEY } = process.env module.exports = { networks: { - development: { - provider: new PrivateKeyProvider(PRIVATE_KEY_DEV, RPC_URL_DEV), - network_id: '44' - }, - staging: { - provider: new PrivateKeyProvider(PRIVATE_KEY, RPC_URL), + home: { + provider: new PrivateKeyProvider(HOME_PRIVATE_KEY, HOME_RPC_URL), network_id: '*' } }, diff --git a/src/deploy/deploy-side/.env.development b/src/deploy/deploy-side/.env.development index 76f6548..aa2fd71 100644 --- a/src/deploy/deploy-side/.env.development +++ b/src/deploy/deploy-side/.env.development @@ -1,5 +1,3 @@ -RPC_URL=https://sokol.poa.network -RPC_URL_DEV=http://ganache_side:8545 +SIDE_RPC_URL=http://ganache_side:8545 -#PRIVATE_KEY is taken from PRIVATE_KEY_SOKOL in src/deploy/.keys -PRIVATE_KEY_DEV=e2aeb24eaa63102d0c0821717c3b6384abdabd7af2ad4ec8e650dce300798b27 +SIDE_PRIVATE_KEY=e2aeb24eaa63102d0c0821717c3b6384abdabd7af2ad4ec8e650dce300798b27 diff --git a/src/deploy/deploy-side/truffle-config.js b/src/deploy/deploy-side/truffle-config.js index 9469afa..3860d80 100644 --- a/src/deploy/deploy-side/truffle-config.js +++ b/src/deploy/deploy-side/truffle-config.js @@ -1,15 +1,11 @@ const PrivateKeyProvider = require('truffle-hdwallet-provider') -const { RPC_URL, PRIVATE_KEY, RPC_URL_DEV, PRIVATE_KEY_DEV } = process.env +const { SIDE_RPC_URL, SIDE_PRIVATE_KEY } = process.env module.exports = { networks: { - development: { - provider: new PrivateKeyProvider(PRIVATE_KEY_DEV, RPC_URL_DEV), - network_id: '33' - }, - staging: { - provider: new PrivateKeyProvider(PRIVATE_KEY, RPC_URL), + side: { + provider: new PrivateKeyProvider(SIDE_PRIVATE_KEY, SIDE_RPC_URL), network_id: '*' } }, diff --git a/src/deploy/deploy-test/.env.development b/src/deploy/deploy-test/.env.development index ce03d4d..f039153 100644 --- a/src/deploy/deploy-test/.env.development +++ b/src/deploy/deploy-test/.env.development @@ -1,7 +1,5 @@ -RPC_URL=https://kovan.infura.io/v3/5d7bd94c50ed43fab1cb8e74f58678b0 -RPC_URL_DEV=http://ganache_home:8545 +HOME_RPC_URL=http://ganache_home:8545 -#PRIVATE_KEY is taken from PRIVATE_KEY_KOVAN in src/deploy/.keys -PRIVATE_KEY_DEV=e2aeb24eaa63102d0c0821717c3b6384abdabd7af2ad4ec8e650dce300798b27 +HOME_PRIVATE_KEY=e2aeb24eaa63102d0c0821717c3b6384abdabd7af2ad4ec8e650dce300798b27 TOKEN_INITIAL_MINT=31415000000000000000000000 diff --git a/src/deploy/deploy-test/.env.staging b/src/deploy/deploy-test/.env.staging index 4ca2e07..351cc84 100644 --- a/src/deploy/deploy-test/.env.staging +++ b/src/deploy/deploy-test/.env.staging @@ -1,5 +1,5 @@ HOME_RPC_URL=https://kovan.infura.io/v3/5d7bd94c50ed43fab1cb8e74f58678b0 -#HOME_PRIVATE_KEY is taken from src/deploy/.keys +#HOME_PRIVATE_KEY is taken from src/deploy/.keys.staging TOKEN_INITIAL_MINT=31415000000000000000000000 diff --git a/src/deploy/deploy-test/truffle-config.js b/src/deploy/deploy-test/truffle-config.js index ab0e079..a58673b 100644 --- a/src/deploy/deploy-test/truffle-config.js +++ b/src/deploy/deploy-test/truffle-config.js @@ -1,15 +1,11 @@ const PrivateKeyProvider = require('truffle-hdwallet-provider') -const { RPC_URL, PRIVATE_KEY, RPC_URL_DEV, PRIVATE_KEY_DEV } = process.env +const { HOME_RPC_URL, HOME_PRIVATE_KEY } = process.env module.exports = { networks: { - development: { - provider: new PrivateKeyProvider(PRIVATE_KEY_DEV, RPC_URL_DEV), - network_id: '44' - }, - staging: { - provider: new PrivateKeyProvider(PRIVATE_KEY, RPC_URL), + home: { + provider: new PrivateKeyProvider(HOME_PRIVATE_KEY, HOME_RPC_URL), network_id: '*' } },