From 2d91848c672d93e38444d96a5999f065b127f285 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Tue, 17 Nov 2020 19:02:38 +0300 Subject: [PATCH] Update neofs-node to v0.12.0 With this commit: * sidechain produces block per second, * inner ring nodes emit gas through alphabet contracts, * storage nodes re-bootstrap every couple of epochs, otherwise they will be removed from netmap. Signed-off-by: Alex Vanin --- .env | 4 ++-- services/ir/.ir.env | 4 +++- services/morph_chain/protocol.privnet.yml | 2 +- services/storage/.storage.env | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.env b/.env index d5db756..8e7907f 100644 --- a/.env +++ b/.env @@ -10,9 +10,9 @@ NEOGO_VERSION=0.91.1-pre-389-g71216865 MORPH_CHAIN_URL="https://fs.neo.org/dist/morph.chain.gz" # NeoFS InnerRing nodes -IR_VERSION=0.12.0-rc3 +IR_VERSION=0.12.0 IR_IMAGE=nspccdev/neofs-ir # NeoFS Storage nodes -NODE_VERSION=0.12.0-rc3 +NODE_VERSION=0.12.0 NODE_IMAGE=nspccdev/neofs-storage diff --git a/services/ir/.ir.env b/services/ir/.ir.env index 297f872..bee3b2b 100644 --- a/services/ir/.ir.env +++ b/services/ir/.ir.env @@ -6,7 +6,9 @@ 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_EPOCH=30s -NEOFS_IR_TIMERS_EMIT=1000h +NEOFS_IR_TIMERS_EMIT=60s +NEOFS_IR_EMIT_STORAGE_AMOUNT=100000000 +NEOFS_IR_NETMAP_CLEANER_ENABLED=true NEOFS_IR_CONTRACTS_NETMAP=80aed80f782d6ac09d717b162123396620f0f382 NEOFS_IR_CONTRACTS_BALANCE=fd5aa5078afdd2f0634636b217f82cb5e7e13258 diff --git a/services/morph_chain/protocol.privnet.yml b/services/morph_chain/protocol.privnet.yml index 49c00d1..bd25cf9 100644 --- a/services/morph_chain/protocol.privnet.yml +++ b/services/morph_chain/protocol.privnet.yml @@ -1,6 +1,6 @@ ProtocolConfiguration: Magic: 56753 - SecondsPerBlock: 15 + SecondsPerBlock: 1 MemPoolSize: 50000 StandbyCommittee: - 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2 diff --git a/services/storage/.storage.env b/services/storage/.storage.env index 38c009b..a3ae304 100644 --- a/services/storage/.storage.env +++ b/services/storage/.storage.env @@ -3,3 +3,5 @@ NEOFS_MORPH_ENDPOINT=http://morph_chain:30333 NEOFS_ACCOUNTING_SCRIPTHASH=fd5aa5078afdd2f0634636b217f82cb5e7e13258 NEOFS_CONTAINER_SCRIPTHASH=a4aa1d4c91f94ddd65b02edf47aab39ba921dd8f NEOFS_NETMAP_SCRIPTHASH=80aed80f782d6ac09d717b162123396620f0f382 + +NEOFS_BOOTSTRAP_PERIODIC_ENABLED=true