diff --git a/config/testnet/README.md b/config/testnet/README.md
index 1b22e3ed6..6a4d7cf2e 100644
--- a/config/testnet/README.md
+++ b/config/testnet/README.md
@@ -1,47 +1,52 @@
-# NEO testnet-preview4 storage node configuration
+# N3 testnet RC1 storage node configuration
There is a prepared configuration for NeoFS storage node deployment in
-NEO testnet-preview4. The Easiest way to deploy storage node is to use prepared
+N3 testnet RC1. The easiest way to deploy storage node is to use prepared
docker image of storage node and run it with docker-compose.
## Build image
-To build custom neofs-storage node image for NEO testnet-preview4:
+Prepared neofs-storage-testnet image is available at docker hub.
+However, if you need to rebuild it for some reason, run
+`make image-storage-testnet` command:
```
-neofs-node$ make image-storage-testnet
+$ make image-storage-testnet
...
Successfully built 80ef4e3c488d
-Successfully tagged nspccdev/neofs-storage-testnet:0.14.1-dirty
-$
+Successfully tagged nspccdev/neofs-storage-testnet:0.18.0-dirty
```
## Deploy node
-To run storage node in NEO testnet-preview4 environment you should deposit
-GAS assets, update docker-compose file and run it.
+To run storage node in N3 testnet RC1 environment you should deposit GAS assets,
+update docker-compose file and start the node.
### Deposit
Storage node holder should deposit assets because it generates a bit of
-sidechain GAS for node's wallet. Sidechain GAS used to send bootstrap tx.
+side chain GAS in node's wallet. Side chain GAS used to send bootstrap tx.
-To make a deposit invoke `deposit` method of NeoFS contract in testnet-preview4.
-There are three arguments in this method:
+First obtain GAS in N3 testnet RC1 chain. You can do that with
+[faucet](https://neowish.ngd.network/neo3/) service.
+
+
+Then make a deposit by invoking `deposit` method of NeoFS contract in N3 testnet
+RC1. There are three arguments in this method:
- scripthash of the wallet
- amount of GAS (in decimal)
- scripthash of the storage node wallet.
-NeoFS contract scripthash in NEO testnet-preview4 is `121da848e5239d24353c7b567a719d27e0fe7c06`
+NeoFS contract scripthash in NEO testnet RC1 is `37a32e1bf20ed5141bc5748892a82f14e75a8e22`
Last argument can be empty if you want to use
wallet key as storage node key. See a deposit example with `neo-go`:
```
-neo-go contract invokefunction -r http://neo3-preview.go.nspcc.ru:20332 \
+neo-go contract invokefunction -r https://rpc1.n3.nspcc.ru:20331 \
-w wallet.json -a NcrE6C1mvScQpAnFctK1Mw7P7i1buLCKav \
-121da848e5239d24353c7b567a719d27e0fe7c06 \
+37a32e1bf20ed5141bc5748892a82f14e75a8e22 \
deposit \
0cbd9d3c3e3a3d12ff5b8bd0d3a0548c6eeac4b9 \
int:1 \
@@ -60,6 +65,29 @@ should contain your public IP.
- NEOFS_GRPC_ENDPOINT=192.168.140.1:36512
```
+Also set up your [UN/LOCODE](https://unece.org/trade/cefact/unlocode-code-list-country-and-territory)
+attribute.
+
+```yaml
+ environment:
+ - NEOFS_NODE_ADDRESS=192.168.140.1:36512
+ - NEOFS_GRPC_ENDPOINT=192.168.140.1:36512
+ - NEOFS_NODE_ATTRIBUTE_1=UN-LOCODE:RU LED
+```
+
+You can check validity of your UN/LOCODE attribute in
+[NeoFS LOCODE database](https://github.com/nspcc-dev/neofs-locode-db/releases/tag/v0.1.0)
+with neofs-cli.
+
+```
+$ neofs-cli util locode info --db ./locode_db --locode 'RU LED'
+Country: Russia
+Location: Saint Petersburg (ex Leningrad)
+Continent: Europe
+Subdivision: [SPE] Sankt-Peterburg
+Coordinates: 59.53, 30.15
+```
+
It is recommended to pass node's key as a file. To do so convert your wallet
WIF to 32-byte hex (via `neofs-cli` for example) and save it in file.
diff --git a/config/testnet/config.yml b/config/testnet/config.yml
index c8051c50c..59e86da7d 100644
--- a/config/testnet/config.yml
+++ b/config/testnet/config.yml
@@ -3,21 +3,21 @@ logger:
morph:
rpc_endpoint:
- - http://rpc1-morph.preview4.nspcc.ru:24333
- - http://rpc2-morph.preview4.nspcc.ru:24333
- - http://rpc3-morph.preview4.nspcc.ru:24333
- - http://rpc4-morph.preview4.nspcc.ru:24333
- - http://rpc5-morph.preview4.nspcc.ru:24333
- - http://rpc6-morph.preview4.nspcc.ru:24333
- - http://rpc7-morph.preview4.nspcc.ru:24333
+ - https://rpc1.morph.fs.neo.org:40341
+ - https://rpc2.morph.fs.neo.org:40341
+ - https://rpc3.morph.fs.neo.org:40341
+ - https://rpc4.morph.fs.neo.org:40341
+ - https://rpc5.morph.fs.neo.org:40341
+ - https://rpc6.morph.fs.neo.org:40341
+ - https://rpc7.morph.fs.neo.org:40341
notification_endpoint:
- - ws://rpc1-morph.preview4.nspcc.ru:24333/ws
- - ws://rpc2-morph.preview4.nspcc.ru:24333/ws
- - ws://rpc3-morph.preview4.nspcc.ru:24333/ws
- - ws://rpc4-morph.preview4.nspcc.ru:24333/ws
- - ws://rpc5-morph.preview4.nspcc.ru:24333/ws
- - ws://rpc6-morph.preview4.nspcc.ru:24333/ws
- - ws://rpc7-morph.preview4.nspcc.ru:24333/ws
+ - wss://rpc1.morph.fs.neo.org:40341/ws
+ - wss://rpc2.morph.fs.neo.org:40341/ws
+ - wss://rpc3.morph.fs.neo.org:40341/ws
+ - wss://rpc4.morph.fs.neo.org:40341/ws
+ - wss://rpc5.morph.fs.neo.org:40341/ws
+ - wss://rpc6.morph.fs.neo.org:40341/ws
+ - wss://rpc7.morph.fs.neo.org:40341/ws
dial_timeout: 20s
bootstrap:
@@ -25,15 +25,14 @@ bootstrap:
enabled: true
accounting:
- scripthash: b9af268168b1546d8b1e0c25dece3faa31153058
+ scripthash: 2835a2d2a28ffc8866840df7aafda5780c7514a3
container:
- scripthash: 31761cba924830bfce2662a39fc7f830b90adbef
+ scripthash: 08ebc0b968cdce2851f1a1d2fe9340e77b1f0f6c
netmap:
- scripthash: 7b383bc5a385859469f366b08b04b4fcd9a41f55
+ scripthash: 600270a6fd666dc137fa3e62c9d2606b75aeb298
node:
key: /node.key
- attribute:
- 0: /external:true
+ attribute_0: Deployed:SelfHosted
storage:
shard:
@@ -49,3 +48,6 @@ storage:
opened_cache_size: 32
shallow_depth: 1
shallow_width: 1
+ gc:
+ remover_batch_size: 100
+ remover_sleep_interval: 1m
diff --git a/config/testnet/docker-compose.yml b/config/testnet/docker-compose.yml
index 15c001adb..f86296748 100644
--- a/config/testnet/docker-compose.yml
+++ b/config/testnet/docker-compose.yml
@@ -3,7 +3,7 @@
version: "2.4"
services:
storage01:
- image: nspccdev/neofs-storage-testnet:0.14.3
+ image: nspccdev/neofs-storage-testnet:0.18.0
container_name: neofs-testnet
network_mode: host
restart: always
@@ -14,6 +14,8 @@ services:
environment:
- NEOFS_NODE_ADDRESS=<ANNOUNCE_ADDRESS>
- NEOFS_GRPC_ENDPOINT=<BIND_ADDRESS>
+ - <NEOFS_NODE_ATTRIBUTE_1>=UN-LOCODE:<XX YYY>
+ - NEOFS_NODE_ATTRIBUTE_2=Price:100000
volumes:
neofs_storage: