From 0bc7f842a32f9c89b5090ed4adfe4fec9f211787 Mon Sep 17 00:00:00 2001
From: Alex Vanin <alexey@nspcc.ru>
Date: Wed, 15 Sep 2021 17:11:20 +0300
Subject: [PATCH] [#132] Update neofs-node to v0.25.0

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
---
 .env                          | 12 ++++++------
 services/ir/.ir.env           | 12 ++----------
 services/storage/.storage.env | 11 ++---------
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/.env b/.env
index a7fe7f7..feb2dfc 100644
--- a/.env
+++ b/.env
@@ -4,18 +4,18 @@ IPV4_PREFIX=192.168.130
 CA_CERTS_TRUSTED_STORE=/etc/ssl/certs
 
 # NeoGo privnet
-CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.10.1/devenv_mainchain_notary_disabled.gz"
+CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.11.0/devenv_mainchain_notary_disabled.gz"
 NEOGO_VERSION=0.97.2
 
 # NeoGo sidechain
-MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.10.1/devenv_sidechain.gz"
+MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.11.0/devenv_sidechain.gz"
 
 # NeoFS InnerRing nodes
-IR_VERSION=0.24.0
+IR_VERSION=0.25.0
 IR_IMAGE=nspccdev/neofs-ir
 
 # NeoFS Storage nodes
-NODE_VERSION=0.24.0
+NODE_VERSION=0.25.0
 NODE_IMAGE=nspccdev/neofs-storage
 
 # HTTP Gate
@@ -23,7 +23,7 @@ HTTP_GW_VERSION=0.16.0
 HTTP_GW_IMAGE=nspccdev/neofs-http-gw
 
 # S3 Gate
-S3_GW_VERSION=0.17.0-rc.1
+S3_GW_VERSION=0.17.0
 S3_GW_IMAGE=nspccdev/neofs-s3-gw
 
 # NeoFS LOCODE database
@@ -31,5 +31,5 @@ LOCODE_DB_URL=https://github.com/nspcc-dev/neofs-locode-db/releases/download/v0.
 #LOCODE_DB_PATH=/path/to/locode_db
 
 # NeoFS CLI binary
-NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.24.0/neofs-cli-amd64.tar.gz
+NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.25.0/neofs-cli-amd64.tar.gz
 #NEOFS_CLI_PATH=/path/to/neofs-cli-binary
diff --git a/services/ir/.ir.env b/services/ir/.ir.env
index bc817f7..533200d 100644
--- a/services/ir/.ir.env
+++ b/services/ir/.ir.env
@@ -32,20 +32,12 @@ NEOFS_IR_TIMERS_DISTRIBUTE_BASIC_INCOME_DIV=4
 NEOFS_IR_EMIT_STORAGE_AMOUNT=100000000
 NEOFS_IR_NETMAP_CLEANER_ENABLED=true
 
-NEOFS_IR_CONTRACTS_NETMAP=6b5a4b75ed4540d14420a7c3264bb936cb78a2d4
-NEOFS_IR_CONTRACTS_BALANCE=21fce15191428e9c2f0e8d0329ff6d3dd14882de
-NEOFS_IR_CONTRACTS_CONTAINER=ed22b4f21f785ed92c1e69e6b307a564aa6dd68d
-NEOFS_IR_CONTRACTS_NEOFS=b65d8243ac63983206d17e5221af0653a7266fa1
-NEOFS_IR_CONTRACTS_AUDIT=eb0bc2d4d02d2c2df424ee252ed07a51f197670e
-NEOFS_IR_CONTRACTS_PROXY=d031ae16a264d019ca32662bfd8fa0809db45361
-NEOFS_IR_CONTRACTS_PROCESSING=91840e88a603db8b422ce472fedabe389d17e228
-NEOFS_IR_CONTRACTS_REPUTATION=53fd67b63e405e102f8cbf1756726f773c8c2424
-NEOFS_IR_CONTRACTS_NEOFSID=96c1c6db6c52de1f90423be02fb73acac5cd9964
+NEOFS_IR_CONTRACTS_NEOFS=e2535ba4e47f02e11187ab47f3d6f31e07b75488
+NEOFS_IR_CONTRACTS_PROCESSING=42102bc8c1b0ad9a269915555dca16e0dc8222d9
 
 # Amount of alphabetic contracts in network, 7 by default.
 # Limited by the number of letters in Glagolitic.
 NEOFS_IR_CONTRACTS_ALPHABET_AMOUNT=1
-NEOFS_IR_CONTRACTS_ALPHABET_AZ=32bec31e059fecefdeb9c0e15f840a0439b5a713
 
 NEOFS_IR_MORPH_VALIDATORS=02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2
 NEOFS_IR_AUDIT_PDP_MAX_SLEEP_INTERVAL=100ms
diff --git a/services/storage/.storage.env b/services/storage/.storage.env
index c7a7eb6..7d0d88c 100644
--- a/services/storage/.storage.env
+++ b/services/storage/.storage.env
@@ -48,21 +48,14 @@ NEOFS_MAINCHAIN_RPC_ENDPOINT=http://morph_chain:30333
 ## Default: 5s
 #NEOFS_APICLIENT_DIAL_TIMEOUT=1m
 
-# Contracts section.
-## Adresses of sidechain contracts.
-## Defaults: empty (invalid)
-NEOFS_CONTRACTS_BALANCE=21fce15191428e9c2f0e8d0329ff6d3dd14882de
-NEOFS_CONTRACTS_CONTAINER=ed22b4f21f785ed92c1e69e6b307a564aa6dd68d
-NEOFS_CONTRACTS_NETMAP=6b5a4b75ed4540d14420a7c3264bb936cb78a2d4
-NEOFS_CONTRACTS_REPUTATION=53fd67b63e405e102f8cbf1756726f773c8c2424
-
 # Common storage node attribute
 NEOFS_NODE_ATTRIBUTE_0=User-Agent:NeoFS\/0.24
 
 # Object section
 ## Worker pool capacity of API Object.Put client calls
 ## Default: 10
-#NEOFS_OBJECT_PUT_POOL_SIZE=100
+#NEOFS_OBJECT_PUT_POOL_SIZE_REMOTE=100
+#NEOFS_OBJECT_PUT_POOL_SIZE_LOCAL=100
 
 # Policer section
 ## Timeout of Object.Head calls by Policer