[#164] services: Do not use underscore in hostnames

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-03-03 15:54:27 +03:00 committed by Alex Vanin
parent a2ab73c82f
commit 1d58f1774d
13 changed files with 28 additions and 28 deletions

View file

@ -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

View file

@ -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} \

View file

@ -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 \

View file

@ -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

View file

@ -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

View file

@ -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 \

View file

@ -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

View file

@ -1 +1 @@
IPV4_PREFIX.50 main_chain.LOCAL_DOMAIN
IPV4_PREFIX.50 main-chain.LOCAL_DOMAIN

View file

@ -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:

View file

@ -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

View file

@ -1 +1 @@
IPV4_PREFIX.90 morph_chain.LOCAL_DOMAIN
IPV4_PREFIX.90 morph-chain.LOCAL_DOMAIN

View file

@ -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:

View file

@ -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