Update components, drop HTTP

.env

@@ -8,7 +8,7 @@ BASTION_VERSION=10
 BASTION_IMAGE=debian
 
 #NEOGO
-NEOGO_VERSION=0.104.0
+NEOGO_VERSION=0.105.1
 NEOGO_IMAGE=nspccdev/neo-go
 NEO_GO_PLATFORM=linux-amd64
 NEO_GO_URL=https://github.com/nspcc-dev/neo-go/releases/download/v${NEOGO_VERSION}/neo-go-${NEO_GO_PLATFORM}
@@ -25,12 +25,8 @@ NODE_IMAGE=nspccdev/neofs-storage
 NATS_VERSION=2.7.2
 NATS_IMAGE=nats
 
-# HTTP Gate
-HTTP_GW_VERSION=0.28.0
-HTTP_GW_IMAGE=nspccdev/neofs-http-gw
-
 # REST Gate
-REST_GW_VERSION=0.5.0
+REST_GW_VERSION=0.8.2
 REST_GW_IMAGE=nspccdev/neofs-rest-gw
 
 # S3 Gate

.services

@@ -1,6 +1,5 @@
 # Services start/stop order
 # Will start from top to bottom and stop in reverse
-http_gate
 s3_gate
 rest_gate
 coredns

Makefile

@@ -119,11 +119,9 @@ up/bootstrap: get vendor/hosts
 		docker-compose -f services/$${svc}/docker-compose.yml up -d 2>&1 | tee -a docker-compose.err; \
 	done
 	@source ./bin/helper.sh
-	@docker exec main_chain neo-go wallet nep17 transfer --force --wallet-config /wallets/config.yml -r http://main-chain.neofs.devenv:30333 --from NfgHwwTi3wHAS8aFAN243C5vGbkYDpqLHP  --to NbUgTSFvPmsRxmGeWpuuGeJUoRoi6PErcM --token GAS --amount 1000
+	@docker exec main_chain neo-go wallet nep17 transfer --force --await --wallet-config /wallets/config.yml -r http://main-chain.neofs.devenv:30333 --from NfgHwwTi3wHAS8aFAN243C5vGbkYDpqLHP  --to NbUgTSFvPmsRxmGeWpuuGeJUoRoi6PErcM --token GAS --amount 1000
 	@echo "NEOFS_IR_CONTRACTS_NEOFS="`./vendor/neo-go contract calc-hash -s NbUgTSFvPmsRxmGeWpuuGeJUoRoi6PErcM --in vendor/contracts/neofs/neofs_contract.nef -m vendor/contracts/neofs/config.json | grep -Eo '[a-fA-F0-9]{40}'` > services/ir/.ir.env
-	@echo "Waiting for transfer to settle" && sleep 2
-	@./vendor/neo-go contract deploy --wallet-config wallets/config.yml --in vendor/contracts/neofs/neofs_contract.nef --manifest vendor/contracts/neofs/config.json --force -r http://main-chain.neofs.devenv:30333 [ true ffffffffffffffffffffffffffffffffffffffff [ 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2 ] [ InnerRingCandidateFee 10000000000 WithdrawFee 100000000 ] ]
-	@echo "Waiting for deployment to happen" && sleep 2
+	@./vendor/neo-go contract deploy --wallet-config wallets/config.yml --in vendor/contracts/neofs/neofs_contract.nef --manifest vendor/contracts/neofs/config.json --force --await -r http://main-chain.neofs.devenv:30333 [ true ffffffffffffffffffffffffffffffffffffffff [ 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2 ] [ InnerRingCandidateFee 10000000000 WithdrawFee 100000000 ] ]
 	@NEOGO=vendor/neo-go WALLET=wallets/wallet.json CONFIG=wallets/config.yml ./bin/deposit.sh
 	@for f in ./services/storage/wallet*.json; do echo "Transfer GAS to wallet $${f}" && ./vendor/neofs-adm -c neofs-adm.yml morph refill-gas --storage-wallet $${f} --gas 10.0 --alphabet-wallets services/ir || die "Failed to transfer GAS to alphabet wallets"; done
 	$(call error_handler,$@);

README.md

@@ -69,7 +69,7 @@ fa6ba62bffb04030d303dcc95bda7413e03aa3c7e6ca9c2f999d65db9ec9b82c
 
 Also you should add self-signed node (`s04.neofs.devenv`) certificate to trusted
 store (default location might be changed using `CA_CERTS_TRUSTED_STORE`
-variable). This step is required for client services (neofs-http-gw,
+variable). This step is required for client services (neofs-rest-gw,
 neofs-s3-gw) to interact with the node:
 
 ```

bin/config.sh

@@ -39,7 +39,7 @@ echo "Changing ${KEY} configuration value to ${VALUE}"
 # shellcheck disable=SC2086
 ${NEOGO} contract invokefunction \
 	--wallet-config ${CONFIG_IMG} \
-	-a ${ADDR} --force \
+	-a ${ADDR} --force --await \
 	-r http://ir01.${LOCAL_DOMAIN}:30333 \
 	${NETMAP_ADDR} \
 	setConfig bytes:beefcafe \

bin/tests/update_hosts_test.sh

@@ -99,7 +99,6 @@ update_entries_in_hosts_test() {
 192.168.100.10 bastion.neofs.devenv
 192.168.100.50 main-chain.neofs.devenv
 192.168.100.53 coredns.neofs.devenv
-192.168.100.81 http.neofs.devenv
 192.168.100.102 k6_node.neofs.devenv
 192.168.100.101 nats.neofs.devenv
 192.168.100.83 rest.neofs.devenv
@@ -117,7 +116,6 @@ echo "127.0.0.1       localhost
 192.168.130.10 bastion.neofs.devenv
 192.168.130.50 main-chain.neofs.devenv
 192.168.130.53 coredns.neofs.devenv
-192.168.130.81 http.neofs.devenv
 192.168.130.61 ir01.neofs.devenv
 192.168.130.101 nats.neofs.devenv
 192.168.130.83 rest.neofs.devenv
@@ -132,7 +130,6 @@ echo "127.0.0.1       localhost
 192.168.100.10 bastion.neofs.devenv
 192.168.100.50 main-chain.neofs.devenv
 192.168.100.53 coredns.neofs.devenv
-192.168.100.81 http.neofs.devenv
 192.168.100.61 ir01.neofs.devenv
 192.168.100.101 nats.neofs.devenv
 192.168.100.83 rest.neofs.devenv

bin/tick.sh

@@ -38,12 +38,8 @@ echo "Updating NeoFS epoch to $((EPOCH+1))"
 # shellcheck disable=SC2086
 ${NEOGO} contract invokefunction \
         --wallet-config ${CONFIG_IMG} \
-	-a ${ADDR} --force \
+	-a ${ADDR} --force --await \
 	-r http://ir01.${LOCAL_DOMAIN}:30333 \
 	${NETMAP_ADDR} \
 	newEpoch int:$((EPOCH+1)) -- ${ADDR}:Global \
         || die "Cannot increment an epoch"
-
-# Wait one NeoFS chain block to ensure the transaction broadcasted
-# shellcheck disable=SC2086
-sleep $BLOCK_DURATION

services/rest_gate/cfg/config.yml

@@ -1,4 +1,5 @@
-listen-address: 0.0.0.0:8090 # The IP and port to listen on
+server:
+  listen-address: 0.0.0.0:8090 # The IP and port to listen on
 
 # Wallet settings
 wallet:

services/rest_gate/docker-compose.yml

@@ -20,10 +20,10 @@ services:
     env_file: [ ".env", ".int_test.env" ]
     command: [ "neofs-rest-gw", "--config", "/etc/neofs/rest/config.yml" ]
     environment:
-      - REST_GW_PEERS_0_ADDRESS=s01.${LOCAL_DOMAIN}:8080
-      - REST_GW_PEERS_1_ADDRESS=s02.${LOCAL_DOMAIN}:8080
-      - REST_GW_PEERS_2_ADDRESS=s03.${LOCAL_DOMAIN}:8080
-      - REST_GW_PEERS_3_ADDRESS=s04.${LOCAL_DOMAIN}:8080
+      - REST_GW_POOL_PEERS_0_ADDRESS=s01.${LOCAL_DOMAIN}:8080
+      - REST_GW_POOL_PEERS_1_ADDRESS=s02.${LOCAL_DOMAIN}:8080
+      - REST_GW_POOL_PEERS_2_ADDRESS=s03.${LOCAL_DOMAIN}:8080
+      - REST_GW_POOL_PEERS_3_ADDRESS=s04.${LOCAL_DOMAIN}:8080
 
 networks:
   rest_gate_int: