From 74717177c088b0833161a4a0bb2067412a69a18c Mon Sep 17 00:00:00 2001
From: Alex Vanin <alexey@nspcc.ru>
Date: Tue, 29 Jun 2021 14:11:39 +0300
Subject: [PATCH] [#104] Update neofs-node to v0.22.0

Release includes group address support in SN.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
---
 .env                                |  4 ++--
 services/storage/.storage.env       |  3 +++
 services/storage/docker-compose.yml | 20 ++++++++++++--------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index ef6f2d6..c642afb 100644
--- a/.env
+++ b/.env
@@ -10,11 +10,11 @@ NEOGO_VERSION=0.95.3
 MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.9.1/devenv_sidechain.gz"
 
 # NeoFS InnerRing nodes
-IR_VERSION=0.21.0-91-g1f461baf
+IR_VERSION=0.22.0
 IR_IMAGE=nspccdev/neofs-ir
 
 # NeoFS Storage nodes
-NODE_VERSION=0.21.0-91-g1f461baf
+NODE_VERSION=0.22.0
 NODE_IMAGE=nspccdev/neofs-storage
 
 # HTTP Gate
diff --git a/services/storage/.storage.env b/services/storage/.storage.env
index 9c65aaf..06a6324 100644
--- a/services/storage/.storage.env
+++ b/services/storage/.storage.env
@@ -19,6 +19,9 @@ NEOFS_METRICS_ADDRESS=:9090
 ## Default: 30s
 #NEOFS_METRICS_SHUTDOWN_TIMEOUT=1m
 
+# GRPC Transport Section
+NEOFS_GRPC_NUM=1
+
 # Morph section
 ## Endpoints of sidechain RPC nodes (comma-separated)
 ## Default: empty list (invalid)
diff --git a/services/storage/docker-compose.yml b/services/storage/docker-compose.yml
index db20cf5..18bf34e 100644
--- a/services/storage/docker-compose.yml
+++ b/services/storage/docker-compose.yml
@@ -20,8 +20,9 @@ services:
     env_file: [ ".env", ".storage.env" ]
     environment:
       - NEOFS_NODE_KEY=/01.key
-      - NEOFS_NODE_ADDRESS=s01.${LOCAL_DOMAIN}:8080
-      - NEOFS_GRPC_ENDPOINT=s01.${LOCAL_DOMAIN}:8080
+      - NEOFS_NODE_ADDRESSES=s01.${LOCAL_DOMAIN}:8080
+      - NEOFS_GRPC_0_ENDPOINT=s01.${LOCAL_DOMAIN}:8080
+      - NEOFS_CONTROL_GRPC_ENDPOINT=s01.${LOCAL_DOMAIN}:8081
       - NEOFS_NODE_ATTRIBUTE_0=UN-LOCODE:RU MSK
       - NEOFS_NODE_ATTRIBUTE_1=Price:22
 
@@ -43,8 +44,9 @@ services:
     env_file: [ ".env", ".storage.env" ]
     environment:
       - NEOFS_NODE_KEY=/02.key
-      - NEOFS_NODE_ADDRESS=s02.${LOCAL_DOMAIN}:8080
-      - NEOFS_GRPC_ENDPOINT=s02.${LOCAL_DOMAIN}:8080
+      - NEOFS_NODE_ADDRESSES=s02.${LOCAL_DOMAIN}:8080
+      - NEOFS_GRPC_0_ENDPOINT=s02.${LOCAL_DOMAIN}:8080
+      - NEOFS_CONTROL_GRPC_ENDPOINT=s02.${LOCAL_DOMAIN}:8081
       - NEOFS_NODE_ATTRIBUTE_0=UN-LOCODE:RU LED
       - NEOFS_NODE_ATTRIBUTE_1=Price:33
 
@@ -66,8 +68,9 @@ services:
     env_file: [ ".env", ".storage.env" ]
     environment:
       - NEOFS_NODE_KEY=/03.key
-      - NEOFS_NODE_ADDRESS=s03.${LOCAL_DOMAIN}:8080
-      - NEOFS_GRPC_ENDPOINT=s03.${LOCAL_DOMAIN}:8080
+      - NEOFS_NODE_ADDRESSES=s03.${LOCAL_DOMAIN}:8080
+      - NEOFS_GRPC_0_ENDPOINT=s03.${LOCAL_DOMAIN}:8080
+      - NEOFS_CONTROL_GRPC_ENDPOINT=s03.${LOCAL_DOMAIN}:8081
       - NEOFS_NODE_ATTRIBUTE_0=UN-LOCODE:SE STO
       - NEOFS_NODE_ATTRIBUTE_1=Price:11
 
@@ -89,8 +92,9 @@ services:
     env_file: [ ".env", ".storage.env" ]
     environment:
       - NEOFS_NODE_KEY=/04.key
-      - NEOFS_NODE_ADDRESS=s04.${LOCAL_DOMAIN}:8080
-      - NEOFS_GRPC_ENDPOINT=s04.${LOCAL_DOMAIN}:8080
+      - NEOFS_NODE_ADDRESSES=s04.${LOCAL_DOMAIN}:8080
+      - NEOFS_GRPC_0_ENDPOINT=s04.${LOCAL_DOMAIN}:8080
+      - NEOFS_CONTROL_GRPC_ENDPOINT=s04.${LOCAL_DOMAIN}:8081
       - NEOFS_NODE_ATTRIBUTE_0=UN-LOCODE:FI HEL
       - NEOFS_NODE_ATTRIBUTE_1=Price:44