From 1d58f1774dc3380aa6995645a9df8994eff09823 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Thu, 3 Mar 2022 15:54:27 +0300 Subject: [PATCH] [#164] services: Do not use underscore in hostnames Signed-off-by: Evgenii Stratonikov --- README.md | 2 +- bin/config.sh | 2 +- bin/deposit.sh | 2 +- bin/resolve.sh | 4 ++-- bin/tick.sh | 4 ++-- docs/chain.md | 16 ++++++++-------- docs/morph.md | 6 +++--- services/chain/.hosts | 2 +- services/chain/docker-compose.yml | 2 +- services/ir/.ir.env | 8 ++++---- services/morph_chain/.hosts | 2 +- services/morph_chain/docker-compose.yml | 2 +- services/storage/.storage.env | 4 ++-- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 0254f1f..efb433f 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ You can see the addresses and hostnames of components with `make hosts` command. ``` $ make hosts 192.168.130.10 bastion.neofs.devenv -192.168.130.50 main_chain.neofs.devenv +192.168.130.50 main-chain.neofs.devenv 192.168.130.61 ir01.neofs.devenv ... 192.168.130.74 s04.neofs.devenv diff --git a/bin/config.sh b/bin/config.sh index 1432762..d4fd1fa 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -36,7 +36,7 @@ echo "Changing ${KEY} configration value to ${VALUE}" ./bin/passwd.exp ${PASSWD} ${NEOGO} contract invokefunction \ -w ${WALLET_IMG} \ -a ${ADDR} \ --r http://morph_chain.${LOCAL_DOMAIN}:30333 \ +-r http://morph-chain.${LOCAL_DOMAIN}:30333 \ ${NETMAP_ADDR} \ setConfig bytes:beefcafe \ string:${KEY} \ diff --git a/bin/deposit.sh b/bin/deposit.sh index 6340fe4..6032354 100755 --- a/bin/deposit.sh +++ b/bin/deposit.sh @@ -20,7 +20,7 @@ CONTRACT_ADDR=`${NEOGO} util convert ${NEOFS_IR_CONTRACTS_NEOFS} | grep 'LE Scri # Make deposit ./bin/passwd.exp ${PASSWD} ${NEOGO} wallet nep17 transfer \ -w ${WALLET} \ --r http://main_chain.${LOCAL_DOMAIN}:30333 \ +-r http://main-chain.${LOCAL_DOMAIN}:30333 \ --from ${ADDR} \ --to ${CONTRACT_ADDR} \ --token GAS \ diff --git a/bin/resolve.sh b/bin/resolve.sh index 8565a93..04b8e52 100755 --- a/bin/resolve.sh +++ b/bin/resolve.sh @@ -6,8 +6,8 @@ # NeoGo binary path. NEOGO="${NEOGO:-docker exec -it morph_chain neo-go}" # NNS contract script hash -NNS_ADDR=`curl -s --data '{ "id": 1, "jsonrpc": "2.0", "method": "getcontractstate", "params": [1] }' http://morph_chain.${LOCAL_DOMAIN}:30333/ | jq -r '.result.hash'` +NNS_ADDR=`curl -s --data '{ "id": 1, "jsonrpc": "2.0", "method": "getcontractstate", "params": [1] }' http://morph-chain.${LOCAL_DOMAIN}:30333/ | jq -r '.result.hash'` ${NEOGO} contract testinvokefunction \ --r http://morph_chain.${LOCAL_DOMAIN}:30333 \ +-r http://morph-chain.${LOCAL_DOMAIN}:30333 \ ${NNS_ADDR} resolve string:${1} int:16 | jq -r '.stack[0].value | if type=="array" then .[0].value else . end' | base64 -d diff --git a/bin/tick.sh b/bin/tick.sh index 5853d1d..5fb7b4a 100755 --- a/bin/tick.sh +++ b/bin/tick.sh @@ -28,7 +28,7 @@ NETMAP_ADDR=`bin/resolve.sh netmap.neofs` # Fetch current epoch value EPOCH=`${NEOGO} contract testinvokefunction -r \ -http://morph_chain.${LOCAL_DOMAIN}:30333 \ +http://morph-chain.${LOCAL_DOMAIN}:30333 \ ${NETMAP_ADDR} \ epoch | grep 'value' | awk -F'"' '{ print $4 }'` @@ -36,7 +36,7 @@ echo "Updating NeoFS epoch to $((EPOCH+1))" ./bin/passwd.exp ${PASSWD} ${NEOGO} contract invokefunction \ -w ${WALLET_IMG} \ -a ${ADDR} \ --r http://morph_chain.${LOCAL_DOMAIN}:30333 \ +-r http://morph-chain.${LOCAL_DOMAIN}:30333 \ ${NETMAP_ADDR} \ newEpoch int:$((EPOCH+1)) -- ${ADDR}:Global diff --git a/docs/chain.md b/docs/chain.md index 8dfbb5e..0ed13ce 100644 --- a/docs/chain.md +++ b/docs/chain.md @@ -7,7 +7,7 @@ Contracts deployed: - NeoFS [contract](https://github.com/nspcc-dev/neofs-contract/tree/master/neofs) - Processing [contract](https://github.com/nspcc-dev/neofs-contract/tree/master/processing) -RPC available at `http://main_chain.neofs.devenv:30333`. +RPC available at `http://main-chain.neofs.devenv:30333`. ## .env settings @@ -31,7 +31,7 @@ There is a wallet with GAS that used for contract deployment: ``` $ neo-go wallet nep17 balance \ -w wallets/wallet.json \ - -r http://main_chain.neofs.devenv:30333 + -r http://main-chain.neofs.devenv:30333 Account NbUgTSFvPmsRxmGeWpuuGeJUoRoi6PErcM GAS: GasToken (d2a4cff31913016155e38e474a2c06d08be276cf) @@ -65,7 +65,7 @@ wallet successfully created, file location is wallets/neofs1.json ``` $ neo-go wallet nep17 transfer \ -w wallets/wallet.json \ - -r http://main_chain.neofs.devenv:30333 \ + -r http://main-chain.neofs.devenv:30333 \ --from NbUgTSFvPmsRxmGeWpuuGeJUoRoi6PErcM \ --to NXnzw3J9VvKXjM1BPAJK4QUpTtEQu4TpU6 \ --amount 50 \ @@ -77,7 +77,7 @@ $ neo-go wallet nep17 transfer \ ``` $ neo-go wallet nep17 balance \ -w wallets/neofs1.json \ - -r http://main_chain.neofs.devenv:30333 + -r http://main-chain.neofs.devenv:30333 Account NXnzw3J9VvKXjM1BPAJK4QUpTtEQu4TpU6 GAS: GasToken (d2a4cff31913016155e38e474a2c06d08be276cf) @@ -98,7 +98,7 @@ Claim GAS to consensus node's wallet. Use account that contains NEO tokens. ``` $ neo-go wallet claim \ -w services/chain/node-wallet.json \ - -r http://main_chain.neofs.devenv:30333 \ + -r http://main-chain.neofs.devenv:30333 \ -a NfgHwwTi3wHAS8aFAN243C5vGbkYDpqLHP \ Password > 70e09bbd55846dcc7cee23905b737c63e5a80d32e387bce108bc6db8e641fb90 @@ -109,7 +109,7 @@ Then you can transfer GAS the same way as it was done in previous section. ``` $ neo-go wallet nep17 transfer \ -w services/chain/node-wallet.json \ - -r http://main_chain.neofs.devenv:30333 \ + -r http://main-chain.neofs.devenv:30333 \ --from NfgHwwTi3wHAS8aFAN243C5vGbkYDpqLHP \ --to NXnzw3J9VvKXjM1BPAJK4QUpTtEQu4TpU6 \ --amount 50 \ @@ -136,7 +136,7 @@ Script converts addresses and executes this command: ``` $ neo-go wallet nep17 transfer \ -w wallets/wallet.json \ - -r http://main_chain.neofs.devenv:30333 \ + -r http://main-chain.neofs.devenv:30333 \ --from NbUgTSFvPmsRxmGeWpuuGeJUoRoi6PErcM \ --to NerhjaqJsJt4LxMqUbkkVMpsF2d9TtcpFv \ --token GAS \ @@ -149,7 +149,7 @@ and NeoFS deposit will be transferred to that address. ``` $ neo-go wallet nep17 transfer \ -w wallets/wallet.json \ - -r http://main_chain.neofs.devenv:30333 \ + -r http://main-chain.neofs.devenv:30333 \ --from NbUgTSFvPmsRxmGeWpuuGeJUoRoi6PErcM \ --to NerhjaqJsJt4LxMqUbkkVMpsF2d9TtcpFv \ --token GAS \ diff --git a/docs/morph.md b/docs/morph.md index 21a359c..a30bfb5 100644 --- a/docs/morph.md +++ b/docs/morph.md @@ -12,7 +12,7 @@ Contracts deployed: - Proxy [contract](https://github.com/nspcc-dev/neofs-contract/tree/master/proxy) - Reputation [contract](https://github.com/nspcc-dev/neofs-contract/tree/master/reputation) -RPC available at `http://morph_chain.neofs.devenv:30333`. +RPC available at `http://morph-chain.neofs.devenv:30333`. ## .env settings @@ -36,8 +36,8 @@ There is a wallet with GAS that used for contract deployment: ``` $ neo-go wallet nep17 balance \ -w wallets/wallet.json \ - -r http://morph_chain.neofs.devenv:30333 - + -r http://morph-chain.neofs.devenv:30333 + Account NbUgTSFvPmsRxmGeWpuuGeJUoRoi6PErcM GAS: GasToken (d2a4cff31913016155e38e474a2c06d08be276cf) Amount : 189826.0515316 diff --git a/services/chain/.hosts b/services/chain/.hosts index 1668720..a576e59 100644 --- a/services/chain/.hosts +++ b/services/chain/.hosts @@ -1 +1 @@ -IPV4_PREFIX.50 main_chain.LOCAL_DOMAIN +IPV4_PREFIX.50 main-chain.LOCAL_DOMAIN diff --git a/services/chain/docker-compose.yml b/services/chain/docker-compose.yml index ce25de9..f460206 100644 --- a/services/chain/docker-compose.yml +++ b/services/chain/docker-compose.yml @@ -7,7 +7,7 @@ services: container_name: main_chain command: ["node", "--config-path", "/config", "--privnet", "--debug"] domainname: ${LOCAL_DOMAIN} - hostname: main_chain + hostname: main-chain networks: chain_int: internet: diff --git a/services/ir/.ir.env b/services/ir/.ir.env index 0954123..4bd9959 100644 --- a/services/ir/.ir.env +++ b/services/ir/.ir.env @@ -19,10 +19,10 @@ NEOFS_IR_METRICS_ADDRESS=:9090 # Toggling the sidechain-only mode NEOFS_IR_WITHOUT_MAINNET=false -NEOFS_IR_MAINNET_ENDPOINT_CLIENT=http://main_chain:30333 -NEOFS_IR_MAINNET_ENDPOINT_NOTIFICATION=ws://main_chain:30333/ws -NEOFS_IR_MORPH_ENDPOINT_CLIENT=http://morph_chain:30333 -NEOFS_IR_MORPH_ENDPOINT_NOTIFICATION=ws://morph_chain:30333/ws +NEOFS_IR_MAINNET_ENDPOINT_CLIENT=http://main-chain:30333 +NEOFS_IR_MAINNET_ENDPOINT_NOTIFICATION=ws://main-chain:30333/ws +NEOFS_IR_MORPH_ENDPOINT_CLIENT=http://morph-chain:30333 +NEOFS_IR_MORPH_ENDPOINT_NOTIFICATION=ws://morph-chain:30333/ws NEOFS_IR_TIMERS_EMIT=50 NEOFS_IR_TIMERS_STOP_ESTIMATION_DIV=4 NEOFS_IR_TIMERS_COLLECT_BASIC_INCOME_DIV=2 diff --git a/services/morph_chain/.hosts b/services/morph_chain/.hosts index 8af39d3..b2ffc31 100644 --- a/services/morph_chain/.hosts +++ b/services/morph_chain/.hosts @@ -1 +1 @@ -IPV4_PREFIX.90 morph_chain.LOCAL_DOMAIN +IPV4_PREFIX.90 morph-chain.LOCAL_DOMAIN diff --git a/services/morph_chain/docker-compose.yml b/services/morph_chain/docker-compose.yml index 9da285f..a622402 100644 --- a/services/morph_chain/docker-compose.yml +++ b/services/morph_chain/docker-compose.yml @@ -7,7 +7,7 @@ services: container_name: morph_chain command: ["node", "--config-path", "/config", "--privnet", "--debug"] domainname: ${LOCAL_DOMAIN} - hostname: morph_chain + hostname: morph-chain networks: chain_int: internet: diff --git a/services/storage/.storage.env b/services/storage/.storage.env index e201e8e..292d79c 100644 --- a/services/storage/.storage.env +++ b/services/storage/.storage.env @@ -25,10 +25,10 @@ NEOFS_GRPC_NUM=1 # Morph section ## Endpoints of sidechain RPC nodes (comma-separated) ## Default: empty list (invalid) -NEOFS_MORPH_RPC_ENDPOINT=http://morph_chain:30333 +NEOFS_MORPH_RPC_ENDPOINT=http://morph-chain:30333 ## Endpoints of sidechain notifications (comma-separated) ## Default: empty list (invalid) -NEOFS_MORPH_NOTIFICATION_ENDPOINT=ws://morph_chain:30333/ws +NEOFS_MORPH_NOTIFICATION_ENDPOINT=ws://morph-chain:30333/ws ## Dial timeout to connect to notification endpoint ## Default: 5s #NEOFS_MORPH_DIAL_TIMEOUT=1m